[MMBASE CVS] applications/scan/src/org/mmbase/module MMUsers.java

[Nico Klasens]

Update of /var/cvs/applications/scan/src/org/mmbase/module
In directory 
james.mmbase.org:/tmp/cvs-serv13704/applications/scan/src/org/mmbase/module

Modified Files:
        MMUsers.java 
Log Message:
Use Map instead of hashtable for userproperties


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


Index: MMUsers.java
===================================================================
RCS file: /var/cvs/applications/scan/src/org/mmbase/module/MMUsers.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- MMUsers.java        8 Mar 2007 08:51:38 -0000       1.14
+++ MMUsers.java        13 Jun 2008 09:59:44 -0000      1.15
@@ -24,7 +24,7 @@
  * @application SCAN
  * @author Arjan Houtman
  * @author Daniel Ockeloen
- * @version $Id: MMUsers.java,v 1.14 2007/03/08 08:51:38 nklasens Exp $
+ * @version $Id: MMUsers.java,v 1.15 2008/06/13 09:59:44 nklasens Exp $
  */
 public class MMUsers extends ProcessorModule {
 
@@ -68,10 +68,9 @@
             log.debug("Clearing session-info of user " + userid);
         }
         if (userid!=null) {
-            Hashtable has = getUserProperties (userid);
+            Map<String, MMObjectNode> has = getUserProperties (userid);
             if (has != null) {
-                for (Enumeration e = has.elements (); e.hasMoreElements (); ) {
-                    MMObjectNode node = (MMObjectNode)e.nextElement ();
+                for (MMObjectNode node : has.values()) {
                     String key = node.getStringValue ("key");
                     if ((key != null) && 
(excludedKeys.indexOf(";"+key+";")<0)) {
                         if (log.isDebugEnabled()) {
@@ -284,7 +283,7 @@
 
             if (tok.equals ("PARENT") && tokens.hasMoreTokens ()) {
                 String    userid = tokens.nextToken ();
-                Hashtable props  = getUserProperties (userid);
+                Map<String, MMObjectNode> props  = getUserProperties (userid);
                 Vector    fields = tagger.Values ("FIELD");
                 String    wanted = (String)fields.firstElement ();
 
@@ -303,12 +302,11 @@
         return res;
     }
 
-    private Vector getListAll (Hashtable props, StringTagger tagger) {
+    private Vector getListAll (Map<String, MMObjectNode> props, StringTagger 
tagger) {
         Vector v = new Vector ();
 
         // Go through all properties...
-        for (Enumeration p    = props.elements (); p.hasMoreElements (); ) {
-            MMObjectNode n    = (MMObjectNode)p.nextElement ();
+        for (MMObjectNode n : props.values()) {
             String       key  = n.getStringValue ("key");
             String       type = n.getStringValue ("ptype");
 
@@ -324,7 +322,7 @@
         return v;
     }
 
-    private Vector getListSelection (Hashtable props, Vector fields, 
StringTagger tagger)
+    private Vector getListSelection (Map<String, MMObjectNode> props, Vector 
fields, StringTagger tagger)
     {
         Vector v = new Vector ();
 
@@ -428,7 +426,7 @@
     // new version from daniel, now uses the getproperties in each node
     // and uses its cache (general mmobjectnode cache).
 
-    private Hashtable getUserProperties (String userid) {
+    private Map<String, MMObjectNode> getUserProperties (String userid) {
         // need a builder to obtain the usernode and its properties
         if (users == null) users = mmbase.getMMObject ("users");
 
@@ -436,7 +434,7 @@
         MMObjectNode usernode = users.getNode(userid);
 
         if (usernode!=null) {
-            Hashtable properties = usernode.getProperties();
+            Map<String, MMObjectNode> properties = usernode.getProperties();
             return properties;
         } else {
             log.warn("MMUsers -> getUserProperties not a valid user = " + 
userid);
@@ -516,13 +514,13 @@
         // oke now lets set the new values
         sessions.setValue(info,"USERNUMBER",newUserID);
 
-        Hashtable has2=getUserProperties(newUserID);
+        Map<String, MMObjectNode> has2=getUserProperties(newUserID);
         if (has2 == null) {
             log.warn("SWITCH: newuser " + newUserID + " has no properties!");
             return "";
         }
-        for (Enumeration e = has2.elements(); e.hasMoreElements (); ) {
-            sessions.setValueFromNode( info, (MMObjectNode)e.nextElement());
+        for (MMObjectNode propNode : has2.values()) {
+            sessions.setValueFromNode( info, propNode);
         }
         return "";
     }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs