[MMBASE CVS] src/org/mmbase/module/core MMObjectBuilder.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv19329

Modified Files:
        MMObjectBuilder.java 
Log Message:
generics


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core


Index: MMObjectBuilder.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMObjectBuilder.java,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -b -r1.433 -r1.434
--- MMObjectBuilder.java        23 Sep 2008 04:12:08 -0000      1.433
+++ MMObjectBuilder.java        23 Sep 2008 07:23:51 -0000      1.434
@@ -62,7 +62,7 @@
  * @author Rob van Maris
  * @author Michiel Meeuwissen
  * @author Ernst Bunders
- * @version $Id: MMObjectBuilder.java,v 1.433 2008/09/23 04:12:08 michiel Exp $
+ * @version $Id: MMObjectBuilder.java,v 1.434 2008/09/23 07:23:51 michiel Exp $
  */
 public class MMObjectBuilder extends MMTable implements NodeEventListener, 
RelationEventListener {
 
@@ -1340,7 +1340,7 @@
         }
 
         String rtn;
-        String field = pars.getString("field");
+        String field = pars.getString(Parameter.FIELD);
 
         if (locale == null) {
             if (field == null || "".equals(field)) {
@@ -2615,15 +2615,13 @@
      * @return a <code>Map</code> containing the current properties
      * @since MMBase 1.8.2
      */
-    public Map getInitParameters(String contextPath) {
-        Map map = new HashMap();
+    public Map<String, String> getInitParameters(String contextPath) {
+        Map<String, String> map = new HashMap<String, String>();
         map.putAll(getInitParameters());
 
         try {
-            Map contextMap = 
ApplicationContextReader.getProperties(contextPath);
-            if (!contextMap.isEmpty()) {
+            Map<String, String> contextMap = 
ApplicationContextReader.getProperties(contextPath);
                 map.putAll(contextMap);
-            }
         } catch (javax.naming.NamingException ne) {
             log.debug("Can't obtain properties from application context: " + 
ne.getMessage());
         }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs