[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Persistence.java, 1.40, 1.41

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32197/src/net/sourceforge/bprocessor/model

Modified Files:
	Persistence.java 
Log Message:
Refactored a bit

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Persistence.java	26 Jun 2007 10:56:54 -0000	1.40
--- Persistence.java	28 Jun 2007 12:18:57 -0000	1.41
***************
*** 211,214 ****
--- 211,237 ----
    
    
+   private static Classification internalizeClassifaction(String string, int type) {
+     Classification classification = null;
+     if (!string.equalsIgnoreCase("unassigned")) {
+       if (type == Space.CONSTRUCTION) {
+         if (string.startsWith("-")) {
+           classification = Project.getInstance().getClassification(string, 0);
+         } else {
+           Classification owner = Project.getInstance().getClassification("-99", 0);
+           classification = new Classification("-1", string, owner, 0);
+           owner.addChild(classification);
+         }
+       } else {
+         if (string.startsWith("-")) {
+           classification = Project.getInstance().getClassification(string, 1);
+         } else {
+           Classification owner = Project.getInstance().getClassification("-99", 1);
+           classification = new Classification("-1", string, owner, 1);
+           owner.addChild(classification);
+         }
+       }
+     }
+     return classification;
+   }
    
    /**
***************
*** 235,262 ****
      space.setDescription(xml.getDescription());
      space.setUnion(xml.isUnion());
!     if (!xml.getClassification().equalsIgnoreCase("unassigned")) {
!       if (type == Space.CONSTRUCTION) {
!         if (xml.getClassification().startsWith("-")) {
!           space.setClassification(Project.getInstance().
!               getClassification(xml.getClassification(), 0));
!         } else {
!           Classification newclas = new Classification("-1", xml.getClassification(), 
!               Project.getInstance().getClassification("-99", 0), 0);
!           Project.getInstance().getClassification("-99", 0).addChild(newclas);
!           space.setClassification(newclas);
!         }
!       } else {
!         if (xml.getClassification().startsWith("-")) {
!           space.setClassification(Project.getInstance().
!               getClassification(xml.getClassification(), 1));
!         } else {
!           Classification newclas = new Classification("-1", xml.getClassification(), 
!               Project.getInstance().getClassification("-99", 1), 1);
!           Project.getInstance().getClassification("-99", 1).addChild(newclas);
!           space.setClassification(newclas);
!         }
!         
!       }
!     } 
      mapper.put(new Long(xml.getId()), space);
      
--- 258,263 ----
      space.setDescription(xml.getDescription());
      space.setUnion(xml.isUnion());
!     space.setClassification(internalizeClassifaction(xml.getClassification(), type));
!     
      mapper.put(new Long(xml.getId()), space);