krysalis-update/src/java/org/krysalis/depot/update/artifact/select NameSelector.java,1.1,1.2 AbstractArtifactSelector.java,1.1,1.2 ReleaseLevelSelector.java,1.1,1.2 TypeSelector.java,1.1,1.2 ConstraintResultSet.java,1.1,1.2 StandardSelections.java,1.1,1.2 ConstraintEvaluator.java,1.1,1.2 ConstraintSet.java,1.1,1.2 VersionSelector.java,1.1,1.2 VersionConstraintsSelector.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/select
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26470/src/java/org/krysalis/depot/update/artifact/select
Modified Files:
NameSelector.java AbstractArtifactSelector.java
ReleaseLevelSelector.java TypeSelector.java
ConstraintResultSet.java StandardSelections.java
ConstraintEvaluator.java ConstraintSet.java
VersionSelector.java VersionConstraintsSelector.java
Log Message:
format
Index: ReleaseLevelSelector.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/select/ReleaseLevelSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReleaseLevelSelector.java 8 Dec 2004 09:07:10 -0000 1.1
--- ReleaseLevelSelector.java 8 Dec 2004 09:11:55 -0000 1.2
***************
*** 34,38 ****
* @param expression
*/
! public ReleaseLevelSelector(org.krysalis.version.impl.data.ReleaseLevel comparisonLevel) {
super(Messages.getString(MessageConstants.VERSION_SELECTOR));
m_comparisonLevel = comparisonLevel;
--- 34,39 ----
* @param expression
*/
! public ReleaseLevelSelector(
! org.krysalis.version.impl.data.ReleaseLevel comparisonLevel) {
super(Messages.getString(MessageConstants.VERSION_SELECTOR));
m_comparisonLevel = comparisonLevel;
***************
*** 47,71 ****
if (null != version) {
! //:TODO: More features...
if (version instanceof ApacheVersion) {
! selected =
! m_comparisonLevel.compareTo(
! ((ApacheVersion) version).getReleaseLevelObject())
! >= 0;
! log.debug(
! "Selected ["
! + m_comparisonLevel
! + "] ["
! + ((ApacheVersion) version).getReleaseLevel()
! + "] ["
! + selected
! + "]");
! }
! else
! log.debug(
! "Non-ApacheVersion " + version.getClass().getName());
! }
! else
log.debug("No Version on " + artifact);
--- 48,63 ----
if (null != version) {
! // :TODO: More features...
if (version instanceof ApacheVersion) {
! selected = m_comparisonLevel
! .compareTo(((ApacheVersion) version)
! .getReleaseLevelObject()) >= 0;
! log.debug("Selected [" + m_comparisonLevel + "] ["
! + ((ApacheVersion) version).getReleaseLevel() + "] ["
! + selected + "]");
! } else
! log.debug("Non-ApacheVersion " + version.getClass().getName());
! } else
log.debug("No Version on " + artifact);
***************
*** 74,81 ****
public String toString() {
! return super.toString()
! + ": [Leval= "
! + m_comparisonLevel.toString()
! + "]";
}
}
--- 66,71 ----
public String toString() {
! return super.toString() + ": [Leval= " + m_comparisonLevel.toString()
! + "]";
}
}
Index: ConstraintResultSet.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/select/ConstraintResultSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConstraintResultSet.java 8 Dec 2004 09:07:10 -0000 1.1
--- ConstraintResultSet.java 8 Dec 2004 09:11:55 -0000 1.2
***************
*** 9,15 ****
/**
* @author nick
! *
! * TODO To change the template for this generated type comment go to
! * Window - Preferences - Java - Code Style - Code Templates
*/
public class ConstraintResultSet {
--- 9,15 ----
/**
* @author nick
! *
! * TODO To change the template for this generated type comment go to Window -
! * Preferences - Java - Code Style - Code Templates
*/
public class ConstraintResultSet {
Index: ConstraintEvaluator.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/select/ConstraintEvaluator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConstraintEvaluator.java 8 Dec 2004 09:07:11 -0000 1.1
--- ConstraintEvaluator.java 8 Dec 2004 09:11:55 -0000 1.2
***************
*** 11,17 ****
/**
* @author nick
! *
! * TODO To change the template for this generated type comment go to
! * Window - Preferences - Java - Code Style - Code Templates
*/
public class ConstraintEvaluator {
--- 11,17 ----
/**
* @author nick
! *
! * TODO To change the template for this generated type comment go to Window -
! * Preferences - Java - Code Style - Code Templates
*/
public class ConstraintEvaluator {
***************
*** 22,26 ****
* @return
*/
! public static ConstraintResultSet evaluate(ApacheVersion version, ConstraintSet m_constraints) {
// TODO Auto-generated method stub
return null;
--- 22,27 ----
* @return
*/
! public static ConstraintResultSet evaluate(ApacheVersion version,
! ConstraintSet m_constraints) {
// TODO Auto-generated method stub
return null;
Index: StandardSelections.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/select/StandardSelections.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StandardSelections.java 8 Dec 2004 09:07:11 -0000 1.1
--- StandardSelections.java 8 Dec 2004 09:11:55 -0000 1.2
***************
*** 21,26 ****
import org.krysalis.depot.update.util.select.logic.AndSelector;
-
-
/**
* @author arb_jack
--- 21,24 ----
***************
*** 29,38 ****
/**
! * @param resource - -a specifier
* @return
*/
public static ISelector getNamedTypedVersion(Artifact artifact) {
AndSelector set = new AndSelector();
!
set.addSelector(new NameSelector(artifact.getIdentifier().getId()));
set.addSelector(new TypeSelector(artifact.getType()));
--- 27,37 ----
/**
! * @param resource -
! * -a specifier
* @return
*/
public static ISelector getNamedTypedVersion(Artifact artifact) {
AndSelector set = new AndSelector();
!
set.addSelector(new NameSelector(artifact.getIdentifier().getId()));
set.addSelector(new TypeSelector(artifact.getType()));
***************
*** 40,44 ****
set.addSelector(new VersionSelector(artifact.getVersion()));
}
!
return set;
}
--- 39,43 ----
set.addSelector(new VersionSelector(artifact.getVersion()));
}
!
return set;
}
Index: VersionConstraintsSelector.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/select/VersionConstraintsSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionConstraintsSelector.java 8 Dec 2004 09:07:11 -0000 1.1
--- VersionConstraintsSelector.java 8 Dec 2004 09:11:55 -0000 1.2
***************
*** 46,73 ****
if (null != version) {
! //:TODO: More features...
if (version instanceof ApacheVersion) {
! ConstraintResultSet resultSet =
! ConstraintEvaluator.evaluate(
! ((ApacheVersion) version),
! m_constraints);
selected = !resultSet.hasErrors();
! log.debug(
! "Selected ["
! + m_constraints.getName()
! + "] ["
! + ((ApacheVersion) version)
! + "] ["
! + selected
! + "]");
! }
! else
! log.debug(
! "Non-ApacheVersion " + version.getClass().getName());
! }
! else
log.debug("No Version on " + artifact);
--- 46,62 ----
if (null != version) {
! // :TODO: More features...
if (version instanceof ApacheVersion) {
! ConstraintResultSet resultSet = ConstraintEvaluator.evaluate(
! ((ApacheVersion) version), m_constraints);
selected = !resultSet.hasErrors();
! log.debug("Selected [" + m_constraints.getName() + "] ["
! + ((ApacheVersion) version) + "] [" + selected + "]");
! } else
! log.debug("Non-ApacheVersion " + version.getClass().getName());
! } else
log.debug("No Version on " + artifact);
***************
*** 76,83 ****
public String toString() {
! return super.toString()
! + ": [Leval= "
! + m_constraints.toString()
! + "]";
}
}
--- 65,69 ----
public String toString() {
! return super.toString() + ": [Leval= " + m_constraints.toString() + "]";
}
}
Index: NameSelector.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/select/NameSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NameSelector.java 8 Dec 2004 09:07:10 -0000 1.1
--- NameSelector.java 8 Dec 2004 09:11:55 -0000 1.2
***************
*** 28,32 ****
public class NameSelector extends AbstractArtifactSelector {
RegularExpressionSelector m_regexp = null;
!
/**
* @param expression
--- 28,32 ----
public class NameSelector extends AbstractArtifactSelector {
RegularExpressionSelector m_regexp = null;
!
/**
* @param expression
***************
*** 34,38 ****
public NameSelector(String expression) {
super(Messages.getString(MessageConstants.NAME_SELECTOR));
!
m_regexp = new RegularExpressionSelector(expression);
}
--- 34,38 ----
public NameSelector(String expression) {
super(Messages.getString(MessageConstants.NAME_SELECTOR));
!
m_regexp = new RegularExpressionSelector(expression);
}
***************
*** 43,47 ****
public NameSelector(RegularExpression expression) {
super(Messages.getString(MessageConstants.NAME_SELECTOR));
!
m_regexp = new RegularExpressionSelector(expression);
}
--- 43,47 ----
public NameSelector(RegularExpression expression) {
super(Messages.getString(MessageConstants.NAME_SELECTOR));
!
m_regexp = new RegularExpressionSelector(expression);
}
Index: ConstraintSet.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/select/ConstraintSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConstraintSet.java 8 Dec 2004 09:07:10 -0000 1.1
--- ConstraintSet.java 8 Dec 2004 09:11:55 -0000 1.2
***************
*** 9,15 ****
/**
* @author nick
! *
! * TODO To change the template for this generated type comment go to
! * Window - Preferences - Java - Code Style - Code Templates
*/
public class ConstraintSet {
--- 9,15 ----
/**
* @author nick
! *
! * TODO To change the template for this generated type comment go to Window -
! * Preferences - Java - Code Style - Code Templates
*/
public class ConstraintSet {
Index: TypeSelector.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/select/TypeSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TypeSelector.java 8 Dec 2004 09:07:10 -0000 1.1
--- TypeSelector.java 8 Dec 2004 09:11:55 -0000 1.2
***************
*** 25,29 ****
* @author arb_jack
*/
! public class TypeSelector extends AbstractArtifactSelector {
ArtifactType m_comparisonType = null;
--- 25,29 ----
* @author arb_jack
*/
! public class TypeSelector extends AbstractArtifactSelector {
ArtifactType m_comparisonType = null;
***************
*** 32,36 ****
*/
public TypeSelector(ArtifactType comparisonType) {
! super(Messages.getString(MessageConstants.TYPE_SELECTOR));
m_comparisonType = comparisonType;
}
--- 32,36 ----
*/
public TypeSelector(ArtifactType comparisonType) {
! super(Messages.getString(MessageConstants.TYPE_SELECTOR));
m_comparisonType = comparisonType;
}
***************
*** 42,46 ****
if (null != type) {
! //:TODO: More features...
selected = m_comparisonType.equals(type);
--- 42,46 ----
if (null != type) {
! // :TODO: More features...
selected = m_comparisonType.equals(type);
Index: AbstractArtifactSelector.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/select/AbstractArtifactSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractArtifactSelector.java 8 Dec 2004 09:07:10 -0000 1.1
--- AbstractArtifactSelector.java 8 Dec 2004 09:11:55 -0000 1.2
***************
*** 38,47 ****
if (object instanceof ArtifactInstance) {
selected = selectArtifact((ArtifactInstance) object);
! }
! else {
! throw new IllegalArgumentException(
! Messages.getString(
! MessageConstants.WRONG_TYPE,
! object.getClass().getName(),
ArtifactInstance.class.getName()));
}
--- 38,44 ----
if (object instanceof ArtifactInstance) {
selected = selectArtifact((ArtifactInstance) object);
! } else {
! throw new IllegalArgumentException(Messages.getString(
! MessageConstants.WRONG_TYPE, object.getClass().getName(),
ArtifactInstance.class.getName()));
}
Index: VersionSelector.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/artifact/select/VersionSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionSelector.java 8 Dec 2004 09:07:10 -0000 1.1
--- VersionSelector.java 8 Dec 2004 09:11:55 -0000 1.2
***************
*** 22,27 ****
import org.krysalis.version.Version;
-
-
/**
* @author arb_jack
--- 22,25 ----
***************
*** 44,48 ****
if (null != version) {
! //:TODO: More features...
selected = version.isCompatible(m_comparisonVersion);
--- 42,46 ----
if (null != version) {
! // :TODO: More features...
selected = version.isCompatible(m_comparisonVersion);
***************
*** 51,55 ****
return selected;
}
!
public String toString() {
return super.toString() + ":" + m_comparisonVersion.toString();
--- 49,53 ----
return selected;
}
!
public String toString() {
return super.toString() + ":" + m_comparisonVersion.toString();
-------------------------------------------------------
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/