[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view Display.java, 1.44, 1.45

[Michael L. <he...@us...>]

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

Modified Files:
	Display.java 
Log Message:
a step in elliminating Net

Index: Display.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** Display.java	31 Oct 2007 07:33:32 -0000	1.44
--- Display.java	2 Nov 2007 11:05:39 -0000	1.45
***************
*** 36,40 ****
  import net.sourceforge.bprocessor.model.Geometry;
  import net.sourceforge.bprocessor.model.Line;
- import net.sourceforge.bprocessor.model.Net;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
--- 36,39 ----
***************
*** 843,847 ****
        }
      } else {
!       if (space instanceof Net) {
          if (space == active) {
            interior = true;
--- 842,846 ----
        }
      } else {
!       if (space.isNet()) {
          if (space == active) {
            interior = true;
***************
*** 911,915 ****
  
        {
!         if (selecting() || (space instanceof Net && space == active)) {
            Set<Vertex> visible = new HashSet();
            for (Edge current : edges) {
--- 910,914 ----
  
        {
!         if (selecting() || (space.isNet() && space == active)) {
            Set<Vertex> visible = new HashSet();
            for (Edge current : edges) {
***************
*** 960,964 ****
            }
          }
!         if (inside || (intersecting() && !(active instanceof Net))) {
            selectEdges(edges);
          }
--- 959,963 ----
            }
          }
!         if (inside || (intersecting() && !(active.isNet()))) {
            selectEdges(edges);
          }
***************
*** 992,996 ****
          float[] color;
  
!         if (space instanceof Net) {
            size = 2.0f;
          } else {
--- 991,995 ----
          float[] color;
  
!         if (space.isNet()) {
            size = 2.0f;
          } else {
***************
*** 1014,1018 ****
        } else {
          float[] color;
!         if (space instanceof Net) {
            color = middleblue;
          } else {
--- 1013,1017 ----
        } else {
          float[] color;
!         if (space.isNet()) {
            color = middleblue;
          } else {