[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.93, 1.94 Persistence.java, 1.17, 1.18

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

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

Modified Files:
	Space.java Persistence.java 
Log Message:
Fixed a bug in persistence

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Persistence.java	6 Nov 2006 11:00:54 -0000	1.17
--- Persistence.java	6 Nov 2006 11:47:06 -0000	1.18
***************
*** 168,184 ****
      mapper.put(new Long(xml.getId()), space);
      
      xmls.add(xml);
      {
-       HashMap elements = new HashMap();
        Iterator iter = xml.getSpace().iterator();
        while (iter.hasNext()) {
          SpaceType current = (SpaceType) iter.next();
!         Space element = internalizeSpace(space, current, mapper, xmls);
!         elements.put(element.getId(), element);
        }
-       space.setElements(elements);
      }
      if (empty != 0) {
!       space.setEmpty((Space) mapper.get(new Long(empty)));
      }
      { 
--- 168,194 ----
      mapper.put(new Long(xml.getId()), space);
      
+     Collection elements = new LinkedList();
+     
      xmls.add(xml);
      {
        Iterator iter = xml.getSpace().iterator();
        while (iter.hasNext()) {
          SpaceType current = (SpaceType) iter.next();
!         Space element = internalizeSpace(null, current, mapper, xmls);
!         elements.add(element);
        }
      }
+     Space e = (Space) mapper.get(new Long(empty));
      if (empty != 0) {
!       space.setEmpty(e);
!     }
!     {
!       Iterator iter = elements.iterator();
!       while (iter.hasNext()) {
!         Space current = (Space) iter.next();
!         if (current != e) {
!           space.add(current);
!         }
!       }
      }
      { 

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** Space.java	6 Nov 2006 11:00:54 -0000	1.93
--- Space.java	6 Nov 2006 11:47:06 -0000	1.94
***************
*** 361,365 ****
--- 361,371 ----
     */
    public void setEmpty(Space element) {
+     if (empty != null) {
+       remove(empty);
+     }
      empty = element;
+     if (empty != null) {
+       add(empty);
+     }
    }