[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool PasteActionListener.java, 1.4, 1.5 ExtrusionTool.java, 1.74, 1.75 SpaceTool.java, 1.100, 1.101 EdgeMoveTool.java, 1.7, 1.8 FinalMoveTool.java, 1.42, 1.43 AbstractPencil.java, 1.101, 1.102 ExtendTool.java, 1.2, 1.3 AbstractTool.java, 1.144, 1.145 ShiftActionListener.java, 1.4, 1.5 SelectStrategy.java, 1.23, 1.24 CopyActionListener.java, 1.3, 1.4 DomainPopupListener.java, 1.8, 1.9 AltMoveTool.java, 1.16, 1.17 ClickBox.java, 1.1, 1.2 CreateSpaceActionListener.java, 1.23, 1.24

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

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

Modified Files:
	PasteActionListener.java ExtrusionTool.java SpaceTool.java 
	EdgeMoveTool.java FinalMoveTool.java AbstractPencil.java 
	ExtendTool.java AbstractTool.java ShiftActionListener.java 
	SelectStrategy.java CopyActionListener.java 
	DomainPopupListener.java AltMoveTool.java ClickBox.java 
	CreateSpaceActionListener.java 
Log Message:
Major change wrt Space/Container

Index: CreateSpaceActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CreateSpaceActionListener.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** CreateSpaceActionListener.java	28 Nov 2007 10:39:21 -0000	1.23
--- CreateSpaceActionListener.java	13 Dec 2007 12:00:49 -0000	1.24
***************
*** 14,18 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
! import net.sourceforge.bprocessor.model.Space;
  
  /**
--- 14,18 ----
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
! import net.sourceforge.bprocessor.model.Container;
  
  /**
***************
*** 46,51 ****
     */
    public void actionPerformed(ActionEvent event) {
!     Space owner = surface.getOwner();
!     Space space;
      if (functional) {
        space = owner.createFunctionalSpace("");
--- 46,51 ----
     */
    public void actionPerformed(ActionEvent event) {
!     Container owner = surface.getOwner();
!     Container 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EdgeMoveTool.java	11 Dec 2007 14:49:11 -0000	1.7
--- EdgeMoveTool.java	13 Dec 2007 12:00:49 -0000	1.8
***************
*** 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;
--- 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;
***************
*** 133,137 ****
          coordMap = new HashMap<Surface, CoordinateSystem>();
          swiwel = new HashMap<Surface, Line>(); 
!         Space space = edge.getOwner();
          // find relations
          Collection<CoordinateSystem> systems = space.getCoordinateSystems();
--- 133,137 ----
          coordMap = new HashMap<Surface, CoordinateSystem>();
          swiwel = new HashMap<Surface, Line>(); 
!         Container 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PasteActionListener.java	4 Jan 2006 14:29:50 -0000	1.4
--- PasteActionListener.java	13 Dec 2007 12:00:49 -0000	1.5
***************
*** 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;
  
--- 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;
  
***************
*** 46,51 ****
     */
    public void actionPerformed(ActionEvent e) {
!     Space facing = CopyActionListener.getFacing();
!     Space nonFacing = CopyActionListener.getNonFacing();
      if (view.facingFront(surface)) {
        surface.setFrontDomain(facing);
--- 46,51 ----
     */
    public void actionPerformed(ActionEvent e) {
!     Container facing = CopyActionListener.getFacing();
!     Container 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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DomainPopupListener.java	21 Nov 2007 09:21:17 -0000	1.8
--- DomainPopupListener.java	13 Dec 2007 12:00:49 -0000	1.9
***************
*** 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;
  
--- 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;
  
***************
*** 21,25 ****
  public class DomainPopupListener implements ActionListener {
    /** The domain */
!   private Space domain;
    
    /** The Surface */
--- 21,25 ----
  public class DomainPopupListener implements ActionListener {
    /** The domain */
!   private Container domain;
    
    /** The 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;
--- 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;
***************
*** 48,52 ****
    public void actionPerformed(ActionEvent arg0) {
      if (front) {
!       Space oldFront = surface.getFrontDomain();
        surface.assignFront(domain, Editor.isMulti());
        if (oldFront != null) {
--- 48,52 ----
    public void actionPerformed(ActionEvent arg0) {
      if (front) {
!       Container oldFront = surface.getFrontDomain();
        surface.assignFront(domain, Editor.isMulti());
        if (oldFront != null) {
***************
*** 54,58 ****
        }
      } else {
!       Space oldBack = surface.getBackDomain();
        surface.assignBack(domain, Editor.isMulti());
        if (oldBack != null) {
--- 54,58 ----
        }
      } else {
!       Container 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CopyActionListener.java	11 Dec 2005 17:50:58 -0000	1.3
--- CopyActionListener.java	13 Dec 2007 12:00:49 -0000	1.4
***************
*** 11,15 ****
  
  import net.sourceforge.bprocessor.gl.view.View;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  
--- 11,15 ----
  
  import net.sourceforge.bprocessor.gl.view.View;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  
***************
*** 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
--- 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
***************
*** 66,70 ****
     * @return the domain
     */
!   public static Space getFacing() {
      return facing;
    }
--- 66,70 ----
     * @return the domain
     */
!   public static Container getFacing() {
      return facing;
    }
***************
*** 73,77 ****
     * @return the domain
     */
!   public static Space getNonFacing() {
      return nonFacing;
    }
--- 73,77 ----
     * @return the domain
     */
!   public static Container getNonFacing() {
      return nonFacing;
    }

Index: ExtrusionTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** ExtrusionTool.java	11 Dec 2007 14:49:11 -0000	1.74
--- ExtrusionTool.java	13 Dec 2007 12:00:49 -0000	1.75
***************
*** 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;
--- 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;
***************
*** 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);
--- 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);
***************
*** 103,107 ****
     */
    private void extrudeOnto(Plane plane, boolean all, boolean finish) {
!     Space space = Project.getInstance().getActiveSpace();
      if (extrusion != null) {
        space.removeProtected(extrusion);
--- 103,107 ----
     */
    private void extrudeOnto(Plane plane, boolean all, 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);
--- 142,146 ----
     */
    private void extrudeEdgesOnto(Plane plane, boolean finish) {
!     Container 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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClickBox.java	25 Jan 2007 12:14:30 -0000	1.1
--- ClickBox.java	13 Dec 2007 12:00:49 -0000	1.2
***************
*** 7,11 ****
  
  package net.sourceforge.bprocessor.gl.tool;
! import net.sourceforge.bprocessor.model.Space;
  
  /**
--- 7,11 ----
  
  package net.sourceforge.bprocessor.gl.tool;
! import net.sourceforge.bprocessor.model.Container;
  
  /**
***************
*** 14,23 ****
   */
  public class ClickBox {
!   private Space space;
    
    /**
     * @param space Space
     */
!   public ClickBox(Space space) {
      this.space = space;
    }
--- 14,23 ----
   */
  public class ClickBox {
!   private Container space;
    
    /**
     * @param space Space
     */
!   public ClickBox(Container space) {
      this.space = space;
    }
***************
*** 26,30 ****
     * @return space
     */
!   public Space space() {
      return space;
    }
--- 26,30 ----
     * @return space
     */
!   public Container space() {
      return space;
    }

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** AbstractTool.java	12 Dec 2007 15:07:01 -0000	1.144
--- AbstractTool.java	13 Dec 2007 12:00:49 -0000	1.145
***************
*** 9,13 ****
  import net.sourceforge.bprocessor.model.AxisRotate;
  import net.sourceforge.bprocessor.model.Camera;
- import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Geometry;
--- 9,12 ----
***************
*** 18,22 ****
  import net.sourceforge.bprocessor.model.Scale;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Transform;
--- 17,21 ----
  import net.sourceforge.bprocessor.model.Scale;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Transform;
***************
*** 781,785 ****
        public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
!         Space space = (Space) env.get(1);
          surface.setFrontDomain(space);
        }
--- 780,784 ----
        public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
!         Container space = (Container) env.get(1);
          surface.setFrontDomain(space);
        }
***************
*** 788,792 ****
        public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
!         Space space = (Space) env.get(1);
          surface.setBackDomain(space);
        }
--- 787,791 ----
        public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
!         Container space = (Container) env.get(1);
          surface.setBackDomain(space);
        }
***************
*** 795,799 ****
        public void evaluate(Environment env, Stack<Object> stack) {
          String name = (String) env.get(0);
!         Space result = new Container(name, Space.CONSTRUCTION, true);
          stack.push(result);
        }
--- 794,798 ----
        public void evaluate(Environment env, Stack<Object> stack) {
          String name = (String) env.get(0);
!         Container result = new Container(name, Container.CONSTRUCTION, true);
          stack.push(result);
        }

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** SpaceTool.java	10 Dec 2007 12:08:21 -0000	1.100
--- SpaceTool.java	13 Dec 2007 12:00:49 -0000	1.101
***************
*** 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;
--- 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;
***************
*** 154,158 ****
      
      Surface surface = null;
!     Space space = null;
      
      { 
--- 154,158 ----
      
      Surface surface = null;
!     Container space = null;
      
      { 
***************
*** 182,186 ****
        
        JMenuItem voidItem = new JMenuItem("Void");
!       Space sp = Project.getInstance().getActiveSpace();
        ActionListener voidListener = 
          new DomainPopupListener(sp.getEmpty(), 
--- 182,186 ----
        
        JMenuItem voidItem = new JMenuItem("Void");
!       Container sp = Project.getInstance().getActiveSpace();
        ActionListener voidListener = 
          new DomainPopupListener(sp.getEmpty(), 
***************
*** 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";
--- 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";
***************
*** 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, 
--- 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, 
***************
*** 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()) {
--- 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()) {
***************
*** 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);
--- 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);

Index: ExtendTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtendTool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExtendTool.java	7 Dec 2007 12:48:31 -0000	1.2
--- ExtendTool.java	13 Dec 2007 12:00:49 -0000	1.3
***************
*** 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;
--- 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;
***************
*** 220,224 ****
    
    private void finishTool() {
!     Space owner = Project.getInstance().getActiveSpace();
      owner.removeProtected(extrusion);
      if (pressedSurface != null && 
--- 220,224 ----
    
    private void finishTool() {
!     Container owner = Project.getInstance().getActiveSpace();
      owner.removeProtected(extrusion);
      if (pressedSurface != null && 

Index: FinalMoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/FinalMoveTool.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** FinalMoveTool.java	12 Dec 2007 14:38:47 -0000	1.42
--- FinalMoveTool.java	13 Dec 2007 12:00:49 -0000	1.43
***************
*** 32,36 ****
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
! import net.sourceforge.bprocessor.model.Space;
  
  /**
--- 32,36 ----
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
! import net.sourceforge.bprocessor.model.Container;
  
  /**
***************
*** 40,44 ****
    
    private Collection<Geometric> geometrics;
!   private Space owner;
    
    private Collection<Geometric> affected;
--- 40,44 ----
    
    private Collection<Geometric> geometrics;
!   private Container 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ShiftActionListener.java	4 Jan 2006 14:29:50 -0000	1.4
--- ShiftActionListener.java	13 Dec 2007 12:00:49 -0000	1.5
***************
*** 10,14 ****
  import java.awt.event.ActionListener;
  
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
  
--- 10,14 ----
  import java.awt.event.ActionListener;
  
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.Surface;
  
***************
*** 42,47 ****
     */
    public void actionPerformed(ActionEvent e) {
!     Space back = surface.getBackDomain();
!     Space front = surface.getFrontDomain();
      
      surface.setFrontDomain(back);
--- 42,47 ----
     */
    public void actionPerformed(ActionEvent e) {
!     Container back = surface.getBackDomain();
!     Container 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.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** AbstractPencil.java	11 Dec 2007 14:49:11 -0000	1.101
--- AbstractPencil.java	13 Dec 2007 12:00:49 -0000	1.102
***************
*** 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;
--- 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;
***************
*** 237,241 ****
      
      if (intersection != null) {
!       Space space = Project.getInstance().getActiveSpace();
        Vertex v = intersection.vertex();
        if (intersection.type() == Intersection.VERTEX) {
--- 237,241 ----
      
      if (intersection != null) {
!       Container 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.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** SelectStrategy.java	7 Dec 2007 14:38:53 -0000	1.23
--- SelectStrategy.java	13 Dec 2007 12:00:49 -0000	1.24
***************
*** 25,29 ****
  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;
--- 25,29 ----
  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;
***************
*** 186,190 ****
              if (extended.isEmpty()) {
                //Move out one space/union level if possible
!               Space sp = Project.getInstance().getActiveSpace();
                if (sp.getOwner() != null) {
                  sp.getOwner().edit();
--- 186,190 ----
              if (extended.isEmpty()) {
                //Move out one space/union level if possible
!               Container sp = Project.getInstance().getActiveSpace();
                if (sp.getOwner() != null) {
                  sp.getOwner().edit();
***************
*** 198,203 ****
                  Surface surface = (Surface) current;
                  extended.addAll(surface.getEdges());
!               } else if (target instanceof Space) {
!                 Space space = (Space) target;
                  extended.clear();
                  space.edit();
--- 198,203 ----
                  Surface surface = (Surface) current;
                  extended.addAll(surface.getEdges());
!               } else if (target instanceof Container) {
!                 Container space = (Container) target;
                  extended.clear();
                  space.edit();

Index: AltMoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AltMoveTool.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AltMoveTool.java	11 Dec 2007 14:49:11 -0000	1.16
--- AltMoveTool.java	13 Dec 2007 12:00:49 -0000	1.17
***************
*** 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;
--- 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;
***************
*** 111,115 ****
        if (target instanceof Surface) {
          surface = (Surface) target; 
!         Space space = surface.getOwner();
          
          system = CoordinateSystem.systemOf(surface);
--- 111,115 ----
        if (target instanceof Surface) {
          surface = (Surface) target; 
!         Container space = surface.getOwner();
          
          system = CoordinateSystem.systemOf(surface);