[MMBASE CVS] src/org/mmbase/bridge/implementation ModuleHandler.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv18304

Modified Files:
        ModuleHandler.java 
Log Message:
generics


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation


Index: ModuleHandler.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/ModuleHandler.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- ModuleHandler.java  1 Aug 2008 22:02:24 -0000       1.39
+++ ModuleHandler.java  1 Oct 2008 19:24:28 -0000       1.40
@@ -30,7 +30,7 @@
  *
  * @author Pierre van Rooden
  * @author Rob Vermeulen
- * @version $Id: ModuleHandler.java,v 1.39 2008/08/01 22:02:24 michiel Exp $
+ * @version $Id: ModuleHandler.java,v 1.40 2008/10/01 19:24:28 michiel Exp $
  */
 public class ModuleHandler implements Module, InvocationHandler {
     private static final Logger log = 
Logging.getLoggerInstance(ModuleHandler.class);
@@ -168,34 +168,30 @@
         process(command, parameter, null, null,null);
     }
 
-    public void process(String command, Object parameter, Map auxparameters) {
-        process(command, parameter, auxparameters, null,null);
+    public void process(String command, Object parameter, Map<String, Object> 
auxparameters) {
+        process(command, parameter, auxparameters, null, null);
     }
 
-    public void process(String command, Object parameter, Map auxparameters, 
ServletRequest req,  ServletResponse resp){
+    public void process(String command, Object parameter, Map<String, Object> 
auxparameters, ServletRequest req,  ServletResponse resp){
         if (mmbaseModule instanceof ProcessorModule) {
-                Hashtable<String, Object> cmds = new Hashtable<String, 
Object>();
+            Map<String, Object> cmds = new Hashtable<String, Object>();
                 if (parameter == null) { parameter = "-1"; }
                 cmds.put(command,parameter);
-                // weird change. should be fixed soon in Module.process
-                Hashtable<String, Object> partab = null;
-                if (auxparameters != null) {
-                    partab = new Hashtable<String, Object>(auxparameters);
-                } else {
-                    partab = new Hashtable<String, Object>();
+            if (auxparameters == null) {
+                auxparameters = new Hashtable<String, Object>();
                 }
-                ((ProcessorModule)mmbaseModule).process(new 
PageInfo((HttpServletRequest)req, (HttpServletResponse)resp, 
getCloud(auxparameters)),cmds,partab);
-                if (auxparameters != null) auxparameters.putAll(partab);
+            ((ProcessorModule)mmbaseModule).process(new 
PageInfo((HttpServletRequest)req, (HttpServletResponse)resp, 
getCloud(auxparameters)), cmds, auxparameters);
+
         } else {
             throw new BridgeException("process() is not supported by this 
module.");
         }
     }
 
-    public NodeList getList(String command, Map parameters){
+    public NodeList getList(String command, Map<String, ?> parameters){
         return getList(command, parameters,null,null);
     }
 
-    public NodeList getList(String command, Map parameters, ServletRequest 
req, ServletResponse resp){
+    public NodeList getList(String command, Map<String, ?> parameters, 
ServletRequest req, ServletResponse resp){
         if (mmbaseModule instanceof ProcessorModule) {
             Cloud cloud = getCloud(parameters);
             log.info("Found " + cloud + " " + (cloud != null ? "" + 
cloud.getUser() : ""));
@@ -279,7 +275,7 @@
         return getFunction(functionName).createParameters();
     }
 
-    public FieldValue getFunctionValue(String functionName, List parameters) {
+    public FieldValue getFunctionValue(String functionName, List<?> 
parameters) {
         return 
(FieldValue)getFunction(functionName).getFunctionValueWithList(parameters);
     }
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs