Author: julien(a)jboss.com Date: 2007-05-01 17:06:42 -0400 (Tue, 01 May 2007) New Revision: 7165 Modified: trunk/common/src/main/org/jboss/portal/common/util/Version.java trunk/server/src/main/org/jboss/portal/server/PortalConstants.java Log: - minor update in Version class : added a type safe wrapper for suffix, so we have only valid suffixes - set version to GA :-) Modified: trunk/common/src/main/org/jboss/portal/common/util/Version.java =================================================================== --- trunk/common/src/main/org/jboss/portal/common/util/Version.java 2007-05-01 15:58:07 UTC (rev 7164) +++ trunk/common/src/main/org/jboss/portal/common/util/Version.java 2007-05-01 21:06:42 UTC (rev 7165) @@ -180,25 +180,60 @@ } } + public static class Suffix + { + + public static final Suffix EMPTY = new Suffix(""); + public static final Suffix SUFFIX_1 = new Suffix("1"); + public static final Suffix SUFFIX_2 = new Suffix("2"); + public static final Suffix SUFFIX_3 = new Suffix("3"); + public static final Suffix SUFFIX_4 = new Suffix("4"); + public static final Suffix SUFFIX_5 = new Suffix("5"); + public static final Suffix SUFFIX_6 = new Suffix("6"); + + /** . */ + private final String value; + + private Suffix(String value) + { + this.value = value; + } + + public String toString() + { + return value; + } + } + + /** . */ private final String toString; + + /** . */ private final Prefix prefix; - private final String suffix; - public Qualifier(Prefix prefix, String suffix) + /** . */ + private final Suffix suffix; + + public Qualifier(Prefix prefix) { + this(prefix, Suffix.EMPTY); + } + + public Qualifier(Prefix prefix, Suffix suffix) + { if (prefix == null) { throw new IllegalArgumentException("No prefix provided"); } if (suffix == null) { - suffix = ""; + suffix = new Suffix(""); } - if (prefix.isSuffixable() == false && suffix.length() > 0) + if (prefix.isSuffixable() == false && suffix.value.length() > 0) { throw new IllegalArgumentException("The prefix " + prefix + " is not suffixable"); } - this.toString = prefix + suffix; + this.toString = "" + prefix + suffix; this.prefix = prefix; this.suffix = suffix; } @@ -208,7 +243,7 @@ return prefix; } - public String getSuffix() + public Suffix getSuffix() { return suffix; } Modified: trunk/server/src/main/org/jboss/portal/server/PortalConstants.java =================================================================== --- trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-05-01 15:58:07 UTC (rev 7164) +++ trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-05-01 21:06:42 UTC (rev 7165) @@ -34,11 +34,12 @@ */ public class PortalConstants { + /** Current version. */ - public static Version VERSION = new Version("JBoss Portal", 2, 6, 0, new Version.Qualifier(Version.Qualifier.Prefix.CR, "2"), "Ninja"); + public static final Version VERSION = new Version("JBoss Portal", 2, 6, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Ninja"); /** The default portal name. */ - public static String DEFAULT_PORTAL_NAME = "default"; + public static final String DEFAULT_PORTAL_NAME = "default"; /** . */ public static final String APPLICATION_X_WWW_FORM_URLENCODED = "application/x-www-form-urlencoded";