[portal-commits] JBoss Portal SVN: r12019 - in branches/JBoss_Portal_Branch_2_7: registration/src/main/org/jboss/portal/registration and 1 other directories.

Author: chris.laprun(a)jboss.com Date: 2008-10-02 08:24:08 -0400 (Thu, 02 Oct 2008) New Revision: 12019 Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java branches/JBoss_Portal_Branch_2_7/registration/src/main/org/jboss/portal/registration/RegistrationStatus.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java Log: - Sort registration properties before displaying them, based on the natural ordering of their name. - Added toString to RegistrationStatus for easier debugging. Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-01 23:28:22 UTC (rev 12018) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-02 12:24:08 UTC (rev 12019) @@ -35,7 +35,7 @@ import javax.faces.event.ValueChangeEvent; import java.net.MalformedURLException; import java.net.URL; -import java.util.ArrayList; +import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -306,7 +306,7 @@ } } - public RegistrationInfo getExpectedRegistrationInfo() + private RegistrationInfo getExpectedRegistrationInfo() { if (expectedRegistrationInfo == null) { @@ -318,14 +318,21 @@ public List<RegistrationProperty> getRegistrationProperties() { - return new LinkedList<RegistrationProperty>(getProducerInfo().getRegistrationInfo().getRegistrationProperties().values()); + return getSortedProperties(getProducerInfo().getRegistrationInfo()); } public List<RegistrationProperty> getExpectedRegistrationProperties() { - return new ArrayList<RegistrationProperty>(getExpectedRegistrationInfo().getRegistrationProperties().values()); + return getSortedProperties(getExpectedRegistrationInfo()); } + private LinkedList<RegistrationProperty> getSortedProperties(RegistrationInfo registrationInfo) + { + LinkedList<RegistrationProperty> list = new LinkedList<RegistrationProperty>(registrationInfo.getRegistrationProperties().values()); + Collections.sort(list); + return list; + } + // Actions public String update() Modified: branches/JBoss_Portal_Branch_2_7/registration/src/main/org/jboss/portal/registration/RegistrationStatus.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/registration/src/main/org/jboss/portal/registration/RegistrationStatus.java 2008-10-01 23:28:22 UTC (rev 12018) +++ branches/JBoss_Portal_Branch_2_7/registration/src/main/org/jboss/portal/registration/RegistrationStatus.java 2008-10-02 12:24:08 UTC (rev 12019) @@ -32,16 +32,24 @@ */ public class RegistrationStatus implements Serializable { + private String humanReadable; + /** The registration is valid. */ - public static final RegistrationStatus VALID = new RegistrationStatus(); + public static final RegistrationStatus VALID = new RegistrationStatus("valid"); /** The registration is waiting for validation. */ - public static final RegistrationStatus PENDING = new RegistrationStatus(); + public static final RegistrationStatus PENDING = new RegistrationStatus("pending"); /** The registration is not valid. */ - public static final RegistrationStatus INVALID = new RegistrationStatus(); + public static final RegistrationStatus INVALID = new RegistrationStatus("invalid"); - private RegistrationStatus() + private RegistrationStatus(String humanReadable) { + this.humanReadable = humanReadable; } + + public String toString() + { + return "RegistrationStatus: " + humanReadable; + } } Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java 2008-10-01 23:28:22 UTC (rev 12018) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java 2008-10-02 12:24:08 UTC (rev 12019) @@ -32,7 +32,7 @@ * @version $Revision$ * @since 2.6 */ -public class RegistrationProperty +public class RegistrationProperty implements Comparable<RegistrationProperty> { private Long persistentId; private RegistrationPropertyDescription persistentDescription; @@ -44,6 +44,11 @@ private transient PropertyChangeListener listener; private transient Status status; + public int compareTo(RegistrationProperty o) + { + return persistentName.compareTo(o.persistentName); + } + public enum Status { INEXISTENT("registration_property_status_inexistent"),