ruper2/src/java/core/org/krysalis/ruper/util/select SelectionHelper.java,1.2,1.3 AllSelector.java,1.1,1.2 SelectorHandlerChain.java,1.1,1.2

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

Modified Files:
	SelectionHelper.java AllSelector.java 
	SelectorHandlerChain.java 
Log Message:
1) listSpecifiers ought not work
2) unit tests run again [need to add those to a project]
3) FilenameAnalyzer a bit smarter (copes w/ -alpha better, ala Ben's soln)
4) FileUpdater does something -- kinda/sorta, try it :-)
5) Ant task same...

Index: SelectionHelper.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/util/select/SelectionHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SelectionHelper.java	5 Sep 2003 15:54:42 -0000	1.2
--- SelectionHelper.java	12 Sep 2003 20:23:43 -0000	1.3
***************
*** 25,29 ****
  	public static List select(List choices, List selectors) {
  		List selected = new ArrayList();
! 		selectInto(choices, selectors, selected, null);
  		return selected;
  	}
--- 25,29 ----
  	public static List select(List choices, List selectors) {
  		List selected = new ArrayList();
! 		selectInto(choices, selectors, selected);
  		return selected;
  	}
***************
*** 36,50 ****
  	 * @return
  	 */
- 	public static List select(List choices, List selectors, Logger logger) {
- 		List selected = new ArrayList();
- 		selectInto(choices, selectors, selected, logger);
- 		return selected;
- 	}
- 
  	public static void selectInto(
  		List choices,
  		List selectors,
! 		List selected,
! 		Logger logger) {
  		//
  		// Keep applying selectors (so long as there are choices)
--- 36,43 ----
  	 * @return
  	 */
  	public static void selectInto(
  		List choices,
  		List selectors,
! 		List selected) {
  		//
  		// Keep applying selectors (so long as there are choices)
***************
*** 55,59 ****
  			Selector selector = (Selector) i.next();
  
! 			selectInto(choices, selector, selected, logger);
  
  			choices = selected;
--- 48,52 ----
  			Selector selector = (Selector) i.next();
  
! 			selectInto(choices, selector, selected);
  
  			choices = selected;
***************
*** 63,73 ****
  	public static List select(List choices, Selector selector) {
  		List selected = new ArrayList();
! 		selectInto(choices, selector, selected, null);
! 		return selected;
! 	}
! 
! 	public static List select(List choices, Selector selector, Logger logger) {
! 		List selected = new ArrayList();
! 		selectInto(choices, selector, selected, logger);
  		return selected;
  	}
--- 56,60 ----
  	public static List select(List choices, Selector selector) {
  		List selected = new ArrayList();
! 		selectInto(choices, selector, selected);
  		return selected;
  	}
***************
*** 76,81 ****
  		List choices,
  		Selector selector,
! 		List selected,
! 		Logger logger) {
  
  		for (Iterator i = choices.iterator(); i.hasNext();) {
--- 63,67 ----
  		List choices,
  		Selector selector,
! 		List selected) {
  
  		for (Iterator i = choices.iterator(); i.hasNext();) {
***************
*** 84,95 ****
  				if (selector.select(choice))
  					selected.add(choice);
! 				else if (null != logger)
! 					logger.debug(Messages.getString("NOT_SELECTED", choice));
  			}
  			catch (Exception e) {
! 				if (null != logger)
! 					logger.error(Messages.getString("SELECT_CRASHED", e), e);
  			}
  		}
  	}
! }
--- 70,87 ----
  				if (selector.select(choice))
  					selected.add(choice);
! 				else
! 					Logger.getLog().debug(
! 						Messages.getString(
! 							"NOT_SELECTED",
! 							new Object[] { choice, selector }));
  			}
  			catch (Exception e) {
! 				Logger.getLog().error(
! 					Messages.getString(
! 						"SELECTOR_CRASHED",
! 						new Object[] { selector, e }),
! 					e);
  			}
  		}
  	}
! }
\ No newline at end of file

Index: AllSelector.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/util/select/AllSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AllSelector.java	29 Aug 2003 00:37:01 -0000	1.1
--- AllSelector.java	12 Sep 2003 20:23:43 -0000	1.2
***************
*** 4,7 ****
--- 4,9 ----
  package org.krysalis.ruper.util.select;
  
+ import org.krysalis.version.util.SystemUtils;
+ 
  /**
   * @author arb_jack
***************
*** 21,23 ****
--- 23,27 ----
  		return AllSelector.INSTANCE;
  	}
+ 	
+ 	public String toString() { return SystemUtils.getShortName(getClass()); }
  }

Index: SelectorHandlerChain.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/util/select/SelectorHandlerChain.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SelectorHandlerChain.java	11 Sep 2003 17:03:30 -0000	1.1
--- SelectorHandlerChain.java	12 Sep 2003 20:23:43 -0000	1.2
***************
*** 8,11 ****
--- 8,12 ----
  
  import org.krysalis.ruper.util.chainprocess.HandlerChain;
+ import org.krysalis.ruper.util.compare.*;
  
  /**




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