resource bundle support updated...

[mir.git] / source / mir / generator / FreemarkerGenerator.java

diff --git a/source/mir/generator/FreemarkerGenerator.java b/source/mir/generator/FreemarkerGenerator.java
index da383aa..62e36bf 100755 (executable)
--- a/source/mir/generator/FreemarkerGenerator.java
+++ b/source/mir/generator/FreemarkerGenerator.java
@@ -5,6 +5,8 @@ import java.io.*;
 import freemarker.template.*;
 import mir.entity.*;
 import mir.util.*;
+import mir.misc.*;
+import org.apache.struts.util.MessageResources;
 
 public class FreemarkerGenerator implements Generator {
   private Template template;
@@ -36,7 +38,9 @@ public class FreemarkerGenerator implements Generator {
            return null;
          if (anObject instanceof TemplateModel)
            return (TemplateModel) anObject;
-         if (anObject instanceof String)
+         else if (anObject instanceof MessageResources)
+           return new MessageMethodModel((MessageResources) anObject);
+         else if (anObject instanceof String)
            return makeStringAdapter((String) anObject);
          else if (anObject instanceof Map)
            return makeMapAdapter((Map) anObject);