Changeset 253

Timestamp:

03/18/10 16:20:42 (14 years ago)

Author:

patdui

Message:

• return descriptions sorted by default

Location:

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

Files:

• ComponentRegistryImpl.java (modified) (2 diffs)
• model/ComponentDescription.java (modified) (2 diffs)
• model/ProfileDescription.java (modified) (2 diffs)

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

@@ -162 +162 @@
 
     public List<ComponentDescription> getComponentDescriptions() {
-        return new ArrayList(componentDescriptions.values());
+        List<ComponentDescription> result = new ArrayList(componentDescriptions.values());
+        Collections.sort(result, ComponentDescription.COMPARE_ON_GROUP_AND_NAME);
+        return result;
     }
 
@@ -234 +236 @@
 
     public List<ProfileDescription> getProfileDescriptions() {
-        return new ArrayList(profileDescriptions.values());
+        List<ProfileDescription> result = new ArrayList(profileDescriptions.values());
+        Collections.sort(result, ProfileDescription.COMPARE_ON_NAME);
+        return result;
     }
 

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.model;
+
+import java.util.Comparator;
 
 import javax.xml.bind.annotation.XmlRootElement;
@@ -9 +11 @@
 public class ComponentDescription extends AbstractDescription {
 
+    public static final Comparator<? super ComponentDescription> COMPARE_ON_GROUP_AND_NAME = new Comparator<ComponentDescription>() {
+        public int compare(ComponentDescription o1, ComponentDescription o2) {
+            int result=0;
+            if (o1.getGroupName() != null && o2.getGroupName() != null)
+                result = o1.getGroupName().compareTo(o2.getGroupName());
+            if (result == 0) { 
+                if (o1.getName() != null && o2.getName() != null) {
+                    result = o1.getName().compareTo(o2.getName());
+                } else {
+                    result = o1.getId().compareTo(o2.getId());
+                }
+            }
+            return result;
+        }
+    };
+    
     private String groupName;
 

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.model;
+
+import java.util.Comparator;
 
 import javax.xml.bind.annotation.XmlRootElement;
@@ -8 +10 @@
 @XmlRootElement(name = "profileDescription")
 public class ProfileDescription extends AbstractDescription {
-    
+
+    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();
+        String id = ComponentRegistry.REGISTRY_ID + "p_" + IdSequence.get();
         ProfileDescription desc = new ProfileDescription();
         desc.setId(id);