[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java,1.68,1.69 SpaceTool.java,1.17,1.18 AbstractPencil.java,1.23,1.24

[rimestad <rim...@us...>]

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

Modified Files:
	AbstractTool.java SpaceTool.java AbstractPencil.java 
Log Message:
NONE space removed from space assign menu and Void added instead. Therefore mesh method is moved from ab. pencil til abstractTool

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** SpaceTool.java	13 Apr 2006 13:45:03 -0000	1.17
--- SpaceTool.java	19 Apr 2006 16:13:54 -0000	1.18
***************
*** 408,416 ****
        }
        
!       JMenuItem noneItem = new JMenuItem("NONE");
!       ActionListener noneListener = new DomainPopupListener(null, 
!                                                             surface, 
!                                                             side.equals("front"));
!       noneItem.addActionListener(noneListener);
        
        Collection domains = null;
--- 408,418 ----
        }
        
!       JMenuItem voidItem = new JMenuItem("Void");
!       Space sp = mesh();
!       ActionListener voidListener = 
!         new DomainPopupListener(sp.getEmpty(), 
!                                 surface, 
!                                 side.equals("front"));
!       voidItem.addActionListener(voidListener);
        
        Collection domains = null;
***************
*** 479,483 ****
        menu.add(constMenu);
        menu.addSeparator();
!       menu.add(noneItem);
        menu.add(editSpaceItem);
        menu.addPopupMenuListener(spl);
--- 481,485 ----
        menu.add(constMenu);
        menu.addSeparator();
!       menu.add(voidItem);
        menu.add(editSpaceItem);
        menu.addPopupMenuListener(spl);

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** AbstractPencil.java	13 Apr 2006 13:34:56 -0000	1.23
--- AbstractPencil.java	19 Apr 2006 16:13:54 -0000	1.24
***************
*** 89,104 ****
      plane = new Plane (0, 0, 1, 0);
    }
- 
-   /**
-    * Get the mesh
-    * @return The mesh
-    */
-   public Space mesh() {
-     if (Project.getInstance().getActiveSpace() != null) {
-       return Project.getInstance().getActiveSpace();
-     } else {
-       return Project.getInstance().world();
-     }
-   }
    
    /**
--- 89,92 ----

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** AbstractTool.java	5 Apr 2006 10:26:40 -0000	1.68
--- AbstractTool.java	19 Apr 2006 16:13:54 -0000	1.69
***************
*** 15,18 ****
--- 15,19 ----
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
+ import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
***************
*** 109,112 ****
--- 110,125 ----
        Toolkit.getDefaultToolkit().createCustomCursor(dragImage, new Point(7, 8), "Drag");
    }
+ 
+   /**
+    * Get the mesh
+    * @return The mesh
+    */
+   public Space mesh() {
+     if (Project.getInstance().getActiveSpace() != null) {
+       return Project.getInstance().getActiveSpace();
+     } else {
+       return Project.getInstance().world();
+     }
+   }
    
    /**