krysalis-version/src/java/org/apache/depot/version/impl/data ReleaseLevel.java,1.1,1.2

Nick Chalko <[email protected]> Tue, 09 Nov 2004 07:41:25 +0000
Newsgroups gmane.comp.krysalis.cvs
Message-ID <[email protected]>
Update of /cvsroot/krysalis/krysalis-version/src/java/org/apache/depot/version/impl/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32167/src/java/org/apache/depot/version/impl/data

Modified Files:
	ReleaseLevel.java 
Log Message:
Use generics.

Index: ReleaseLevel.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-version/src/java/org/apache/depot/version/impl/data/ReleaseLevel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReleaseLevel.java	9 Nov 2004 06:40:28 -0000	1.1
--- ReleaseLevel.java	9 Nov 2004 07:41:23 -0000	1.2
***************
*** 19,26 ****
  import java.util.ArrayList;
  import java.util.HashMap;
  
  import org.krysalis.version.VersionException;
  
- 
  /**
   * @author ajack
--- 19,26 ----
  import java.util.ArrayList;
  import java.util.HashMap;
+ import java.util.Map;
  
  import org.krysalis.version.VersionException;
  
  /**
   * @author ajack
***************
*** 35,98 ****
  	/** Unset */
  	private static final int LEVEL_UNSET = 0;
  	private static final String UNSET_WORD = "unset";
  	private static final String UNSET_ABRV = "?";
  
  	/** Gump */
  	private static final int LEVEL_GUMP = 1;
  	private static final String GUMP_WORD = "gump";
  	private static final String GUMP_ABRV = "g";
  
  	/** Nightly */
  	private static final int LEVEL_NIGHTLY = 2;
  	private static final String NIGHTLY_WORD = "nightly";
  	private static final String NIGHTLY_ABRV = "n";
  
  	/** Snapshot */
  	private static final int LEVEL_SNAPSHOT = 3;
  	private static final String SNAPSHOT_WORD = "snapshot";
  	private static final String SNAPSHOT_ABRV = "s";
! 	
  	/** Development */
  	private static final int LEVEL_DEVELOPMENT = 4;
  	private static final String DEVELOPMENT_WORD = "dev";
  	private static final String DEVELOPMENT_ABRV = "d";
  
  	/** Alpha */
  	private static final int LEVEL_ALPHA = 5;
  	private static final String ALPHA_WORD = "alpha";
  	private static final String ALPHA_ABRV = "a";
  
  	/** Beta */
  	private static final int LEVEL_BETA = 6;
  	private static final String BETA_WORD = "beta";
  	private static final String BETA_ABRV = "b";
  
  	/** Milestone */
  	private static final int LEVEL_MILESTONE = 7;
  	private static final String MILESTONE_WORD = "mile";
  	private static final String MILESTONE_ABRV = "m";
  
  	/** Early Access */
  	private static final int LEVEL_EARLY_ACCESS = 8;
  	private static final String EARLY_ACCESS_WORD = "ea";
  	private static final String EARLY_ACCESS_ABRV = "ea";
  
  	/** Release Candidate */
  	private static final int LEVEL_RELEASE_CANDIDATE = 9;
  	private static final String RELEASE_CANDIDATE_WORD = "rc";
  	private static final String RELEASE_CANDIDATE_ABRV = "rc";
  
! 	/** Release*/
  	private static final int LEVEL_RELEASE = 10;
  	private static final String RELEASE_WORD = "release";
  	private static final String RELEASE_ABRV = "rel";
  
  	/** HotFix */
  	private static final int LEVEL_HOTFIX = 11;
  	private static final String HOTFIX_WORD = "hotfix";
  	private static final String HOTFIX_ABRV = "fix";
  
  	/** MIN_LEVEL */
  	public static final int MIN_RELEASE_LEVEL = ReleaseLevel.LEVEL_GUMP;
  	/** MAX_LEVEL */
  	public static final int MAX_RELEASE_LEVEL = ReleaseLevel.LEVEL_HOTFIX;
--- 35,123 ----
  	/** Unset */
  	private static final int LEVEL_UNSET = 0;
+ 
  	private static final String UNSET_WORD = "unset";
+ 
  	private static final String UNSET_ABRV = "?";
  
  	/** Gump */
  	private static final int LEVEL_GUMP = 1;
+ 
  	private static final String GUMP_WORD = "gump";
+ 
  	private static final String GUMP_ABRV = "g";
  
  	/** Nightly */
  	private static final int LEVEL_NIGHTLY = 2;
+ 
  	private static final String NIGHTLY_WORD = "nightly";
+ 
  	private static final String NIGHTLY_ABRV = "n";
  
  	/** Snapshot */
  	private static final int LEVEL_SNAPSHOT = 3;
+ 
  	private static final String SNAPSHOT_WORD = "snapshot";
+ 
  	private static final String SNAPSHOT_ABRV = "s";
! 
  	/** Development */
  	private static final int LEVEL_DEVELOPMENT = 4;
+ 
  	private static final String DEVELOPMENT_WORD = "dev";
+ 
  	private static final String DEVELOPMENT_ABRV = "d";
  
  	/** Alpha */
  	private static final int LEVEL_ALPHA = 5;
+ 
  	private static final String ALPHA_WORD = "alpha";
+ 
  	private static final String ALPHA_ABRV = "a";
  
  	/** Beta */
  	private static final int LEVEL_BETA = 6;
+ 
  	private static final String BETA_WORD = "beta";
+ 
  	private static final String BETA_ABRV = "b";
  
  	/** Milestone */
  	private static final int LEVEL_MILESTONE = 7;
+ 
  	private static final String MILESTONE_WORD = "mile";
+ 
  	private static final String MILESTONE_ABRV = "m";
  
  	/** Early Access */
  	private static final int LEVEL_EARLY_ACCESS = 8;
+ 
  	private static final String EARLY_ACCESS_WORD = "ea";
+ 
  	private static final String EARLY_ACCESS_ABRV = "ea";
  
  	/** Release Candidate */
  	private static final int LEVEL_RELEASE_CANDIDATE = 9;
+ 
  	private static final String RELEASE_CANDIDATE_WORD = "rc";
+ 
  	private static final String RELEASE_CANDIDATE_ABRV = "rc";
  
! 	/** Release */
  	private static final int LEVEL_RELEASE = 10;
+ 
  	private static final String RELEASE_WORD = "release";
+ 
  	private static final String RELEASE_ABRV = "rel";
  
  	/** HotFix */
  	private static final int LEVEL_HOTFIX = 11;
+ 
  	private static final String HOTFIX_WORD = "hotfix";
+ 
  	private static final String HOTFIX_ABRV = "fix";
  
  	/** MIN_LEVEL */
  	public static final int MIN_RELEASE_LEVEL = ReleaseLevel.LEVEL_GUMP;
+ 
  	/** MAX_LEVEL */
  	public static final int MAX_RELEASE_LEVEL = ReleaseLevel.LEVEL_HOTFIX;
***************
*** 102,150 ****
  
  	/** Gump */
! 	public static final ReleaseLevel GUMP =
! 		new ReleaseLevel(LEVEL_GUMP);
  	public static final ReleaseLevel MIN = GUMP;
! 	
  	/** Nightly */
! 	public static final ReleaseLevel NIGHTLY =
! 		new ReleaseLevel(LEVEL_NIGHTLY);
! 	
  	//** Snapshot */
! 	public static final ReleaseLevel SNAPSHOT =
! 		new ReleaseLevel(LEVEL_SNAPSHOT);
! 	
  	/** Development */
! 	public static final ReleaseLevel DEVELOPMENT =
! 		new ReleaseLevel(LEVEL_DEVELOPMENT);
  
  	/** Alpha */
  	public static final ReleaseLevel ALPHA = new ReleaseLevel(LEVEL_ALPHA);
  	/** Milestone */
! 	public static final ReleaseLevel MILESTONE =
! 		new ReleaseLevel(LEVEL_MILESTONE);
  	/** Beta */
  	public static final ReleaseLevel BETA = new ReleaseLevel(LEVEL_BETA);
  	/** Early Access */
! 	public static final ReleaseLevel EARLY_ACCESS =
! 		new ReleaseLevel(LEVEL_EARLY_ACCESS);
  	/** Release */
! 	public static final ReleaseLevel RELEASE_CANDIDATE =
! 		new ReleaseLevel(LEVEL_RELEASE_CANDIDATE);
  	/** Release */
  	public static final ReleaseLevel RELEASE = new ReleaseLevel(LEVEL_RELEASE);
  	/** HotFix */
  	public static final ReleaseLevel HOTFIX = new ReleaseLevel(LEVEL_HOTFIX);
  
  	public static final ReleaseLevel MAX = RELEASE;
  	public static final ReleaseLevel DEFAULT = RELEASE;
  
  	/** Collections */
! 	public static final ArrayList RELEASE_LEVELS = new ArrayList();
  
! 	public static final HashMap WORD_FOR_LEVEL = new HashMap();
! 	public static final HashMap LEVEL_FOR_WORD = new HashMap();
  
! 	public static final HashMap ABBREVIATION_FOR_LEVEL = new HashMap();
! 	public static final HashMap LEVEL_FOR_ABBREVIATION = new HashMap();
  
  	private final int m_level;
--- 127,182 ----
  
  	/** Gump */
! 	public static final ReleaseLevel GUMP = new ReleaseLevel(LEVEL_GUMP);
! 
  	public static final ReleaseLevel MIN = GUMP;
! 
  	/** Nightly */
! 	public static final ReleaseLevel NIGHTLY = new ReleaseLevel(LEVEL_NIGHTLY);
! 
  	//** Snapshot */
! 	public static final ReleaseLevel SNAPSHOT = new ReleaseLevel(LEVEL_SNAPSHOT);
! 
  	/** Development */
! 	public static final ReleaseLevel DEVELOPMENT = new ReleaseLevel(
! 			LEVEL_DEVELOPMENT);
  
  	/** Alpha */
  	public static final ReleaseLevel ALPHA = new ReleaseLevel(LEVEL_ALPHA);
+ 
  	/** Milestone */
! 	public static final ReleaseLevel MILESTONE = new ReleaseLevel(
! 			LEVEL_MILESTONE);
! 
  	/** Beta */
  	public static final ReleaseLevel BETA = new ReleaseLevel(LEVEL_BETA);
+ 
  	/** Early Access */
! 	public static final ReleaseLevel EARLY_ACCESS = new ReleaseLevel(
! 			LEVEL_EARLY_ACCESS);
! 
  	/** Release */
! 	public static final ReleaseLevel RELEASE_CANDIDATE = new ReleaseLevel(
! 			LEVEL_RELEASE_CANDIDATE);
! 
  	/** Release */
  	public static final ReleaseLevel RELEASE = new ReleaseLevel(LEVEL_RELEASE);
+ 
  	/** HotFix */
  	public static final ReleaseLevel HOTFIX = new ReleaseLevel(LEVEL_HOTFIX);
  
  	public static final ReleaseLevel MAX = RELEASE;
+ 
  	public static final ReleaseLevel DEFAULT = RELEASE;
  
  	/** Collections */
! 	public static final ArrayList<ReleaseLevel> RELEASE_LEVELS = new ArrayList<ReleaseLevel>();
  
! 	public static final Map<ReleaseLevel, String> WORD_FOR_LEVEL = new HashMap<ReleaseLevel, String>();
  
! 	public static final Map<String, ReleaseLevel> LEVEL_FOR_WORD = new HashMap<String, ReleaseLevel>();
! 
! 	public static final Map<ReleaseLevel, String> ABBREVIATION_FOR_LEVEL = new HashMap<ReleaseLevel, String>();
! 
! 	public static final Map<String, ReleaseLevel> LEVEL_FOR_ABBREVIATION = new HashMap<String, ReleaseLevel>();
  
  	private final int m_level;
***************
*** 169,173 ****
  		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.UNSET, ReleaseLevel.UNSET_ABRV);
  		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.UNSET_ABRV, ReleaseLevel.UNSET);
! 		
  		WORD_FOR_LEVEL.put(ReleaseLevel.GUMP, ReleaseLevel.GUMP_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.GUMP_WORD, ReleaseLevel.GUMP);
--- 201,205 ----
  		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.UNSET, ReleaseLevel.UNSET_ABRV);
  		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.UNSET_ABRV, ReleaseLevel.UNSET);
! 
  		WORD_FOR_LEVEL.put(ReleaseLevel.GUMP, ReleaseLevel.GUMP_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.GUMP_WORD, ReleaseLevel.GUMP);
***************
*** 175,212 ****
  		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.GUMP, ReleaseLevel.GUMP_ABRV);
  		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.GUMP_ABRV, ReleaseLevel.GUMP);
! 		
  		WORD_FOR_LEVEL.put(ReleaseLevel.NIGHTLY, ReleaseLevel.NIGHTLY_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.NIGHTLY_WORD, ReleaseLevel.NIGHTLY);
! 		
! 		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.NIGHTLY, ReleaseLevel.NIGHTLY_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.NIGHTLY_ABRV, ReleaseLevel.NIGHTLY);
! 		
  		WORD_FOR_LEVEL.put(ReleaseLevel.SNAPSHOT, ReleaseLevel.SNAPSHOT_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.SNAPSHOT_WORD, ReleaseLevel.SNAPSHOT);
- 		
- 		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.SNAPSHOT, ReleaseLevel.SNAPSHOT_ABRV);
- 		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.SNAPSHOT_ABRV, ReleaseLevel.SNAPSHOT);
  
! 		WORD_FOR_LEVEL.put(
! 			ReleaseLevel.DEVELOPMENT,
! 			ReleaseLevel.DEVELOPMENT_WORD);
! 		LEVEL_FOR_WORD.put(
! 			ReleaseLevel.DEVELOPMENT_WORD,
! 			ReleaseLevel.DEVELOPMENT);
! 		ABBREVIATION_FOR_LEVEL.put(
! 			ReleaseLevel.DEVELOPMENT,
! 			ReleaseLevel.DEVELOPMENT_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(
! 			ReleaseLevel.DEVELOPMENT_ABRV,
! 			ReleaseLevel.DEVELOPMENT);
  
  		WORD_FOR_LEVEL.put(ReleaseLevel.MILESTONE, ReleaseLevel.MILESTONE_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.MILESTONE_WORD, ReleaseLevel.MILESTONE);
! 		ABBREVIATION_FOR_LEVEL.put(
! 			ReleaseLevel.MILESTONE,
! 			ReleaseLevel.MILESTONE_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(
! 			ReleaseLevel.MILESTONE_ABRV,
! 			ReleaseLevel.MILESTONE);
  
  		WORD_FOR_LEVEL.put(ReleaseLevel.ALPHA, ReleaseLevel.ALPHA_WORD);
--- 207,242 ----
  		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.GUMP, ReleaseLevel.GUMP_ABRV);
  		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.GUMP_ABRV, ReleaseLevel.GUMP);
! 
  		WORD_FOR_LEVEL.put(ReleaseLevel.NIGHTLY, ReleaseLevel.NIGHTLY_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.NIGHTLY_WORD, ReleaseLevel.NIGHTLY);
! 
! 		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.NIGHTLY,
! 				ReleaseLevel.NIGHTLY_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.NIGHTLY_ABRV,
! 				ReleaseLevel.NIGHTLY);
! 
  		WORD_FOR_LEVEL.put(ReleaseLevel.SNAPSHOT, ReleaseLevel.SNAPSHOT_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.SNAPSHOT_WORD, ReleaseLevel.SNAPSHOT);
  
! 		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.SNAPSHOT,
! 				ReleaseLevel.SNAPSHOT_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.SNAPSHOT_ABRV,
! 				ReleaseLevel.SNAPSHOT);
! 
! 		WORD_FOR_LEVEL.put(ReleaseLevel.DEVELOPMENT,
! 				ReleaseLevel.DEVELOPMENT_WORD);
! 		LEVEL_FOR_WORD.put(ReleaseLevel.DEVELOPMENT_WORD,
! 				ReleaseLevel.DEVELOPMENT);
! 		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.DEVELOPMENT,
! 				ReleaseLevel.DEVELOPMENT_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.DEVELOPMENT_ABRV,
! 				ReleaseLevel.DEVELOPMENT);
  
  		WORD_FOR_LEVEL.put(ReleaseLevel.MILESTONE, ReleaseLevel.MILESTONE_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.MILESTONE_WORD, ReleaseLevel.MILESTONE);
! 		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.MILESTONE,
! 				ReleaseLevel.MILESTONE_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.MILESTONE_ABRV,
! 				ReleaseLevel.MILESTONE);
  
  		WORD_FOR_LEVEL.put(ReleaseLevel.ALPHA, ReleaseLevel.ALPHA_WORD);
***************
*** 220,266 ****
  		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.BETA_ABRV, ReleaseLevel.BETA);
  
! 		WORD_FOR_LEVEL.put(
! 			ReleaseLevel.EARLY_ACCESS,
! 			ReleaseLevel.EARLY_ACCESS_WORD);
! 		LEVEL_FOR_WORD.put(
! 			ReleaseLevel.EARLY_ACCESS_WORD,
! 			ReleaseLevel.EARLY_ACCESS);
! 		ABBREVIATION_FOR_LEVEL.put(
! 			ReleaseLevel.EARLY_ACCESS,
! 			ReleaseLevel.EARLY_ACCESS_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(
! 			ReleaseLevel.EARLY_ACCESS_ABRV,
! 			ReleaseLevel.EARLY_ACCESS);
  
! 		WORD_FOR_LEVEL.put(
! 			ReleaseLevel.RELEASE_CANDIDATE,
! 			ReleaseLevel.RELEASE_CANDIDATE_WORD);
! 		LEVEL_FOR_WORD.put(
! 			ReleaseLevel.RELEASE_CANDIDATE_WORD,
! 			ReleaseLevel.RELEASE_CANDIDATE);
! 		ABBREVIATION_FOR_LEVEL.put(
! 			ReleaseLevel.RELEASE_CANDIDATE,
! 			ReleaseLevel.RELEASE_CANDIDATE_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(
! 			ReleaseLevel.RELEASE_CANDIDATE_ABRV,
! 			ReleaseLevel.RELEASE_CANDIDATE);
  
  		WORD_FOR_LEVEL.put(ReleaseLevel.RELEASE, ReleaseLevel.RELEASE_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.RELEASE_WORD, ReleaseLevel.RELEASE);
! 		ABBREVIATION_FOR_LEVEL.put(
! 			ReleaseLevel.RELEASE,
! 			ReleaseLevel.RELEASE_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(
! 			ReleaseLevel.RELEASE_ABRV,
! 			ReleaseLevel.RELEASE);
! 			
  		WORD_FOR_LEVEL.put(ReleaseLevel.HOTFIX, ReleaseLevel.HOTFIX_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.HOTFIX_WORD, ReleaseLevel.HOTFIX);
! 		ABBREVIATION_FOR_LEVEL.put(
! 			ReleaseLevel.HOTFIX,
! 			ReleaseLevel.HOTFIX_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(
! 			ReleaseLevel.HOTFIX_ABRV,
! 			ReleaseLevel.HOTFIX);
  	}
  
--- 250,284 ----
  		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.BETA_ABRV, ReleaseLevel.BETA);
  
! 		WORD_FOR_LEVEL.put(ReleaseLevel.EARLY_ACCESS,
! 				ReleaseLevel.EARLY_ACCESS_WORD);
! 		LEVEL_FOR_WORD.put(ReleaseLevel.EARLY_ACCESS_WORD,
! 				ReleaseLevel.EARLY_ACCESS);
! 		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.EARLY_ACCESS,
! 				ReleaseLevel.EARLY_ACCESS_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.EARLY_ACCESS_ABRV,
! 				ReleaseLevel.EARLY_ACCESS);
  
! 		WORD_FOR_LEVEL.put(ReleaseLevel.RELEASE_CANDIDATE,
! 				ReleaseLevel.RELEASE_CANDIDATE_WORD);
! 		LEVEL_FOR_WORD.put(ReleaseLevel.RELEASE_CANDIDATE_WORD,
! 				ReleaseLevel.RELEASE_CANDIDATE);
! 		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.RELEASE_CANDIDATE,
! 				ReleaseLevel.RELEASE_CANDIDATE_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.RELEASE_CANDIDATE_ABRV,
! 				ReleaseLevel.RELEASE_CANDIDATE);
  
  		WORD_FOR_LEVEL.put(ReleaseLevel.RELEASE, ReleaseLevel.RELEASE_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.RELEASE_WORD, ReleaseLevel.RELEASE);
! 		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.RELEASE,
! 				ReleaseLevel.RELEASE_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.RELEASE_ABRV,
! 				ReleaseLevel.RELEASE);
! 
  		WORD_FOR_LEVEL.put(ReleaseLevel.HOTFIX, ReleaseLevel.HOTFIX_WORD);
  		LEVEL_FOR_WORD.put(ReleaseLevel.HOTFIX_WORD, ReleaseLevel.HOTFIX);
! 		ABBREVIATION_FOR_LEVEL.put(ReleaseLevel.HOTFIX,
! 				ReleaseLevel.HOTFIX_ABRV);
! 		LEVEL_FOR_ABBREVIATION.put(ReleaseLevel.HOTFIX_ABRV,
! 				ReleaseLevel.HOTFIX);
  	}
  
***************
*** 274,278 ****
  	 * @param level
  	 * @return ReleaseLevel
! 	 * @throws VersionException -- if unrecognized string
  	 */
  	public static ReleaseLevel getFromStringFailSafe(String level) {
--- 292,297 ----
  	 * @param level
  	 * @return ReleaseLevel
! 	 * @throws VersionException --
! 	 *             if unrecognized string
  	 */
  	public static ReleaseLevel getFromStringFailSafe(String level) {
***************
*** 281,286 ****
  		try {
  			releaseLevel = getFromString(level);
! 		}
! 		catch (org.krysalis.version.VersionException ve) {
  			releaseLevel = ReleaseLevel.UNSET;
  		}
--- 300,304 ----
  		try {
  			releaseLevel = getFromString(level);
! 		} catch (org.krysalis.version.VersionException ve) {
  			releaseLevel = ReleaseLevel.UNSET;
  		}
***************
*** 294,301 ****
  	 * @param level
  	 * @return ReleaseLevel
! 	 * @throws VersionException -- if unrecognized string
  	 */
  	public static ReleaseLevel getFromString(String level)
! 		throws org.krysalis.version.VersionException {
  		ReleaseLevel releaseLevel = null;
  
--- 312,320 ----
  	 * @param level
  	 * @return ReleaseLevel
! 	 * @throws VersionException --
! 	 *             if unrecognized string
  	 */
  	public static ReleaseLevel getFromString(String level)
! 			throws org.krysalis.version.VersionException {
  		ReleaseLevel releaseLevel = null;
  
***************
*** 306,310 ****
  			// Try as alpha/beta/...rc...
  			//
! 			releaseLevel = (ReleaseLevel) LEVEL_FOR_WORD.get(level.toLowerCase());
  
  			//
--- 325,330 ----
  			// Try as alpha/beta/...rc...
  			//
! 			releaseLevel = (ReleaseLevel) LEVEL_FOR_WORD.get(level
! 					.toLowerCase());
  
  			//
***************
*** 312,321 ****
  			//
  			if (null == releaseLevel)
! 				releaseLevel = (ReleaseLevel) LEVEL_FOR_ABBREVIATION.get(level.toLowerCase());
  		}
  
  		if (null == releaseLevel)
! 			throw new VersionException(
! 				"Unrecognized Release Level [" + level + "]");
  
  		return releaseLevel;
--- 332,342 ----
  			//
  			if (null == releaseLevel)
! 				releaseLevel = (ReleaseLevel) LEVEL_FOR_ABBREVIATION.get(level
! 						.toLowerCase());
  		}
  
  		if (null == releaseLevel)
! 			throw new VersionException("Unrecognized Release Level [" + level
! 					+ "]");
  
  		return releaseLevel;
***************
*** 326,400 ****
  
  		switch (level) {
! 			case LEVEL_UNSET :
! 				{
! 					releaseLevel = ReleaseLevel.UNSET;
! 					break;
! 				}
  
! 			case LEVEL_NIGHTLY :
! 				{
! 					releaseLevel = ReleaseLevel.NIGHTLY;
! 					break;
! 				}
  
! 			case LEVEL_SNAPSHOT :
! 				{
! 					releaseLevel = ReleaseLevel.SNAPSHOT;
! 					break;
! 				}
  
! 			case LEVEL_DEVELOPMENT :
! 				{
! 					releaseLevel = ReleaseLevel.DEVELOPMENT;
! 					break;
! 				}
  
! 			case LEVEL_MILESTONE :
! 				{
! 					releaseLevel = ReleaseLevel.MILESTONE;
! 					break;
! 				}
  
! 			case LEVEL_ALPHA :
! 				{
! 					releaseLevel = ReleaseLevel.ALPHA;
! 					break;
! 				}
  
! 			case LEVEL_EARLY_ACCESS :
! 				{
! 					releaseLevel = ReleaseLevel.EARLY_ACCESS;
! 					break;
! 				}
  
! 			case LEVEL_BETA :
! 				{
! 					releaseLevel = ReleaseLevel.BETA;
! 					break;
! 				}
  
! 			case LEVEL_RELEASE_CANDIDATE :
! 				{
! 					releaseLevel = ReleaseLevel.RELEASE_CANDIDATE;
! 					break;
! 				}
  
! 			case LEVEL_RELEASE :
! 				{
! 					releaseLevel = ReleaseLevel.RELEASE;
! 					break;
! 				}
  
! 			case LEVEL_HOTFIX :
! 				{
! 					releaseLevel = ReleaseLevel.HOTFIX;
! 					break;
! 				}
  
! 			default :
! 				{
! 					releaseLevel = ReleaseLevel.UNSET;
! 					break;
! 				}
  
  		}
--- 347,409 ----
  
  		switch (level) {
! 		case LEVEL_UNSET: {
! 			releaseLevel = ReleaseLevel.UNSET;
! 			break;
! 		}
  
! 		case LEVEL_NIGHTLY: {
! 			releaseLevel = ReleaseLevel.NIGHTLY;
! 			break;
! 		}
  
! 		case LEVEL_SNAPSHOT: {
! 			releaseLevel = ReleaseLevel.SNAPSHOT;
! 			break;
! 		}
  
! 		case LEVEL_DEVELOPMENT: {
! 			releaseLevel = ReleaseLevel.DEVELOPMENT;
! 			break;
! 		}
  
! 		case LEVEL_MILESTONE: {
! 			releaseLevel = ReleaseLevel.MILESTONE;
! 			break;
! 		}
  
! 		case LEVEL_ALPHA: {
! 			releaseLevel = ReleaseLevel.ALPHA;
! 			break;
! 		}
  
! 		case LEVEL_EARLY_ACCESS: {
! 			releaseLevel = ReleaseLevel.EARLY_ACCESS;
! 			break;
! 		}
  
! 		case LEVEL_BETA: {
! 			releaseLevel = ReleaseLevel.BETA;
! 			break;
! 		}
  
! 		case LEVEL_RELEASE_CANDIDATE: {
! 			releaseLevel = ReleaseLevel.RELEASE_CANDIDATE;
! 			break;
! 		}
  
! 		case LEVEL_RELEASE: {
! 			releaseLevel = ReleaseLevel.RELEASE;
! 			break;
! 		}
  
! 		case LEVEL_HOTFIX: {
! 			releaseLevel = ReleaseLevel.HOTFIX;
! 			break;
! 		}
  
! 		default: {
! 			releaseLevel = ReleaseLevel.UNSET;
! 			break;
! 		}
  
  		}
***************
*** 428,502 ****
  
  		switch (m_level) {
! 			case LEVEL_UNSET :
! 				{
! 					releaseLevel = "ReleaseLevel.UNSET";
! 					break;
! 				}
  
! 			case LEVEL_NIGHTLY :
! 				{
! 					releaseLevel = "ReleaseLevel.NIGHTLY";
! 					break;
! 				}
  
! 			case LEVEL_SNAPSHOT :
! 				{
! 					releaseLevel = "ReleaseLevel.SNAPSHOT";
! 					break;
! 				}
  
! 			case LEVEL_DEVELOPMENT :
! 				{
! 					releaseLevel = "ReleaseLevel.DEVELOPMENT";
! 					break;
! 				}
  
! 			case LEVEL_MILESTONE :
! 				{
! 					releaseLevel = "ReleaseLevel.MILESTONE";
! 					break;
! 				}
  
! 			case LEVEL_ALPHA :
! 				{
! 					releaseLevel = "ReleaseLevel.ALPHA";
! 					break;
! 				}
  
! 			case LEVEL_EARLY_ACCESS :
! 				{
! 					releaseLevel = "ReleaseLevel.EARLY_ACCESS";
! 					break;
! 				}
  
! 			case LEVEL_BETA :
! 				{
! 					releaseLevel = "ReleaseLevel.BETA";
! 					break;
! 				}
  
! 			case LEVEL_RELEASE_CANDIDATE :
! 				{
! 					releaseLevel = "ReleaseLevel.RELEASE_CANDIDATE";
! 					break;
! 				}
  
! 			case LEVEL_RELEASE :
! 				{
! 					releaseLevel = "ReleaseLevel.RELEASE";
! 					break;
! 				}
  
! 			case LEVEL_HOTFIX :
! 				{
! 					releaseLevel = "ReleaseLevel.HOTFIX";
! 					break;
! 				}
  
! 			default :
! 				{
! 					releaseLevel = "ReleaseLevel.UNSET";
! 					break;
! 				}
  
  		}
--- 437,499 ----
  
  		switch (m_level) {
! 		case LEVEL_UNSET: {
! 			releaseLevel = "ReleaseLevel.UNSET";
! 			break;
! 		}
  
! 		case LEVEL_NIGHTLY: {
! 			releaseLevel = "ReleaseLevel.NIGHTLY";
! 			break;
! 		}
  
! 		case LEVEL_SNAPSHOT: {
! 			releaseLevel = "ReleaseLevel.SNAPSHOT";
! 			break;
! 		}
  
! 		case LEVEL_DEVELOPMENT: {
! 			releaseLevel = "ReleaseLevel.DEVELOPMENT";
! 			break;
! 		}
  
! 		case LEVEL_MILESTONE: {
! 			releaseLevel = "ReleaseLevel.MILESTONE";
! 			break;
! 		}
  
! 		case LEVEL_ALPHA: {
! 			releaseLevel = "ReleaseLevel.ALPHA";
! 			break;
! 		}
  
! 		case LEVEL_EARLY_ACCESS: {
! 			releaseLevel = "ReleaseLevel.EARLY_ACCESS";
! 			break;
! 		}
  
! 		case LEVEL_BETA: {
! 			releaseLevel = "ReleaseLevel.BETA";
! 			break;
! 		}
  
! 		case LEVEL_RELEASE_CANDIDATE: {
! 			releaseLevel = "ReleaseLevel.RELEASE_CANDIDATE";
! 			break;
! 		}
  
! 		case LEVEL_RELEASE: {
! 			releaseLevel = "ReleaseLevel.RELEASE";
! 			break;
! 		}
  
! 		case LEVEL_HOTFIX: {
! 			releaseLevel = "ReleaseLevel.HOTFIX";
! 			break;
! 		}
  
! 		default: {
! 			releaseLevel = "ReleaseLevel.UNSET";
! 			break;
! 		}
  
  		}
***************
*** 514,519 ****
  
  			equal = (otherLevel.m_level == m_level);
! 		}
! 		else if (other instanceof String) {
  			String otherString = (String) other;
  
--- 511,515 ----
  
  			equal = (otherLevel.m_level == m_level);
! 		} else if (other instanceof String) {
  			String otherString = (String) other;
  
***************
*** 545,555 ****
  
  			comparison = (m_level - otherLevel.m_level);
! 		}
! 		else
! 			throw new IllegalArgumentException(
! 				"Not a ReleaseLevel: "
! 					+ other.getClass()
! 					+ " : "
! 					+ other.toString());
  
  		return comparison;
--- 541,547 ----
  
  			comparison = (m_level - otherLevel.m_level);
! 		} else
! 			throw new IllegalArgumentException("Not a ReleaseLevel: "
! 					+ other.getClass() + " : " + other.toString());
  
  		return comparison;



-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click