Various fixes + Upgrades to the FileEdit module:

[mir.git] / source / mircoders / servlet / ServletHelper.java

diff --git a/source/mircoders/servlet/ServletHelper.java b/source/mircoders/servlet/ServletHelper.java
index 205ac8b..c3e4b85 100755 (executable)
--- a/source/mircoders/servlet/ServletHelper.java
+++ b/source/mircoders/servlet/ServletHelper.java
@@ -1,51 +1,101 @@
-package mircoders.servlet;
-
-import java.util.*;
-import java.io.*;
-
-import org.apache.struts.util.MessageResources;
-
-import mir.entity.*;
-import mir.entity.adapter.*;
-import mir.generator.*;
-import mir.servlet.*;
-import mir.util.*;
-
-import mircoders.global.*;
-
-
-
-public class ServletHelper {
-// ML: add logging!
-
-  static Map makeGenerationData(Locale aLocale) throws ServletModuleException {
-    try {
-      MessageResources messages;
-      Map result = new HashMap();
-
-      MirGlobal.localizer().producerAssistant().initializeGenerationValueSet(result);
-      messages = MessageResources.getMessageResources("bundles.admin");
-
-      result.put( "lang", new ResourceBundleGeneratorFunction( aLocale, messages));
-
-      return result;
-    }
-    catch (Throwable t) {
-      throw new ServletModuleException(t.getMessage());
-    }
-  }
-
-  static void generateResponse(PrintWriter aWriter, Map aGenerationData, String aGenerator) throws ServletModuleException {
-
-    Generator generator;
-
-    try {
-      generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator(aGenerator);
-
-      generator.generate(aWriter, aGenerationData, new PrintWriter(new NullWriter()));
-    }
-    catch (Throwable t) {
-      throw new ServletModuleException(t.getMessage());
-    }
-  }
-}
\ No newline at end of file
+package mircoders.servlet;\r
+\r
+import java.io.PrintWriter;\r
+import java.util.HashMap;\r
+import java.util.Locale;\r
+import java.util.Map;\r
+\r
+import org.apache.struts.util.MessageResources;\r
+\r
+import mir.entity.adapter.EntityIteratorAdapter;\r
+import mir.generator.Generator;\r
+import mir.servlet.ServletModuleExc;\r
+import mir.servlet.ServletModuleFailure;\r
+import mir.util.CachingRewindableIterator;\r
+import mir.util.NullWriter;\r
+import mir.util.ResourceBundleGeneratorFunction;\r
+\r
+import mircoders.global.MirGlobal;\r
+\r
+\r
+\r
+public class ServletHelper {\r
+  static Map makeGenerationData(Locale aLocale) throws ServletModuleExc {\r
+    return makeGenerationData(aLocale, "bundles.adminlocal", "bundles.admin");\r
+  }\r
+\r
+  static Map makeGenerationData(Locale aLocale, String aBundle) throws ServletModuleExc {\r
+    return makeGenerationData(aLocale, aBundle, aBundle);\r
+  }\r
+\r
+  static Map makeGenerationData(Locale aLocale, String aBundle, String aDefaultBundle) throws ServletModuleExc {\r
+\r
+    try {\r
+      Map result = new HashMap();\r
+\r
+      MirGlobal.localizer().producerAssistant().initializeGenerationValueSet(result);\r
+\r
+      result.put("returnurl", null);\r
+\r
+      Object languages =\r
+          new CachingRewindableIterator(\r
+            new EntityIteratorAdapter( "", "id", 30,\r
+               MirGlobal.localizer().dataModel().adapterModel(), "language"));\r
+      Object topics =\r
+          new CachingRewindableIterator(\r
+            new EntityIteratorAdapter("", "id", 30,\r
+               MirGlobal.localizer().dataModel().adapterModel(), "topic"));\r
+\r
+      Object articleTypes =\r
+          new CachingRewindableIterator(\r
+            new EntityIteratorAdapter( "", "id", 30,\r
+               MirGlobal.localizer().dataModel().adapterModel(), "articleType"));\r
+\r
+      Object commentStatuses =\r
+          new CachingRewindableIterator(\r
+            new EntityIteratorAdapter( "", "id", 30,\r
+               MirGlobal.localizer().dataModel().adapterModel(), "commentStatus"));\r
+\r
+      result.put("commentstatuses", commentStatuses);\r
+      result.put("articletypes", articleTypes);\r
+      result.put("languages", languages);\r
+      result.put("topics", topics);\r
+\r
+      result.put( "lang",\r
+          new ResourceBundleGeneratorFunction( aLocale,\r
+                  MessageResources.getMessageResources(aBundle),\r
+                  MessageResources.getMessageResources(aDefaultBundle)));\r
+\r
+      return result;\r
+    }\r
+    catch (Throwable t) {\r
+      throw new ServletModuleFailure(t);\r
+    }\r
+  }\r
+\r
+  static void generateResponse(PrintWriter aWriter, Map aGenerationData, String aGenerator) throws ServletModuleExc {\r
+    Generator generator;\r
+\r
+    try {\r
+      generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator(aGenerator);\r
+\r
+      generator.generate(aWriter, aGenerationData, new PrintWriter(new NullWriter()));\r
+    }\r
+    catch (Throwable t) {\r
+      throw new ServletModuleFailure(t);\r
+    }\r
+  }\r
+\r
+  static void generateOpenPostingResponse(PrintWriter aWriter, Map aGenerationData, String aGenerator) throws ServletModuleExc {\r
+    Generator generator;\r
+\r
+    try {\r
+      generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator(aGenerator);\r
+\r
+      generator.generate(aWriter, aGenerationData, new PrintWriter(new NullWriter()));\r
+    }\r
+    catch (Throwable t) {\r
+      throw new ServletModuleFailure(t);\r
+    }\r
+  }\r
+}\r