rebuilding head

[mir.git] / source / mir / producer / reader / ScriptedProducerFactory.java

diff --git a/source/mir/producer/reader/ScriptedProducerFactory.java b/source/mir/producer/reader/ScriptedProducerFactory.java
index 9e328d5..1964b3c 100755 (executable)
--- a/source/mir/producer/reader/ScriptedProducerFactory.java
+++ b/source/mir/producer/reader/ScriptedProducerFactory.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,48 +18,67 @@
  * 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 mir.producer.reader;
 
-import java.util.*;
-import mir.producer.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import mir.producer.CompositeProducerNode;
+import mir.producer.NodedProducer;
+import mir.producer.Producer;
+import mir.producer.ProducerExc;
+import mir.producer.ProducerFactory;
+import mir.producer.ProducerFailure;
+import mir.producer.ProducerNode;
 
 public class ScriptedProducerFactory implements ProducerFactory {
-  private Map verbs;
+  private List verbs;
+  private Map verbNodes;
   private ProducerNode body;
   private String defaultVerb;
+  private String name;
 
-  public ScriptedProducerFactory(Map aVerbs, ProducerNode aBody, String aDefaultVerb) {
+  public ScriptedProducerFactory(String aName, List aVerbs, Map aVerbNodes, ProducerNode aBody, String aDefaultVerb) {
     verbs = aVerbs;
+    verbNodes = aVerbNodes;
     body = aBody;
     defaultVerb = aDefaultVerb;
+    name = aName;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public boolean allowVerb(String aVerb) {
+    return verbNodes.containsKey(aVerb) || defaultVerb!=null;
   }
 
-  public ScriptedProducerFactory(Map aVerbs, ProducerNode aBody) {
-    this(aVerbs, aBody, null);
+  public ScriptedProducerFactory(String aName, List aVerbs, Map aVerbNodes, ProducerNode aBody) {
+    this(aName, aVerbs, aVerbNodes, aBody, null);
   }
 
   public Producer makeProducer(String aVerb, Map aStartingValues) throws ProducerFailure, ProducerExc {
     CompositeProducerNode rootNode;
     ProducerNode verbNode;
 
-    if (verbs.containsKey(aVerb)) {
-      verbNode = (ProducerNode) verbs.get(aVerb);
+    if (verbNodes.containsKey(aVerb)) {
+      verbNode = (ProducerNode) verbNodes.get(aVerb);
     }
-    else if (defaultVerb!=null && verbs.containsKey(defaultVerb)) {
-      verbNode = (ProducerNode) verbs.get(defaultVerb);
+    else if (defaultVerb!=null && verbNodes.containsKey(defaultVerb)) {
+      verbNode = (ProducerNode) verbNodes.get(defaultVerb);
     }
-    else throw new ProducerExc("Undefined verb: " + aVerb);
+    else throw new ProducerExc("Undefined verb: " + aVerb + " (and no default verb was defined)");
 
     rootNode = new CompositeProducerNode();
     rootNode.addSubNode(verbNode);
@@ -68,7 +87,7 @@ public class ScriptedProducerFactory implements ProducerFactory {
     return new NodedProducer(rootNode, aVerb, aStartingValues);
   };
 
-  public Iterator verbs() {
-    return verbs.keySet().iterator();
+  public List verbs() {
+    return verbs;
   }
 }
\ No newline at end of file