see previous message....

diff --git a/source/mircoders/servlet/ServletHelper.java b/source/mircoders/servlet/ServletHelper.java
index 2dc6842..91617da 100755 (executable)
--- a/source/mircoders/servlet/ServletHelper.java
+++ b/source/mircoders/servlet/ServletHelper.java
@@ -36,16 +36,13 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import org.apache.struts.util.MessageResources;\r
-\r
 import mir.config.MirPropertiesConfiguration;\r
 import mir.entity.adapter.*;\r
 import mir.generator.Generator;\r
+import mir.generator.GeneratorHelper;\r
 import mir.log.LoggerWrapper;\r
 import mir.servlet.ServletModuleExc;\r
 import mir.servlet.ServletModuleFailure;\r
-import mir.util.CachingRewindableIterator;\r
-import mir.util.ResourceBundleGeneratorFunction;\r
 import mircoders.entity.EntityUsers;\r
 import mircoders.global.MirGlobal;\r
 \r
@@ -64,9 +61,7 @@ public class ServletHelper {
   public static Map makeGenerationData(HttpServletRequest aRequest, HttpServletResponse aResponse, Locale[] aLocales, String aBundle, String aDefaultBundle) throws ServletModuleExc {\r
     try {\r
       MirPropertiesConfiguration configuration = MirPropertiesConfiguration.instance();\r
-      Map result = new HashMap();\r
-\r
-      MirGlobal.localizer().producerAssistant().initializeGenerationValueSet(result);\r
+      Map result=GeneratorHelper.makeBasicGenerationData(aLocales,aBundle,aBundle,configuration);\r
 \r
       // ML: hackish\r
       ((Map) result.get("config")).put("actionRoot",\r
@@ -75,42 +70,6 @@ public class ServletHelper {
       result.put("returnurl", null);\r
       result.put("login_user", getUserAdapter(aRequest));\r
 \r
-      if (configuration.getString("Mir.Admin.ShowLoggedinUsers").equals("1")) {\r
-        result.put("loggedinusers", MirGlobal.getLoggedInUsers());\r
-      }\r
-      else\r
-        result.put("loggedinusers", null);\r
-\r
-      Object languages =\r
-          new CachingRewindableIterator(\r
-            new EntityIteratorAdapter( "", "id", 30,\r
-               MirGlobal.localizer().dataModel().adapterModel(), "language"));\r
-\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( aLocales,\r
-             new MessageResources[] { MessageResources.getMessageResources(aBundle),\r
-                MessageResources.getMessageResources(aDefaultBundle)}));\r
-\r
       return result;\r
     }\r
     catch (Throwable t) {\r