[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.289, 1.290 Display.java, 1.93, 1.94 PopupMenu.java, 1.30, 1.31

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

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

Modified Files:
	View.java Display.java PopupMenu.java 
Log Message:
Renamed Space to Item and Container to Space

Index: Display.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** Display.java	22 Jun 2009 13:30:19 -0000	1.93
--- Display.java	25 Jun 2009 22:17:40 -0000	1.94
***************
*** 30,34 ****
  import net.sourceforge.bprocessor.model.Grid;
  import net.sourceforge.bprocessor.model.Material;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Camera;
  import net.sourceforge.bprocessor.model.ClippingPlane;
--- 30,34 ----
  import net.sourceforge.bprocessor.model.Grid;
  import net.sourceforge.bprocessor.model.Material;
! import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.Camera;
  import net.sourceforge.bprocessor.model.ClippingPlane;
***************
*** 42,46 ****
  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;
--- 42,46 ----
  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;
***************
*** 77,81 ****
    private static Project project;
    private static Camera camera;
!   private static Space active;
  
  
--- 77,81 ----
    private static Project project;
    private static Camera camera;
!   private static Item active;
  
  
***************
*** 847,856 ****
    }
  
!   private static boolean hidden(Container space) {
      Collection<Geometric> hidden = camera.getHiddenGeometrics();
      return hidden.contains(space);
    }
  
!   private static boolean transparent(Container space) {
      if (hidden(space)) {
        return true;
--- 847,856 ----
    }
  
!   private static boolean hidden(Space space) {
      Collection<Geometric> hidden = camera.getHiddenGeometrics();
      return hidden.contains(space);
    }
  
!   private static boolean transparent(Space space) {
      if (hidden(space)) {
        return true;
***************
*** 870,875 ****
  
    private static boolean transparent(Surface surface) {
!     Container front = surface.getFrontDomain();
!     Container back = surface.getBackDomain();
      return transparent(front) && transparent(back);
    }
--- 870,875 ----
  
    private static boolean transparent(Surface surface) {
!     Space front = surface.getFrontDomain();
!     Space back = surface.getBackDomain();
      return transparent(front) && transparent(back);
    }
***************
*** 898,902 ****
  
  
!   private static boolean active(Container space) {
      if (space == null) {
        return false;
--- 898,902 ----
  
  
!   private static boolean active(Space space) {
      if (space == null) {
        return false;
***************
*** 910,918 ****
    }
  
!   private static void draw(Space space, boolean inside) {
      if (space.isInstance()) {
        drawInstance((Instance) space, inside);
      } else {
!       drawSpace((Container) space, inside);
      }
    }
--- 910,918 ----
    }
  
!   private static void draw(Item space, boolean inside) {
      if (space.isInstance()) {
        drawInstance((Instance) space, inside);
      } else {
!       drawSpace((Space) space, inside);
      }
    }
***************
*** 925,929 ****
      translateToCoordinatesystem(space);
      if (USEDL && inside) {
!       Container work = space.getProto();
        Integer index = displayLists.get(work);
        if (index != null) {
--- 925,929 ----
      translateToCoordinatesystem(space);
      if (USEDL && inside) {
!       Space work = space.getProto();
        Integer index = displayLists.get(work);
        if (index != null) {
***************
*** 970,978 ****
    }
  
!   private static void drawSpace(Container space, boolean inside) {
      Set<Geometric> hidden = new HashSet();
      hidden.addAll(camera.getHiddenGeometrics());
  
!     Collection<Space> elements = new LinkedList();
      Collection<Surface> surfaces = new LinkedList();
      Collection<Edge> edges = new LinkedList();
--- 970,978 ----
    }
  
!   private static void drawSpace(Space space, boolean inside) {
      Set<Geometric> hidden = new HashSet();
      hidden.addAll(camera.getHiddenGeometrics());
  
!     Collection<Item> elements = new LinkedList();
      Collection<Surface> surfaces = new LinkedList();
      Collection<Edge> edges = new LinkedList();
***************
*** 1009,1013 ****
        // Geometry collection
  
!       for (Space current : space.getElements()) {
          if (!hidden.contains(current)) {
            elements.add(current);
--- 1009,1013 ----
        // Geometry collection
  
!       for (Item current : space.getElements()) {
          if (!hidden.contains(current)) {
            elements.add(current);
***************
*** 1016,1020 ****
        {
          Set<Surface> visible = new HashSet();
!         for (Space current : elements) {
            visible.addAll(current.getEnvelope());
          }
--- 1016,1020 ----
        {
          Set<Surface> visible = new HashSet();
!         for (Item current : elements) {
            visible.addAll(current.getEnvelope());
          }
***************
*** 1097,1101 ****
          }
        }
!       Container work = space;
        while (work != null) {
          for (Constructor current : work.getConstructors()) {
--- 1097,1101 ----
          }
        }
!       Space work = space;
        while (work != null) {
          for (Constructor current : work.getConstructors()) {
***************
*** 1104,1108 ****
            }
          }
!         work = (Container)work.parent();
        }
      }
--- 1104,1108 ----
            }
          }
!         work = (Space)work.parent();
        }
      }
***************
*** 1212,1216 ****
        System.out.println("c: " + ctime + " s: " + stime + " e: " + etime);
      }
!     for (Space current : elements) {
        draw(current, inside || (current == active));
      }
--- 1212,1216 ----
        System.out.println("c: " + ctime + " s: " + stime + " e: " + etime);
      }
!     for (Item current : elements) {
        draw(current, inside || (current == active));
      }
***************
*** 1224,1228 ****
      List<CoordinateSystem> translation = new LinkedList<CoordinateSystem>();
  
!     Space current = space;
  
      while (current != null) {
--- 1224,1228 ----
      List<CoordinateSystem> translation = new LinkedList<CoordinateSystem>();
  
!     Item current = space;
  
      while (current != null) {
***************
*** 1268,1273 ****
  
      for (Geometric current : geometrics) {
!       if (current instanceof Space) {
!         Space space = (Space) current;
          Collection<Edge> edges = space.hiliteEdges();
          paintEdges(edges, View.SELECTED_COLOR, 2.0f);
--- 1268,1273 ----
  
      for (Geometric current : geometrics) {
!       if (current instanceof Item) {
!         Item space = (Item) current;
          Collection<Edge> edges = space.hiliteEdges();
          paintEdges(edges, View.SELECTED_COLOR, 2.0f);
***************
*** 1333,1338 ****
      Display.camera = camera;
      Display.active = Project.getInstance().world();
!     if (geometric instanceof Container) {
!       Display.draw((Container)geometric, true);
      } else if (geometric instanceof Surface) {
        Display.draw((Surface)geometric, true);
--- 1333,1338 ----
      Display.camera = camera;
      Display.active = Project.getInstance().world();
!     if (geometric instanceof Space) {
!       Display.draw((Space)geometric, true);
      } else if (geometric instanceof Surface) {
        Display.draw((Surface)geometric, true);
***************
*** 1357,1361 ****
      camera = project.getCurrentCamera();
      active = project.getActiveSpace();
!     Container world = project.world();
      grid = world.getGrid();
      draw(world, world == active);
--- 1357,1361 ----
      camera = project.getCurrentCamera();
      active = project.getActiveSpace();
!     Space world = project.world();
      grid = world.getGrid();
      draw(world, world == active);

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** PopupMenu.java	19 Jun 2009 13:32:29 -0000	1.30
--- PopupMenu.java	25 Jun 2009 22:17:40 -0000	1.31
***************
*** 42,46 ****
  import net.sourceforge.bprocessor.model.Component;
  import net.sourceforge.bprocessor.model.Constructor;
! import net.sourceforge.bprocessor.model.Container;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
--- 42,46 ----
  import net.sourceforge.bprocessor.model.Component;
  import net.sourceforge.bprocessor.model.Constructor;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 52,56 ****
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.SpaceAnalysis;
  import net.sourceforge.bprocessor.model.Surface;
--- 52,56 ----
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
! import net.sourceforge.bprocessor.model.Item;
  import net.sourceforge.bprocessor.model.SpaceAnalysis;
  import net.sourceforge.bprocessor.model.Surface;
***************
*** 246,252 ****
    private abstract class ModellorAction extends AbstractAction {
      protected Modellor modellor;
!     protected Container space;
      
!     public ModellorAction(Modellor modellor, Container space) {
        super(modellor.title());
        this.modellor = modellor;
--- 246,252 ----
    private abstract class ModellorAction extends AbstractAction {
      protected Modellor modellor;
!     protected Space space;
      
!     public ModellorAction(Modellor modellor, Space space) {
        super(modellor.title());
        this.modellor = modellor;
***************
*** 268,273 ****
        AbstractAction action = new CollectionMenuAction(s, "Explode") {
          public void actionPerformed(ActionEvent event) {
!           List<Container> spaces = new LinkedList(col);
!           for (Container space : spaces) {
              Collection<Vertex> vertices = new LinkedList(space.getVertices());
              Collection<Edge> edges = new LinkedList(space.getEdges());
--- 268,273 ----
        AbstractAction action = new CollectionMenuAction(s, "Explode") {
          public void actionPerformed(ActionEvent event) {
!           List<Space> spaces = new LinkedList(col);
!           for (Space space : spaces) {
              Collection<Vertex> vertices = new LinkedList(space.getVertices());
              Collection<Edge> edges = new LinkedList(space.getEdges());
***************
*** 303,307 ****
      if (s.size() == 1) {
        // Some options do only apply to one space
!       Container sp = (Container)s.iterator().next();
        
        AbstractAction edit = new SpaceMenuAction(sp, "Edit") {
--- 303,307 ----
      if (s.size() == 1) {
        // Some options do only apply to one space
!       Space sp = (Space)s.iterator().next();
        
        AbstractAction edit = new SpaceMenuAction(sp, "Edit") {
***************
*** 364,373 ****
          AbstractAction action = new SpaceMenuAction(sp, "Normals") {
            public void actionPerformed(ActionEvent event) {
!             Container union = Space.createConstructionSpace("Normals");
              for (Surface surface : space.getSurfaces()) {
                Vertex normal = surface.normal();
                Vertex origin = surface.center();
                CoordinateSystem system = CoordinateSystem.systemFor(origin, normal);
!               Container pyramid = Command.Pyramid.pyramid(0.05, 0.05, 0.2);
                for (Vertex current : pyramid.getVertices()) {
                  current.set(system.unTranslate(current));
--- 364,373 ----
          AbstractAction action = new SpaceMenuAction(sp, "Normals") {
            public void actionPerformed(ActionEvent event) {
!             Space union = Item.createConstructionSpace("Normals");
              for (Surface surface : space.getSurfaces()) {
                Vertex normal = surface.normal();
                Vertex origin = surface.center();
                CoordinateSystem system = CoordinateSystem.systemFor(origin, normal);
!               Space pyramid = Command.Pyramid.pyramid(0.05, 0.05, 0.2);
                for (Vertex current : pyramid.getVertices()) {
                  current.set(system.unTranslate(current));
***************
*** 588,592 ****
            Collection<Geometric> geometrics = new LinkedList();
            {
!             Set<Space> spaces = new HashSet();
              Set<Surface> surfaces = new HashSet();
              Set<Edge> edges = new HashSet();
--- 588,592 ----
            Collection<Geometric> geometrics = new LinkedList();
            {
!             Set<Item> spaces = new HashSet();
              Set<Surface> surfaces = new HashSet();
              Set<Edge> edges = new HashSet();
***************
*** 594,599 ****
              
              for (Geometric current : entities) {
!               if (current instanceof Space) {
!                 spaces.add((Space) current);
                } else if (current instanceof Surface) {
                  surfaces.add((Surface) current);
--- 594,599 ----
              
              for (Geometric current : entities) {
!               if (current instanceof Item) {
!                 spaces.add((Item) current);
                } else if (current instanceof Surface) {
                  surfaces.add((Surface) current);
***************
*** 605,609 ****
              }
              spaces.addAll(Surface.spaces(surfaces));
!             for (Space current : spaces) {
                surfaces.addAll(current.getEnvelope());
              }
--- 605,609 ----
              }
              spaces.addAll(Surface.spaces(surfaces));
!             for (Item current : spaces) {
                surfaces.addAll(current.getEnvelope());
              }
***************
*** 619,623 ****
            HashMap map = new HashMap();
            Mesh copy = mesh.copy(map);
!           Container union = Space.createUnion("Union");
            for (Vertex current : copy.vertices()) {
              union.add(current);
--- 619,623 ----
            HashMap map = new HashMap();
            Mesh copy = mesh.copy(map);
!           Space union = Item.createUnion("Union");
            for (Vertex current : copy.vertices()) {
              union.add(current);
***************
*** 629,633 ****
              union.add(current);
            }
!           for (Space current : copy.elements()) {
              union.add(current);
            }
--- 629,633 ----
              union.add(current);
            }
!           for (Item current : copy.elements()) {
              union.add(current);
            }
***************
*** 846,851 ****
      { 
        AbstractAction action = new AbstractAction("Bounding Sphere") {
!         private Container circle(Vertex i, Vertex j, Vertex origin, double radius) {
!           Container union = Space.createUnion("Circle");
            LinkedList<Vertex> vertices = new LinkedList();
            int n = 64;
--- 846,851 ----
      { 
        AbstractAction action = new AbstractAction("Bounding Sphere") {
!         private Space circle(Vertex i, Vertex j, Vertex origin, double radius) {
!           Space union = Item.createUnion("Circle");
            LinkedList<Vertex> vertices = new LinkedList();
            int n = 64;
***************
*** 878,890 ****
            double radius = sphere.radius();
            { 
!             Space circle = circle(i, j, origin, radius);
              Project.getInstance().world().add(circle);
            }
            { 
!             Space circle = circle(j, k, origin, radius);
              Project.getInstance().world().add(circle);
            }
            { 
!             Space circle = circle(k, i, origin, radius);
              Project.getInstance().world().add(circle);
            }
--- 878,890 ----
            double radius = sphere.radius();
            { 
!             Item circle = circle(i, j, origin, radius);
              Project.getInstance().world().add(circle);
            }
            { 
!             Item circle = circle(j, k, origin, radius);
              Project.getInstance().world().add(circle);
            }
            { 
!             Item circle = circle(k, i, origin, radius);
              Project.getInstance().world().add(circle);
            }
***************
*** 907,911 ****
    }
    
!   private JMenu getFrameMenu(Container net) {
      JMenu menu = new JMenu("Frame");
      {
--- 907,911 ----
    }
    
!   private JMenu getFrameMenu(Space net) {
      JMenu menu = new JMenu("Frame");
      {
***************
*** 938,942 ****
      AbstractAction planeanalysis = new AbstractAction("Plane Analysis") {
        public void actionPerformed(ActionEvent arg0) {
!         Container space = Project.getInstance().getActiveSpace();
          SurfaceAnalysis analysis = new SurfaceAnalysis();
          analysis.clearPlanes(space);
--- 938,942 ----
      AbstractAction planeanalysis = new AbstractAction("Plane Analysis") {
        public void actionPerformed(ActionEvent arg0) {
!         Space space = Project.getInstance().getActiveSpace();
          SurfaceAnalysis analysis = new SurfaceAnalysis();
          analysis.clearPlanes(space);
***************
*** 954,958 ****
      AbstractAction clearplanes = new AbstractAction("Delete Planes") {
        public void actionPerformed(ActionEvent arg0) {
!         Container space = Project.getInstance().getActiveSpace();
          SurfaceAnalysis analysis = new SurfaceAnalysis();
          analysis.clearPlanes(space);
--- 954,958 ----
      AbstractAction clearplanes = new AbstractAction("Delete Planes") {
        public void actionPerformed(ActionEvent arg0) {
!         Space space = Project.getInstance().getActiveSpace();
          SurfaceAnalysis analysis = new SurfaceAnalysis();
          analysis.clearPlanes(space);
***************
*** 964,968 ****
      AbstractAction surfaceanalysis = new AbstractAction("Surface Analysis") {
        public void actionPerformed(ActionEvent arg0) {
!         Container space = Project.getInstance().getActiveSpace();
          SurfaceAnalysis analysis = new SurfaceAnalysis();
          analysis.surfaceAnalysis(space);
--- 964,968 ----
      AbstractAction surfaceanalysis = new AbstractAction("Surface Analysis") {
        public void actionPerformed(ActionEvent arg0) {
!         Space space = Project.getInstance().getActiveSpace();
          SurfaceAnalysis analysis = new SurfaceAnalysis();
          analysis.surfaceAnalysis(space);
***************
*** 974,978 ****
      AbstractAction clearsurfaces = new AbstractAction("Delete Surfaces") {
        public void actionPerformed(ActionEvent arg0) {
!         Container space = Project.getInstance().getActiveSpace();
          SurfaceAnalysis analysis = new SurfaceAnalysis();
          analysis.clearSurfaces(space);
--- 974,978 ----
      AbstractAction clearsurfaces = new AbstractAction("Delete Surfaces") {
        public void actionPerformed(ActionEvent arg0) {
!         Space space = Project.getInstance().getActiveSpace();
          SurfaceAnalysis analysis = new SurfaceAnalysis();
          analysis.clearSurfaces(space);
***************
*** 995,1002 ****
        public void actionPerformed(ActionEvent e) {
          Project proj = Project.getInstance();
!         Container world = proj.getActiveSpace();
          for (Object o : col) {
            Component lo = (Component)o;
!           Container space = lo.getSpace();
            Instance instance = new Instance(space.getName() + " instance ");
            proj.addCalalogObject(lo);
--- 995,1002 ----
        public void actionPerformed(ActionEvent e) {
          Project proj = Project.getInstance();
!         Space world = proj.getActiveSpace();
          for (Object o : col) {
            Component lo = (Component)o;
!           Space space = lo.getSpace();
            Instance instance = new Instance(space.getName() + " instance ");
            proj.addCalalogObject(lo);
***************
*** 1037,1041 ****
          for (Geometric geomeric : entities) {
            ClippingPlane clip = (ClippingPlane) geomeric;
!           Container silhouette = clip.getSilhouette();
            Project.getInstance().getActiveSpace().add(silhouette);
          }
--- 1037,1041 ----
          for (Geometric geomeric : entities) {
            ClippingPlane clip = (ClippingPlane) geomeric;
!           Space silhouette = clip.getSilhouette();
            Project.getInstance().getActiveSpace().add(silhouette);
          }
***************
*** 1062,1067 ****
        if (type instanceof ClippingPlane) {
          return getClippingPlaneMenu(new LinkedList(geometrics));
!       } else if (type instanceof Container) {
!         return getSpaceMenu(new LinkedList<Container>((Collection<Container>)geometrics));
        } else if (type instanceof Surface) {
          return getSurfaceMenu(new LinkedList<Surface>((Collection<Surface>)geometrics));
--- 1062,1067 ----
        if (type instanceof ClippingPlane) {
          return getClippingPlaneMenu(new LinkedList(geometrics));
!       } else if (type instanceof Space) {
!         return getSpaceMenu(new LinkedList<Space>((Collection<Space>)geometrics));
        } else if (type instanceof Surface) {
          return getSurfaceMenu(new LinkedList<Surface>((Collection<Surface>)geometrics));

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.289
retrieving revision 1.290
diff -C2 -d -r1.289 -r1.290
*** View.java	19 Jun 2009 13:32:29 -0000	1.289
--- View.java	25 Jun 2009 22:17:40 -0000	1.290
***************
*** 29,34 ****
  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.Vertex;
  import net.sourceforge.bprocessor.model.Surface;
--- 29,34 ----
  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.Vertex;
  import net.sourceforge.bprocessor.model.Surface;
***************
*** 571,578 ****
      List<Surface> surfaces = tesselator.tesselate(surface);
      Vertex normal = surface.normal();
!     Container front = surface.getFrontDomain();
!     Container back = surface.getBackDomain();
  
!     Container owner = surface.getOwner();
      Collection<Surface> holes = new LinkedList(surface.getHoles());
      for (Surface hole : holes) {
--- 571,578 ----
      List<Surface> surfaces = tesselator.tesselate(surface);
      Vertex normal = surface.normal();
!     Space front = surface.getFrontDomain();
!     Space back = surface.getBackDomain();
  
!     Space owner = surface.getOwner();
      Collection<Surface> holes = new LinkedList(surface.getHoles());
      for (Surface hole : holes) {
***************
*** 755,761 ****
            drawSelectionWidget((Surface) candidate, hitdetection);
          }
!       } else if (candidate instanceof Space) {
          if (editor.getTool() instanceof SpaceSelectTool) {
!           drawSpeechBubble((Space) candidate, hitdetection);
          }
        }
--- 755,761 ----
            drawSelectionWidget((Surface) candidate, hitdetection);
          }
!       } else if (candidate instanceof Item) {
          if (editor.getTool() instanceof SpaceSelectTool) {
!           drawSpeechBubble((Item) candidate, hitdetection);
          }
        }
***************
*** 941,948 ****
    }
  
!   private void drawPath(LinkedList<Container> path, boolean selecting) {
      LinkedList<Label> labels = new LinkedList<Label>();
      boolean first = true;
!     for (Container space : path) {
        labels.add(new SpaceBox(space));
        labels.add(new Label("/"));
--- 941,948 ----
    }
  
!   private void drawPath(LinkedList<Space> path, boolean selecting) {
      LinkedList<Label> labels = new LinkedList<Label>();
      boolean first = true;
!     for (Space space : path) {
        labels.add(new SpaceBox(space));
        labels.add(new Label("/"));
***************
*** 953,958 ****
      if (selection.size() == 1) {
        Geometric geometric = selection.iterator().next();
!       if (geometric instanceof Container) {
!         Container container = (Container) geometric;
          labels.add(new SpaceBox(container));
          labels.add(new Label(">>"));
--- 953,958 ----
      if (selection.size() == 1) {
        Geometric geometric = selection.iterator().next();
!       if (geometric instanceof Space) {
!         Space container = (Space) geometric;
          labels.add(new SpaceBox(container));
          labels.add(new Label(">>"));
***************
*** 1000,1006 ****
     */
    private void drawSpacePath(boolean selection) {
!     Container active = Project.getInstance().getActiveSpace();
!     Container world = Project.getInstance().world();
!     LinkedList<Container> path = new LinkedList<Container>();
      path.add(active);
      while (active != world) {
--- 1000,1006 ----
     */
    private void drawSpacePath(boolean selection) {
!     Space active = Project.getInstance().getActiveSpace();
!     Space world = Project.getInstance().world();
!     LinkedList<Space> path = new LinkedList<Space>();
      path.add(active);
      while (active != world) {
***************
*** 1091,1096 ****
      Vertex front = transformation.project(from);
      front.setZ(1);
!     Container frontDomain = surface.getFrontDomain();
!     Container backDomain = surface.getBackDomain();
      String frontName;
      String backName;
--- 1091,1096 ----
      Vertex front = transformation.project(from);
      front.setZ(1);
!     Space frontDomain = surface.getFrontDomain();
!     Space backDomain = surface.getBackDomain();
      String frontName;
      String backName;
***************
*** 1183,1187 ****
    }
  
!   private void drawSpeechBubble(Space space, boolean clickable) {
      Transformation transformation = transformation();
      double width =  240;
--- 1183,1187 ----
    }
  
!   private void drawSpeechBubble(Item space, boolean clickable) {
      Transformation transformation = transformation();
      double width =  240;
***************
*** 1259,1264 ****
      Vertex front = transformation.project(from);
      front.setZ(1);
!     Container frontDomain = surface.getFrontDomain();
!     Container backDomain = surface.getBackDomain();
      String frontName;
      String backName;
--- 1259,1264 ----
      Vertex front = transformation.project(from);
      front.setZ(1);
!     Space frontDomain = surface.getFrontDomain();
!     Space backDomain = surface.getBackDomain();
      String frontName;
      String backName;
***************
*** 1822,1826 ****
        if (object instanceof Geometric) {
          Geometric current = (Geometric) object;
!         Container active = Project.getInstance().getActiveSpace();
          while (current != null && current.getOwner() != active) {
            current = current.getOwner();
--- 1822,1826 ----
        if (object instanceof Geometric) {
          Geometric current = (Geometric) object;
!         Space active = Project.getInstance().getActiveSpace();
          while (current != null && current.getOwner() != active) {
            current = current.getOwner();
***************
*** 2230,2235 ****
     */
    public void update(Object entity) {
!     if (entity instanceof Container) {
!       for (Surface s : ((Container)entity).getSurfaces()) {
          if (DISP) {
            Integer which = displayLists.remove(s);
--- 2230,2235 ----
     */
    public void update(Object entity) {
!     if (entity instanceof Space) {
!       for (Surface s : ((Space)entity).getSurfaces()) {
          if (DISP) {
            Integer which = displayLists.remove(s);
***************
*** 2249,2253 ****
        if (DISP) {
          Geometric g = (Geometric)entity;
!         Container sp = g.getOwner();
          for (Surface s : sp.getSurfaces()) {
            Integer which = displayLists.remove(s);
--- 2249,2253 ----
        if (DISP) {
          Geometric g = (Geometric)entity;
!         Space sp = g.getOwner();
          for (Surface s : sp.getSurfaces()) {
            Integer which = displayLists.remove(s);