ruper2/src/java/core/org/krysalis/ruper2/resource/compare StandardResourceComparisons.java,1.1,1.2

Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/resource/compare
In directory sc8-pr-cvs1:/tmp/cvs-serv13407/src/java/core/org/krysalis/ruper2/resource/compare

Modified Files:
	StandardResourceComparisons.java 
Log Message:
ComparatorSet -> ComparatorSequence

Index: StandardResourceComparisons.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/resource/compare/StandardResourceComparisons.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StandardResourceComparisons.java	29 Sep 2003 18:09:16 -0000	1.1
--- StandardResourceComparisons.java	4 Oct 2003 01:26:20 -0000	1.2
***************
*** 4,8 ****
  package org.krysalis.ruper2.resource.compare;
  
! import org.krysalis.ruper2.util.compare.ComparatorSet;
  
  /**
--- 4,8 ----
  package org.krysalis.ruper2.resource.compare;
  
! import org.krysalis.ruper2.util.compare.ComparatorSequence;
  
  /**
***************
*** 12,38 ****
  public class StandardResourceComparisons {
  
! 	private static ComparatorSet l_nameTypeVersion = null;
! 	private static ComparatorSet l_nameVersion = null;
! 	private static ComparatorSet l_name = null;
! 	private static ComparatorSet l_version = null;
! 	private static ComparatorSet l_nameType = null;
  
  	static {
! 		l_nameTypeVersion = new ComparatorSet();
  		l_nameTypeVersion.addComparator(NameComparator.getInstance());
  		l_nameTypeVersion.addComparator(TypeComparator.getInstance());
  		l_nameTypeVersion.addComparator(VersionComparator.getInstance());
  
! 		l_nameVersion = new ComparatorSet();
  		l_nameVersion.addComparator(NameComparator.getInstance());
  		l_nameVersion.addComparator(VersionComparator.getInstance());
  		
! 		l_name = new ComparatorSet();
  		l_name.addComparator(NameComparator.getInstance());
  		
! 		l_version = new ComparatorSet();
  		l_version.addComparator(VersionComparator.getInstance());
  		
! 		l_nameType = new ComparatorSet();
  		l_nameType.addComparator(NameComparator.getInstance());
  		l_nameType.addComparator(TypeComparator.getInstance());
--- 12,38 ----
  public class StandardResourceComparisons {
  
! 	private static ComparatorSequence l_nameTypeVersion = null;
! 	private static ComparatorSequence l_nameVersion = null;
! 	private static ComparatorSequence l_name = null;
! 	private static ComparatorSequence l_version = null;
! 	private static ComparatorSequence l_nameType = null;
  
  	static {
! 		l_nameTypeVersion = new ComparatorSequence();
  		l_nameTypeVersion.addComparator(NameComparator.getInstance());
  		l_nameTypeVersion.addComparator(TypeComparator.getInstance());
  		l_nameTypeVersion.addComparator(VersionComparator.getInstance());
  
! 		l_nameVersion = new ComparatorSequence();
  		l_nameVersion.addComparator(NameComparator.getInstance());
  		l_nameVersion.addComparator(VersionComparator.getInstance());
  		
! 		l_name = new ComparatorSequence();
  		l_name.addComparator(NameComparator.getInstance());
  		
! 		l_version = new ComparatorSequence();
  		l_version.addComparator(VersionComparator.getInstance());
  		
! 		l_nameType = new ComparatorSequence();
  		l_nameType.addComparator(NameComparator.getInstance());
  		l_nameType.addComparator(TypeComparator.getInstance());
***************
*** 42,46 ****
  	 * @return
  	 */
! 	public static ComparatorSet getNameTypeVersionComparatorSet() {
  		return l_nameTypeVersion;
  	}
--- 42,46 ----
  	 * @return
  	 */
! 	public static ComparatorSequence getNameTypeVersionComparatorSet() {
  		return l_nameTypeVersion;
  	}
***************
*** 49,53 ****
  	 * @return
  	 */
! 	public static ComparatorSet getNameTypeComparatorSet() {
  		return l_nameType;
  	}
--- 49,53 ----
  	 * @return
  	 */
! 	public static ComparatorSequence getNameTypeComparatorSet() {
  		return l_nameType;
  	}
***************
*** 56,60 ****
  	 * @return
  	 */
! 	public static ComparatorSet getNameVersionComparatorSet() {
  		return l_nameVersion;
  	}
--- 56,60 ----
  	 * @return
  	 */
! 	public static ComparatorSequence getNameVersionComparatorSet() {
  		return l_nameVersion;
  	}
***************
*** 63,67 ****
  	 * @return
  	 */
! 	public static ComparatorSet getVersionComparatorSet() {
  		return l_version;
  	}
--- 63,67 ----
  	 * @return
  	 */
! 	public static ComparatorSequence getVersionComparatorSet() {
  		return l_version;
  	}
***************
*** 70,74 ****
  	 * @return
  	 */
! 	public static ComparatorSet getNameComparatorSet() {
  		return l_name;
  	}
--- 70,74 ----
  	 * @return
  	 */
! 	public static ComparatorSequence getNameComparatorSet() {
  		return l_name;
  	}




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf