X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Flocalizer%2Fbasic%2FMirBasicProducerLocalizer.java;h=a54ba004e85c995e9486ee6e18f4cab11909f7d2;hb=314b6a22bd19592c88720a079a6fdf763e123be4;hp=0531d06328b41fc7da3ba695e3d9cceb6993c334;hpb=b5dfdb12e72c15762c6a9d21a3d37db9ba97c92a;p=mir.git

diff --git a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
index 0531d063..a54ba004 100755
--- a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,17 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License, 
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
+ * (or with modified versions of the above that use the same license as the above), 
+ * and distribute linked combinations including the two.  You must obey the 
+ * GNU General Public License in all respects for all of the code used other than 
+ * the above mentioned libraries.  If you modify this file, you may extend this 
+ * exception to your version of the file, but you are not obligated to do so.  
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package mircoders.localizer.basic;
 
 import java.io.File;
@@ -42,7 +40,6 @@ 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;
@@ -53,12 +50,6 @@ import mircoders.global.ProducerEngine;
 import mircoders.localizer.MirLocalizerExc;
 import mircoders.localizer.MirLocalizerFailure;
 import mircoders.localizer.MirProducerLocalizer;
-import mircoders.producer.CompositeProducerFactory;
-import mircoders.producer.OldProducerAdapterFactory;
-import mircoders.producer.ProducerAudio;
-import mircoders.producer.ProducerImages;
-import mircoders.producer.ProducerOther;
-import mircoders.producer.ProducerVideo;
 import mircoders.producer.reader.SupplementalProducerNodeBuilders;
 
 public class MirBasicProducerLocalizer implements MirProducerLocalizer {
@@ -77,7 +68,7 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
     try {
       logger = new LoggerWrapper("Localizer.Basic.Producer");
 
-      String allNewProducers = MirGlobal.getConfigProperty("Mir.Localizer.Producer.AllNewProducers");
+      String allNewProducers = MirGlobal.config().getString("Mir.Localizer.Producer.AllNewProducers");
       allNewProducerTasks = ProducerEngine.ProducerTask.parseProducerTaskList(allNewProducers);
 
       producerFactories = new Vector();
@@ -112,6 +103,7 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
       }
       catch (Throwable t) {
         logger.error("MirBasicProducerLocalizer.factories(): Unable to setup factories: "+t.getMessage());
+        t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
       }
     }
 
@@ -122,7 +114,7 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
     try {
       DefaultProducerNodeBuilders.registerBuilders(
           aLibrary, model, generatorLibrary, writerEngine,
-          MirGlobal.getConfigProperty("Home"), MirGlobal.getConfigProperty("Producer.StorageRoot"));
+          MirGlobal.config().getString("Home"), MirGlobal.config().getString("Producer.StorageRoot"));
       SupplementalProducerNodeBuilders.registerBuilders(aLibrary, model);
     }
     catch (Throwable t) {
@@ -139,33 +131,13 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
 
     aFileMonitor.clear();
     reader = new ProducerConfigReader();
-    reader.parseFile(MirGlobal.getConfigProperty("Home") + File.separatorChar + MirGlobal.getConfigProperty("Mir.Localizer.ProducerConfigFile"), library, aFactories, usedFiles);
+    reader.parseFile(MirGlobal.config().getString("Home") + File.separatorChar + MirGlobal.config().getString("Mir.Localizer.ProducerConfigFile"), library, aFactories, usedFiles);
 
     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);
   };