fileedit fixed

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

diff --git a/source/mir/generator/GeneratorHelper.java b/source/mir/generator/GeneratorHelper.java
index 9697141..cfd49e0 100755 (executable)
--- a/source/mir/generator/GeneratorHelper.java
+++ b/source/mir/generator/GeneratorHelper.java
@@ -34,17 +34,13 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.struts.util.MessageResources;
-
-
-import mir.config.MirPropertiesConfiguration;
-import mir.entity.adapter.*;
-import mir.generator.GeneratorExc;
+import mir.entity.adapter.EntityIteratorAdapter;
 import mir.util.CachingRewindableIterator;
 import mir.util.ResourceBundleGeneratorFunction;
-
 import mircoders.global.MirGlobal;
 
+import org.apache.struts.util.MessageResources;
+
 
 
 public class GeneratorHelper {
@@ -54,29 +50,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(