[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool PasteActionListener.java, 1.5, 1.6 ExtrusionTool.java, 1.75, 1.76 SpaceTool.java, 1.101, 1.102 EdgeMoveTool.java, 1.9, 1.10 FinalMoveTool.java, 1.50, 1.51 AbstractPencil.java, 1.107, 1.108 ExtendTool.java, 1.4, 1.5 SpaceSelectTool.java, 1.2, 1.3 AbstractTool.java, 1.148, 1.149 ShiftActionListener.java, 1.5, 1.6 SelectStrategy.java, 1.32, 1.33 CopyActionListener.java, 1.4, 1.5 DomainPopupListener.java, 1.9, 1.10 SelectTool.java, 1.73, 1.74 AltMoveTool.java, 1.18, 1.19 ClickBox.java, 1.2, 1.3 CreateSpaceActionListener.java, 1.24, 1.25

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

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

Modified Files:
	PasteActionListener.java ExtrusionTool.java SpaceTool.java 
	EdgeMoveTool.java FinalMoveTool.java AbstractPencil.java 
	ExtendTool.java SpaceSelectTool.java AbstractTool.java 
	ShiftActionListener.java SelectStrategy.java 
	CopyActionListener.java DomainPopupListener.java 
	SelectTool.java AltMoveTool.java ClickBox.java 
	CreateSpaceActionListener.java 
Log Message:
Renamed Space to Item and Container to Space

Index: CreateSpaceActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CreateSpaceActionListener.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CreateSpaceActionListener.java	13 Dec 2007 12:00:49 -0000	1.24
--- CreateSpaceActionListener.java	25 Jun 2009 22:17:40 -0000	1.25
***************
*** 14,18 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
! import net.sourceforge.bprocessor.model.Container;
  
  /**
--- 14,18 ----
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
! import net.sourceforge.bprocessor.model.Space;
  
  /**
***************
*** 46,51 ****
     */
    public void actionPerformed(ActionEvent event) {
!     Container owner = surface.getOwner();
!     Container space;
      if (functional) {
        space = owner.createFunctionalSpace("");
--- 46,51 ----
     */
    public void actionPerformed(ActionEvent event) {
!     Space owner = surface.getOwner();
!     Space space;
      if (functional) {
        space = owner.createFunctionalSpace("");

Index: EdgeMoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/EdgeMoveTool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EdgeMoveTool.java	30 Dec 2007 23:29:10 -0000	1.9
--- EdgeMoveTool.java	25 Jun 2009 22:17:40 -0000	1.10
***************
*** 30,34 ****
  import net.sourceforge.bprocessor.model.Relation;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 30,34 ----
  import net.sourceforge.bprocessor.model.Relation;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
***************
*** 133,137 ****
          coordMap = new HashMap<Surface, CoordinateSystem>();
          swiwel = new HashMap<Surface, Line>(); 
!         Container space = edge.getOwner();
          // find relations
          Collection<CoordinateSystem> systems = space.getCoordinateSystems();
--- 133,137 ----
          coordMap = new HashMap<Surface, CoordinateSystem>();
          swiwel = new HashMap<Surface, Line>(); 
!         Space space = edge.getOwner();
          // find relations
          Collection<CoordinateSystem> systems = space.getCoordinateSystems();

Index: PasteActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PasteActionListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PasteActionListener.java	13 Dec 2007 12:00:49 -0000	1.5
--- PasteActionListener.java	25 Jun 2009 22:17:39 -0000	1.6
***************
*** 10,14 ****
  import java.awt.event.ActionListener;
  import net.sourceforge.bprocessor.gl.view.View;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  
--- 10,14 ----
  import java.awt.event.ActionListener;
  import net.sourceforge.bprocessor.gl.view.View;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  
***************
*** 46,51 ****
     */
    public void actionPerformed(ActionEvent e) {
!     Container facing = CopyActionListener.getFacing();
!     Container nonFacing = CopyActionListener.getNonFacing();
      if (view.facingFront(surface)) {
        surface.setFrontDomain(facing);
--- 46,51 ----
     */
    public void actionPerformed(ActionEvent e) {
!     Space facing = CopyActionListener.getFacing();
!     Space nonFacing = CopyActionListener.getNonFacing();
      if (view.facingFront(surface)) {
        surface.setFrontDomain(facing);

Index: DomainPopupListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/DomainPopupListener.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DomainPopupListener.java	13 Dec 2007 12:00:49 -0000	1.9
--- DomainPopupListener.java	25 Jun 2009 22:17:40 -0000	1.10
***************
*** 12,16 ****
  import net.sourceforge.bprocessor.gl.Editor;
  import net.sourceforge.bprocessor.model.Project;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  
--- 12,16 ----
  import net.sourceforge.bprocessor.gl.Editor;
  import net.sourceforge.bprocessor.model.Project;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  
***************
*** 21,25 ****
  public class DomainPopupListener implements ActionListener {
    /** The domain */
!   private Container domain;
    
    /** The Surface */
--- 21,25 ----
  public class DomainPopupListener implements ActionListener {
    /** The domain */
!   private Space domain;
    
    /** The Surface */
***************
*** 36,40 ****
     * @param front werther or not this popup for the front of the back of the surface
     */
!   public DomainPopupListener(Container domain, Surface surface, boolean front) {
      this.domain = domain;
      this.surface = surface;
--- 36,40 ----
     * @param front werther or not this popup for the front of the back of the surface
     */
!   public DomainPopupListener(Space domain, Surface surface, boolean front) {
      this.domain = domain;
      this.surface = surface;
***************
*** 48,52 ****
    public void actionPerformed(ActionEvent arg0) {
      if (front) {
!       Container oldFront = surface.getFrontDomain();
        surface.assignFront(domain, Editor.isMulti());
        if (oldFront != null) {
--- 48,52 ----
    public void actionPerformed(ActionEvent arg0) {
      if (front) {
!       Space oldFront = surface.getFrontDomain();
        surface.assignFront(domain, Editor.isMulti());
        if (oldFront != null) {
***************
*** 54,58 ****
        }
      } else {
!       Container oldBack = surface.getBackDomain();
        surface.assignBack(domain, Editor.isMulti());
        if (oldBack != null) {
--- 54,58 ----
        }
      } else {
!       Space oldBack = surface.getBackDomain();
        surface.assignBack(domain, Editor.isMulti());
        if (oldBack != null) {

Index: CopyActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CopyActionListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CopyActionListener.java	13 Dec 2007 12:00:49 -0000	1.4
--- CopyActionListener.java	25 Jun 2009 22:17:40 -0000	1.5
***************
*** 11,15 ****
  
  import net.sourceforge.bprocessor.gl.view.View;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  
--- 11,15 ----
  
  import net.sourceforge.bprocessor.gl.view.View;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  
***************
*** 27,35 ****
     * The copied domain facing the camera
     */
!   private static Container facing = null;
    /**
     * The copied domain not facing the camera
     */
!   private static Container nonFacing = null;
    /**
     * The surface this listener shifts spaces on
--- 27,35 ----
     * The copied domain facing the camera
     */
!   private static Space facing = null;
    /**
     * The copied domain not facing the camera
     */
!   private static Space nonFacing = null;
    /**
     * The surface this listener shifts spaces on
***************
*** 66,70 ****
     * @return the domain
     */
!   public static Container getFacing() {
      return facing;
    }
--- 66,70 ----
     * @return the domain
     */
!   public static Space getFacing() {
      return facing;
    }
***************
*** 73,77 ****
     * @return the domain
     */
!   public static Container getNonFacing() {
      return nonFacing;
    }
--- 73,77 ----
     * @return the domain
     */
!   public static Space getNonFacing() {
      return nonFacing;
    }

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** SelectTool.java	22 Jul 2008 13:19:52 -0000	1.73
--- SelectTool.java	25 Jun 2009 22:17:40 -0000	1.74
***************
*** 9,13 ****
  import net.sourceforge.bprocessor.gl.Editor;
  import net.sourceforge.bprocessor.gui.GUI;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Selection;
--- 9,13 ----
  import net.sourceforge.bprocessor.gl.Editor;
  import net.sourceforge.bprocessor.gui.GUI;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Selection;
***************
*** 54,58 ****
              String side = (String)target;
              Surface surface = null;
!             Container space = null;
  
              { 
--- 54,58 ----
              String side = (String)target;
              Surface surface = null;
!             Space space = null;
  
              { 

Index: ExtendTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtendTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExtendTool.java	4 Feb 2009 15:09:41 -0000	1.4
--- ExtendTool.java	25 Jun 2009 22:17:40 -0000	1.5
***************
*** 27,31 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 27,31 ----
  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;
***************
*** 213,217 ****
    
    private void finishTool() {
!     Container owner = Project.getInstance().getActiveSpace();
      owner.removeProtected(extrusion);
      if (pressedSurface != null && 
--- 213,217 ----
    
    private void finishTool() {
!     Space owner = Project.getInstance().getActiveSpace();
      owner.removeProtected(extrusion);
      if (pressedSurface != null && 

Index: ExtrusionTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** ExtrusionTool.java	13 Dec 2007 12:00:49 -0000	1.75
--- ExtrusionTool.java	25 Jun 2009 22:17:40 -0000	1.76
***************
*** 31,35 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 31,35 ----
  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;
***************
*** 88,92 ****
     * @param extrusion Collection of surfaces
     */
!   protected static void insert(Container space, Collection<Surface> extrusion) {
      Collection<Edge> edges = Surface.edges(extrusion);
      Collection<Vertex> vertices = Edge.vertices(edges);
--- 88,92 ----
     * @param extrusion Collection of surfaces
     */
!   protected static void insert(Space space, Collection<Surface> extrusion) {
      Collection<Edge> edges = Surface.edges(extrusion);
      Collection<Vertex> vertices = Edge.vertices(edges);
***************
*** 103,107 ****
     */
    private void extrudeOnto(Plane plane, boolean all, boolean finish) {
!     Container space = Project.getInstance().getActiveSpace();
      if (extrusion != null) {
        space.removeProtected(extrusion);
--- 103,107 ----
     */
    private void extrudeOnto(Plane plane, boolean all, boolean finish) {
!     Space space = Project.getInstance().getActiveSpace();
      if (extrusion != null) {
        space.removeProtected(extrusion);
***************
*** 142,146 ****
     */
    private void extrudeEdgesOnto(Plane plane, boolean finish) {
!     Container space = Project.getInstance().getActiveSpace();
      if (extrusion != null) {
        space.removeProtected(extrusion);
--- 142,146 ----
     */
    private void extrudeEdgesOnto(Plane plane, boolean finish) {
!     Space space = Project.getInstance().getActiveSpace();
      if (extrusion != null) {
        space.removeProtected(extrusion);

Index: ClickBox.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ClickBox.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ClickBox.java	13 Dec 2007 12:00:49 -0000	1.2
--- ClickBox.java	25 Jun 2009 22:17:40 -0000	1.3
***************
*** 7,11 ****
  
  package net.sourceforge.bprocessor.gl.tool;
! import net.sourceforge.bprocessor.model.Container;
  
  /**
--- 7,11 ----
  
  package net.sourceforge.bprocessor.gl.tool;
! import net.sourceforge.bprocessor.model.Space;
  
  /**
***************
*** 14,23 ****
   */
  public class ClickBox {
!   private Container space;
    
    /**
     * @param space Space
     */
!   public ClickBox(Container space) {
      this.space = space;
    }
--- 14,23 ----
   */
  public class ClickBox {
!   private Space space;
    
    /**
     * @param space Space
     */
!   public ClickBox(Space space) {
      this.space = space;
    }
***************
*** 26,30 ****
     * @return space
     */
!   public Container space() {
      return space;
    }
--- 26,30 ----
     * @return space
     */
!   public Space space() {
      return space;
    }

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** AbstractTool.java	3 Nov 2008 13:14:06 -0000	1.148
--- AbstractTool.java	25 Jun 2009 22:17:40 -0000	1.149
***************
*** 17,22 ****
  import net.sourceforge.bprocessor.model.Scale;
  import net.sourceforge.bprocessor.model.Selection;
- import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Transform;
--- 17,22 ----
  import net.sourceforge.bprocessor.model.Scale;
  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;
***************
*** 783,787 ****
        public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
!         Container space = (Container) env.get(1);
          surface.setFrontDomain(space);
        }
--- 783,787 ----
        public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
!         Space space = (Space) env.get(1);
          surface.setFrontDomain(space);
        }
***************
*** 790,794 ****
        public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
!         Container space = (Container) env.get(1);
          surface.setBackDomain(space);
        }
--- 790,794 ----
        public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
!         Space space = (Space) env.get(1);
          surface.setBackDomain(space);
        }
***************
*** 797,801 ****
        public void evaluate(Environment env, Stack<Object> stack) {
          String name = (String) env.get(0);
!         Container result = Space.createConstructionSpace(name);
          stack.push(result);
        }
--- 797,801 ----
        public void evaluate(Environment env, Stack<Object> stack) {
          String name = (String) env.get(0);
!         Space result = Item.createConstructionSpace(name);
          stack.push(result);
        }

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** SpaceTool.java	13 Dec 2007 12:00:49 -0000	1.101
--- SpaceTool.java	25 Jun 2009 22:17:40 -0000	1.102
***************
*** 37,41 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 37,41 ----
  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;
***************
*** 154,158 ****
      
      Surface surface = null;
!     Container space = null;
      
      { 
--- 154,158 ----
      
      Surface surface = null;
!     Space space = null;
      
      { 
***************
*** 182,186 ****
        
        JMenuItem voidItem = new JMenuItem("Void");
!       Container sp = Project.getInstance().getActiveSpace();
        ActionListener voidListener = 
          new DomainPopupListener(sp.getEmpty(), 
--- 182,186 ----
        
        JMenuItem voidItem = new JMenuItem("Void");
!       Space sp = Project.getInstance().getActiveSpace();
        ActionListener voidListener = 
          new DomainPopupListener(sp.getEmpty(), 
***************
*** 191,208 ****
        Collection domains = null;
        String category = null;
!       Container owner = space.getOwner();
        
        
        
!       if (space.getLevel() == Container.PROJECT_LEVEL) {
          domains = Project.getInstance().getSpaces();
          category = "Project";
!       } else if (space.getLevel() == Container.SPACE_LEVEL) {
          domains = owner.getElements();
          category = "Space";
!       } else if (space.getLevel() == Container.ELEMENT_LEVEL) {
          domains = owner.getElements();
          category = "Element";
!       } else if (space.getLevel() == Container.PART_LEVEL) {
          domains = owner.getElements();
          category = "Part";
--- 191,208 ----
        Collection domains = null;
        String category = null;
!       Space owner = space.getOwner();
        
        
        
!       if (space.getLevel() == Space.PROJECT_LEVEL) {
          domains = Project.getInstance().getSpaces();
          category = "Project";
!       } else if (space.getLevel() == Space.SPACE_LEVEL) {
          domains = owner.getElements();
          category = "Space";
!       } else if (space.getLevel() == Space.ELEMENT_LEVEL) {
          domains = owner.getElements();
          category = "Element";
!       } else if (space.getLevel() == Space.PART_LEVEL) {
          domains = owner.getElements();
          category = "Part";
***************
*** 259,263 ****
          Iterator domIt = domains.iterator();
          while (domIt.hasNext()) {
!           Container domain = (Container)domIt.next();
            JMenuItem domainItem = new JMenuItem(domain.getDisplayName());
            ActionListener ml = new DomainPopupListener(domain, 
--- 259,263 ----
          Iterator domIt = domains.iterator();
          while (domIt.hasNext()) {
!           Space domain = (Space)domIt.next();
            JMenuItem domainItem = new JMenuItem(domain.getDisplayName());
            ActionListener ml = new DomainPopupListener(domain, 
***************
*** 296,304 ****
      Stack stack = evaluateString(value);
      if (stack != null) {
!       Container space = Project.getInstance().getActiveSpace();
        Collection<Vertex> vertices = new LinkedList<Vertex>();
        Collection<Edge> edges = new LinkedList<Edge>();
        Collection<Surface> surfaces = new LinkedList<Surface>();
!       Collection<Container> spaces = new LinkedList<Container>();
  
        while (!stack.empty()) {
--- 296,304 ----
      Stack stack = evaluateString(value);
      if (stack != null) {
!       Space space = Project.getInstance().getActiveSpace();
        Collection<Vertex> vertices = new LinkedList<Vertex>();
        Collection<Edge> edges = new LinkedList<Edge>();
        Collection<Surface> surfaces = new LinkedList<Surface>();
!       Collection<Space> spaces = new LinkedList<Space>();
  
        while (!stack.empty()) {
***************
*** 310,315 ****
          } else if (result instanceof Surface) {
            surfaces.add((Surface)result);
!         } else if (result instanceof Container) {
!           Container s = (Container) result;
            spaces.add(s);
            space.add(s);
--- 310,315 ----
          } else if (result instanceof Surface) {
            surfaces.add((Surface)result);
!         } else if (result instanceof Space) {
!           Space s = (Space) result;
            spaces.add(s);
            space.add(s);

Index: SpaceSelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceSelectTool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SpaceSelectTool.java	22 Jun 2009 12:39:12 -0000	1.2
--- SpaceSelectTool.java	25 Jun 2009 22:17:40 -0000	1.3
***************
*** 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;
  
--- 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;
  
***************
*** 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);
--- 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);

Index: FinalMoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** FinalMoveTool.java	28 Dec 2007 11:17:05 -0000	1.50
--- FinalMoveTool.java	25 Jun 2009 22:17:40 -0000	1.51
***************
*** 37,41 ****
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
! import net.sourceforge.bprocessor.model.Container;
  
  /**
--- 37,41 ----
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
! import net.sourceforge.bprocessor.model.Space;
  
  /**
***************
*** 45,49 ****
    
    private Collection<Geometric> geometrics;
!   private Container owner;
    
    private Collection<Geometric> affected;
--- 45,49 ----
    
    private Collection<Geometric> geometrics;
!   private Space owner;
    
    private Collection<Geometric> affected;

Index: ShiftActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ShiftActionListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ShiftActionListener.java	13 Dec 2007 12:00:49 -0000	1.5
--- ShiftActionListener.java	25 Jun 2009 22:17:40 -0000	1.6
***************
*** 10,14 ****
  import java.awt.event.ActionListener;
  
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  
--- 10,14 ----
  import java.awt.event.ActionListener;
  
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  
***************
*** 42,47 ****
     */
    public void actionPerformed(ActionEvent e) {
!     Container back = surface.getBackDomain();
!     Container front = surface.getFrontDomain();
      
      surface.setFrontDomain(back);
--- 42,47 ----
     */
    public void actionPerformed(ActionEvent e) {
!     Space back = surface.getBackDomain();
!     Space front = surface.getFrontDomain();
      
      surface.setFrontDomain(back);

Index: AbstractPencil.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractPencil.java,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** AbstractPencil.java	18 Jan 2008 13:37:10 -0000	1.107
--- AbstractPencil.java	25 Jun 2009 22:17:40 -0000	1.108
***************
*** 37,41 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 37,41 ----
  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;
***************
*** 230,234 ****
                                                    unwanted, View.INTERSECTIONS, work);
      if (intersection != null) {
!       Container space = Project.getInstance().getActiveSpace();
        Vertex v = intersection.vertex();
        if (intersection.type() == Intersection.VERTEX) {
--- 230,234 ----
                                                    unwanted, View.INTERSECTIONS, work);
      if (intersection != null) {
!       Space space = Project.getInstance().getActiveSpace();
        Vertex v = intersection.vertex();
        if (intersection.type() == Intersection.VERTEX) {

Index: SelectStrategy.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** SelectStrategy.java	25 Feb 2008 13:02:52 -0000	1.32
--- SelectStrategy.java	25 Jun 2009 22:17:40 -0000	1.33
***************
*** 25,30 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
- import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 25,30 ----
  import net.sourceforge.bprocessor.model.Project;
  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;
***************
*** 145,149 ****
      
      
!     Set<Space> spaces = Surface.spaces(surfaces);
      
      edges.addAll(Surface.edges(surfaces));
--- 145,149 ----
      
      
!     Set<Item> spaces = Surface.spaces(surfaces);
      
      edges.addAll(Surface.edges(surfaces));
***************
*** 180,184 ****
      }
      
!     Set<Space> spaces = Surface.spaces(surfaces);
      
      if (spaces.size() > 0) {
--- 180,184 ----
      }
      
!     Set<Item> spaces = Surface.spaces(surfaces);
      
      if (spaces.size() > 0) {
***************
*** 223,227 ****
          
          
!         Container owner = Project.getInstance().getActiveSpace();
          Command.Inverse inv = new Command.Inverse(owner.mesh());
          Collection<Geometric> objects;
--- 223,227 ----
          
          
!         Space owner = Project.getInstance().getActiveSpace();
          Command.Inverse inv = new Command.Inverse(owner.mesh());
          Collection<Geometric> objects;
***************
*** 288,292 ****
            if (e.getClickCount() == 2) {
              if (selection.isEmpty()) {
!               Container sp = Project.getInstance().getActiveSpace();
                if (sp.getOwner() != null) {
                  sp.getOwner().edit();
--- 288,292 ----
            if (e.getClickCount() == 2) {
              if (selection.isEmpty()) {
!               Space sp = Project.getInstance().getActiveSpace();
                if (sp.getOwner() != null) {
                  sp.getOwner().edit();
***************
*** 298,303 ****
                if (Selection.primary().size() == 1) {
                  Geometric leader = Selection.primary().iterator().next();
!                 if (leader instanceof Container) {
!                   Container space = (Container) leader;
                    if (space.isUnion() || space.isNet()) {
                      space.edit();
--- 298,303 ----
                if (Selection.primary().size() == 1) {
                  Geometric leader = Selection.primary().iterator().next();
!                 if (leader instanceof Space) {
!                   Space space = (Space) leader;
                    if (space.isUnion() || space.isNet()) {
                      space.edit();

Index: AltMoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AltMoveTool.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** AltMoveTool.java	30 Dec 2007 23:29:10 -0000	1.18
--- AltMoveTool.java	25 Jun 2009 22:17:40 -0000	1.19
***************
*** 26,30 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 26,30 ----
  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;
***************
*** 111,115 ****
        if (target instanceof Surface) {
          surface = (Surface) target; 
!         Container space = surface.getOwner();
          
          system = CoordinateSystem.systemOf(surface);
--- 111,115 ----
        if (target instanceof Surface) {
          surface = (Surface) target; 
!         Space space = surface.getOwner();
          
          system = CoordinateSystem.systemOf(surface);