[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.215, 1.216

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18051/src/net/sourceforge/bprocessor/gl/view

Modified Files:
	View.java 
Log Message:
a bit of code clean up.

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.215
retrieving revision 1.216
diff -C2 -d -r1.215 -r1.216
*** View.java	20 Jun 2007 12:06:30 -0000	1.215
--- View.java	25 Jun 2007 21:43:33 -0000	1.216
***************
*** 924,928 ****
            Space space = (Space) object;
            if (space.isUnion()) {
!             for (Space element : (Collection<Space>) space.getElements()) {
                Collection<Surface> envelope = element.getEnvelope();
                for (Surface surface : envelope) {
--- 924,928 ----
            Space space = (Space) object;
            if (space.isUnion()) {
!             for (Space element : space.getElements()) {
                Collection<Surface> envelope = element.getEnvelope();
                for (Surface surface : envelope) {
***************
*** 951,957 ****
          }
        }
!     }
!     
!     
      
      drawSpace(Project.getInstance().world(), false, false);
--- 951,955 ----
          }
        }
!     }    
      
      drawSpace(Project.getInstance().world(), false, false);
***************
*** 995,1004 ****
        if (target instanceof Vertex) {
          disableClipplanes();
!       }
! 
!       drawGeometric((Geometric) target);
!       // remember to enable clip again
!       if (target instanceof Vertex) {
          enableClipplanes();
        }
      }
--- 993,1000 ----
        if (target instanceof Vertex) {
          disableClipplanes();
!         drawGeometric((Geometric) target);
          enableClipplanes();
+       } else {
+         drawGeometric((Geometric) target);
        }
      }
***************
*** 1163,1170 ****
      }
      
!     Collection elements = space.getElements();
!     Iterator iter = elements.iterator();
!     while (iter.hasNext()) {
!       Space current = (Space) iter.next();
        if (!(current instanceof Net) || Project.getInstance().getActiveSpace() == current) {
          drawSpace(current, active, selected);
--- 1159,1164 ----
      }
      
!     Collection<Space> elements = space.getElements();
!     for (Space current : elements) {
        if (!(current instanceof Net) || Project.getInstance().getActiveSpace() == current) {
          drawSpace(current, active, selected);
***************
*** 2266,2276 ****
      }
    }
-   
-   private void drawEdges(Collection<Edge> edges, EdgeAttributes attributes) {
-     apply(attributes);
-     for (Edge edge : edges) {
-       drawEdge(edge);
-     }
-   }
  
    /**
--- 2260,2263 ----