Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29621/src/net/sourceforge/bprocessor/model
Modified Files:
Mesh.java Container.java
Log Message:
improvement to copy, but not done
Index: Mesh.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Mesh.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Mesh.java 13 Dec 2007 12:00:32 -0000 1.26
--- Mesh.java 20 Dec 2007 10:24:18 -0000 1.27
***************
*** 304,307 ****
--- 304,324 ----
}
}
+ for (Container current : elements) {
+ Container container = (Container) map.get(current);
+ Mesh mesh = current.mesh().copy(map);
+ for (Space e : mesh.elements) {
+ container.add(e);
+ }
+ for (Surface s : mesh.surfaces) {
+ container.add(s);
+ }
+ for (Edge e : mesh.edges) {
+ container.add(e);
+ }
+ for (Vertex v : mesh.vertices) {
+ container.add(v);
+ }
+
+ }
return copy;
}
Index: Container.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Container.java 19 Dec 2007 11:39:04 -0000 1.8
--- Container.java 20 Dec 2007 10:24:18 -0000 1.9
***************
*** 58,62 ****
--- 58,65 ----
public Container() {
super();
+ container = true;
initializeContainers();
+ empty = new Container("Void", FUNCTIONAL, false);
+ ((Container) this).add(empty);
}
***************
*** 1437,1439 ****
--- 1440,1454 ----
return edges;
}
+
+ /**
+ *
+ * @return mesh
+ */
+ public Mesh mesh() {
+ Collection<Container> elements = (Collection) getElements();
+ Collection<Surface> surfaces = getSurfaces();
+ Collection<Edge> edges = getEdges();
+ Collection<Vertex> vertices = getVertices();
+ return new Mesh(elements, surfaces, edges, vertices);
+ }
}
|
