Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/resource/select
In directory sc8-pr-cvs1:/tmp/cvs-serv17387/src/java/core/org/krysalis/ruper/resource/select
Modified Files:
VersionSelector.java NameSelector.java TypeSelector.java
Added Files:
AbstractResourceSelector.java FilenameSelector.java
Log Message:
Some pretttiness on output
Working on the ant task some more.
--- NEW FILE: AbstractResourceSelector.java ---
/*
* Created on Sep 4, 2003
*/
package org.krysalis.ruper.resource.select;
import org.krysalis.ruper.resource.Resource;
import org.krysalis.ruper.util.select.Selector;
import org.krysalis.ruper.util.text.MessageConstants;
import org.krysalis.ruper.util.text.Messages;
import org.krysalis.version.util.SystemUtils;
/**
* @author arb_jack
*/
public abstract class AbstractResourceSelector implements Selector {
private String m_description = null;
protected AbstractResourceSelector(String description) {
m_description = description;
}
public boolean select(final Object object) {
boolean selected = false;
if (object instanceof Resource) {
selected =
selectResource((Resource) object);
}
else {
throw new IllegalArgumentException(
Messages.getString(
MessageConstants.WRONG_TYPE,
new Object[] {
object.getClass().getName(),
Resource.class.getName()}));
}
return selected;
}
public String toString() {
return SystemUtils.getShortName(getClass()) + ":" + m_description;
}
public abstract boolean selectResource(
final Resource resource);
}
--- NEW FILE: FilenameSelector.java ---
/*
* Created on Sep 4, 2003
*/
package org.krysalis.ruper.resource.select;
import org.krysalis.ruper.resource.Resource;
import org.krysalis.ruper.util.regexp.RegularExpression;
import org.krysalis.ruper.util.regexp.RegularExpressionSelector;
import org.krysalis.ruper.util.text.MessageConstants;
import org.krysalis.ruper.util.text.Messages;
/**
* @author arb_jack
*/
public class FilenameSelector extends AbstractResourceSelector {
RegularExpressionSelector m_regexp = null;
/**
* @param expression
*/
public FilenameSelector(String expression) {
super(Messages.getString(MessageConstants.FILENAME_SELECTOR));
m_regexp = new RegularExpressionSelector(expression);
}
/**
* @param expression
*/
public FilenameSelector(RegularExpression expression) {
super(Messages.getString(MessageConstants.FILENAME_SELECTOR));
m_regexp = new RegularExpressionSelector(expression);
}
public boolean selectResource(Resource resource) {
return m_regexp.select(resource.getFilename());
}
public String toString() {
return super.toString() + ":" + m_regexp;
}
}
Index: VersionSelector.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/resource/select/VersionSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionSelector.java 4 Sep 2003 16:45:53 -0000 1.1
--- VersionSelector.java 12 Sep 2003 13:28:22 -0000 1.2
***************
*** 8,12 ****
import org.krysalis.ruper.resource.Resource;
! import org.krysalis.ruper.util.select.Selector;
import org.krysalis.version.Version;
--- 8,13 ----
import org.krysalis.ruper.resource.Resource;
! import org.krysalis.ruper.util.text.MessageConstants;
! import org.krysalis.ruper.util.text.Messages;
import org.krysalis.version.Version;
***************
*** 14,18 ****
* @author arb_jack
*/
! public class VersionSelector implements Selector {
Version m_comparisonVersion = null;
--- 15,19 ----
* @author arb_jack
*/
! public class VersionSelector extends AbstractResourceSelector {
Version m_comparisonVersion = null;
***************
*** 21,31 ****
*/
public VersionSelector(Version comparisonVersion) {
m_comparisonVersion = comparisonVersion;
}
! public boolean select(Object resource) {
boolean selected = false;
! Version version = ((Resource) resource).getVersion();
if (null != version) {
--- 22,33 ----
*/
public VersionSelector(Version comparisonVersion) {
+ super(Messages.getString(MessageConstants.VERSION_SELECTOR));
m_comparisonVersion = comparisonVersion;
}
! public boolean selectResource(Resource resource) {
boolean selected = false;
! Version version = resource.getVersion();
if (null != version) {
***************
*** 36,39 ****
--- 38,45 ----
return selected;
+ }
+
+ public String toString() {
+ return super.toString() + ":" + m_comparisonVersion.toString();
}
}
Index: NameSelector.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/resource/select/NameSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NameSelector.java 4 Sep 2003 16:45:53 -0000 1.1
--- NameSelector.java 12 Sep 2003 13:28:22 -0000 1.2
***************
*** 7,21 ****
import org.krysalis.ruper.util.regexp.RegularExpression;
import org.krysalis.ruper.util.regexp.RegularExpressionSelector;
/**
* @author arb_jack
*/
! public class NameSelector extends RegularExpressionSelector {
!
/**
* @param expression
*/
public NameSelector(String expression) {
! super(expression);
}
--- 7,26 ----
import org.krysalis.ruper.util.regexp.RegularExpression;
import org.krysalis.ruper.util.regexp.RegularExpressionSelector;
+ import org.krysalis.ruper.util.text.MessageConstants;
+ import org.krysalis.ruper.util.text.Messages;
/**
* @author arb_jack
*/
! public class NameSelector extends AbstractResourceSelector {
! RegularExpressionSelector m_regexp = null;
!
/**
* @param expression
*/
public NameSelector(String expression) {
! super(Messages.getString(MessageConstants.NAME_SELECTOR));
!
! m_regexp = new RegularExpressionSelector(expression);
}
***************
*** 24,32 ****
*/
public NameSelector(RegularExpression expression) {
! super(expression);
}
! public boolean select(Object resource) {
! return super.select(((Resource) resource).getIdentifier().getId());
}
}
--- 29,43 ----
*/
public NameSelector(RegularExpression expression) {
! super(Messages.getString(MessageConstants.NAME_SELECTOR));
!
! m_regexp = new RegularExpressionSelector(expression);
}
! public boolean selectResource(Resource resource) {
! return m_regexp.select(resource.getIdentifier().getId());
! }
!
! public String toString() {
! return super.toString() + ":" + m_regexp;
}
}
Index: TypeSelector.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/resource/select/TypeSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TypeSelector.java 4 Sep 2003 16:45:53 -0000 1.1
--- TypeSelector.java 12 Sep 2003 13:28:22 -0000 1.2
***************
*** 9,18 ****
import org.krysalis.ruper.resource.Resource;
import org.krysalis.ruper.resource.ResourceType;
! import org.krysalis.ruper.util.select.Selector;
/**
* @author arb_jack
*/
! public class TypeSelector implements Selector {
ResourceType m_comparisonType = null;
--- 9,19 ----
import org.krysalis.ruper.resource.Resource;
import org.krysalis.ruper.resource.ResourceType;
! import org.krysalis.ruper.util.text.MessageConstants;
! import org.krysalis.ruper.util.text.Messages;
/**
* @author arb_jack
*/
! public class TypeSelector extends AbstractResourceSelector {
ResourceType m_comparisonType = null;
***************
*** 21,31 ****
*/
public TypeSelector(ResourceType comparisonType) {
m_comparisonType = comparisonType;
}
! public boolean select(Object resource) {
boolean selected = false;
! ResourceType type = ((Resource) resource).getType();
if (null != type) {
--- 22,33 ----
*/
public TypeSelector(ResourceType comparisonType) {
+ super(Messages.getString(MessageConstants.TYPE_SELECTOR));
m_comparisonType = comparisonType;
}
! public boolean selectResource(Resource resource) {
boolean selected = false;
! ResourceType type = resource.getType();
if (null != type) {
***************
*** 36,39 ****
--- 38,45 ----
return selected;
+ }
+
+ public String toString() {
+ return super.toString() + ":" + m_comparisonType.toString();
}
}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.