[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool SpaceSelectTool.java, 1.3, 1.4 AbstractTool.java, 1.149, 1.150 SelectStrategy.java, 1.33, 1.34

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25666/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	SpaceSelectTool.java AbstractTool.java SelectStrategy.java 
Log Message:
item to space


Index: SelectStrategy.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** SelectStrategy.java	25 Jun 2009 22:17:40 -0000	1.33
--- SelectStrategy.java	25 Jun 2009 23:28:49 -0000	1.34
***************
*** 26,30 ****
  import net.sourceforge.bprocessor.model.Selection;
  import net.sourceforge.bprocessor.model.Space;
- import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 26,29 ----
***************
*** 145,149 ****
      
      
!     Set<Item> spaces = Surface.spaces(surfaces);
      
      edges.addAll(Surface.edges(surfaces));
--- 144,148 ----
      
      
!     Set<Space> spaces = Surface.spaces(surfaces);
      
      edges.addAll(Surface.edges(surfaces));
***************
*** 180,184 ****
      }
      
!     Set<Item> spaces = Surface.spaces(surfaces);
      
      if (spaces.size() > 0) {
--- 179,183 ----
      }
      
!     Set<Space> spaces = Surface.spaces(surfaces);
      
      if (spaces.size() > 0) {

Index: SpaceSelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceSelectTool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SpaceSelectTool.java	25 Jun 2009 22:17:40 -0000	1.3
--- SpaceSelectTool.java	25 Jun 2009 23:28:49 -0000	1.4
***************
*** 11,15 ****
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.Surface;
  
--- 11,15 ----
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  
***************
*** 58,63 ****
        if (target instanceof Surface) {
          Surface surface = (Surface) target;
!         Item front = surface.getFrontDomain();
!         Item back = surface.getBackDomain();
          if (front.isConstructionSpace()) {
            Selection.primary().set(front);
--- 58,63 ----
        if (target instanceof Surface) {
          Surface surface = (Surface) target;
!         Space front = surface.getFrontDomain();
!         Space back = surface.getBackDomain();
          if (front.isConstructionSpace()) {
            Selection.primary().set(front);

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -d -r1.149 -r1.150
*** AbstractTool.java	25 Jun 2009 22:17:40 -0000	1.149
--- AbstractTool.java	25 Jun 2009 23:28:49 -0000	1.150
***************
*** 18,22 ****
  import net.sourceforge.bprocessor.model.Selection;
  import net.sourceforge.bprocessor.model.Space;
- import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Transform;
--- 18,21 ----
***************
*** 797,801 ****
        public void evaluate(Environment env, Stack<Object> stack) {
          String name = (String) env.get(0);
!         Space result = Item.createConstructionSpace(name);
          stack.push(result);
        }
--- 796,800 ----
        public void evaluate(Environment env, Stack<Object> stack) {
          String name = (String) env.get(0);
!         Space result = Space.createConstructionSpace(name);
          stack.push(result);
        }