[Openproj-commitlog] openproj_core/src/com/projity/configuration Dictionary.java, 1.8, 1.9 Configuration.java, 1.9, 1.10

[l <sur...@us...>]

Update of /cvsroot/openproj/openproj_core/src/com/projity/configuration
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3897/src/com/projity/configuration

Modified Files:
	Dictionary.java Configuration.java 
Log Message:


Index: Dictionary.java
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/configuration/Dictionary.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Dictionary.java	18 Mar 2009 04:26:27 -0000	1.8
+++ Dictionary.java	29 Apr 2009 15:13:08 -0000	1.9
@@ -98,9 +98,6 @@
 
 	public Dictionary() {
 	}
-	public void clear() {
-		instance = null;
-	}
 
 	private Hashtable mainMap = new Hashtable();
 
@@ -178,7 +175,7 @@
 		ContextStore.addDigesterEvents(digester);
 		ChartDefinition.addDigesterEvents(digester);
 
-		
+
 	}
 
 	private static Comparator namedItemComparator = new NamedItemComparator();
@@ -206,4 +203,10 @@
 	public static String getCategoryText(String category) {
 		return Messages.getString("Category."+category);
 	}
+
+	public static void cleanUp() {
+		instance = null;
+		namedItemComparator = new NamedItemComparator();
+	}
+
 }
\ No newline at end of file

Index: Configuration.java
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/configuration/Configuration.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Configuration.java	18 Mar 2009 04:26:27 -0000	1.9
+++ Configuration.java	29 Apr 2009 15:13:08 -0000	1.10
@@ -91,11 +91,11 @@
 	}
 	public Configuration() {
 	}
-	
-	public static void clear() {
-		Dictionary.getInstance().clear(); // need to reload everything into dictionary
-		instance = null;
-	}
+
+//	public static void clear() {
+//		Dictionary.getInstance().clear(); // need to reload everything into dictionary
+//		instance = null;
+//	}
 
 	public void setDonePopulating() {
 		fieldDictionary.setDonePopulating(); // makes its hash table fast if using a FastHashMap
@@ -217,5 +217,8 @@
 	public Set<String> getRemovedMenu() {
 		return removedMenu;
 	}
+	public static void cleanUp() {
+		instance = null;
+	}
 
 }