ruper2/src/java/core/org/krysalis/ruper ResourceUpdater.java,1.8,1.9

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

Modified Files:
	ResourceUpdater.java 
Log Message:
Comparator

Index: ResourceUpdater.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/ResourceUpdater.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ResourceUpdater.java	5 Sep 2003 15:54:42 -0000	1.8
--- ResourceUpdater.java	6 Sep 2003 23:01:15 -0000	1.9
***************
*** 8,11 ****
--- 8,13 ----
  
  import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.Comparator;
  import java.util.Iterator;
  import java.util.List;
***************
*** 22,25 ****
--- 24,28 ----
  import org.krysalis.ruper.resource.ResourceIdentifier;
  import org.krysalis.ruper.resource.ResourceSpecifier;
+ import org.krysalis.ruper.resource.compare.StandardComparisons;
  import org.krysalis.ruper.resource.select.StandardSelections;
  import org.krysalis.ruper.util.RuperConstants;
***************
*** 109,112 ****
--- 112,126 ----
  		ResourceRequestContext context)
  		throws RuperException {
+ 
+ 		return request(repos, request, context, null, null);
+ 	}
+ 
+ 	public ResourceResult request(
+ 		RepositorySet repos,
+ 		ResourceRequest request,
+ 		ResourceRequestContext context,
+ 		Selector selector,
+ 		Comparator comparator)
+ 		throws RuperException {
  		ResourceResult result = new ResourceResult();
  
***************
*** 115,119 ****
  
  		List wrappers = getRepositoryWrappers(repos);
! 		
  		for (Iterator i = wrappers.iterator(); i.hasNext();) {
  			RepositoryWrapper repo = (RepositoryWrapper) i.next();
--- 129,133 ----
  
  		List wrappers = getRepositoryWrappers(repos);
! 
  		for (Iterator i = wrappers.iterator(); i.hasNext();) {
  			RepositoryWrapper repo = (RepositoryWrapper) i.next();
***************
*** 130,137 ****
  						Messages.getString("Resource Specifier", specifier));
  
- 
  					// How to filter
! 					Selector selector =
! 						StandardSelections.getNamedTypedVersion(specifier);
  
  					// Look...
--- 144,151 ----
  						Messages.getString("Resource Specifier", specifier));
  
  					// How to filter
! 					if (null == selector)
! 						selector =
! 							StandardSelections.getNamedTypedVersion(specifier);
  
  					// Look...
***************
*** 158,161 ****
--- 172,181 ----
  			context.getLogger().warn(Messages.getString("NO_RESOURCES"));
  		}
+ 		else {
+ 			if (null == comparator)
+ 				comparator = StandardComparisons.getNameTypeVersion();
+ 
+ 			Collections.sort(result, comparator);
+ 		}
  
  		return result;
***************
*** 166,170 ****
  
  		for (Iterator i = repos.iterator(); i.hasNext();) {
! 			wrappers.add(new RepositoryWrapper((Repository)i.next(), m_context));
  		}
  
--- 186,191 ----
  
  		for (Iterator i = repos.iterator(); i.hasNext();) {
! 			wrappers.add(
! 				new RepositoryWrapper((Repository) i.next(), m_context));
  		}
  




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