1.1 restoration

[mir.git] / source / mir / util / GeneratorFormatAdapters.java

diff --git a/source/mir/util/GeneratorFormatAdapters.java b/source/mir/util/GeneratorFormatAdapters.java
index 1e5a55b..becea34 100755 (executable)
--- a/source/mir/util/GeneratorFormatAdapters.java
+++ b/source/mir/util/GeneratorFormatAdapters.java
@@ -54,11 +54,11 @@ public class GeneratorFormatAdapters {
       value = aValue;
     }
 
-    public Generator.GeneratorFunction getFormat() {
+    public Generator.Function getFormat() {
       return new NumberFormattingFunction();
     }
 
-    private class NumberFormattingFunction implements Generator.GeneratorFunction {
+    private class NumberFormattingFunction implements Generator.Function {
       public Object perform(List aParameters) throws GeneratorExc, GeneratorFailure {
         try {
           if (aParameters.size() != 1 || ! (aParameters.get(0)instanceof String))
@@ -81,6 +81,10 @@ public class GeneratorFormatAdapters {
     private TimeZone defaultTimezone;
     private String defaultTimezoneName;
 
+    public DateFormatAdapter(Date aValue) {
+      this(aValue, "");
+    }
+
     public DateFormatAdapter(Date aValue, String aDefaultTimezone) {
       value = aValue;
       defaultTimezoneName = aDefaultTimezone;
@@ -102,7 +106,7 @@ public class GeneratorFormatAdapters {
       return defaultTimezone;
     }
 
-    public Generator.GeneratorFunction getFormat() {
+    public Generator.Function getFormat() {
       return new DateFormattingFunction();
     }
 
@@ -114,7 +118,7 @@ public class GeneratorFormatAdapters {
       return value;
     }
 
-    private class DateFormattingFunction implements Generator.GeneratorFunction {
+    private class DateFormattingFunction implements Generator.Function {
       public Object perform(List aParameters) throws GeneratorExc, GeneratorFailure {
         try {
           if (aParameters.size() < 1 || aParameters.size() > 2 ||