various fixes/cleanup: old producers are now completely gone, old logfile class too

[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 30db6f4..a31fadd 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
@@ -31,19 +31,29 @@
 
 package mircoders.localizer.basic;
 
-import java.util.*;
-import java.io.*;
-import mir.producer.*;
-import mir.generator.*;
-import mir.producer.reader.*;
-import mir.misc.*;
-import mir.util.*;
-import mir.entity.adapter.*;
-import mircoders.global.*;
-import mircoders.global.*;
-import mircoders.localizer.*;
-import mircoders.producer.reader.*;
-import mircoders.producer.*;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+import mir.entity.adapter.EntityAdapterModel;
+import mir.generator.Generator;
+import mir.generator.WriterEngine;
+import mir.log.LoggerWrapper;
+import mir.producer.CompositeProducerNode;
+import mir.producer.ProducerFactory;
+import mir.producer.reader.DefaultProducerNodeBuilders;
+import mir.producer.reader.ProducerConfigReader;
+import mir.producer.reader.ProducerNodeBuilderLibrary;
+import mir.util.FileMonitor;
+import mircoders.global.MirGlobal;
+import mircoders.global.ProducerEngine;
+import mircoders.localizer.MirLocalizerExc;
+import mircoders.localizer.MirLocalizerFailure;
+import mircoders.localizer.MirProducerLocalizer;
+import mircoders.producer.reader.SupplementalProducerNodeBuilders;
 
 public class MirBasicProducerLocalizer implements MirProducerLocalizer {
   private List producerFactories;
@@ -55,10 +65,12 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
   protected Generator.GeneratorLibrary generatorLibrary;
   protected WriterEngine writerEngine;
 
-  protected static Logfile logger = Logfile.getInstance( MirGlobal.getConfigProperty("Home") + "/" + MirGlobal.getConfigProperty("Mir.Localizer.Logfile"));
+  protected LoggerWrapper logger;
 
   public MirBasicProducerLocalizer() {
     try {
+      logger = new LoggerWrapper("Localizer.Basic.Producer");
+
       String allNewProducers = MirGlobal.getConfigProperty("Mir.Localizer.Producer.AllNewProducers");
       allNewProducerTasks = ProducerEngine.ProducerTask.parseProducerTaskList(allNewProducers);
 
@@ -69,7 +81,7 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
       nameToFactory = new HashMap();
     }
     catch (Throwable t) {
-      logger.printError("MirBasicProducerLocalizer(): Exception "+t.getMessage());
+      logger.error("MirBasicProducerLocalizer(): Exception "+t.getMessage());
       model = new EntityAdapterModel();
     }
   }
@@ -83,7 +95,7 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
 
         producerFactories = newProducers;
         fileMonitor = newFileMonitor;
-        logger.printInfo("MirBasicProducerLocalizer.factories(): successfully setup factories");
+        logger.info("MirBasicProducerLocalizer.factories(): successfully setup factories");
 
         nameToFactory.clear();
         Iterator i = producerFactories.iterator();
@@ -93,7 +105,7 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
         }
       }
       catch (Throwable t) {
-        logger.printError("MirBasicProducerLocalizer.factories(): Unable to setup factories: "+t.getMessage());
+        logger.error("MirBasicProducerLocalizer.factories(): Unable to setup factories: "+t.getMessage());
       }
     }
 
@@ -126,28 +138,8 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
     i = usedFiles.iterator();
     while (i.hasNext())
       aFileMonitor.addFile((File) i.next());
-
-    setupFactories(aFactories);
   }
 
-  protected void setupFactories(List aFactories) throws MirLocalizerExc, MirLocalizerFailure {
-    CompositeProducerNode node;
-
-    try {
-      aFactories.add(
-                   new CompositeProducerFactory("media", new ProducerFactory[] {
-                      new OldProducerAdapterFactory("images", new ProducerImages()),
-                      new OldProducerAdapterFactory("audio", new ProducerAudio()),
-                      new OldProducerAdapterFactory("video", new ProducerVideo()),
-                      new OldProducerAdapterFactory("other", new ProducerOther())
-                  } )
-      );
-    }
-    catch (Exception e) {
-      throw new MirLocalizerFailure(e);
-    }
-  };
-
   public void produceAllNew() {
     MirGlobal.producerEngine().addTasks(allNewProducerTasks);
   };