ruper2/src/java/core/org/krysalis/ruper2/repository RepositoryManager.java,1.1,1.2

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

Modified Files:
	RepositoryManager.java 
Log Message:


Index: RepositoryManager.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/repository/RepositoryManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RepositoryManager.java	29 Sep 2003 18:09:18 -0000	1.1
--- RepositoryManager.java	6 Oct 2003 15:04:37 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  import org.krysalis.ruper2.ResourceUpdater;
  import org.krysalis.ruper2.RuperException;
+ import org.krysalis.ruper2.impl.ReferenceManager;
  import org.krysalis.ruper2.log.Logger;
  import org.krysalis.ruper2.query.ResourceQuery;
***************
*** 23,26 ****
--- 24,28 ----
  
  	private String m_sortContextID = RuperConstants.DEFAULT;
+ 	private RepositorySet m_defaultSortedRepositorySet;
  
  	public RepositoryManager() {
***************
*** 42,53 ****
  		// set the default sort context
  		// default selectors and comparators are used
! 		setDefaultRepositorySortContext();
  	}
  
  	public void setDefaultRepositorySortContext() {
! 		RepositorySetSortContext repositorySetSortContext =
! 			RepositorySetSortContext.getDefaultRepositorySetSortContext();
! 		if (repositorySetSortContext != null)
  			setRepositorySortContext(repositorySetSortContext);
  	}
  
--- 44,86 ----
  		// set the default sort context
  		// default selectors and comparators are used
! 		setDefaultRepositorySortContext(
! 			RepositorySetSortContext.getDefaultRepositorySetSortContext());
  	}
  
  	public void setDefaultRepositorySortContext() {
! 		setDefaultRepositorySortContext(
! 			RepositorySetSortContext.getDefaultRepositorySetSortContext());
! 	}
! 	
! 	public void setDefaultRepositorySortContext(RepositorySetSortContext repositorySetSortContext) {
! 		if (repositorySetSortContext != null) {
! 			//TODO set the default sort context in the refMgr
! 			ReferenceManager.createReference(repositorySetSortContext);
  			setRepositorySortContext(repositorySetSortContext);
+ 			sortDefaultRepositorySet();
+ 		}
+ 	}
+ 
+ 	private void sortDefaultRepositorySet() {
+ 		RepositorySet repositorySet =
+ 			RepositorySet.getRepositorySet(
+ 				new RepositorySetIdentifier(RuperConstants.DEFAULT),
+ 				true);
+ 		try {
+ 			this.m_defaultSortedRepositorySet =
+ 				getSortedRepositorySet(repositorySet);
+ 		}
+ 		catch (RuperException exp) {
+ 			Logger.getLog().error(
+ 				"Error in sorting the default repository set",
+ 				exp);
+ 		}
+ 	}
+ 
+ 	public void setDefaultSortedRepositorySet(RepositorySet set){
+ 		this.m_defaultSortedRepositorySet = set;
+ 	}
+ 	public RepositorySetSortContext getDefaultRepositorySortContext() {
+ 		return RepositorySetSortContext.getDefaultRepositorySetSortContext();
  	}
  
***************
*** 69,86 ****
  
  	public RepositorySet getDefaultSortedRepositorySet() {
! 		RepositorySet repositorySet =
! 			RepositorySet.getRepositorySet(
! 				new RepositorySetIdentifier(RuperConstants.DEFAULT),
! 				true);
! 		try {
! 			repositorySet = getSortedRepositorySet(repositorySet);
! 		}
! 		catch (RuperException exp) {
! 			Logger.getLog().error(
! 				"Error in sorting the default repository set",
! 				exp);
! 		}
! 
! 		return repositorySet;
  	}
  
--- 102,106 ----
  
  	public RepositorySet getDefaultSortedRepositorySet() {
! 		return this.m_defaultSortedRepositorySet;
  	}
  
***************
*** 126,130 ****
  			RepositorySetSortContext repositoryContext =
  				query.getRepositorySetSortContext();
! 				
  			if (repositoryContext != null) {
  				// if sort context is not same as the one that already exists
--- 146,150 ----
  			RepositorySetSortContext repositoryContext =
  				query.getRepositorySetSortContext();
! 
  			if (repositoryContext != null) {
  				// if sort context is not same as the one that already exists




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