ruper2/src/java/core/org/krysalis/ruper/resource/compare StandardComparisons.java,1.1,1.2 AbstractResourceComparator.java,1.1,1.2

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

Modified Files:
	StandardComparisons.java AbstractResourceComparator.java 
Log Message:
1) Finished Query & Query Engine
2) Worked on Files

Index: StandardComparisons.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/resource/compare/StandardComparisons.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StandardComparisons.java	6 Sep 2003 23:01:15 -0000	1.1
--- StandardComparisons.java	8 Sep 2003 23:21:40 -0000	1.2
***************
*** 12,15 ****
--- 12,16 ----
  
  	private static ComparatorSet l_nameTypeVersion = null;
+ 	private static ComparatorSet l_nameVersion = null;
  
  	static {
***************
*** 18,21 ****
--- 19,26 ----
  		l_nameTypeVersion.addComparator(TypeComparator.getInstance());
  		l_nameTypeVersion.addComparator(VersionComparator.getInstance());
+ 		
+ 		l_nameVersion = new ComparatorSet();
+ 		l_nameVersion.addComparator(NameComparator.getInstance());
+ 		l_nameVersion.addComparator(VersionComparator.getInstance());
  	}
  
***************
*** 25,28 ****
--- 30,40 ----
  	public static ComparatorSet getNameTypeVersion() {
  		return l_nameTypeVersion;
+ 	}
+ 	
+ 	/**
+ 	 * @return
+ 	 */
+ 	public static ComparatorSet getNameVersion() {
+ 		return l_nameVersion;
  	}
  }

Index: AbstractResourceComparator.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/resource/compare/AbstractResourceComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractResourceComparator.java	6 Sep 2003 23:01:15 -0000	1.1
--- AbstractResourceComparator.java	8 Sep 2003 23:21:40 -0000	1.2
***************
*** 8,12 ****
  import org.krysalis.ruper.resource.Resource;
  import org.krysalis.ruper.util.text.Messages;
- import org.krysalis.version.util.SystemUtils;
  
  /**
--- 8,11 ----
***************
*** 21,35 ****
  			if (object2 instanceof Resource) {
  
! 				System.out.println(
! 					SystemUtils.getShortName(getClass())
! 						+ ": "
! 						+ object1
! 						+ " & "
! 						+ object2);
  
  				comparison =
  					compareResources((Resource) object1, (Resource) object2);
  			}
! 			else
  				throw new IllegalArgumentException(
  					Messages.getString(
--- 20,34 ----
  			if (object2 instanceof Resource) {
  
! 				//				System.out.println(
! 				//					SystemUtils.getShortName(getClass())
! 				//						+ ": "
! 				//						+ object1
! 				//						+ " & "
! 				//						+ object2);
  
  				comparison =
  					compareResources((Resource) object1, (Resource) object2);
  			}
! 			else {
  				throw new IllegalArgumentException(
  					Messages.getString(
***************
*** 38,43 ****
  							object2.getClass().getName(),
  							Resource.class.getName()}));
  		}
! 		else
  			throw new IllegalArgumentException(
  				Messages.getString(
--- 37,43 ----
  							object2.getClass().getName(),
  							Resource.class.getName()}));
+ 			}
  		}
! 		else {
  			throw new IllegalArgumentException(
  				Messages.getString(
***************
*** 46,50 ****
  						object1.getClass().getName(),
  						Resource.class.getName()}));
! 
  		return comparison;
  	}
--- 46,51 ----
  						object1.getClass().getName(),
  						Resource.class.getName()}));
! 		}
! 		
  		return comparison;
  	}




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