Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27542/src/net/sourceforge/bprocessor/model
Modified Files:
Surface.java Space.java
Log Message:
Minor changes
Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -d -r1.152 -r1.153
*** Surface.java 10 Apr 2007 07:56:01 -0000 1.152
--- Surface.java 10 Apr 2007 13:01:10 -0000 1.153
***************
*** 254,266 ****
vertices.add(current);
Edge edge = (Edge) iter.next();
- Vertex prev = current;
current = edge.otherVertex(current);
if (current == null) {
return null;
- //throw new Error("the vertex following " + prev + " is null in surface " + this);
}
}
} else {
! throw new Error("first vertex null in Surface " + this);
}
}
--- 254,264 ----
vertices.add(current);
Edge edge = (Edge) iter.next();
current = edge.otherVertex(current);
if (current == null) {
return null;
}
}
} else {
! return null;
}
}
***************
*** 2074,2082 ****
*
* @return true if consistent
*/
! public boolean check() {
Collection<Vertex> vertices = this.getVertices();
if (vertices == null) {
! throw new Error("surface inconsistent");
}
return true;
--- 2072,2081 ----
*
* @return true if consistent
+ * @throws Exception
*/
! public boolean check() throws Exception {
Collection<Vertex> vertices = this.getVertices();
if (vertices == null) {
! throw new Exception("surface inconsistent");
}
return true;
Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** Space.java 10 Apr 2007 07:56:01 -0000 1.129
--- Space.java 10 Apr 2007 13:01:11 -0000 1.130
***************
*** 2734,2739 ****
}
for (Surface surface : mesh.surfaces()) {
! surface.check();
! surfaces.add(insert(surface));
}
SurfaceAnalysis analysis = new SurfaceAnalysis();
--- 2734,2743 ----
}
for (Surface surface : mesh.surfaces()) {
! try {
! surface.check();
! surfaces.add(insert(surface));
! } catch(Exception error) {
! System.out.println("inconsistent: " + surface);
! }
}
SurfaceAnalysis analysis = new SurfaceAnalysis();
|
