[Date] Use the new format_default method on StringFormatter to do def…

…ault stringification on Date and TimeSpan
Whiteknight · Mar 3, 2012 · ec37e35 · ec37e35
1 parent c6aab2b
commit ec37e35
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 14 deletions.
diff --git a/src/core/StringFormatter.winxed b/src/core/StringFormatter.winxed
@@ -28,6 +28,16 @@ namespace Rosella.StringFormatter
         f[type_c] = fmt;
     }
 
+    // Search for a formatter for the given type. Return null if none are found.
+    function get_type_formatter(var type)
+    {
+        var type_c = Rosella.get_type_class(type);
+        var f = Rosella.StringFormatter.type_formatters();
+        if (exists f[type_c])
+            return f[type_c];
+        return null;
+    }
+
     /* Role-Specific Formatters
     */
 

diff --git a/src/date/Date.winxed b/src/date/Date.winxed
@@ -139,24 +139,25 @@ namespace Rosella.Date
     }
 
     // Get the default Date formatter object
-    const string DEFAULT_DATE_FORMATTER = "Rosella.Date.default_date_formatter";
     function default_date_formatter()
     {
-        var temp = Rosella.Globals.get_global(DEFAULT_DATE_FORMATTER);
+        var date_c = class Rosella.Date;
+        var temp = Rosella.StringFormatter.get_type_formatter(date_c);
         if (temp == null) {
             temp = new Rosella.Date.DateFormatter();
-            Rosella.Globals.register_global(DEFAULT_DATE_FORMATTER, temp);
+            Rosella.StringFormatter.register_type_formatter(date_c, temp);
         }
         return temp;
     }
 
-    const string DEFAULT_TIMESPAN_FORMATTER = "Rosella.Date.default_timespan_formatter";
+    // Get the default TimeSpan formatter object
     function default_timespan_formatter()
     {
-        var temp = Rosella.Globals.get_global(DEFAULT_TIMESPAN_FORMATTER);
+        var ts_c = class Rosella.Date.TimeSpan;
+        var temp = Rosella.StringFormatter.get_type_formatter(ts_c);
         if (temp == null) {
             temp = new Rosella.Date.TimeSpanFormatter();
-            Rosella.Globals.register_global(DEFAULT_TIMESPAN_FORMATTER, temp);
+            Rosella.StringFormatter.register_type_formatter(ts_c, temp);
         }
         return temp;
     }
@@ -533,18 +534,18 @@ class Rosella.Date
     {
         if (f == null || f == "")
             return string(self);
-        return self.get_string_converter().format(self, f);
+        return self.get_string_formatter().format(self, f);
     }
 
-    // Get the string converter to use
-    function get_string_converter()
+    // Get the string formatter to use
+    function get_string_formatter()
     {
         return Rosella.Date.default_date_formatter();
     }
 
     function to_string()
     {
-        return sprintf("%04d/%02d/%02d %02d:%02d:%02d", [self.year(), self.month(), self.day(), self.hours(), self.minutes(), self.seconds()]);
+        return self.get_string_formatter().format_default(self);
     }
 
     /* Operations and TimeSpans

diff --git a/src/date/DateFormatter.winxed b/src/date/DateFormatter.winxed
@@ -40,4 +40,11 @@ class Rosella.Date.DateFormatter : Rosella.StringFormatter
         if (contains(f, "ss"))   f = f.replace("ss", format("%02d", obj.seconds()));
         return f;
     }
+
+    function format_default(var obj)
+    {
+        return sprintf("%04d/%02d/%02d %02d:%02d:%02d",
+            [obj.year(), obj.month(), obj.day(), obj.hours(), obj.minutes(), obj.seconds()]
+        );
+    }
 }
diff --git a/src/date/TimeSpan.winxed b/src/date/TimeSpan.winxed
@@ -102,19 +102,20 @@ class Rosella.Date.TimeSpan
     {
         if (f == null || f == "")
             return string(self);
-        return self.get_string_converter().format(self, f);
+        return self.get_string_formatter().format(self, f);
     }
 
-    // Get the string converter to use
-    function get_string_converter()
+    // Get the string formatter to use. Use the default formatter. Subclasses
+    // can use something else
+    function get_string_formatter()
     {
         return Rosella.Date.default_timespan_formatter();
     }
 
     // Get a string represetation
     function to_string()
     {
-        return sprintf("%d days, %02d:%02d:%02d", [self.days(), self.hours(), self.minutes(), self.seconds()]);
+        return self.get_string_formatter().format_default(self);
     }
 
     /* Vtables

diff --git a/src/date/TimeSpanFormatter.winxed b/src/date/TimeSpanFormatter.winxed
@@ -16,4 +16,11 @@ class Rosella.Date.TimeSpanFormatter : Rosella.StringFormatter
         if (contains(f, "ss")) f = f.replace("ss", format("%02d", obj.seconds()));
         return f;
     }
+
+    function format_default(var obj)
+    {
+        return sprintf("%d days, %02d:%02d:%02d",
+            [obj.days(), obj.hours(), obj.minutes(), obj.seconds()]
+        );
+    }
 }