[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Space.java, 1.155, 1.156
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2007-07-11 13:02:53
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4004/src/net/sourceforge/bprocessor/model Modified Files: Space.java Log Message: Removed unecessary code in Space.delete(edge) Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.155 retrieving revision 1.156 diff -C2 -d -r1.155 -r1.156 *** Space.java 11 Jul 2007 11:25:29 -0000 1.155 --- Space.java 11 Jul 2007 13:02:51 -0000 1.156 *************** *** 781,822 **** } - - // Remove adjacant surfaces - // FIXME unclear what goes on. for (Surface surface : surfaces) { ! List<Edge> edges = surface.getEdges(); ! int firstIndex = edges.indexOf(edge); ! int lastIndex = edges.lastIndexOf(edge); ! if (firstIndex == lastIndex) { ! remove(surface); ! } else { ! int size = edges.size(); ! int gapSize = lastIndex - firstIndex; ! if ((gapSize == 1) || gapSize == size - 1) { ! edges.remove(lastIndex); ! edges.remove(firstIndex); ! surface.setEdges(edges); ! } else { ! List<Edge> head = new LinkedList<Edge>(edges.subList(0, firstIndex)); ! List<Edge> middel = new LinkedList<Edge>(edges.subList(firstIndex + 1, lastIndex)); ! List<Edge> tail = new LinkedList<Edge>(edges.subList(lastIndex, size)); ! tail.remove(edge); ! head.addAll(tail); ! Surface s1 = new Surface(head); ! Surface s2 = new Surface(middel); ! if (s1.surrounds(s2, true)) { ! surface.setEdges(head); ! add(s2); ! surface.addHole(s2); ! } else { ! surface.setEdges(middel); ! add(s1); ! surface.addHole(s1); ! } ! } ! } } - // Remove empty endpoints if (to.getOwner() != null) { if (to.getEdges().size() == 0) { --- 781,788 ---- } for (Surface surface : surfaces) { ! remove(surface); } if (to.getOwner() != null) { if (to.getEdges().size() == 0) { |