ruper2/src/java/core/org/krysalis/ruper2/util/select ISelector.java,NONE,1.1 ISelectable.java,NONE,1.1 AllSelector.java,1.1,1.2 CompositeSelector.java,1.2,1.3 SelectionHelper.java,1.1,1.2 Selector.java,1.1,NONE Selectable.java,1.1,NONE

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

Modified Files:
	AllSelector.java CompositeSelector.java SelectionHelper.java 
Added Files:
	ISelector.java ISelectable.java 
Removed Files:
	Selector.java Selectable.java 
Log Message:
Consistency changes, interfaces starting with I --- retry commit.

--- NEW FILE: ISelector.java ---
/*
 * Created on Aug 27, 2003
 *
 * To change the template for this generated file go to
 * Window>Preferences>Java>Code Generation>Code and Comments
 */
package org.krysalis.ruper2.util.select;

/**
 * @author arb_jack
 */
public interface ISelector {
	boolean select(Object o) throws Exception;
}

--- NEW FILE: ISelectable.java ---
/*
 * Created on Aug 27, 2003
 */
package org.krysalis.ruper2.util.select;

/**
 * @author arb_jack
 */
public interface ISelectable {
	Object getSelectionObject();
}

Index: AllSelector.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/util/select/AllSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AllSelector.java	29 Sep 2003 18:09:24 -0000	1.1
--- AllSelector.java	9 Oct 2003 14:05:37 -0000	1.2
***************
*** 9,15 ****
   * @author arb_jack
   */
! public class AllSelector implements Selector {
  
! 	private final static Selector INSTANCE = new AllSelector();
  
  	/* (non-Javadoc)
--- 9,15 ----
   * @author arb_jack
   */
! public class AllSelector implements ISelector {
  
! 	private final static ISelector INSTANCE = new AllSelector();
  
  	/* (non-Javadoc)
***************
*** 20,24 ****
  	}
  
! 	public static Selector getInstance() {
  		return AllSelector.INSTANCE;
  	}
--- 20,24 ----
  	}
  
! 	public static ISelector getInstance() {
  		return AllSelector.INSTANCE;
  	}

Index: CompositeSelector.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/util/select/CompositeSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompositeSelector.java	2 Oct 2003 23:56:50 -0000	1.2
--- CompositeSelector.java	9 Oct 2003 14:05:37 -0000	1.3
***************
*** 21,25 ****
   * @author Ben Sommerville
   */
! public abstract class CompositeSelector implements Selector, Dumpable {
  	// Would be much easier if we could use a LinkedHashSet, but that
  	// isn't available until JDK 1.4
--- 21,25 ----
   * @author Ben Sommerville
   */
! public abstract class CompositeSelector implements ISelector, Dumpable {
  	// Would be much easier if we could use a LinkedHashSet, but that
  	// isn't available until JDK 1.4
***************
*** 34,38 ****
  	 * @throws NullPointerException If selector is null
  	 */
! 	public boolean addSelector(Selector selector) {
  		if (selector == null) {
  			throw new IllegalArgumentException("Can't add null selector to composite");
--- 34,38 ----
  	 * @throws NullPointerException If selector is null
  	 */
! 	public boolean addSelector(ISelector selector) {
  		if (selector == null) {
  			throw new IllegalArgumentException("Can't add null selector to composite");
***************
*** 126,130 ****
  		Iterator iter = childIterator();
  		while (iter.hasNext()) {
! 			Selector selector = (Selector) iter.next();
  			DebugUtils.dump(out, depth + 1, verbose, selector);
  		}
--- 126,130 ----
  		Iterator iter = childIterator();
  		while (iter.hasNext()) {
! 			ISelector selector = (ISelector) iter.next();
  			DebugUtils.dump(out, depth + 1, verbose, selector);
  		}
***************
*** 142,146 ****
  		Iterator iter = childIterator();
  		while (iter.hasNext()) {
! 			Selector selector = (Selector) iter.next();
  			buffer.append(selector);
  		}
--- 142,146 ----
  		Iterator iter = childIterator();
  		while (iter.hasNext()) {
! 			ISelector selector = (ISelector) iter.next();
  			buffer.append(selector);
  		}

Index: SelectionHelper.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/util/select/SelectionHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SelectionHelper.java	29 Sep 2003 18:09:24 -0000	1.1
--- SelectionHelper.java	9 Oct 2003 14:05:37 -0000	1.2
***************
*** 46,50 ****
  			i.hasNext() && !choices.isEmpty();
  			) {
! 			Selector selector = (Selector) i.next();
  
  			selectInto(choices, selector, selected);
--- 46,50 ----
  			i.hasNext() && !choices.isEmpty();
  			) {
! 			ISelector selector = (ISelector) i.next();
  
  			selectInto(choices, selector, selected);
***************
*** 57,61 ****
  	}
  
! 	public static List select(List choices, Selector selector) {
  		List selected = new ArrayList();
  		selectInto(choices, selector, selected);
--- 57,61 ----
  	}
  
! 	public static List select(List choices, ISelector selector) {
  		List selected = new ArrayList();
  		selectInto(choices, selector, selected);
***************
*** 65,69 ****
  	public static void selectInto(
  		List choices,
! 		Selector selector,
  		List selected) {
  
--- 65,69 ----
  	public static void selectInto(
  		List choices,
! 		ISelector selector,
  		List selected) {
  

--- Selector.java DELETED ---

--- Selectable.java DELETED ---




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php