Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18377/src/net/sourceforge/bprocessor/model
Modified Files:
Camera.java Persistence.java
Log Message:
Hidden status saved
Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** Persistence.java 5 Feb 2008 13:34:20 -0000 1.74
--- Persistence.java 5 Feb 2008 14:21:08 -0000 1.75
***************
*** 166,170 ****
CameraType current = document.getView();
if (current != null) {
! Project.getInstance().setCurrentCamera(internalizeCamera(current));
}
}
--- 166,172 ----
CameraType current = document.getView();
if (current != null) {
! Camera camera = internalizeCamera(current);
! internalizeReferences(camera, current, mapper);
! Project.getInstance().setCurrentCamera(camera);
}
}
***************
*** 762,765 ****
--- 764,771 ----
+ private static void internalizeReferences(Camera object, CameraType xml, Map map) {
+ object.setHiddenGeometrics(asSet(xml.getHidden(), map));
+ }
+
/**
*
***************
*** 855,859 ****
{
Camera current = Project.getInstance().getCurrentCamera();
! document.setView(externalizeCamera(current));
}
{
--- 861,867 ----
{
Camera current = Project.getInstance().getCurrentCamera();
! CameraType xml = externalizeCamera(current);
! document.setView(xml);
! externalizeReferences(current, xml, mapper);
}
{
***************
*** 1379,1382 ****
--- 1387,1395 ----
}
+
+ private static void externalizeReferences(Camera object, CameraType xml, Map map) {
+ xml.getHidden().addAll(ids(map, object.getHiddenGeometrics()));
+ }
+
/**
* Externalize references
Index: Camera.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** Camera.java 8 Jan 2008 10:49:19 -0000 1.57
--- Camera.java 5 Feb 2008 14:21:08 -0000 1.58
***************
*** 140,143 ****
--- 140,144 ----
this.addClipplane(clip.copy());
}
+ this.setHiddenGeometrics(new HashSet(other.getHiddenGeometrics()));
}
***************
*** 752,755 ****
--- 753,764 ----
return hiddenGeometrics;
}
+
+ /**
+ *
+ * @param geometrics set of geometrics
+ */
+ public void setHiddenGeometrics(Set<Geometric> geometrics) {
+ hiddenGeometrics = geometrics;
+ }
/**
|
