keep the logged in users out of basic generation data setup

diff --git a/source/mir/generator/GeneratorHelper.java b/source/mir/generator/GeneratorHelper.java
index 9697141..54bb03c 100755 (executable)
--- a/source/mir/generator/GeneratorHelper.java
+++ b/source/mir/generator/GeneratorHelper.java
@@ -37,7 +37,6 @@ import java.util.Map;
 import org.apache.struts.util.MessageResources;
 
 
-import mir.config.MirPropertiesConfiguration;
 import mir.entity.adapter.*;
 import mir.generator.GeneratorExc;
 import mir.util.CachingRewindableIterator;
@@ -54,29 +53,9 @@ public class GeneratorHelper {
 
   public static Map makeBasicGenerationData(Locale[] aLocales, String aBundle, String aDefaultBundle) throws GeneratorExc{
     try{
-    MirPropertiesConfiguration configuration = MirPropertiesConfiguration.instance();
-    return makeBasicGenerationData(aLocales, aBundle, aDefaultBundle,configuration);
-    }
-    catch (Throwable t){
-      throw new GeneratorExc(t.getMessage());
-    }
-    
-  }
-  
-  /**
-   * Method to initialize the basic generation values for templates.  Does nothing which assumes a servlet context.
-   */
-
-  public static Map makeBasicGenerationData(Locale[] aLocales, String aBundle, String aDefaultBundle,MirPropertiesConfiguration configuration) throws GeneratorExc{
-    try{
     Map result = new HashMap();
     MirGlobal.localizer().producerAssistant().initializeGenerationValueSet(result);
     
-    if (configuration.getString("Mir.Admin.ShowLoggedinUsers").equals("1")) {
-      result.put("loggedinusers", MirGlobal.getLoggedInUsers());
-    }
-    else
-      result.put("loggedinusers", null);
     
     Object languages =
       new CachingRewindableIterator(

diff --git a/source/mircoders/servlet/ServletHelper.java b/source/mircoders/servlet/ServletHelper.java
index 3543083..613b831 100755 (executable)
--- a/source/mircoders/servlet/ServletHelper.java
+++ b/source/mircoders/servlet/ServletHelper.java
@@ -61,7 +61,12 @@ 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=GeneratorHelper.makeBasicGenerationData(aLocales,aBundle,aDefaultBundle,configuration);\r
+      Map result=GeneratorHelper.makeBasicGenerationData(aLocales,aBundle,aDefaultBundle);\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
       // ML: hackish\r
       ((Map) result.get("config")).put("actionRoot",\r