ruper2/src/java/core/org/krysalis/ruper2 ResourceUpdater.java,1.2,1.3

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

Modified Files:
	ResourceUpdater.java 
Log Message:
ComparatorSet -> ComparatorSequence

Index: ResourceUpdater.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/ResourceUpdater.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ResourceUpdater.java	2 Oct 2003 23:56:51 -0000	1.2
--- ResourceUpdater.java	4 Oct 2003 01:26:21 -0000	1.3
***************
*** 35,43 ****
  public class ResourceUpdater implements Referenceable {
  
  	private ResourceUpdaterIdentifier m_identifier = null;
  	private ResourceUpdaterContext m_context = null;
  	private DefaultQueryEngine m_engine = null;
  
! 	// repository
  	private RepositorySet m_defaultSortedRepositorySet;
  	private RepositoryManager m_repositoryManager;
--- 35,49 ----
  public class ResourceUpdater implements Referenceable {
  
+ 	static {
+ 		// Configure from the XML file...
+ 		//:TODO: *Maybe* move later, or allow user to pass filename
+ 		RuperConfig.configure();
+ 	}
+ 
  	private ResourceUpdaterIdentifier m_identifier = null;
  	private ResourceUpdaterContext m_context = null;
  	private DefaultQueryEngine m_engine = null;
  
! 	// Repository...
  	private RepositorySet m_defaultSortedRepositorySet;
  	private RepositoryManager m_repositoryManager;
***************
*** 51,88 ****
  		m_identifier = identifier;
  		m_context = context;
- 		m_engine = new DefaultQueryEngine();
- 
- 		initRepository();
- 	}
  
! 	private void initRepository() {
! 		//configure from the XML file
! 		RuperConfig.configure();
! 		
! 		//	initialize the repository
! 		m_repositoryManager = new RepositoryManager();
! 		m_defaultSortedRepositorySet =
! 			m_repositoryManager.getDefaultSortedRepositorySet();
  	}
  
  	public ResourceUpdater(ResourceUpdaterIdentifier identifier) {
  		m_identifier = identifier;
! 		m_context = new ResourceUpdaterContext(RuperConstants.DEFAULT);
! 		m_engine = new DefaultQueryEngine();
! 		initRepository();
  	}
  
  	public ResourceUpdater(String identifier) {
  		m_identifier = new ResourceUpdaterIdentifier(identifier);
! 		m_context = new ResourceUpdaterContext(RuperConstants.DEFAULT);
! 		m_engine = new DefaultQueryEngine();
! 		initRepository();
  	}
  
  	public ResourceUpdater() {
  		m_identifier = new ResourceUpdaterIdentifier(RuperConstants.DEFAULT);
! 		m_context = new ResourceUpdaterContext(RuperConstants.DEFAULT);
  		m_engine = new DefaultQueryEngine();
! 		initRepository();
  	}
  
--- 57,89 ----
  		m_identifier = identifier;
  		m_context = context;
  
! 		initClass();
  	}
  
  	public ResourceUpdater(ResourceUpdaterIdentifier identifier) {
  		m_identifier = identifier;
! 		initClass();
  	}
  
  	public ResourceUpdater(String identifier) {
  		m_identifier = new ResourceUpdaterIdentifier(identifier);
! 		initClass();
  	}
  
  	public ResourceUpdater() {
  		m_identifier = new ResourceUpdaterIdentifier(RuperConstants.DEFAULT);
! 		initClass();
! 	}
! 
! 	private void initClass() {
! 		if (null == m_context)
! 			m_context = ResourceUpdaterContext.getDefaultContext();
! 
  		m_engine = new DefaultQueryEngine();
! 
! 		//	initialize the repository management
! 		m_repositoryManager = new RepositoryManager();
! 		m_defaultSortedRepositorySet =
! 			m_repositoryManager.getDefaultSortedRepositorySet();
  	}
  
***************
*** 138,142 ****
  			m_repositoryManager.performRepositoryQuery(this, query);
  
! 		RepositorySetWrapper wrappers = new RepositorySetWrapper(repositorySet, m_context);
  
  		return m_engine.query(wrappers, query);
--- 139,144 ----
  			m_repositoryManager.performRepositoryQuery(this, query);
  
! 		RepositorySetWrapper wrappers =
! 			new RepositorySetWrapper(repositorySet, m_context);
  
  		return m_engine.query(wrappers, query);
***************
*** 171,175 ****
  		}
  	}
! 	
  	public static ResourceUpdater getResourceUpdater(
  		ResourceUpdaterIdentifier identifier,
--- 173,177 ----
  		}
  	}
! 
  	public static ResourceUpdater getResourceUpdater(
  		ResourceUpdaterIdentifier identifier,




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