ruper2/src/java/core/org/krysalis/ruper/resource/select StandardSelections.java,1.2,1.3

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

Modified Files:
	StandardSelections.java 
Log Message:
Refactored SelectorSet & added some logic selectors

Index: StandardSelections.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/resource/select/StandardSelections.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StandardSelections.java	4 Sep 2003 19:13:01 -0000	1.2
--- StandardSelections.java	16 Sep 2003 13:55:10 -0000	1.3
***************
*** 5,9 ****
  
  import org.krysalis.ruper.resource.ResourceSpecifier;
! import org.krysalis.ruper.util.select.SelectorSet;
  
  /**
--- 5,11 ----
  
  import org.krysalis.ruper.resource.ResourceSpecifier;
! 
! import org.krysalis.ruper.util.select.Selector;
! import org.krysalis.ruper.util.select.logic.AndSelector;
  
  /**
***************
*** 16,26 ****
  	 * @return
  	 */
! 	public static SelectorSet getNamedTypedVersion(ResourceSpecifier resource) {
! 		SelectorSet set = new SelectorSet();
  
  		set.addSelector(new NameSelector(resource.getIdentifier().getId()));
  		set.addSelector(new TypeSelector(resource.getType()));
! 		if (null != resource.getVersion())
  			set.addSelector(new VersionSelector(resource.getVersion()));
  
  		return set;
--- 18,29 ----
  	 * @return
  	 */
! 	public static Selector getNamedTypedVersion(ResourceSpecifier resource) {
! 		AndSelector set = new AndSelector();
  
  		set.addSelector(new NameSelector(resource.getIdentifier().getId()));
  		set.addSelector(new TypeSelector(resource.getType()));
! 		if (null != resource.getVersion()) {
  			set.addSelector(new VersionSelector(resource.getVersion()));
+         }
  
  		return set;




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