1.1 restoration

[mir.git] / source / mircoders / localizer / basic / MirBasicProducerLocalizer.java

diff --git a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
index 8b4f987..66d5596 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
@@ -40,11 +40,9 @@ import mir.entity.adapter.EntityAdapterModel;
 import mir.generator.Generator;
 import mir.generator.WriterEngine;
 import mir.log.LoggerWrapper;
-import mir.producer.ProducerFactory;
 import mir.producer.reader.DefaultProducerNodeBuilders;
 import mir.producer.reader.ProducerConfigReader;
 import mir.producer.reader.ProducerNodeBuilderLibrary;
-import mir.util.FileMonitor;
 import mir.util.StringRoutines;
 import mircoders.global.MirGlobal;
 import mircoders.global.ProducerEngine;
@@ -54,15 +52,11 @@ import mircoders.localizer.MirProducerLocalizer;
 import mircoders.producer.reader.SupplementalProducerNodeBuilders;
 
 public class MirBasicProducerLocalizer implements MirProducerLocalizer {
-  private List producerFactories;
-  private Map nameToFactory;
-
   private Map producerRecipes;
   private List producerRecipeNames;
 
-  protected FileMonitor fileMonitor;
   protected EntityAdapterModel model;
-  protected Generator.GeneratorLibrary generatorLibrary;
+  protected Generator.Library generatorLibrary;
   protected WriterEngine writerEngine;
 
   protected LoggerWrapper logger;
@@ -79,8 +73,10 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
         try {
           List parts = StringRoutines.separateString(recipes[i], "=");
           if (parts.size() == 2) {
-            producerRecipes.put(parts.get(0), ProducerEngine.ProducerTask.parseProducerTaskList( (String) parts.get(1)));
-            producerRecipeNames.add(parts.get(0));
+            String key = ((String) parts.get(0)).trim();
+            producerRecipes.put(key, ProducerEngine.ProducerTask.parseProducerTaskList(
+                ((String) parts.get(1)).trim()));
+            producerRecipeNames.add(key);
           }
           else {
             throw new Exception("'=' expected");
@@ -95,14 +91,15 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
       String allNewProducers = MirGlobal.config().getString("Mir.Localizer.Producer.AllNewProducers");
       if (allNewProducers!=null && allNewProducers.length()>0) {
         producerRecipes.put("allnew", ProducerEngine.ProducerTask.parseProducerTaskList(allNewProducers));
-        producerRecipeNames.add("allnew");
+
+        if (!producerRecipeNames.contains("allnew")) {
+          producerRecipeNames.add("allnew");
+        }
       }
 
-      producerFactories = new Vector();
       model = MirGlobal.localizer().dataModel().adapterModel();
       generatorLibrary = MirGlobal.localizer().generators().makeProducerGeneratorLibrary();
       writerEngine = MirGlobal.localizer().generators().makeWriterEngine();
-      nameToFactory = new HashMap();
     }
     catch (Throwable t) {
       logger.error("MirBasicProducerLocalizer(): Exception "+t.getMessage());
@@ -122,10 +119,11 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
         ProducerEngine.ProducerTask task = (ProducerEngine.ProducerTask) i.next();
 
         try {
-          MirGlobal.producerEngine().addTask(task);
+          MirGlobal.getProducerEngine().addTask(task);
         }
         catch (Throwable t) {
-          logger.error("Error recipe "+aName+" tasks "+task.getProducer()+"::"+task.getVerb()+": " + t.toString());
+          logger.error("Error recipe "+aName+" tasks "+
+              task.getProducer()+"::"+task.getVerb()+": " + t.toString());
         }
       }
     }
@@ -133,65 +131,46 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
       throw new MirLocalizerExc("Unknown recipe name: " + aName);
   }
 
-  public List factories() throws MirLocalizerExc {
-    if (fileMonitor==null || producerFactories == null || fileMonitor.hasChanged()) {
+  /**
+   * Loads factories from a file with a {@link ProducerConfigReader}
+   */
+  public List loadFactories() throws MirLocalizerExc {
       try {
-        List newProducers = new Vector();
-        FileMonitor newFileMonitor = new FileMonitor();
-        setupFactories(newProducers, newFileMonitor);
-
-        producerFactories = newProducers;
-        fileMonitor = newFileMonitor;
-        logger.info("MirBasicProducerLocalizer.factories(): successfully setup factories");
-
-        nameToFactory.clear();
-        Iterator i = producerFactories.iterator();
-        while (i.hasNext()) {
-          ProducerFactory factory = (ProducerFactory) i.next();
-          nameToFactory.put(factory.getName(), factory);
-        }
+        List producers = new Vector();
+        ProducerConfigReader reader;
+        ProducerNodeBuilderLibrary library = new ProducerNodeBuilderLibrary();
+        setupProducerNodeBuilderLibrary(library);
+        reader = new ProducerConfigReader();
+        File inputFile =
+            MirGlobal.config().getFile("Mir.Localizer.ProducerConfigFile");
+        reader.parse(inputFile, library, producers);
+
+        logger.info("MirBasicProducerLocalizer.loadFactories(): successfully loaded factories");
+
+        return producers;
       }
       catch (Throwable t) {
-        logger.error("MirBasicProducerLocalizer.factories(): Unable to setup factories: "+t.getMessage());
-        t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
+        logger.error("MirBasicProducerLocalizer.loadFactories(): Unable to load factories: "+
+            t.getMessage());
+        throw new MirLocalizerFailure(t);
       }
-    }
-
-    return producerFactories;
   };
 
-  public ProducerFactory getFactoryForName(String aName) {
-    try {
-      factories();
-    }
-    catch (Throwable t) {
-    }
-
-    return (ProducerFactory) nameToFactory.get(aName);
-  }
-
+  /**
+   * Sets up a {@link ProducerNodeBuilderLibrary} for use by the producer
+   * definition reader. Can be overridden by subclasses to tweak the standard
+   * library.
+   */
   protected void setupProducerNodeBuilderLibrary(ProducerNodeBuilderLibrary aLibrary) throws MirLocalizerFailure {
     try {
       DefaultProducerNodeBuilders.registerBuilders(
           aLibrary, model, generatorLibrary, writerEngine,
-          MirGlobal.config().getString("Home"), MirGlobal.config().getString("Producer.StorageRoot"));
-      SupplementalProducerNodeBuilders.registerBuilders(aLibrary, model);
+          MirGlobal.config().getHome(), MirGlobal.config().getFile("Producer.StorageRoot"));
+      SupplementalProducerNodeBuilders.registerBuilders(aLibrary, MirGlobal.config().getHome());
     }
     catch (Throwable t) {
       throw new MirLocalizerFailure(t.getMessage(), t);
     }
   }
 
-  protected void setupFactories(List aFactories, FileMonitor aFileMonitor) throws MirLocalizerExc, MirLocalizerFailure {
-    ProducerConfigReader reader;
-    ProducerNodeBuilderLibrary library = new ProducerNodeBuilderLibrary();
-    setupProducerNodeBuilderLibrary(library);
-
-    aFileMonitor.clear();
-    reader = new ProducerConfigReader();
-
-    File inputFile = new File(MirGlobal.config().getString("Home"), MirGlobal.config().getString("Mir.Localizer.ProducerConfigFile"));
-    aFileMonitor.addFile(inputFile);
-    reader.parse(inputFile, library, aFactories);
-  }
 }