Changeset 4026 for ssme/trunk/src/com/kh/ssme/rest/parsers/JSONEntityCreator.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/JSONEntityCreator.java (modified) (4 diffs)

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

@@ -111 +111 @@
                 //private User owner_ = new User();     
                 
+                create((BasicData)group, json);         
+                
                 if(group.getName() != null){
                         json.put("name", group.getName());                      
@@ -118 +120 @@
                         json.put("description", group.getDescription());                        
                 }                       
+                
+                if(group.getOwner() != null){
+                        JSONObject owner = new JSONObject();
+                        create(group.getOwner(), owner);
+                        json.put("owner", owner);                       
+                }               
                 
                 if(group.getUsers() != null){
@@ -128 +136 @@
                         json.put("users", users);
                 }       
-                
-                if(group.getOwner() != null){
-                        json.put("owner", group.getOwner().getUUID());                  
-                }       
+                        
         }
 
@@ -211 +216 @@
                 //private Set<com.kh.ssme.model.ifc.Calendar> calendars_ = new TreeSet<com.kh.ssme.model.ifc.Calendar>();
                 //private Set<Group> ownedGroups_ = new TreeSet<Group>();
+                
+                create((BasicData)user, json);          
                         
                 if(user.getLogin() != null){