[Openproj-commitlog] openproj_core/src/com/projity/configuration FieldDictionaryFactory.java, 1.1, 1.2 FieldDictionary.java, 1.6, 1.7

[Howard K. <ne...@us...>]

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

Modified Files:
	FieldDictionaryFactory.java FieldDictionary.java 
Log Message:
Unit Test refactoring

Index: FieldDictionary.java
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/configuration/FieldDictionary.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FieldDictionary.java	13 Feb 2009 17:53:36 -0000	1.6
+++ FieldDictionary.java	26 Feb 2009 01:29:21 -0000	1.7
@@ -86,6 +86,8 @@
 	private HashedMap map = new HashedMap();
 	private HashMap actionsMap = new HashMap();
 	public void addField(Field field) {
+		if (Configuration.getFieldFromId(field.getId()) != null) // if already exists
+			return;
 		if (field.isServer()&&Environment.getStandAlone()) return;
 		field.setClass(clazz);
 		if (field.build() || true) {
@@ -246,9 +248,10 @@
 		digester.addFactoryCreate("*/fieldDictionary", "com.projity.configuration.FieldDictionaryFactory");
 		digester.addSetNext("*/fieldDictionary", "setFieldDictionary", "com.projity.configuration.FieldDictionary");	//TODO can we do this more easily
 	    digester.addSetProperties("*/fieldDictionary/class","name","className"); // object is field dictionary
-		digester.addObjectCreate("*/fieldDictionary/class/field", "com.projity.field.Field");
-		digester.addSetProperties("*/fieldDictionary/class/field");
-		digester.addSetNext("*/fieldDictionary/class/field", "addField", "com.projity.field.Field");
+	    
+		digester.addFactoryCreate("*/field", "com.projity.field.FieldFactory");
+		digester.addSetProperties("*/field");
+		digester.addSetNext("*/field", "addField", "com.projity.field.Field");
 
 		digester.addObjectCreate("*/field/select", "com.projity.field.StaticSelect"); // create a select
 		digester.addSetProperties("*/field/select"); // set name of select
@@ -280,7 +283,6 @@
 		digester.addCallMethod("*/fieldDictionary/removeField","removeField", 1, new Class[] {String.class});
 		digester.addCallParam("*/fieldDictionary/removeField",0);
 		
-
 	}
 	
 	public void removeField(String id) {

Index: FieldDictionaryFactory.java
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/configuration/FieldDictionaryFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FieldDictionaryFactory.java	15 Aug 2007 23:23:54 -0000	1.1
+++ FieldDictionaryFactory.java	26 Feb 2009 01:29:21 -0000	1.2
@@ -58,8 +58,10 @@
 public class FieldDictionaryFactory extends AbstractObjectCreationFactory  {
 	public Object createObject(Attributes arg0) throws Exception {
 		FieldDictionary fieldDictionary = Configuration.getInstance().getFieldDictionary();
-		if (fieldDictionary == null) // make it a singleton
+		if (fieldDictionary == null)  {// make it a singleton
 			fieldDictionary = new FieldDictionary();
+			Configuration.getInstance().setFieldDictionary(fieldDictionary);
+		}
 		return fieldDictionary;
 	}