Changeset 1371

Timestamp:

05/24/11 14:39:05 (13 years ago)

Author:

patdui

Message:

• Sort the leafs of the tree.

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry

Files:

• frontend/AdminHomePage.java (modified) (2 diffs)
• impl/filesystem/ComponentRegistryImpl.java (modified) (1 diff)
• model/AbstractDescription.java (modified) (2 diffs)
• model/ComponentDescription.java (modified) (1 diff)
• model/ProfileDescription.java (modified) (2 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/AdminHomePage.java

@@ -2 +2 @@
 
 import java.security.Principal;
+import java.util.Collections;
 import java.util.List;
 
@@ -286 +287 @@
 
     private void add(DefaultMutableTreeNode parent, List<? extends AbstractDescription> descs, boolean isDeleted, boolean isPublic) {
+        Collections.sort(descs, AbstractDescription.COMPARE_ON_NAME);
         for (AbstractDescription desc : descs) {
             DefaultMutableTreeNode child = new DefaultMutableTreeNode(new DisplayDataNode(desc.getName(), isDeleted, desc, isPublic));

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/filesystem/ComponentRegistryImpl.java

@@ -230 +230 @@
         List<ProfileDescription> result = new ArrayList<ProfileDescription>(profileDescriptions.
                 values());
-        Collections.sort(result, ProfileDescription.COMPARE_ON_NAME);
+        Collections.sort(result, AbstractDescription.COMPARE_ON_NAME);
         return result;
     }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/AbstractDescription.java

@@ -2 +2 @@
 
 import java.text.ParseException;
+import java.util.Comparator;
 import java.util.Date;
 
@@ -145 +146 @@
     }
 
+    public static final Comparator<? super AbstractDescription> COMPARE_ON_NAME = new Comparator<AbstractDescription>() {
+        public int compare(AbstractDescription o1, AbstractDescription o2) {
+            int result = 0;
+            if (o1.getName() != null && o2.getName() != null) {
+                result = o1.getName().compareToIgnoreCase(o2.getName());
+            } else {
+                result = o1.getId().compareTo(o2.getId());
+            }
+            return result;
+        }
+    };
 }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/ComponentDescription.java

@@ -18 +18 @@
             int result = 0;
             if (o1.getGroupName() != null && o2.getGroupName() != null)
-                result = o1.getGroupName().compareTo(o2.getGroupName());
+                result = o1.getGroupName().compareToIgnoreCase(o2.getGroupName());
             if (result == 0) {
                 if (o1.getName() != null && o2.getName() != null) {
-                    result = o1.getName().compareTo(o2.getName());
+                    result = o1.getName().compareToIgnoreCase(o2.getName());
                 } else {
                     result = o1.getId().compareTo(o2.getId());

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/ProfileDescription.java

@@ -2 +2 @@
 
 import java.io.Serializable;
-import java.util.Comparator;
 
 import javax.xml.bind.annotation.XmlRootElement;
@@ -14 +13 @@
     private static final long serialVersionUID = 1L;
 
-    public static final Comparator<? super ProfileDescription> COMPARE_ON_NAME = new Comparator<ProfileDescription>() {
-        public int compare(ProfileDescription o1, ProfileDescription o2) {
-            int result = 0;
-            if (o1.getName() != null && o2.getName() != null) {
-                result = o1.getName().compareTo(o2.getName());
-            } else {
-                result = o1.getId().compareTo(o2.getId());
-            }
-            return result;
-        }
-    };
-
     public static ProfileDescription createNewDescription() {
         String id = ComponentRegistry.REGISTRY_ID + "p_" + IdSequence.get();