Changeset 5577

Timestamp:

08/22/08 13:59:18 (3 months ago)

Author:

jburel

Message:

Modified text and fixed bug related to comments' display (cf. ticket #629)

Location:

trunk/SRC/org/openmicroscopy/shoola/agents

Files:

• metadata/editor/EditorModel.java (modified) (1 diff)
• metadata/editor/TextualAnnotationsUI.java (modified) (1 diff)
• metadata/editor/UserProfile.java (modified) (5 diffs)
• util/EditorUtil.java (modified) (1 diff)

trunk/SRC/org/openmicroscopy/shoola/agents/metadata/editor/EditorModel.java

@@ -610 +610 @@
         Map<Long, List> getTextualAnnotationByOwner()
         {
-                if (textualAnnotationsByUsers != null)
+                if (textualAnnotationsByUsers != null 
+                        && textualAnnotationsByUsers.size() > 0)
                         return textualAnnotationsByUsers;
                 textualAnnotationsByUsers = new HashMap<Long, List>();

trunk/SRC/org/openmicroscopy/shoola/agents/metadata/editor/TextualAnnotationsUI.java

@@ -401 +401 @@
                 removeAll();
                 setAreaText("");
+                originalText = null;
                 setComponentTitle();
                 add(buildAreaPane());

trunk/SRC/org/openmicroscopy/shoola/agents/metadata/editor/UserProfile.java

@@ -117 +117 @@
     /** The user's details. */
     private Map                                         details;
+    
+    private GroupData[]                         groupData;
     
     /** Modifies the existing password. */
@@ -179 +181 @@
                                 validGroups.add(g);
                 }
-                GroupData[] objects = new GroupData[validGroups.size()];
+                groupData = new GroupData[validGroups.size()];
                 int selectedIndex = 0;
                 int index = 0;
@@ -185 +187 @@
                 while (i.hasNext()) {
                         g = (GroupData) i.next();
-                        objects[index] = g;
+                        groupData[index] = g;
                         if (g.getId() == groupID) originalIndex = index;
                         index++;
@@ -191 +193 @@
                 selectedIndex = originalIndex;
                 //sort by name
-                groups = new JComboBox(objects);
+                groups = new JComboBox(groupData);
                 groups.setRenderer(new GroupsRenderer());
-                if (objects.length != 0)
+                if (groupData.length != 0)
                         groups.setSelectedIndex(selectedIndex);
                 if (isOwner) {
@@ -407 +409 @@
         newOne.setFirstName(v.trim());
         newOne.setId(original.getId());
+        //set the groups
+        if (selectedIndex != originalIndex) {
+                GroupData g = groupData[selectedIndex];
+                ExperimenterData user = (ExperimenterData) model.getRefObject();
+                List userGroups = user.getGroups();
+                List<GroupData> newGroups = new ArrayList<GroupData>();
+                newGroups.add(g);
+                Iterator i = userGroups.iterator();
+                GroupData group;
+                while (i.hasNext()) {
+                                group = (GroupData) i.next();
+                                if (group.getId() != g.getId())
+                                        newGroups.add(group);
+                        }
+                newOne.setGroups(newGroups);
+        }
                 return newOne;
         }

trunk/SRC/org/openmicroscopy/shoola/agents/util/EditorUtil.java

@@ -74 +74 @@
         
     /** Identifies the <code>Default group</code>. */
-        public static final String      DEFAULT_GROUP = "Default Group";
+        public static final String      DEFAULT_GROUP = "Main Group";
         
         /** Symbols indicating the mandatory values. */