- producer links are moved to an "advanced" page, not intended for normal

[mir.git] / source / mircoders / producer / CompositeProducerFactory.java

diff --git a/source/mircoders/producer/CompositeProducerFactory.java b/source/mircoders/producer/CompositeProducerFactory.java
index 4184417..1a38be9 100755 (executable)
--- a/source/mircoders/producer/CompositeProducerFactory.java
+++ b/source/mircoders/producer/CompositeProducerFactory.java
@@ -36,14 +36,18 @@ import mir.entity.*;
 import mir.producer.*;
 
 public class CompositeProducerFactory implements ProducerFactory {
-  Map factories;          // verb -> Vector ( ProducerFactory )
+  private Map factories;          // verb -> Vector ( ProducerFactory )
+  private List verbs;
+  private String name;
 
-  public CompositeProducerFactory() {
+  public CompositeProducerFactory(String aName) {
     factories = new HashMap();
+    verbs = new Vector();
+    name = aName;
   }
 
-  public CompositeProducerFactory(ProducerFactory[] aSubProducerFactories) {
-    this();
+  public CompositeProducerFactory(String aName, ProducerFactory[] aSubProducerFactories) {
+    this(aName);
 
     int i;
 
@@ -52,15 +56,25 @@ public class CompositeProducerFactory implements ProducerFactory {
     }
   }
 
-  private List factoriesForVerb(String aVerb) {
+  private List findFactoriesForVerb(String aVerb) {
+    List result = (List) factories.get(aVerb);
+
+    if (result==null)
+      result = new Vector();
+
+    return result;
+  }
+
+  private List factoriesForVerb(ProducerVerb aVerb) {
     List result;
 
-    result=(List) factories.get(aVerb);
+    result=(List) factories.get(aVerb.getName());
 
     if (result==null) {
       result=new Vector();
 
-      factories.put(aVerb, result);
+      verbs.add(aVerb);
+      factories.put(aVerb.getName(), result);
     }
 
     return result;
@@ -72,14 +86,14 @@ public class CompositeProducerFactory implements ProducerFactory {
     i=aFactory.verbs();
 
     while (i.hasNext()) {
-      factoriesForVerb((String) i.next()).add(aFactory);
+      factoriesForVerb((ProducerVerb) i.next()).add(aFactory);
     }
   }
 
   public mir.producer.Producer makeProducer(String aVerb, Map aBasicValueSet) throws ProducerExc, ProducerFailure {
     CompositeProducer result = new CompositeProducer();
 
-    Iterator i=factoriesForVerb(aVerb).iterator();
+    Iterator i=findFactoriesForVerb(aVerb).iterator();
 
     while (i.hasNext())
       result.addProducer(((ProducerFactory) i.next()).makeProducer(aVerb, aBasicValueSet));
@@ -88,6 +102,10 @@ public class CompositeProducerFactory implements ProducerFactory {
   }
 
   public Iterator verbs() {
-    return factories.keySet().iterator();
+    return verbs.iterator();
+  }
+
+  public String getName() {
+    return name;
   }
 }