ruper2/src/java/core/org/krysalis/ruper2/query ResourceQueryHelper.java,NONE,1.1 DefaultQueryEngine.java,1.3,1.4 ResourceRequest.java,1.2,NONE ResourceSpecifierRequest.java,1.1,NONE

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

Modified Files:
	DefaultQueryEngine.java 
Added Files:
	ResourceQueryHelper.java 
Removed Files:
	ResourceRequest.java ResourceSpecifierRequest.java 
Log Message:
Another stab at dependencies...

--- NEW FILE: ResourceQueryHelper.java ---
/*
 * Created on Aug 23, 2003
 *
 */
package org.krysalis.ruper2.query;

import java.util.Comparator;

import org.krysalis.ruper2.RuperException;
import org.krysalis.ruper2.log.Logger;
import org.krysalis.ruper2.repository.RepositorySet;
import org.krysalis.ruper2.resource.Resource;
import org.krysalis.ruper2.resource.ResourceGroup;
import org.krysalis.ruper2.resource.ResourceSpecifier;
import org.krysalis.ruper2.resource.compare.StandardResourceComparisons;
import org.krysalis.ruper2.resource.select.StandardSelections;
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;

/**
 * @author arb_jack
 */
public class ResourceQueryHelper {

	public static ResourceQuery getResourceQuery(Resource resource)
		throws RuperException {
		return getResourceSpecifierQuery(resource.getSpecifier());
	}

	public static ResourceQuery getResourceSpecifierQuery(Resource resource)
		throws RuperException {
		return getResourceSpecifierQuery(resource.getSpecifier());
	}

	public static ResourceQuery getResourceSpecifierQuery(
		Resource resource,
		RepositorySet repos)
		throws RuperException {
		return getResourceSpecifierQuery(resource.getSpecifier(), repos);
	}

	public static ResourceQuery getResourceSpecifierQuery(ResourceSpecifier specifier)
		throws RuperException {
		return getResourceSpecifierQuery(
			specifier,
			RepositorySet.getRepositorySet(RuperConstants.DEFAULT, true));
	}

	public static ResourceQuery getResourceSpecifierQuery(
		ResourceSpecifier specifier,
		RepositorySet repos)
		throws RuperException {

		ResourceQuery resourceQuery = null;
		if (specifier != null) {

			Selector where = StandardSelections.getNamedTypedVersion(specifier);
			Comparator orderBy =
				StandardResourceComparisons
					.getNameTypeVersionComparatorSequence();
			//Comparator groupBy = StandardResourceComparisons.getNameVersion();
			Comparator groupBy =
				StandardResourceComparisons.getNameVersionComparatorSequence();

			resourceQuery =
				new ResourceQuery(
					specifier.getGroup(),
					repos,
					where,
					groupBy,
					orderBy);
		}
		else {
			String message = Messages.getString(MessageConstants.NULL_RESOURCE);
			Logger.getLog().error(message);

			throw new RuperException(message);
		}
		return resourceQuery;
	}

	public static ResourceQuery getResourceGroupQuery(ResourceGroup group)
		throws RuperException {
		return getResourceGroupQuery(
			group,
			RepositorySet.getRepositorySet(RuperConstants.DEFAULT, true));
	}

	public static ResourceQuery getResourceGroupQuery(
		ResourceGroup group,
		RepositorySet repos)
		throws RuperException {

		ResourceQuery resourceQuery = null;
		if (group != null) {

			//
			// Extract the query
			//
			Selector where = AllSelector.getInstance();
			Comparator orderBy =
				StandardResourceComparisons
					.getNameTypeVersionComparatorSequence();
			Comparator groupBy =
				StandardResourceComparisons.getNameVersionComparatorSequence();

			resourceQuery =
				new ResourceQuery(group, repos, where, groupBy, orderBy);

		}
		else {
			String message = Messages.getString(MessageConstants.NULL_GROUP);
			Logger.getLog().error(message);

			throw new RuperException(message);
		}
		return resourceQuery;
	}

}

Index: DefaultQueryEngine.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/query/DefaultQueryEngine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultQueryEngine.java	2 Oct 2003 23:56:50 -0000	1.3
--- DefaultQueryEngine.java	7 Oct 2003 00:03:24 -0000	1.4
***************
*** 142,146 ****
  				orderBy =
  					StandardResourceComparisons
! 						.getNameTypeVersionComparatorSet();
  
  			orderBy(result, orderBy);
--- 142,146 ----
  				orderBy =
  					StandardResourceComparisons
! 						.getNameTypeVersionComparatorSequence();
  
  			orderBy(result, orderBy);

--- ResourceRequest.java DELETED ---

--- ResourceSpecifierRequest.java DELETED ---




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