ruper2/src/java/core/org/krysalis/ruper2/api ResourceAPI.java,1.3,1.4

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

Modified Files:
	ResourceAPI.java 
Log Message:
Another stab at dependencies...

Index: ResourceAPI.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/api/ResourceAPI.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ResourceAPI.java	6 Oct 2003 21:14:06 -0000	1.3
--- ResourceAPI.java	7 Oct 2003 00:03:24 -0000	1.4
***************
*** 16,27 ****
  import org.krysalis.ruper2.log.Logger;
  import org.krysalis.ruper2.query.ResourceQuery;
! import org.krysalis.ruper2.query.ResourceRequest;
  import org.krysalis.ruper2.query.ResourceResult;
  import org.krysalis.ruper2.query.ResourceResultHelper;
- import org.krysalis.ruper2.query.ResourceSpecifierRequest;
  import org.krysalis.ruper2.repository.Repository;
  import org.krysalis.ruper2.repository.RepositorySet;
  import org.krysalis.ruper2.repository.RepositorySetSortContext;
  import org.krysalis.ruper2.resource.Resource;
  import org.krysalis.ruper2.util.RuperConstants;
  import org.krysalis.ruper2.util.text.MessageConstants;
--- 16,27 ----
  import org.krysalis.ruper2.log.Logger;
  import org.krysalis.ruper2.query.ResourceQuery;
! import org.krysalis.ruper2.query.ResourceQueryHelper;
  import org.krysalis.ruper2.query.ResourceResult;
  import org.krysalis.ruper2.query.ResourceResultHelper;
  import org.krysalis.ruper2.repository.Repository;
  import org.krysalis.ruper2.repository.RepositorySet;
  import org.krysalis.ruper2.repository.RepositorySetSortContext;
  import org.krysalis.ruper2.resource.Resource;
+ import org.krysalis.ruper2.resource.ResourceGroup;
  import org.krysalis.ruper2.util.RuperConstants;
  import org.krysalis.ruper2.util.text.MessageConstants;
***************
*** 45,48 ****
--- 45,57 ----
  	 * 
  	 */
+ 	public ResourceAPI(String id) throws RuperException {
+ 		ResourceUpdaterIdentifier ruperId = new ResourceUpdaterIdentifier(id);
+ 		m_ruper = ResourceUpdater.getResourceUpdater(ruperId, true);
+ 		resourceConfigInit();
+ 	}
+ 
+ 	/**
+ 	* 
+ 	*/
  	public ResourceAPI() throws RuperException {
  		ResourceUpdaterIdentifier ruperId =
***************
*** 123,127 ****
  
  			// get the resource specifier query
! 			ResourceQuery resourceQuery = getResourceSpecifierQuery(resource);
  			updateResource(resourceQuery, targetRepository);
  		}
--- 132,137 ----
  
  			// get the resource specifier query
! 			ResourceQuery resourceQuery =
! 				ResourceQueryHelper.getResourceQuery(resource);
  			updateResource(resourceQuery, targetRepository);
  		}
***************
*** 135,138 ****
--- 145,176 ----
  
  	/* (non-Javadoc)
+ 	 * @see org.krysalis.ruper2.api.ResourceAPIInterface#updateGroup(org.krysalis.ruper2.resource.ResourceGroup)
+ 	 */
+ 	public void updateGroup(ResourceGroup group) throws RuperException {
+ 		updateGroup(group, null);
+ 	}
+ 
+ 	/* (non-Javadoc)
+ 	 * @see org.krysalis.ruper2.api.ResourceAPIInterface#updateGroup(org.krysalis.ruper2.resource.ResourceGroup)
+ 	 */
+ 	public void updateGroup(ResourceGroup group, Repository targetRepository)
+ 		throws RuperException {
+ 
+ 		if (group != null) {
+ 
+ 			// get the resource specifier query
+ 			ResourceQuery resourceQuery =
+ 				ResourceQueryHelper.getResourceGroupQuery(group);
+ 			updateResource(resourceQuery, targetRepository);
+ 		}
+ 		else {
+ 			String message = Messages.getString(MessageConstants.NULL_GROUP);
+ 			Logger.getLog().error(message);
+ 
+ 			throw new RuperException(message);
+ 		}
+ 	}
+ 
+ 	/* (non-Javadoc)
  	 * @see org.krysalis.ruper2.api.ResourceAPIInterface#updateResource(org.krysalis.ruper2.resource.Resource, org.krysalis.ruper2.query.ResourceQuery)
  	 */
***************
*** 178,214 ****
  	}
  
- 	private ResourceQuery getResourceSpecifierQuery(Resource resource)
- 		throws RuperException {
- 
- 		ResourceQuery resourceQuery = null;
- 		if (resource != null) {
- 
- 			//
- 			// Generate a request using the default resource specifier
- 			//
- 			ResourceRequest request =
- 				new ResourceSpecifierRequest(resource.getSpecifier());
- 
- 			if (request != null) {
- 				//
- 				// Extract the query for this request
- 				//
- 				resourceQuery = request.getQuery();
- 
- 				Logger.getLog().debug(
- 					Messages.getString(
- 						MessageConstants.RESOURCE_REQUEST,
- 						request));
- 			}
- 		}
- 		else {
- 			String message = Messages.getString(MessageConstants.NULL_RESOURCE);
- 			Logger.getLog().error(message);
- 
- 			throw new RuperException(message);
- 		}
- 		return resourceQuery;
- 	}
- 
  	private List sortResult(
  		ResourceQuery resourceQuery,
--- 216,219 ----
***************
*** 265,268 ****
--- 270,274 ----
  		return findResources(resources, null);
  	}
+ 
  	/* (non-Javadoc)
  	 * @see org.krysalis.ruper2.api.ResourceAPIInterface#findResources(java.util.List, org.krysalis.ruper2.repository.Repository)
***************
*** 289,293 ****
  		throws RuperException {
  		// get the resource specifier query
! 		ResourceQuery resourceQuery = getResourceSpecifierQuery(resource);
  		//set the target repository
  		if (target != null)
--- 295,300 ----
  		throws RuperException {
  		// get the resource specifier query
! 		ResourceQuery resourceQuery =
! 			ResourceQueryHelper.getResourceSpecifierQuery(resource);
  		//set the target repository
  		if (target != null)
***************
*** 342,347 ****
  		else {
  			String message = Messages.getString(MessageConstants.NULL_RESOURCE);
! 			Logger.getLog().error(message);			
! 			
  			throw new RuperException(message);
  		}
--- 349,354 ----
  		else {
  			String message = Messages.getString(MessageConstants.NULL_RESOURCE);
! 			Logger.getLog().error(message);
! 
  			throw new RuperException(message);
  		}
***************
*** 358,364 ****
  		}
  		if (targetRepository == null) {
! 			String message = Messages.getString(MessageConstants.NO_TARGET_REPOSITORY);
! 			Logger.getLog().error(message);			
! 			
  			throw new RuperException(message);
  		}
--- 365,372 ----
  		}
  		if (targetRepository == null) {
! 			String message =
! 				Messages.getString(MessageConstants.NO_TARGET_REPOSITORY);
! 			Logger.getLog().error(message);
! 
  			throw new RuperException(message);
  		}




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