krysalis-update/src/java/org/krysalis/depot/update/artifact/compare AbstractArtifactGroupComparator.java,1.1,1.2 AbstractArtifactComparator.java,1.1,1.2 TypeComparator.java,1.1,1.2 NameComparator.java,1.1,1.2 VersionComparator.java,1.1,1.2 ArtifactGroupNameComparator.java,1.1,1.2 StandardArtifactComparisons.java,1.1,1.2 FilenameComparator.java,1.1,1.2
Nick Chalko <[email protected]> Wed, 08 Dec 2004 09:11:59 +0000
| Newsgroups | gmane.comp.krysalis.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/compare
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26470/src/java/org/krysalis/depot/update/artifact/compare
Modified Files:
AbstractArtifactGroupComparator.java
AbstractArtifactComparator.java TypeComparator.java
NameComparator.java VersionComparator.java
ArtifactGroupNameComparator.java
StandardArtifactComparisons.java FilenameComparator.java
Log Message:
format
Index: FilenameComparator.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/compare/FilenameComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FilenameComparator.java 8 Dec 2004 09:06:41 -0000 1.1
--- FilenameComparator.java 8 Dec 2004 09:11:54 -0000 1.2
***************
*** 41,48 ****
}
! public int compareResources(final ArtifactInstance artifact1, final ArtifactInstance artifact2) {
! int comparison =
! artifact1.getLocator().getFilename().compareToIgnoreCase(
! artifact2.getLocator().getFilename());
return comparison;
}
--- 41,48 ----
}
! public int compareResources(final ArtifactInstance artifact1,
! final ArtifactInstance artifact2) {
! int comparison = artifact1.getLocator().getFilename()
! .compareToIgnoreCase(artifact2.getLocator().getFilename());
return comparison;
}
Index: ArtifactGroupNameComparator.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/compare/ArtifactGroupNameComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ArtifactGroupNameComparator.java 8 Dec 2004 09:06:40 -0000 1.1
--- ArtifactGroupNameComparator.java 8 Dec 2004 09:11:54 -0000 1.2
***************
*** 28,32 ****
* Compare two entities by their group name.
*/
! public final class ArtifactGroupNameComparator extends AbstractArtifactGroupComparator {
private static final ArtifactGroupNameComparator INSTANCE = new ArtifactGroupNameComparator();
--- 28,33 ----
* Compare two entities by their group name.
*/
! public final class ArtifactGroupNameComparator extends
! AbstractArtifactGroupComparator {
private static final ArtifactGroupNameComparator INSTANCE = new ArtifactGroupNameComparator();
***************
*** 43,51 ****
}
! public int compareResourceGroups(
! final ArtifactGroup resourceGroup1,
! final ArtifactGroup resourceGroup2) {
! int comparison =
! resourceGroup1.getName().compareToIgnoreCase(
resourceGroup2.getName());
return comparison;
--- 44,50 ----
}
! public int compareResourceGroups(final ArtifactGroup resourceGroup1,
! final ArtifactGroup resourceGroup2) {
! int comparison = resourceGroup1.getName().compareToIgnoreCase(
resourceGroup2.getName());
return comparison;
Index: NameComparator.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/compare/NameComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NameComparator.java 8 Dec 2004 09:06:41 -0000 1.1
--- NameComparator.java 8 Dec 2004 09:11:54 -0000 1.2
***************
*** 43,51 ****
}
! public int compareResources(
! final ArtifactInstance artifact1,
! final ArtifactInstance artifact2) {
! int comparison =
! artifact1.getIdentifier().getId().compareToIgnoreCase(
artifact2.getIdentifier().getId());
return comparison;
--- 43,49 ----
}
! public int compareResources(final ArtifactInstance artifact1,
! final ArtifactInstance artifact2) {
! int comparison = artifact1.getIdentifier().getId().compareToIgnoreCase(
artifact2.getIdentifier().getId());
return comparison;
Index: AbstractArtifactComparator.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/compare/AbstractArtifactComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractArtifactComparator.java 8 Dec 2004 09:06:40 -0000 1.1
--- AbstractArtifactComparator.java 8 Dec 2004 09:11:54 -0000 1.2
***************
*** 39,68 ****
if (object2 instanceof ArtifactInstance) {
! // System.out.println(
! // SystemUtils.getShortName(getClass())
! // + ": "
! // + object1
! // + " & "
! // + object2);
! comparison =
! compareResources((ArtifactInstance) object1, (ArtifactInstance) object2);
! }
! else {
! throw new IllegalArgumentException(
! Messages.getString(
! MessageConstants.WRONG_TYPE,
! new Object[] {
! object2.getClass().getName(),
! ArtifactInstance.class.getName()}));
}
! }
! else {
! throw new IllegalArgumentException(
! Messages.getString(
! MessageConstants.WRONG_TYPE,
! new Object[] {
! object1.getClass().getName(),
! ArtifactInstance.class.getName()}));
}
--- 39,62 ----
if (object2 instanceof ArtifactInstance) {
! // System.out.println(
! // SystemUtils.getShortName(getClass())
! // + ": "
! // + object1
! // + " & "
! // + object2);
! comparison = compareResources((ArtifactInstance) object1,
! (ArtifactInstance) object2);
! } else {
! throw new IllegalArgumentException(Messages.getString(
! MessageConstants.WRONG_TYPE, new Object[] {
! object2.getClass().getName(),
! ArtifactInstance.class.getName() }));
}
! } else {
! throw new IllegalArgumentException(Messages.getString(
! MessageConstants.WRONG_TYPE, new Object[] {
! object1.getClass().getName(),
! ArtifactInstance.class.getName() }));
}
***************
*** 74,79 ****
}
! public abstract int compareResources(
! final ArtifactInstance artifact1,
! final ArtifactInstance artifact2);
}
--- 68,72 ----
}
! public abstract int compareResources(final ArtifactInstance artifact1,
! final ArtifactInstance artifact2);
}
Index: VersionComparator.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/compare/VersionComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionComparator.java 8 Dec 2004 09:06:41 -0000 1.1
--- VersionComparator.java 8 Dec 2004 09:11:54 -0000 1.2
***************
*** 15,18 ****
--- 15,19 ----
*/
package org.krysalis.depot.update.artifact.compare;
+
import java.util.Comparator;
***************
*** 27,30 ****
--- 28,32 ----
public final class VersionComparator extends AbstractArtifactComparator {
public static final Comparator INSTANCE = new VersionComparator();
+
/**
* Campare to Resources by Version in reverse order.
***************
*** 35,38 ****
--- 37,41 ----
}
};
+
/**
* @param expression
***************
*** 41,47 ****
--- 44,52 ----
super(Messages.getString(MessageConstants.VERSION_COMPARATOR));
}
+
public static Comparator getInstance() {
return INSTANCE;
}
+
public int compareResources(final ArtifactInstance artifact1,
final ArtifactInstance artifact2) {
Index: TypeComparator.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/compare/TypeComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TypeComparator.java 8 Dec 2004 09:06:40 -0000 1.1
--- TypeComparator.java 8 Dec 2004 09:11:54 -0000 1.2
***************
*** 43,51 ****
}
! public int compareResources(
! final ArtifactInstance artifact1,
! final ArtifactInstance artifact2) {
! int comparison =
! artifact1.getArtifact().getType().compareTo(
artifact2.getArtifact().getType());
return comparison;
--- 43,49 ----
}
! public int compareResources(final ArtifactInstance artifact1,
! final ArtifactInstance artifact2) {
! int comparison = artifact1.getArtifact().getType().compareTo(
artifact2.getArtifact().getType());
return comparison;
Index: StandardArtifactComparisons.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/compare/StandardArtifactComparisons.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StandardArtifactComparisons.java 8 Dec 2004 09:06:40 -0000 1.1
--- StandardArtifactComparisons.java 8 Dec 2004 09:11:54 -0000 1.2
***************
*** 19,23 ****
import org.krysalis.depot.update.util.compare.ComparatorSequence;
-
/**
* @author arb_jack
--- 19,22 ----
***************
*** 27,33 ****
--- 26,36 ----
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;
***************
*** 41,51 ****
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());
--- 44,54 ----
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());
***************
*** 59,63 ****
return l_nameTypeVersion;
}
!
/**
* @return
--- 62,66 ----
return l_nameTypeVersion;
}
!
/**
* @return
***************
*** 66,70 ****
return l_nameType;
}
!
/**
* @return
--- 69,73 ----
return l_nameType;
}
!
/**
* @return
***************
*** 73,77 ****
return l_nameVersion;
}
!
/**
* @return
--- 76,80 ----
return l_nameVersion;
}
!
/**
* @return
***************
*** 80,84 ****
return l_version;
}
!
/**
* @return
--- 83,87 ----
return l_version;
}
!
/**
* @return
Index: AbstractArtifactGroupComparator.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/compare/AbstractArtifactGroupComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractArtifactGroupComparator.java 8 Dec 2004 09:06:40 -0000 1.1
--- AbstractArtifactGroupComparator.java 8 Dec 2004 09:11:54 -0000 1.2
***************
*** 39,68 ****
if (object2 instanceof ArtifactGroup) {
! // System.out.println(
! // SystemUtils.getShortName(getClass())
! // + ": "
! // + object1
! // + " & "
! // + object2);
! comparison =
! compareResourceGroups((ArtifactGroup) object1, (ArtifactGroup) object2);
! }
! else {
! throw new IllegalArgumentException(
! Messages.getString(
! MessageConstants.WRONG_TYPE,
! new Object[] {
! object2.getClass().getName(),
! ArtifactGroup.class.getName()}));
}
! }
! else {
! throw new IllegalArgumentException(
! Messages.getString(
! MessageConstants.WRONG_TYPE,
! new Object[] {
! object1.getClass().getName(),
! ArtifactGroup.class.getName()}));
}
--- 39,62 ----
if (object2 instanceof ArtifactGroup) {
! // System.out.println(
! // SystemUtils.getShortName(getClass())
! // + ": "
! // + object1
! // + " & "
! // + object2);
! comparison = compareResourceGroups((ArtifactGroup) object1,
! (ArtifactGroup) object2);
! } else {
! throw new IllegalArgumentException(Messages.getString(
! MessageConstants.WRONG_TYPE, new Object[] {
! object2.getClass().getName(),
! ArtifactGroup.class.getName() }));
}
! } else {
! throw new IllegalArgumentException(Messages.getString(
! MessageConstants.WRONG_TYPE, new Object[] {
! object1.getClass().getName(),
! ArtifactGroup.class.getName() }));
}
***************
*** 75,79 ****
public abstract int compareResourceGroups(
! final ArtifactGroup artifactGroup1,
! final ArtifactGroup artifactGroup2);
}
--- 69,73 ----
public abstract int compareResourceGroups(
! final ArtifactGroup artifactGroup1,
! final ArtifactGroup artifactGroup2);
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/