[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.210, 1.211 Persistence.java, 1.63, 1.64

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

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

Modified Files:
	Space.java Persistence.java 
Log Message:
fixed persistence of instanses

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** Persistence.java	2 Dec 2007 12:02:14 -0000	1.63
--- Persistence.java	7 Dec 2007 13:19:54 -0000	1.64
***************
*** 386,390 ****
      } else {
        if (xml.getAnchor() != null) {
!         space.setInstanceAnchor(internalizeCoordinateSystem(xml.getAnchor(), mapper, xmls));
        }
      }
--- 386,392 ----
      } else {
        if (xml.getAnchor() != null) {
!         CoordinateSystem anchor;
!         anchor = internalizeCoordinateSystem(xml.getAnchor(), mapper, xmls);
!         space.setInstanceAnchor(anchor);
        }
      }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.210
retrieving revision 1.211
diff -C2 -d -r1.210 -r1.211
*** Space.java	7 Dec 2007 11:00:22 -0000	1.210
--- Space.java	7 Dec 2007 13:19:54 -0000	1.211
***************
*** 269,273 ****
      this.proto = space;
      if (proto != null) {
!       this.anchor = Project.getInstance().getActiveCoordinateSystem().copy();
      } else {
        this.anchor = null;
--- 269,275 ----
      this.proto = space;
      if (proto != null) {
!       if (anchor == null) {
!         this.anchor = Project.getInstance().getActiveCoordinateSystem().copy();
!       }
      } else {
        this.anchor = null;
***************
*** 2832,2838 ****
     */
    public void setInstanceAnchor(CoordinateSystem cs) {
!     if (isInstance()) {
!       anchor = cs;
!     }
    }
    
--- 2834,2838 ----
     */
    public void setInstanceAnchor(CoordinateSystem cs) {
!     anchor = cs;
    }