Changeset 4026 for ssme/trunk/src/com/kh/ssme/rest/parsers/JSONEntityMerger.java

Timestamp:

01/27/10 12:20:28 (2 years ago)

Author:

mszopinski

Message:

user <-> group interaction

Files:

• ssme/trunk/src/com/kh/ssme/rest/parsers/JSONEntityMerger.java (modified) (3 diffs)

ssme/trunk/src/com/kh/ssme/rest/parsers/JSONEntityMerger.java

@@ -110 +110 @@
                 //private User owner_ = new User();     
                 
-                JSONObject json = (JSONObject)o;
-                Set<User> tempSet = new TreeSet<User>();                
+                JSONObject json = (JSONObject)o;        
                 
                 String name = (String) json.get("name");
@@ -125 +124 @@
                 JSONArray users = (JSONArray) json.get("users");
                 if(users != null){
+                        group.getUsers().clear();                       
                         for (Object ob : users) {
-                                String uuid = (String) ob;
-                                if(uuid!=null){
-                                        boolean add = true;
-                                        for(User u : group.getUsers()){
-                                                if(uuid.equalsIgnoreCase(u.getUUID())){
-                                                        tempSet.add(u);
-                                                        add = false;
-                                                        break;
-                                                }                       
-                                        }
-                                        if(add){
-                                                tempSet.add(UserManager.findUserByUUID(uuid));
-                                        }
-                                }
+                                String uuid = (String) ob;                              
+                                group.getUsers().add(UserManager.findUserByUUID(uuid));
                         }
-                        group.getUsers().clear();
-                        group.getUsers().addAll(tempSet);
-                        tempSet.clear();
                 }
                 
@@ -250 +235 @@
                         user.setMobile(mobile);                 
                 }               
-
-                Set<Group> tempSet = new TreeSet<Group>();                              
+                        
                 JSONArray groups = (JSONArray) json.get("groups");
                 if(groups != null){
+                        user.getGroups().clear();                       
                         for (Object ob : groups) {
                                 String uuid = (String) ob;
-                                if(uuid!=null){
-                                        boolean add = true;
-                                        for(Group g : user.getGroups()){
-                                                if(uuid.equalsIgnoreCase(g.getUUID())){
-                                                        tempSet.add(g);
-                                                        add = false;
-                                                        break;
-                                                }                       
-                                        }
-                                        if(add){
-                                                tempSet.add(GroupManager.findGroupByUUID(uuid));
-                                        }
-                                }
+                                user.getGroups().add(GroupManager.findGroupByUUID(uuid));
                         }
-                        user.getGroups().clear();
-                        user.getGroups().addAll(tempSet);
-
-                }
-                
-                tempSet.clear();                
+                }
+        
                 JSONArray ownedGroups = (JSONArray) json.get("ownedGroups");
                 if(ownedGroups != null){
+                        user.getOwnedGroups().clear();                  
                         for (Object ob : ownedGroups) {
                                 String uuid = (String) ob;
-                                if(uuid!=null){
-                                        boolean add = true;
-                                        for(Group g : user.getOwnedGroups()){
-                                                if(uuid.equalsIgnoreCase(g.getUUID())){
-                                                        tempSet.add(g);
-                                                        add = false;                                                    
-                                                        break;
-                                                }                       
-                                        }
-                                        if(add){
-                                                tempSet.add(GroupManager.findGroupByUUID(uuid));
-                                        }
-                                }
+                                user.getOwnedGroups().add(GroupManager.findGroupByUUID(uuid));
                         }
-                        user.getOwnedGroups().clear();
-                        user.getOwnedGroups().addAll(tempSet);
                 }