Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5822/src/net/sourceforge/bprocessor/model
Modified Files:
Plane.java Persistence.java
Log Message:
Saving material for spaces
Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** Persistence.java 11 Jun 2009 12:42:15 -0000 1.77
--- Persistence.java 22 Jun 2009 12:39:16 -0000 1.78
***************
*** 792,795 ****
--- 792,796 ----
private static void internalizeReferences(Container object, SpaceType xml, Map map) {
object.setEnvelope(asSet(xml.getBoundary(), map));
+ object.setMaterial((Material) get(xml.getInsideMaterial(), map));
{
Modellor m = internalizeModellor(xml.getModellor(), map);
***************
*** 1436,1439 ****
--- 1437,1443 ----
xml.setVoidref(id(map, object.getEmpty()));
}
+ if (object.getMaterial() != null) {
+ xml.setInsideMaterial(id(map, object.getMaterial()));
+ }
xml.getBoundary().addAll(ids(map, sorted(object.getEnvelope())));
}
Index: Plane.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Plane.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Plane.java 3 Nov 2008 14:26:18 -0000 1.41
--- Plane.java 22 Jun 2009 12:39:16 -0000 1.42
***************
*** 266,269 ****
--- 266,272 ----
private void copyPlanarEdges() {
for (Edge current : input.edges()) {
+ if (current == null) {
+ System.out.println("BANG!");
+ }
if (contains(current)) {
Edge edge = (Edge) current.copy(map);
|
