[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view AbstractView.java,1.73,1.74

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

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

Modified Files:
	AbstractView.java 
Log Message:
Removed some usage of ConstructionSpace/FunctionalSpace

Index: AbstractView.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/AbstractView.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** AbstractView.java	11 Dec 2005 17:58:32 -0000	1.73
--- AbstractView.java	12 Dec 2005 09:05:41 -0000	1.74
***************
*** 12,17 ****
  
  import net.sourceforge.bprocessor.model.CoordinateSystem;
- import net.sourceforge.bprocessor.model.FunctionalSpace;
- import net.sourceforge.bprocessor.model.ConstructionSpace;
  import net.sourceforge.bprocessor.model.Plane;
  import net.sourceforge.bprocessor.model.Edge;
--- 12,15 ----
***************
*** 583,593 ****
        }
        //draw the front domain name
!       
!       if (frontDomain instanceof FunctionalSpace) {
          gl.glColor3d(0.2 + fcb, 0.2 + fcb, 0.5 + fcb);
!       } else if (frontDomain instanceof ConstructionSpace) {
          gl.glColor3d(0.8 + fcb, 0.2 + fcb, 0.4 + fcb);
-       } else {
-         gl.glColor3d(0.2 + fcb, 0.2 + fcb, 0.2 + fcb);
        }
        
--- 581,590 ----
        }
        //draw the front domain name
!       if (frontDomain == null) {
!         gl.glColor3d(0.2 + fcb, 0.2 + fcb, 0.2 + fcb);
!       } else if (frontDomain.isFunctionalSpace()) {
          gl.glColor3d(0.2 + fcb, 0.2 + fcb, 0.5 + fcb);
!       } else if (frontDomain.isConstructionSpace()) {
          gl.glColor3d(0.8 + fcb, 0.2 + fcb, 0.4 + fcb);
        }
        
***************
*** 599,610 ****
        }
        //draw the back domain name
!       if (backDomain instanceof FunctionalSpace) {
          gl.glColor3d(0.2 + bcb, 0.2 + bcb, 0.5 + bcb);
!       } else if (backDomain instanceof ConstructionSpace) {
          gl.glColor3d(0.8 + bcb, 0.2 + bcb, 0.4 + bcb);
!       } else {
!         gl.glColor3d(0.2 + bcb, 0.2 + bcb, 0.2 + bcb);
!       }
!       
        drawString(backTextAnchor.getX(), backTextAnchor.getY(), backName);
        
--- 596,606 ----
        }
        //draw the back domain name
!       if (backDomain == null) {
!         gl.glColor3d(0.2 + bcb, 0.2 + bcb, 0.2 + bcb);
!       } else if (backDomain.isFunctionalSpace()) {
          gl.glColor3d(0.2 + bcb, 0.2 + bcb, 0.5 + bcb);
!       } else if (backDomain.isConstructionSpace()) {
          gl.glColor3d(0.8 + bcb, 0.2 + bcb, 0.4 + bcb);
!       } 
        drawString(backTextAnchor.getX(), backTextAnchor.getY(), backName);
        
***************
*** 1218,1225 ****
      Space back = surface.getBackDomain();
      Space front = surface.getFrontDomain();
!     if ((front instanceof FunctionalSpace) && (back instanceof FunctionalSpace)) {
        return false;
      }
!     if ((front instanceof ConstructionSpace) && (back instanceof ConstructionSpace)) {
        return false;
      }
--- 1214,1227 ----
      Space back = surface.getBackDomain();
      Space front = surface.getFrontDomain();
!     if (back == null) {
!       return true;
!     }
!     if (front == null) {
!       return true;
!     }
!     if ((front.isFunctionalSpace()) && (back.isFunctionalSpace())) {
        return false;
      }
!     if ((front.isConstructionSpace()) && (back.isConstructionSpace())) {
        return false;
      }
***************
*** 1238,1246 ****
      } else {
        // TODO check if the space space has a color
!       if (space instanceof ConstructionSpace) {
          // We are looking at  a constructionspace
          return frontCcolor;
        }
!       if (space instanceof FunctionalSpace) {
          // We are looking at a constructionspace
          return backColor;
--- 1240,1248 ----
      } else {
        // TODO check if the space space has a color
!       if (space.isConstructionSpace()) {
          // We are looking at  a constructionspace
          return frontCcolor;
        }
!       if (space.isFunctionalSpace()) {
          // We are looking at a constructionspace
          return backColor;