ruper2/src/java/core/org/krysalis/ruper2/query DefaultQueryEngine.java,1.5,1.6 ResourceQueryHelper.java,1.1,1.2 ResourceQuery.java,1.2,1.3

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

Modified Files:
	DefaultQueryEngine.java ResourceQueryHelper.java 
	ResourceQuery.java 
Log Message:
Consistency changes, interfaces starting with I --- retry commit.

Index: DefaultQueryEngine.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/query/DefaultQueryEngine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DefaultQueryEngine.java	8 Oct 2003 00:26:58 -0000	1.5
--- DefaultQueryEngine.java	9 Oct 2003 14:05:35 -0000	1.6
***************
*** 20,24 ****
  import org.krysalis.ruper2.resource.compare.StandardResourceComparisons;
  import org.krysalis.ruper2.util.select.AllSelector;
! import org.krysalis.ruper2.util.select.Selector;
  import org.krysalis.ruper2.util.text.MessageConstants;
  import org.krysalis.ruper2.util.text.Messages;
--- 20,24 ----
  import org.krysalis.ruper2.resource.compare.StandardResourceComparisons;
  import org.krysalis.ruper2.util.select.AllSelector;
! import org.krysalis.ruper2.util.select.ISelector;
  import org.krysalis.ruper2.util.text.MessageConstants;
  import org.krysalis.ruper2.util.text.Messages;
***************
*** 48,52 ****
  		// Extract query components
  		List resourceGroups = query.getGroups();
! 		Selector whereClause = query.getWhere();
  		Comparator groupBy = query.getGroupBy();
  		Comparator orderBy = query.getOrderBy();
--- 48,52 ----
  		// Extract query components
  		List resourceGroups = query.getGroups();
! 		ISelector whereClause = query.getWhere();
  		Comparator groupBy = query.getGroupBy();
  		Comparator orderBy = query.getOrderBy();

Index: ResourceQueryHelper.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/query/ResourceQueryHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResourceQueryHelper.java	7 Oct 2003 00:03:24 -0000	1.1
--- ResourceQueryHelper.java	9 Oct 2003 14:05:35 -0000	1.2
***************
*** 17,21 ****
  import org.krysalis.ruper2.util.RuperConstants;
  import org.krysalis.ruper2.util.select.AllSelector;
! import org.krysalis.ruper2.util.select.Selector;
  import org.krysalis.ruper2.util.text.MessageConstants;
  import org.krysalis.ruper2.util.text.Messages;
--- 17,21 ----
  import org.krysalis.ruper2.util.RuperConstants;
  import org.krysalis.ruper2.util.select.AllSelector;
! import org.krysalis.ruper2.util.select.ISelector;
  import org.krysalis.ruper2.util.text.MessageConstants;
  import org.krysalis.ruper2.util.text.Messages;
***************
*** 58,62 ****
  		if (specifier != null) {
  
! 			Selector where = StandardSelections.getNamedTypedVersion(specifier);
  			Comparator orderBy =
  				StandardResourceComparisons
--- 58,62 ----
  		if (specifier != null) {
  
! 			ISelector where = StandardSelections.getNamedTypedVersion(specifier);
  			Comparator orderBy =
  				StandardResourceComparisons
***************
*** 101,105 ****
  			// Extract the query
  			//
! 			Selector where = AllSelector.getInstance();
  			Comparator orderBy =
  				StandardResourceComparisons
--- 101,105 ----
  			// Extract the query
  			//
! 			ISelector where = AllSelector.getInstance();
  			Comparator orderBy =
  				StandardResourceComparisons

Index: ResourceQuery.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/query/ResourceQuery.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ResourceQuery.java	2 Oct 2003 23:56:50 -0000	1.2
--- ResourceQuery.java	9 Oct 2003 14:05:35 -0000	1.3
***************
*** 13,17 ****
  import org.krysalis.ruper2.repository.RepositorySetSortContext;
  import org.krysalis.ruper2.resource.ResourceGroup;
! import org.krysalis.ruper2.util.select.Selector;
  import org.krysalis.version.util.debug.DebugUtils;
  import org.krysalis.version.util.debug.Dumpable;
--- 13,17 ----
  import org.krysalis.ruper2.repository.RepositorySetSortContext;
  import org.krysalis.ruper2.resource.ResourceGroup;
! import org.krysalis.ruper2.util.select.ISelector;
  import org.krysalis.version.util.debug.DebugUtils;
  import org.krysalis.version.util.debug.Dumpable;
***************
*** 50,54 ****
  	private RepositorySetSortContext m_repositorySetSortContext = null;
  
! 	private Selector m_where = null;
  	private Comparator m_orderBy = null;
  	private Comparator m_groupBy = null;
--- 50,54 ----
  	private RepositorySetSortContext m_repositorySetSortContext = null;
  
! 	private ISelector m_where = null;
  	private Comparator m_orderBy = null;
  	private Comparator m_groupBy = null;
***************
*** 61,65 ****
  		ResourceGroup group,
  		RepositorySet repositories,
! 		Selector where,
  		Comparator groupBy,
  		Comparator orderBy) {
--- 61,65 ----
  		ResourceGroup group,
  		RepositorySet repositories,
! 		ISelector where,
  		Comparator groupBy,
  		Comparator orderBy) {
***************
*** 75,79 ****
  	public ResourceQuery(
  		ResourceGroup group,
! 		Selector where,
  		Comparator groupBy,
  		Comparator orderBy) {
--- 75,79 ----
  	public ResourceQuery(
  		ResourceGroup group,
! 		ISelector where,
  		Comparator groupBy,
  		Comparator orderBy) {
***************
*** 136,140 ****
  	 * @return
  	 */
! 	public Selector getWhere() {
  		return m_where;
  	}
--- 136,140 ----
  	 * @return
  	 */
! 	public ISelector getWhere() {
  		return m_where;
  	}
***************
*** 164,168 ****
  	 * @param selector
  	 */
! 	public void setWhere(Selector selector) {
  		m_where = selector;
  	}
--- 164,168 ----
  	 * @param selector
  	 */
! 	public void setWhere(ISelector selector) {
  		m_where = selector;
  	}




-------------------------------------------------------
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