/ - Diff - Pithos Web Client - Greek Research and Technology Network's projects

             hide();
+        }
         private void doAddUser(final String userID) {
             group.addMember(userID);
         private void doAddUserByName(final String userDisplayName) {
             final String userID = app.getIDForUserDisplayName(userDisplayName);
             group.addMemberID(userID);
             String path = "?update=";
             PostRequest updateGroup = new PostRequest(app.getApiPath(), app.getUserID(), path) {
-...
             };
             updateGroup.setHeader(Const.X_AUTH_TOKEN, app.getUserToken());
             String groupMembers = "";
             for(String u : group.getMembers()) {
             for(String u : group.getMemberIDs()) {
                 groupMembers += (URL.encodePathSegment(u) + ",");
+            }
             updateGroup.setHeader(Const.X_ACCOUNT_GROUP_ + URL.encodePathSegment(group.getName()), groupMembers);
-...
+            }
             if(app.hasIDForUserDisplayName(userDisplayName)) {
                 final String userID = app.getIDForUserDisplayName(userDisplayName);
                 doAddUser(userID);
                 doAddUserByName(userDisplayName);
+            }
             else {
                 new UpdateUserCatalogs(app, null, Arrays.asList(userDisplayName)) {
                     @Override
                     public void onSuccess(UserCatalogs requestedUserCatalogs, UserCatalogs updatedUserCatalogs) {
                         final String userID = app.getIDForUserDisplayName(userDisplayName);
                         doAddUser(userID);
                         doAddUserByName(userDisplayName);
+                    }
                 }.scheduleDeferred();
+            }

                     final List<Group> groups = account.getGroups();
                     for(Group group : groups) {
                         LOG("Group ", group);
                         for(String member: group.getMembers()) {
                         for(String member: group.getMemberIDs()) {
                             LOG("      ", member);
                             memberIDs.add(member);
+                        }

         	final Group group = app.getAccount().getGroup(groupName);
         	if (group == null)
         		return;
         	group.removeMember(user.getUserID());
         	group.removeMemberID(user.getUserID());
         	String path = "?update=";
         	PostRequest updateGroup = new PostRequest(app.getApiPath(), app.getUserID(), path) {
-...
     		};
     		updateGroup.setHeader("X-Auth-Token", app.getUserToken());
     		String groupMembers = "";
     		if (!group.getMembers().isEmpty()) {
     			for (String u : group.getMembers())
     		if (!group.getMemberIDs().isEmpty()) {
     			for (String u : group.getMemberIDs())
     				groupMembers += (URL.encodePathSegment(u) + ",");
+    		}
     		else

     		            Group g = new Group(groupName);
     		            String[] members = h.getValue().split(",");
     		            for (String s : members)
     		                g.addMember(URL.decodePathSegment(s).trim());
     		                g.addMemberID(URL.decodePathSegment(s).trim());
     		            groups.add(g);
+    		        }
     		        else if (name.equals("X-Account-Container-Count")) {

     import java.util.List;
     public class Group {
         private String name;
         private final String name;
         private List<String> members = new ArrayList<String>();
         private final List<String> memberIDs = new ArrayList<String>();
         public Group(String _name) {
             name = _name;
         public Group(String name) {
             this.name = name;
+        }
         public List<String> getMembers() {
             return members;
         public List<String> getMemberIDs() {
             return memberIDs;
+        }
         public String getName() {
             return name;
+        }
         public void addMember(String user) {
             members.add(user);
         public void addMemberID(String userID) {
             memberIDs.add(userID);
+        }
     	public void removeMember(String username) {
     		members.remove(username);
     	public void removeMemberID(String userID) {
     		memberIDs.remove(userID);
+    	}
         @Override
         public String toString() {
             return "Group(" + name + ", " + members.size() + " members)";
             return "Group(" + name + ", " + memberIDs.size() + " members)";
+        }
+    }

b/src/gr/grnet/pithos/web/client/grouptree/GroupTreeViewModel.java
83	83	private Cell<User> userCell = new AbstractCell<User>(ContextMenuEvent.getType().getName()) {
84	84
85	85	@Override
86		public void render(Context context, User value, SafeHtmlBuilder sb) {
	86	public void render(Context context, User user, SafeHtmlBuilder sb) {
87	87	String html = AbstractImagePrototype.create(GroupTreeView.images.user()).getHTML();
88	88	sb.appendHtmlConstant(html).appendHtmlConstant(" ");
89		sb.append(Templates.INSTANCE.nameSpan(value.getUserID()));
	89	final String userID = user.getUserID();
	90	final String userDisplayName = app.getDisplayNameForUserID(userID);
	91	sb.append(Templates.INSTANCE.nameSpan(userDisplayName));
90	92	}
91	93
92	94	@Override
...	...
174	176	}
175	177	final ListDataProvider<User> dataProvider = userDataProviderMap.get(g);
176	178	dataProvider.getList().clear();
177		for (String u : g.getMembers())
178		dataProvider.getList().add(new User(u, g.getName()));
	179	for (String userID : g.getMemberIDs())
	180	dataProvider.getList().add(new User(userID, g.getName()));
179	181	return new DefaultNodeInfo<User>(dataProvider, userCell, userSelectionModel, null);
180	182	}
181	183
...	...
185	187	return true;
186	188	}
187	189	else if (o instanceof Group)
188		return ((Group) o).getMembers().isEmpty();
	190	return ((Group) o).getMemberIDs().isEmpty();
189	191	return false;
190	192	}
191	193
...	...
201	203	}
202	204	final ListDataProvider<User> dataProvider = userDataProviderMap.get(group);
203	205	dataProvider.getList().clear();
204		for (String u : group.getMembers())
	206	for (String u : group.getMemberIDs())
205	207	dataProvider.getList().add(new User(u, group.getName()));
206	208	}
207	209	}

Synnefo » Pithos Web Client

Revision 0459d2ef