bprocessor-commit — Commit

[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model/modellor TileModellor.java, 1.1, 1.2

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

Update of /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4298/src/net/sourceforge/bprocessor/model/modellor

Modified Files:
	TileModellor.java 
Log Message:
now the tilemodellor acctually draws a single tile :-)

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TileModellor.java	10 Apr 2007 20:59:01 -0000	1.1
--- TileModellor.java	14 Apr 2007 15:03:06 -0000	1.2
***************
*** 11,17 ****
--- 11,21 ----
  import java.util.List;
  
+ import org.apache.log4j.Logger;
+ 
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Material;
+ import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.Relation;
  import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
***************
*** 23,26 ****
--- 27,32 ----
   */
  public class TileModellor extends Modellor {
+   /** The logger */
+   private static Logger log = Logger.getLogger(TileModellor.class);
  
    private static final long serialVersionUID = 1L;
***************
*** 32,36 ****
    private static int jointSize = 3;
  
!   private Material tileColor = new Material("White", new float[]{.0f, .0f, .0f});
    
    private Surface surface;
--- 38,42 ----
    private static int jointSize = 3;
  
!   private Material tileColor = new Material("White", new float[]{1.0f, 1.0f, 1.0f});
    
    private Surface surface;
***************
*** 48,54 ****
     */
    public TileModellor(Space s) {
!     space = s;
!     surface = s.getSurfaces().iterator().next();
!     startPoint = surface.coordinateSystem();
    }
    
--- 54,65 ----
     */
    public TileModellor(Space s) {
!     if (s == null) {
!       return;
!     } else {
!       space = s;
!       surface = s.getEnvelope().iterator().next();
!       startPoint = surface.coordinateSystem();
!       startPoint.add(new Relation(surface, "0"));
!     }
    }
    
***************
*** 66,76 ****
    @Override
    public void update(Object entity) {
      Space tile = new Space("Tile", Space.CONSTRUCTION, Space.PART_LEVEL, true);
-     tile.setUnion(true);
      space.add(tile);
!     Vertex v1 = new Vertex(0, 0, 0);
!     Vertex v2 = new Vertex(tileSize.width, 0, 0);
!     Vertex v3 = new Vertex(tileSize.width, tileSize.height, 0);
!     Vertex v4 = new Vertex(0, tileSize.height, 0);
      Edge e1 = new Edge(v1, v2);
      Edge e2 = new Edge(v2, v3);
--- 77,93 ----
    @Override
    public void update(Object entity) {
+     if (space == null || surface == null) {
+       log.warn("Could not update modellor due to null space og surface");
+       return;
+     }
+     space.clear();
+     space.add(startPoint);
+     CoordinateSystem cs = startPoint;
      Space tile = new Space("Tile", Space.CONSTRUCTION, Space.PART_LEVEL, true);
      space.add(tile);
!     Vertex v1 = cs.unTranslate(new Vertex(0.0, 0.0, 0.0));
!     Vertex v2 = cs.unTranslate(new Vertex(tileSize.getWidth()/1000.0, 0, 0));
!     Vertex v3 = cs.unTranslate(new Vertex(tileSize.getWidth()/1000.0, tileSize.getHeight()/1000.0, 0));
!     Vertex v4 = cs.unTranslate(new Vertex(0.0, tileSize.getHeight()/1000.0, 0));
      Edge e1 = new Edge(v1, v2);
      Edge e2 = new Edge(v2, v3);
***************
*** 84,91 ****
      Surface front = new Surface(edges);
      front.setFrontMaterial(tileColor);
!     front.setFrontDomain(tile);
!     space.insert(front);
      List<Surface> extrusion = new ArrayList<Surface>();
!     front.extrusion(tileThickness  / 1000, extrusion);
      space.addAll(extrusion);
      
--- 101,109 ----
      Surface front = new Surface(edges);
      front.setFrontMaterial(tileColor);
!     front.setBackDomain(tile);
      List<Surface> extrusion = new ArrayList<Surface>();
!     Surface back = front.extrusion(-tileThickness  / 1000.0, extrusion);
!     extrusion.add(back);
!     extrusion.add(front);
      space.addAll(extrusion);
      
***************
*** 104,109 ****
    @Override
    public int getUseableLevel() {
!     return Space.PART_LEVEL;
    }
- 
  }
--- 122,134 ----
    @Override
    public int getUseableLevel() {
!     return Space.SPACE_LEVEL;
!   }
!   
!   /**
!    * {@inheritDoc}
!    */
!   @Override
!   public String getName() {
!     return "TileModellor";
    }
  }

[Bprocessor-commit] /bscript/src/net/sourceforge/bprocessor/model/evaluator Operation.java, 1.5, 1.6 Invokable.java, 1.3, 1.4 Call.java, 1.8, 1.9

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

Update of /cvsroot/bprocessor//bscript/src/net/sourceforge/bprocessor/model/evaluator
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3442/src/net/sourceforge/bprocessor/model/evaluator

Modified Files:
	Operation.java Invokable.java Call.java 
Log Message:
more generics

Index: Operation.java
===================================================================
RCS file: /cvsroot/bprocessor//bscript/src/net/sourceforge/bprocessor/model/evaluator/Operation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Operation.java	11 Oct 2006 11:23:26 -0000	1.5
--- Operation.java	14 Apr 2007 15:01:08 -0000	1.6
***************
*** 28,31 ****
     * @return offset
     */
!   public abstract int evaluate(Environment env, Stack stack) throws SemanticError;
  }
--- 28,31 ----
     * @return offset
     */
!   public abstract int evaluate(Environment env, Stack<Object> stack) throws SemanticError;
  }

Index: Invokable.java
===================================================================
RCS file: /cvsroot/bprocessor//bscript/src/net/sourceforge/bprocessor/model/evaluator/Invokable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Invokable.java	11 Oct 2006 11:23:26 -0000	1.3
--- Invokable.java	14 Apr 2007 15:01:08 -0000	1.4
***************
*** 19,22 ****
     * @throws SemanticError 
     */
!   public void evaluate(Environment env, Stack stack) throws SemanticError;
  }
--- 19,22 ----
     * @throws SemanticError 
     */
!   public void evaluate(Environment env, Stack<Object> stack) throws SemanticError;
  }

Index: Call.java
===================================================================
RCS file: /cvsroot/bprocessor//bscript/src/net/sourceforge/bprocessor/model/evaluator/Call.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Call.java	11 Oct 2006 11:23:26 -0000	1.8
--- Call.java	14 Apr 2007 15:01:08 -0000	1.9
***************
*** 35,41 ****
     * @param stack Stack
     */
!   public int evaluate(Environment env, Stack stack) throws SemanticError {
      int length = stack.search(Function.mark) - 1;
!     List arguments = new ArrayList(length);
      for (int i = 0; i < length; i++) {
        arguments.add(null);
--- 35,42 ----
     * @param stack Stack
     */
!   @Override
!   public int evaluate(Environment env, Stack<Object> stack) throws SemanticError {
      int length = stack.search(Function.mark) - 1;
!     List<Object> arguments = new ArrayList<Object>(length);
      for (int i = 0; i < length; i++) {
        arguments.add(null);
***************
*** 49,53 ****
      Invokable invokable = (Invokable) env.lookupGlobal(name);
      if (invokable != null) {
!       HashMap locals = new HashMap();
        if (invokable instanceof Function) {
          Function function = (Function) invokable;
--- 50,54 ----
      Invokable invokable = (Invokable) env.lookupGlobal(name);
      if (invokable != null) {
!       HashMap<String, Object> locals = new HashMap<String, Object>();
        if (invokable instanceof Function) {
          Function function = (Function) invokable;

[Bprocessor-commit] /gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.114, 1.115 SelectStrategy.java, 1.8, 1.9 SpaceTool.java, 1.71, 1.72

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

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

Modified Files:
	AbstractTool.java SelectStrategy.java SpaceTool.java 
Log Message:
altered selection to a generic collection og geometrics which lead to quite alot of changes

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** SpaceTool.java	10 Apr 2007 20:56:47 -0000	1.71
--- SpaceTool.java	14 Apr 2007 15:00:52 -0000	1.72
***************
*** 38,41 ****
--- 38,42 ----
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Entity;
+ import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.IDTransform;
  import net.sourceforge.bprocessor.model.Mesh;
***************
*** 85,88 ****
--- 86,90 ----
     * @param e The MouseEvent object
     */
+   @Override
    protected void pressed(MouseEvent e) {   
      glv.setLengthValue("");
***************
*** 92,96 ****
      
      if (e.getButton() == MouseEvent.BUTTON3 || 
!         (e.isControlDown() && e.getButton() == MouseEvent.BUTTON3)) {
        glv.popup(makeSelectionMenu(), e.getX(), e.getY());
        done = true;
--- 94,98 ----
      
      if (e.getButton() == MouseEvent.BUTTON3 || 
!         e.isPopupTrigger()) {
        glv.popup(makeSelectionMenu(), e.getX(), e.getY());
        done = true;
***************
*** 168,172 ****
      } else {
        Iterator sel = Selection.primary().iterator();
!       Class type = null;
        while (sel.hasNext()) {
          Object next = sel.next();
--- 170,174 ----
      } else {
        Iterator sel = Selection.primary().iterator();
!       Class<? extends Object> type = null;
        while (sel.hasNext()) {
          Object next = sel.next();
***************
*** 221,225 ****
    private JPopupMenu seperatorPopup() {
      JPopupMenu sepPop = new JPopupMenu();
!     Iterator selIt = new HashSet(Selection.primary()).iterator();
      if (selIt.hasNext()) {
        Object o = selIt.next();
--- 223,227 ----
    private JPopupMenu seperatorPopup() {
      JPopupMenu sepPop = new JPopupMenu();
!     Iterator<Geometric> selIt = new HashSet<Geometric>(Selection.primary()).iterator();
      if (selIt.hasNext()) {
        Object o = selIt.next();
***************
*** 257,261 ****
      
      
!     Iterator selIt = new HashSet(Selection.primary()).iterator();
      Surface surface = null;
      Space space = null;
--- 259,263 ----
      
      
!     Iterator<Geometric> selIt = new HashSet<Geometric>(Selection.primary()).iterator();
      Surface surface = null;
      Space space = null;
***************
*** 320,324 ****
          public void actionPerformed(ActionEvent arg0) {
            if (space != null) {
-             Selection.primary().clear();
              glv.getView().makeTarget(null);
              Selection.primary().set(space);
--- 322,325 ----
***************
*** 431,444 ****
      transform = new TransformStack();
      id = new IDTransform();
!     HashMap globals = Project.getInstance().getGlobals().environment();
      
      
      globals.put("echo", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          stack.push(env.get(0));
        }
      });
      globals.put("cos", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Double argument = (Double) env.get(0);
          stack.push(new Double(Math.cos(argument.doubleValue())));
--- 432,445 ----
      transform = new TransformStack();
      id = new IDTransform();
!     HashMap<String, Object> globals = Project.getInstance().getGlobals().environment();
      
      
      globals.put("echo", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          stack.push(env.get(0));
        }
      });
      globals.put("cos", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Double argument = (Double) env.get(0);
          stack.push(new Double(Math.cos(argument.doubleValue())));
***************
*** 446,450 ****
      });
      globals.put("sin", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Double argument = (Double) env.get(0);
          stack.push(new Double(Math.sin(argument.doubleValue())));
--- 447,451 ----
      });
      globals.put("sin", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Double argument = (Double) env.get(0);
          stack.push(new Double(Math.sin(argument.doubleValue())));
***************
*** 452,456 ****
      });
      globals.put("sqrt", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Double argument = (Double) env.get(0);
          stack.push(new Double(Math.sqrt(argument.doubleValue())));
--- 453,457 ----
      });
      globals.put("sqrt", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Double argument = (Double) env.get(0);
          stack.push(new Double(Math.sqrt(argument.doubleValue())));
***************
*** 458,462 ****
      });
      globals.put("length", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          List argument = (List) env.get(0);
          stack.push(new Double(argument.size()));
--- 459,463 ----
      });
      globals.put("length", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          List argument = (List) env.get(0);
          stack.push(new Double(argument.size()));
***************
*** 464,473 ****
      });
      globals.put("push", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          transform.push(id);
        }
      });
      globals.put("pop", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          while (transform.pop() != id) {
            // NOTHING
--- 465,474 ----
      });
      globals.put("push", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          transform.push(id);
        }
      });
      globals.put("pop", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          while (transform.pop() != id) {
            // NOTHING
***************
*** 478,482 ****
      
      globals.put("vertex", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Double x = (Double) env.get(0);
          Double y = (Double) env.get(1);
--- 479,483 ----
      
      globals.put("vertex", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Double x = (Double) env.get(0);
          Double y = (Double) env.get(1);
***************
*** 488,492 ****
      });
      globals.put("edge", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Vertex from = (Vertex) env.get(0);
          Vertex to = (Vertex) env.get(1);
--- 489,493 ----
      });
      globals.put("edge", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Vertex from = (Vertex) env.get(0);
          Vertex to = (Vertex) env.get(1);
***************
*** 496,501 ****
      });
      globals.put("surface", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
!         List edges = new LinkedList();
          for (int i = 0; i < env.length(); i++) {
            Edge current = (Edge) env.get(i);
--- 497,502 ----
      });
      globals.put("surface", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
!         List<Edge> edges = new LinkedList<Edge>();
          for (int i = 0; i < env.length(); i++) {
            Edge current = (Edge) env.get(i);
***************
*** 507,511 ****
      });
      globals.put("front", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Surface surface = (Surface) env.get(0);
          Space space = (Space) env.get(1);
--- 508,512 ----
      });
      globals.put("front", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
          Space space = (Space) env.get(1);
***************
*** 514,518 ****
      });
      globals.put("back", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Surface surface = (Surface) env.get(0);
          Space space = (Space) env.get(1);
--- 515,519 ----
      });
      globals.put("back", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
          Space space = (Space) env.get(1);
***************
*** 521,525 ****
      });
      globals.put("space", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          String name = (String) env.get(0);
          Space result = new Space(name, Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
--- 522,526 ----
      });
      globals.put("space", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          String name = (String) env.get(0);
          Space result = new Space(name, Space.CONSTRUCTION, Space.SPACE_LEVEL, true);
***************
*** 528,532 ****
      });
      globals.put("contour", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Vertex previous = (Vertex) env.get(env.length() - 1);
          for (int i = 0; i < env.length(); i++) {
--- 529,533 ----
      });
      globals.put("contour", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Vertex previous = (Vertex) env.get(env.length() - 1);
          for (int i = 0; i < env.length(); i++) {
***************
*** 538,542 ****
      });
      globals.put("translate", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Double x = (Double) env.get(0);
          Double y = (Double) env.get(1);
--- 539,543 ----
      });
      globals.put("translate", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Double x = (Double) env.get(0);
          Double y = (Double) env.get(1);
***************
*** 548,552 ****
      });
      globals.put("scale", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Double x = (Double) env.get(0);
          Double y = (Double) env.get(1);
--- 549,553 ----
      });
      globals.put("scale", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Double x = (Double) env.get(0);
          Double y = (Double) env.get(1);
***************
*** 558,562 ****
      });
      globals.put("rotate", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Double a = (Double) env.get(0);
          Double x = (Double) env.get(1);
--- 559,563 ----
      });
      globals.put("rotate", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Double a = (Double) env.get(0);
          Double x = (Double) env.get(1);
***************
*** 569,573 ****
      });
      globals.put("extrude", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Surface surface = (Surface) env.get(0);
          Double distance = (Double) env.get(1);
--- 570,574 ----
      });
      globals.put("extrude", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
          Double distance = (Double) env.get(1);
***************
*** 585,589 ****
      
      globals.put("extrudeall", new Builtin() {
!       public void evaluate(Environment env, Stack stack) {
          Surface surface = (Surface) env.get(0);
          Double distance = (Double) env.get(1);
--- 586,590 ----
      
      globals.put("extrudeall", new Builtin() {
!       public void evaluate(Environment env, Stack<Object> stack) {
          Surface surface = (Surface) env.get(0);
          Double distance = (Double) env.get(1);
***************
*** 631,638 ****
          
          Space space = Project.getInstance().getActiveSpace();
!         Collection<Vertex> vertices = new LinkedList();
!         Collection<Edge> edges = new LinkedList();
!         Collection<Surface> surfaces = new LinkedList();
!         Collection<Space> spaces = new LinkedList();
          
          
--- 632,639 ----
          
          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>();
          
          
***************
*** 646,652 ****
              surfaces.add((Surface)result);
            } else if (result instanceof Space) {
!             spaces.add((Space) result);
!             space.add((Space) result);
!             Selection.primary().add(result);
            } else {
              glv.setLengthValue(result.toString());
--- 647,654 ----
              surfaces.add((Surface)result);
            } else if (result instanceof Space) {
!             Space s = (Space) result;
!             spaces.add(s);
!             space.add(s);
!             Selection.primary().add(s);
            } else {
              glv.setLengthValue(result.toString());
***************
*** 701,704 ****
--- 703,707 ----
     * Delete
     */
+   @Override
    public void delete() {
      if (typing) {
***************
*** 713,719 ****
      
      Iterator it = Selection.primary().iterator();
!     List edges = new ArrayList();
!     List vertices = new ArrayList();
!     List surfaces = new ArrayList();
      while (it.hasNext()) {
        Object selected = it.next();
--- 716,722 ----
      
      Iterator it = Selection.primary().iterator();
!     List<Geometric> edges = new ArrayList<Geometric>();
!     List<Geometric> vertices = new ArrayList<Geometric>();
!     List<Geometric> surfaces = new ArrayList<Geometric>();
      while (it.hasNext()) {
        Object selected = it.next();

Index: SelectStrategy.java
===================================================================
RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/SelectStrategy.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SelectStrategy.java	20 Feb 2007 15:16:10 -0000	1.8
--- SelectStrategy.java	14 Apr 2007 15:00:52 -0000	1.9
***************
*** 22,25 ****
--- 22,26 ----
  import net.sourceforge.bprocessor.model.Constructor;
  import net.sourceforge.bprocessor.model.Edge;
+ import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Selection;
***************
*** 136,143 ****
          multipleSelection = true;
        } else if (e.isShiftDown()) {
!         if (!selection.contains(target)) {
!           selection.add(target);
          } else {
!           selection.remove(target);
          }
        } else if (target instanceof GlCamera) {
--- 137,149 ----
          multipleSelection = true;
        } else if (e.isShiftDown()) {
!         if (target instanceof Geometric) {
!           Geometric g = (Geometric)target;
!           if (!selection.contains(g)) {
!             selection.add(g);
!           } else {
!             selection.remove(g);
!           }
          } else {
!           log.error("Tried to insert something different from Geometric in selection");
          }
        } else if (target instanceof GlCamera) {
***************
*** 145,150 ****
          Project.getInstance().setCurrentCamera(glcam.getCamera());
        } else {
!         if (!selection.contains(target)) {
!           selection.retain(target);
          }
        }
--- 151,160 ----
          Project.getInstance().setCurrentCamera(glcam.getCamera());
        } else {
!         if (target instanceof Geometric) {
!           if (!selection.contains(target)) {
!             selection.set((Geometric)target);
!           }
!         } else {
!         	log.warn("Target weren't a Geometric");
          }
        }

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** AbstractTool.java	20 Feb 2007 15:14:10 -0000	1.114
--- AbstractTool.java	14 Apr 2007 15:00:52 -0000	1.115
***************
*** 388,399 ****
     */
    public void mousePressed(MouseEvent e) {
-     if (!e.isPopupTrigger()) {
-       if (e.getButton() == 1) {
-         if (selectMode) {
-           select.pressed(e);
-           return;
-         }
-       }
-     }    
      pressPos[0] = e.getX();
      pressPos[1] = e.getY();
--- 388,391 ----
***************
*** 409,412 ****
--- 401,410 ----
        if (cameraMode) {
          orbit.pressed(e);
+       } else if (selectMode) {
+         if (this instanceof SpaceTool) {
+           pressed(e);
+         } else { 
+           select.pressed(e);
+         }
        } else {
          if (o instanceof Widget) {

[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.29, 1.30

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

Update of /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3173/src/net/sourceforge/bprocessor/gui

Modified Files:
	PopupMenu.java 
Log Message:
altered selection to a generic collection og geometrics which lead to quite alot of changes

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** PopupMenu.java	10 Apr 2007 20:55:25 -0000	1.29
--- PopupMenu.java	14 Apr 2007 15:00:42 -0000	1.30
***************
*** 344,349 ****
        public void actionPerformed(ActionEvent arg0) {
          int size = 0;
!         Collection vertices = Geometry.collect(entities);
!         Collection edges = new LinkedList();
          while (vertices.size() > size) {
            size = vertices.size();
--- 344,349 ----
        public void actionPerformed(ActionEvent arg0) {
          int size = 0;
!         Collection<Vertex> vertices = Geometry.collect(entities);
!         Collection<Edge> edges = new LinkedList<Edge>();
          while (vertices.size() > size) {
            size = vertices.size();
***************
*** 351,361 ****
            vertices = Geometry.collect(edges);
          }
!         Collection surfaces = Edge.surfaces(edges);
!         Collection geometrics = new HashSet();
          geometrics.addAll(surfaces);
          geometrics.addAll(edges);
          geometrics.addAll(vertices);
!         Selection.primary().clear();
!         Selection.primary().addAll(geometrics);
        }
      };
--- 351,360 ----
            vertices = Geometry.collect(edges);
          }
!         Collection<Surface> surfaces = Edge.surfaces(edges);
!         Collection<Geometric> geometrics = new HashSet<Geometric>();
          geometrics.addAll(surfaces);
          geometrics.addAll(edges);
          geometrics.addAll(vertices);
!         Selection.primary().set(geometrics);
        }
      };
***************
*** 464,469 ****
          owner.add(union);
          Project.getInstance().changed(owner);
!         Selection.primary().clear();
!         Selection.primary().add(union);
          Project.getInstance().checkpoint();
        }
--- 463,467 ----
          owner.add(union);
          Project.getInstance().changed(owner);
!         Selection.primary().set(union);
          Project.getInstance().checkpoint();
        }

[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui/attrview LinkAttribute.java, 1.16, 1.17

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

Update of /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/attrview
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3173/src/net/sourceforge/bprocessor/gui/attrview

Modified Files:
	LinkAttribute.java 
Log Message:
altered selection to a generic collection og geometrics which lead to quite alot of changes

Index: LinkAttribute.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/attrview/LinkAttribute.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** LinkAttribute.java	2 Jan 2007 17:47:50 -0000	1.16
--- LinkAttribute.java	14 Apr 2007 15:00:42 -0000	1.17
***************
*** 307,311 ****
      Object object = attribute().getValue();
      if (object instanceof Geometric) {
!       Selection.primary().set(object);
      } else {
        AttributeView.instance().display(object);
--- 307,311 ----
      Object object = attribute().getValue();
      if (object instanceof Geometric) {
!       Selection.primary().set((Geometric)object);
      } else {
        AttributeView.instance().display(object);

[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model Space.java, 1.132, 1.133

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

Update of /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2709/src/net/sourceforge/bprocessor/model

Modified Files:
	Space.java 
Log Message:
needed a way to get space level into a reasonable string

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** Space.java	11 Apr 2007 08:44:58 -0000	1.132
--- Space.java	14 Apr 2007 14:59:34 -0000	1.133
***************
*** 1271,1279 ****
     *   class="net.sourceforge.bprocessor.model.Surface"
     */
!   public Set getEnvelope() {
      if (envelope != null) {
        return envelope;
      } else {
!       return new HashSet();
      }
    }
--- 1271,1279 ----
     *   class="net.sourceforge.bprocessor.model.Surface"
     */
!   public Set<Surface> getEnvelope() {
      if (envelope != null) {
        return envelope;
      } else {
!       return Collections.emptySet();
      }
    }
***************
*** 2753,2755 ****
--- 2753,2784 ----
      return new Mesh(surfaces, edges, vertices);
    }
+ 
+   /**
+    * A method the can convert a level of a space to the string rep for it
+    * @param level2 the level
+    * @return the sting representation
+    */
+   public static String levelToSting(int level2) {
+     String res = "";
+     switch (level2) {
+     case PROJECT_LEVEL:
+       res += "Project";
+       break;
+     case SPACE_LEVEL:
+       res += "Space";
+       break;
+     case ELEMENT_LEVEL:
+       res += "Element";
+       break;
+     case PART_LEVEL:
+       res += "Part";
+       break;
+     case NET_LEVEL:
+       res += "Net";
+       break;
+     default:
+       break;
+     }
+     return res;
+   }
  }

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java, 1.154, 1.155

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3785/src/net/sourceforge/bprocessor/model

Modified Files:
	Surface.java 
Log Message:
replaced use of the "directions" method with dot product of normal in the mergeSpaceAssign method

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -d -r1.154 -r1.155
*** Surface.java	10 Apr 2007 20:53:49 -0000	1.154
--- Surface.java	11 Apr 2007 12:17:32 -0000	1.155
***************
*** 2037,2043 ****
        }
      }
!     
!     if (onto.direction(Project.getInstance().getActiveCoordinateSystem()) == 
!       sur1.direction(Project.getInstance().getActiveCoordinateSystem())) {
        onto.setFrontDomain(front);
        onto.setBackDomain(back);
--- 2037,2042 ----
        }
      }
!     Vertex nOnto = onto.normal();
!     if (nOnto.dot(n1) > 0) {
        onto.setFrontDomain(front);
        onto.setBackDomain(back);

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Classification.java, 1.10, 1.11

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2199/src/net/sourceforge/bprocessor/model

Modified Files:
	Classification.java 
Log Message:
removed if's with dublicated code in if and else. removed use of .toString on string objects.

Index: Classification.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Classification.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Classification.java	29 Mar 2007 21:57:49 -0000	1.10
--- Classification.java	11 Apr 2007 12:13:20 -0000	1.11
***************
*** 168,172 ****
    public String getFullId(Space cur) {
      Space current = cur;
!     String fullId = id.toString();
      if (current != null && current.getTypeClassification() != null) {
        if (!("" + fullId.charAt(0)).equalsIgnoreCase("-")) {
--- 168,172 ----
    public String getFullId(Space cur) {
      Space current = cur;
!     String fullId = id;
      if (current != null && current.getTypeClassification() != null) {
        if (!("" + fullId.charAt(0)).equalsIgnoreCase("-")) {
***************
*** 184,195 ****
        if (cur != null && cur.getOwner().getLevel() != 2) {
          current = cur.getOwner();
!         if (current.getClassification() == par) {
!           if (current.getTypeClassification() != null) {
!             fullId = current.getClassification().getFullId(current) + "." + fullId; 
!           } else {
!             fullId = current.getClassification().getFullId(current) + "." + fullId;
!           }
            par = par.getParent();
-           current = current.getOwner();
          } else {
            fullId = current.getClassification().getFullId(current) + "." + fullId;
--- 184,190 ----
        if (cur != null && cur.getOwner().getLevel() != 2) {
          current = cur.getOwner();
!         if (current.getClassification() == par) {   
!           fullId = current.getClassification().getFullId(current) + "." + fullId; 
            par = par.getParent();
          } else {
            fullId = current.getClassification().getFullId(current) + "." + fullId;

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Plane.java, 1.28, 1.29

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3001/src/net/sourceforge/bprocessor/model

Modified Files:
	Plane.java 
Log Message:
removed unread assignment.

Index: Plane.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Plane.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Plane.java	2 Jan 2007 17:48:58 -0000	1.28
--- Plane.java	11 Apr 2007 12:15:15 -0000	1.29
***************
*** 260,264 ****
      if (Math.abs(c) > coefficient) {
        result = Z;
-       coefficient = Math.abs(c);
      }
      
--- 260,263 ----

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.63, 1.64

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4666/src/net/sourceforge/bprocessor/gui

Modified Files:
	GUI.java 
Log Message:
Made createMenus private again.

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** GUI.java	11 Apr 2007 12:15:17 -0000	1.63
--- GUI.java	11 Apr 2007 12:20:08 -0000	1.64
***************
*** 155,159 ****
     * Create menus
     */
!   public void createMenus() {
      Menu menu = Menu.getInstance();
      menu.setMainWindow(this);
--- 155,159 ----
     * Create menus
     */
!   private void createMenus() {
      Menu menu = Menu.getInstance();
      menu.setMainWindow(this);

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model ParameterBlock.java, 1.6, 1.7 Mesh.java, 1.15, 1.16 Persistence.java, 1.35, 1.36 Description.java, 1.1, 1.2 CoordinateSystem.java, 1.48, 1.49

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4614/src/net/sourceforge/bprocessor/model

Modified Files:
	ParameterBlock.java Mesh.java Persistence.java 
	Description.java CoordinateSystem.java 
Log Message:
replaced usage of new Long objects with use of the Long.valueOf method, which should be better practise, and allow for chaching.

Index: CoordinateSystem.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** CoordinateSystem.java	27 Mar 2007 17:18:11 -0000	1.48
--- CoordinateSystem.java	11 Apr 2007 12:19:41 -0000	1.49
***************
*** 165,170 ****
     */
    public void add(Relation relation) {
!     relations.add(relation);
!     relation.setId(new Long(relations.size() + 1));
    }
    
--- 165,170 ----
     */
    public void add(Relation relation) {
!     relations.add(relation);  
!     relation.setId(Long.valueOf(relations.size() + 1));
    }
    

Index: Persistence.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Persistence.java	13 Mar 2007 09:56:50 -0000	1.35
--- Persistence.java	11 Apr 2007 12:19:41 -0000	1.36
***************
*** 648,652 ****
        return null;
      } else {
!       return map.get(new Long(id));
      }
    }
--- 648,652 ----
        return null;
      } else {
!       return map.get(Long.valueOf(id));
      }
    }
***************
*** 1216,1220 ****
      while (iter.hasNext()) {
        Object current = iter.next();
!       ids.add(new Long(id(map, current)));
      }
      return ids;
--- 1216,1220 ----
      while (iter.hasNext()) {
        Object current = iter.next();
!       ids.add(Long.valueOf(id(map, current)));
      }
      return ids;
***************
*** 1374,1378 ****
      while (iter.hasNext()) {
        long l = id(map, iter.next());
!       xml.getConnected().add(new Long(l));
      }
      
--- 1374,1378 ----
      while (iter.hasNext()) {
        long l = id(map, iter.next());
!       xml.getConnected().add(Long.valueOf(l));
      }
      

Index: Mesh.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Mesh.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Mesh.java	27 Mar 2007 08:47:11 -0000	1.15
--- Mesh.java	11 Apr 2007 12:19:41 -0000	1.16
***************
*** 72,76 ****
      for (Edge current : edges) {
        if (current.id == null) {
!         current.setId(new Long(count++));
        }
      }
--- 72,76 ----
      for (Edge current : edges) {
        if (current.id == null) {
!         current.setId(Long.valueOf(count++));
        }
      }
***************
*** 78,82 ****
      for (Vertex current : vertices) {
        if (current.id == null) {
!         current.setId(new Long(count++));
        }
      }
--- 78,82 ----
      for (Vertex current : vertices) {
        if (current.id == null) {
!         current.setId(Long.valueOf(count++));
        }
      }

Index: Description.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Description.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Description.java	28 Feb 2006 02:26:25 -0000	1.1
--- Description.java	11 Apr 2007 12:19:41 -0000	1.2
***************
*** 27,31 ****
     */
    public String toString() {
!     return description.toString();
    }
  }
--- 27,31 ----
     */
    public String toString() {
!     return description;
    }
  }

Index: ParameterBlock.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ParameterBlock.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ParameterBlock.java	13 Mar 2007 10:10:23 -0000	1.6
--- ParameterBlock.java	11 Apr 2007 12:19:41 -0000	1.7
***************
*** 81,85 ****
    public void add(Attribute attribute) {
      parameters.add(attribute);
!     attribute.setId(new Long(parameters.size() + 1));
    }
    
--- 81,85 ----
    public void add(Attribute attribute) {
      parameters.add(attribute);
!     attribute.setId(Long.valueOf(parameters.size() + 1));
    }
    

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.62, 1.63

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3017/src/net/sourceforge/bprocessor/gui

Modified Files:
	GUI.java 
Log Message:
made createMenues public

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** GUI.java	11 Apr 2007 09:09:28 -0000	1.62
--- GUI.java	11 Apr 2007 12:15:17 -0000	1.63
***************
*** 155,159 ****
     * Create menus
     */
!   private void createMenus() {
      Menu menu = Menu.getInstance();
      menu.setMainWindow(this);
--- 155,159 ----
     * Create menus
     */
!   public void createMenus() {
      Menu menu = Menu.getInstance();
      menu.setMainWindow(this);

[Bprocessor-commit] /tools/checkstyle checkstyle.xml,1.7,1.8

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

Update of /cvsroot/bprocessor//tools/checkstyle
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27266/checkstyle

Modified Files:
	checkstyle.xml 
Log Message:
yet a woops forgot to commit checkstyle to accept wildcard without enclosing spaces

Index: checkstyle.xml
===================================================================
RCS file: /cvsroot/bprocessor//tools/checkstyle/checkstyle.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** checkstyle.xml	14 Jan 2007 23:33:32 -0000	1.7
--- checkstyle.xml	11 Apr 2007 09:11:16 -0000	1.8
***************
*** 59,64 ****
        LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, 
        LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, 
!       NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, 
!       SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
      </module>
  
--- 59,64 ----
        LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, 
        LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, 
!       NOT_EQUAL, PLUS, PLUS_ASSIGN, RCURLY, SL, SLIST, SL_ASSIGN, SR, 
!       SR_ASSIGN, STAR, STAR_ASSIGN, QUESTION, TYPE_EXTENSION_AND"/>
      </module>
  

[Bprocessor-commit] /bprocessor/src/net/sourceforge/bprocessor Application.java, 1.3, 1.4

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

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

Modified Files:
	Application.java 
Log Message:
ups, compile error, moved construction to the GUI class itself instead (think it is nicer)

Index: Application.java
===================================================================
RCS file: /cvsroot/bprocessor//bprocessor/src/net/sourceforge/bprocessor/Application.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Application.java	8 Sep 2006 13:22:38 -0000	1.3
--- Application.java	11 Apr 2007 09:09:31 -0000	1.4
***************
*** 21,27 ****
      }
      GUI gui = new GUI();
-     gui.createMenus();
-     gui.createMainView();
-     gui.start();
      GLView gl = new GLView();
      FacadeMain fm = new FacadeMain();
--- 21,24 ----

[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.61, 1.62

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

Update of /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26430/src/net/sourceforge/bprocessor/gui

Modified Files:
	GUI.java 
Log Message:
ups, compile error, moved construction to the GUI class itself instead (think it is nicer)

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** GUI.java	10 Apr 2007 21:02:37 -0000	1.61
--- GUI.java	11 Apr 2007 09:09:28 -0000	1.62
***************
*** 115,119 ****
      setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
      instance = this;
!     
      /**
       * FIXME there have to be some kind of thread lock on 
--- 115,121 ----
      setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
      instance = this;
!     createMenus();
!     createMainView();
!     start();
      /**
       * FIXME there have to be some kind of thread lock on 

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Edge.java, 1.81, 1.82 Space.java, 1.131, 1.132 Entity.java, 1.15, 1.16

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16357/src/net/sourceforge/bprocessor/model

Modified Files:
	Edge.java Space.java Entity.java 
Log Message:
Fixed error in geometry insertion that caused empty edges to be inserted

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** Space.java	10 Apr 2007 20:53:16 -0000	1.131
--- Space.java	11 Apr 2007 08:44:58 -0000	1.132
***************
*** 2730,2734 ****
      }
      for (Edge edge : mesh.edges()) {
!       edges.add(insert(edge));
      }
      for (Surface surface : mesh.surfaces()) {
--- 2730,2742 ----
      }
      for (Edge edge : mesh.edges()) {
!       try {
!         edge.check();
!         edges.add(insert(edge)); 
!       } catch (Exception e) {
!         System.out.println("inconsistent: " + edge);
!         System.out.println("   " + edge.getFrom());
!         System.out.println("   " + edge.getTo());
!       }
!       
      }
      for (Surface surface : mesh.surfaces()) {
***************
*** 2740,2743 ****
--- 2748,2752 ----
        }
      }
+     
      SurfaceAnalysis analysis = new SurfaceAnalysis();
      surfaces.addAll(analysis.surfaceAnalysis(this, edges));

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** Edge.java	10 Apr 2007 07:56:01 -0000	1.81
--- Edge.java	11 Apr 2007 08:44:58 -0000	1.82
***************
*** 515,522 ****
--- 515,531 ----
      Vertex p0 = getFrom();
      Vertex p1 = getTo();
+     
+     if (p0.equalEps(vertex)) {
+       return false;
+     }
+     if (p1.equalEps(vertex)) {
+       return false;
+     }
+     
      Vertex r = p1.minus(p0);
      Vertex q = vertex;
      double t = 0.0;
      
+     
      if (Math.abs(r.getX()) > 0.0000001) {
        t = (q.getX() - p0.getX()) / r.getX();
***************
*** 1079,1096 ****
    /**
     * Check consistency
     * @return true if ok
     */
!   public boolean check() {
      if (from == null) {
!       throw new Error("from null");
      }
      if (to == null) {
!       throw new Error ("to null");
      }
      if (from == to) {
!       throw new Error ("from == to");
      }
      if (from.equalEps(to)) {
!       throw new Error ("from overlaps to");
      }
      return true;
--- 1088,1106 ----
    /**
     * Check consistency
+    * @throws Exception when not consistent
     * @return true if ok
     */
!   public boolean check() throws Exception {
      if (from == null) {
!       throw new Exception("from null");
      }
      if (to == null) {
!       throw new Exception ("to null");
      }
      if (from == to) {
!       throw new Exception ("from == to");
      }
      if (from.equalEps(to)) {
!       throw new Exception ("from overlaps to");
      }
      return true;

Index: Entity.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Entity.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Entity.java	10 Apr 2007 20:54:26 -0000	1.15
--- Entity.java	11 Apr 2007 08:44:58 -0000	1.16
***************
*** 67,71 ****
     * @param entities List of entities to be sorted
     */
!   public static void sort(List<?> entities) {
      final Comparator<Object> comparator = 
        new Comparator<Object>() {
--- 67,71 ----
     * @param entities List of entities to be sorted
     */
!   public static void sort(List< ? > entities) {
      final Comparator<Object> comparator = 
        new Comparator<Object>() {

[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.60, 1.61

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

Update of /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29126/src/net/sourceforge/bprocessor/gui

Modified Files:
	GUI.java 
Log Message:
added modellor submenu to the menu

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** GUI.java	29 Mar 2007 22:02:37 -0000	1.60
--- GUI.java	10 Apr 2007 21:02:37 -0000	1.61
***************
*** 22,25 ****
--- 22,26 ----
  import net.sourceforge.bprocessor.gui.actions.FileSaveActionListener;
  import net.sourceforge.bprocessor.gui.actions.FileSaveAsActionListener;
+ import net.sourceforge.bprocessor.gui.actions.ModellorMenuAction;
  import net.sourceforge.bprocessor.gui.actions.ToolsEnergyActionListener;
  import net.sourceforge.bprocessor.gui.attrview.AttributeView;
***************
*** 37,40 ****
--- 38,42 ----
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
+ import net.sourceforge.bprocessor.model.modellor.Modellor;
  
  import java.util.Collection;
***************
*** 63,66 ****
--- 65,70 ----
  import javax.swing.JPopupMenu;
  import javax.swing.KeyStroke;
+ import javax.swing.event.MenuEvent;
+ import javax.swing.event.MenuListener;
  
  import org.apache.log4j.Logger;
***************
*** 149,153 ****
     * Create menus
     */
!   public void createMenus() {
      Menu menu = Menu.getInstance();
      menu.setMainWindow(this);
--- 153,157 ----
     * Create menus
     */
!   private void createMenus() {
      Menu menu = Menu.getInstance();
      menu.setMainWindow(this);
***************
*** 156,231 ****
  
      // File menu
!     JMenu file = new JMenu("File");
!     file.setMnemonic(KeyEvent.VK_F);
  
!     JMenuItem fileNew = new JMenuItem("New");
!     fileNew.addActionListener(new FileNewActionListener());
!     fileNew.setMnemonic(KeyEvent.VK_N);
!     fileNew.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileNew.setEnabled(true);
!     file.add(fileNew);
  
!     JMenuItem fileLoad = new JMenuItem("Open");
!     fileLoad.addActionListener(new FileLoadActionListener());
!     fileLoad.setMnemonic(KeyEvent.VK_L);
!     fileLoad.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileLoad.setEnabled(true);
!     file.add(fileLoad);
!     
!     file.addSeparator();
!     
!     JMenuItem fileClose = new JMenuItem("Close");
!     fileClose.addActionListener(new FileCloseActionListener());
!     fileClose.setMnemonic(KeyEvent.VK_C);
!     fileClose.setEnabled(true);
!     file.add(fileClose);
!     
!     JMenuItem fileSave = new JMenuItem("Save");
!     fileSave.addActionListener(new FileSaveActionListener());
!     fileSave.setMnemonic(KeyEvent.VK_S);
!     fileSave.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileSave.setEnabled(true);
!     file.add(fileSave);
      
!     JMenuItem fileSaveAs = new JMenuItem("Save As");
!     fileSaveAs.addActionListener(new FileSaveAsActionListener());
!     fileSaveAs.setMnemonic(KeyEvent.VK_A);
!     fileSaveAs.setEnabled(true);
!     file.add(fileSaveAs);
      
!     file.addSeparator();
  
!     JMenuItem fileImport = new JMenuItem("Import");
!     fileImport.addActionListener(new FileImportActionListener());
!     fileImport.setMnemonic(KeyEvent.VK_I);
!     fileImport.setEnabled(true);
!     file.add(fileImport);
  
!     JMenuItem fileExport = new JMenuItem("Export");
!     fileExport.addActionListener(new FileExportActionListener());
!     fileExport.setMnemonic(KeyEvent.VK_E);
!     fileExport.setEnabled(false);
!     file.add(fileExport);
  
!     file.addSeparator();
  
!     JMenuItem fileProperties = new JMenuItem("Properties");
!     fileProperties.setMnemonic(KeyEvent.VK_P);
!     fileProperties.addActionListener(new FilePropertiesActionListener());
!     file.add(fileProperties);
  
!     file.addSeparator();
  
!     JMenuItem fileExit = new JMenuItem("Exit");
!     fileExit.addActionListener(new FileExitActionListener());
!     fileExit.setMnemonic(KeyEvent.VK_X);
!     file.add(fileExit);
  
!     menu.registerMenu(file);
  
!     // Edit menu REMEMBER TO CHANGE EditMenuListener WHEN CHANGING CONTENT OF edit
      JMenu edit = new JMenu("Edit");
      edit.setMnemonic(KeyEvent.VK_E);
--- 160,292 ----
  
      // File menu
!     JMenu file = createFileMenu();
!     menu.registerMenu(file);
  
!     // Edit menu REMEMBER TO CHANGE EditMenuListener WHEN CHANGING CONTENT OF edit
!     JMenu edit = createEditMenu();
!     menu.registerMenu(edit);
  
!     // Create menu
!     JMenu create = createCreateMenu();
      
!     /*JMenuItem createElement = new JMenuItem("Element");
!     createElement.setMnemonic(KeyEvent.VK_E);
!     createElement.setEnabled(false);
!     create.add(createElement);
! 
!     JMenuItem createPart = new JMenuItem("Part");
!     createPart.setMnemonic(KeyEvent.VK_P);
!     createPart.setEnabled(false);
!     create.add(createPart);
! 
!     JMenuItem createSurface = new JMenuItem("Surface");
!     createSurface.setMnemonic(KeyEvent.VK_S);
!     createSurface.addActionListener(new CreateSurfaceActionListener());
!     createSurface.setEnabled(false);
!     create.add(createSurface);*/
! 
!     menu.registerMenu(create);
! 
!     // Tools menu
!     JMenu tools = new JMenu("Tools");
!     tools.setMnemonic(KeyEvent.VK_T);
      
!     JMenuItem toolsEnergy = new JMenuItem("Energy calc");
!     toolsEnergy.setMnemonic(KeyEvent.VK_T);
!     toolsEnergy.addActionListener(new ToolsEnergyActionListener());
!     tools.add(toolsEnergy);
!    
!     menu.registerMenu(tools);
  
!     // Plugin menu
!     JMenu plugin = new JMenu("Plugin");
!     plugin.setMnemonic(KeyEvent.VK_P);
  
!     menu.registerMenu(plugin);
  
!     // Help menu
!     JMenu help = new JMenu("Help");
!     help.setMnemonic(KeyEvent.VK_H);
  
!     JMenuItem helpHandbook = new JMenuItem("Handbook");
!     helpHandbook.setMnemonic(KeyEvent.VK_H);
!     helpHandbook.setEnabled(false);
!     help.add(helpHandbook);
  
!     JMenuItem helpWhat = new JMenuItem("What is this?");
!     helpWhat.setMnemonic(KeyEvent.VK_W);
!     helpWhat.setEnabled(false);
!     help.add(helpWhat);
  
!     help.addSeparator();
  
!     JMenuItem helpTip = new JMenuItem("Tip of the day");
!     helpTip.setMnemonic(KeyEvent.VK_T);
!     helpTip.setEnabled(false);
!     help.add(helpTip);
  
!     help.addSeparator();
! 
!     JMenuItem helpAbout = new JMenuItem("About");
!     helpAbout.addActionListener(new AboutActionListener());
!     helpAbout.setMnemonic(KeyEvent.VK_A);
!     help.add(helpAbout);
! 
!     menu.registerMenu(help);
!   }
! 
!   private JMenu createCreateMenu() {
!     JMenu create = new JMenu("Create");
!     create.setMnemonic(KeyEvent.VK_C);
! 
!     JMenuItem createConstructor = new JMenuItem("Constructor");
!     createConstructor.setMnemonic(KeyEvent.VK_N);
!     createConstructor.addActionListener(new CreateConstructorActionListener());
!     createConstructor.setEnabled(false);
!     create.add(createConstructor);
! 
!     JMenuItem createFunctionalSpace = new JMenuItem("Functional Space");
!     createFunctionalSpace.setMnemonic(KeyEvent.VK_F);
!     createFunctionalSpace.addActionListener(new CreateFunctionalSpaceActionListener());
!     create.add(createFunctionalSpace);
! 
!     JMenuItem createConstructionSpace = new JMenuItem("Construction Space");
!     createConstructionSpace.setMnemonic(KeyEvent.VK_O);
!     createConstructionSpace.addActionListener(new CreateConstructionSpaceActionListener());
!     create.add(createConstructionSpace);
!     
!     JMenuItem createNet = new JMenuItem("B-net");
!     createNet.setMnemonic(KeyEvent.VK_N);
!     createNet.addActionListener(new CreateNetActionListener());
!     create.add(createNet);
! 
!     JMenu modellorSubmenu = new JMenu("Modellors");
!     modellorSubmenu.setMnemonic(KeyEvent.VK_M);
!     modellorSubmenu.addMenuListener(new MenuListener() {
!       public void menuCanceled(MenuEvent e) {
!       }
! 
!       public void menuDeselected(MenuEvent e) {
!       }
! 
!       public void menuSelected(MenuEvent e) {
!         JMenu jm = (JMenu)e.getSource();
!         jm.removeAll();
!         Space s = Project.getInstance().getActiveSpace();
!         int level = s.getLevel();
!         for (Modellor m : Modellor.getRegisteredModellors()) {
!           JMenuItem mod = new JMenuItem(m.getName());
!           if (level == m.getUseableLevel()) {
!             mod.addActionListener(new ModellorMenuAction(s, m));
!             jm.add(mod);
!           }
!         }
!       }
!     });
!     create.add(modellorSubmenu);
!     return create;
!   }
! 
!   private JMenu createEditMenu() {
      JMenu edit = new JMenu("Edit");
      edit.setMnemonic(KeyEvent.VK_E);
***************
*** 356,449 ****
      edit.add(repaintTree);
      Selection.primary().addObserver(new EditMenuListener(edit));
!     menu.registerMenu(edit);
! 
!     // Create menu
!     JMenu create = new JMenu("Create");
!     create.setMnemonic(KeyEvent.VK_C);
  
!     JMenuItem createConstructor = new JMenuItem("Constructor");
!     createConstructor.setMnemonic(KeyEvent.VK_N);
!     createConstructor.addActionListener(new CreateConstructorActionListener());
!     createConstructor.setEnabled(false);
!     create.add(createConstructor);
  
!     JMenuItem createFunctionalSpace = new JMenuItem("Functional Space");
!     createFunctionalSpace.setMnemonic(KeyEvent.VK_F);
!     createFunctionalSpace.addActionListener(new CreateFunctionalSpaceActionListener());
!     create.add(createFunctionalSpace);
  
!     JMenuItem createConstructionSpace = new JMenuItem("Construction Space");
!     createConstructionSpace.setMnemonic(KeyEvent.VK_O);
!     createConstructionSpace.addActionListener(new CreateConstructionSpaceActionListener());
!     create.add(createConstructionSpace);
      
!     JMenuItem createNet = new JMenuItem("B-net");
!     createNet.addActionListener(new CreateNetActionListener());
!     create.add(createNet);
! 
!     /*JMenuItem createElement = new JMenuItem("Element");
!     createElement.setMnemonic(KeyEvent.VK_E);
!     createElement.setEnabled(false);
!     create.add(createElement);
! 
!     JMenuItem createPart = new JMenuItem("Part");
!     createPart.setMnemonic(KeyEvent.VK_P);
!     createPart.setEnabled(false);
!     create.add(createPart);
! 
!     JMenuItem createSurface = new JMenuItem("Surface");
!     createSurface.setMnemonic(KeyEvent.VK_S);
!     createSurface.addActionListener(new CreateSurfaceActionListener());
!     createSurface.setEnabled(false);
!     create.add(createSurface);*/
! 
!     menu.registerMenu(create);
! 
!     // Tools menu
!     JMenu tools = new JMenu("Tools");
!     tools.setMnemonic(KeyEvent.VK_T);
      
!     JMenuItem toolsEnergy = new JMenuItem("Energy calc");
!     toolsEnergy.setMnemonic(KeyEvent.VK_T);
!     toolsEnergy.addActionListener(new ToolsEnergyActionListener());
!     tools.add(toolsEnergy);
!    
!     menu.registerMenu(tools);
! 
!     // Plugin menu
!     JMenu plugin = new JMenu("Plugin");
!     plugin.setMnemonic(KeyEvent.VK_P);
! 
!     menu.registerMenu(plugin);
! 
!     // Help menu
!     JMenu help = new JMenu("Help");
!     help.setMnemonic(KeyEvent.VK_H);
! 
!     JMenuItem helpHandbook = new JMenuItem("Handbook");
!     helpHandbook.setMnemonic(KeyEvent.VK_H);
!     helpHandbook.setEnabled(false);
!     help.add(helpHandbook);
  
!     JMenuItem helpWhat = new JMenuItem("What is this?");
!     helpWhat.setMnemonic(KeyEvent.VK_W);
!     helpWhat.setEnabled(false);
!     help.add(helpWhat);
  
!     help.addSeparator();
  
!     JMenuItem helpTip = new JMenuItem("Tip of the day");
!     helpTip.setMnemonic(KeyEvent.VK_T);
!     helpTip.setEnabled(false);
!     help.add(helpTip);
  
!     help.addSeparator();
  
!     JMenuItem helpAbout = new JMenuItem("About");
!     helpAbout.addActionListener(new AboutActionListener());
!     helpAbout.setMnemonic(KeyEvent.VK_A);
!     help.add(helpAbout);
  
!     menu.registerMenu(help);
    }
    
--- 417,493 ----
      edit.add(repaintTree);
      Selection.primary().addObserver(new EditMenuListener(edit));
!     return edit;
!   }
  
!   private JMenu createFileMenu() {
!     JMenu file = new JMenu("File");
!     file.setMnemonic(KeyEvent.VK_F);
  
!     JMenuItem fileNew = new JMenuItem("New");
!     fileNew.addActionListener(new FileNewActionListener());
!     fileNew.setMnemonic(KeyEvent.VK_N);
!     fileNew.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileNew.setEnabled(true);
!     file.add(fileNew);
  
!     JMenuItem fileLoad = new JMenuItem("Open");
!     fileLoad.addActionListener(new FileLoadActionListener());
!     fileLoad.setMnemonic(KeyEvent.VK_L);
!     fileLoad.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileLoad.setEnabled(true);
!     file.add(fileLoad);
      
!     file.addSeparator();
      
!     JMenuItem fileClose = new JMenuItem("Close");
!     fileClose.addActionListener(new FileCloseActionListener());
!     fileClose.setMnemonic(KeyEvent.VK_C);
!     fileClose.setEnabled(true);
!     file.add(fileClose);
!     
!     JMenuItem fileSave = new JMenuItem("Save");
!     fileSave.addActionListener(new FileSaveActionListener());
!     fileSave.setMnemonic(KeyEvent.VK_S);
!     fileSave.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,
!         Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
!     fileSave.setEnabled(true);
!     file.add(fileSave);
!     
!     JMenuItem fileSaveAs = new JMenuItem("Save As");
!     fileSaveAs.addActionListener(new FileSaveAsActionListener());
!     fileSaveAs.setMnemonic(KeyEvent.VK_A);
!     fileSaveAs.setEnabled(true);
!     file.add(fileSaveAs);
!     
!     file.addSeparator();
  
!     JMenuItem fileImport = new JMenuItem("Import");
!     fileImport.addActionListener(new FileImportActionListener());
!     fileImport.setMnemonic(KeyEvent.VK_I);
!     fileImport.setEnabled(true);
!     file.add(fileImport);
  
!     JMenuItem fileExport = new JMenuItem("Export");
!     fileExport.addActionListener(new FileExportActionListener());
!     fileExport.setMnemonic(KeyEvent.VK_E);
!     fileExport.setEnabled(false);
!     file.add(fileExport);
  
!     file.addSeparator();
  
!     JMenuItem fileProperties = new JMenuItem("Properties");
!     fileProperties.setMnemonic(KeyEvent.VK_P);
!     fileProperties.addActionListener(new FilePropertiesActionListener());
!     file.add(fileProperties);
  
!     file.addSeparator();
  
!     JMenuItem fileExit = new JMenuItem("Exit");
!     fileExit.addActionListener(new FileExitActionListener());
!     fileExit.setMnemonic(KeyEvent.VK_X);
!     file.add(fileExit);
!     return file;
    }
    

[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui/actions ModellorMenuAction.java, 1.1, 1.2

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

Update of /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/actions
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28385/src/net/sourceforge/bprocessor/gui/actions

Modified Files:
	ModellorMenuAction.java 
Log Message:
moved the action to from popupmenu to this class

Index: ModellorMenuAction.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/actions/ModellorMenuAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ModellorMenuAction.java	26 Sep 2006 09:50:54 -0000	1.1
--- ModellorMenuAction.java	10 Apr 2007 21:01:10 -0000	1.2
***************
*** 7,12 ****
--- 7,17 ----
  package net.sourceforge.bprocessor.gui.actions;
  
+ import java.awt.event.ActionEvent;
+ 
  import javax.swing.AbstractAction;
+ import javax.swing.JOptionPane;
  
+ import net.sourceforge.bprocessor.gui.attrview.AttributeView;
+ import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
***************
*** 16,20 ****
   * Actions for a entity
   */
! public abstract class ModellorMenuAction extends AbstractAction {
    /** The space */
    protected Space space;
--- 21,28 ----
   * Actions for a entity
   */
! public class ModellorMenuAction extends AbstractAction {
!   /** */
!   private static final long serialVersionUID = 1L;
! 
    /** The space */
    protected Space space;
***************
*** 33,35 ****
--- 41,62 ----
      this.modellor = m;
    }
+   
+   /**
+    * The action when the menu point is selected
+    * @param e The actionEvent
+    */
+   public void actionPerformed(ActionEvent e) {
+     Modellor created = modellor.newInstance(space);
+     if (created != null) {
+       space.setModellor(created);
+       AttributeView.instance().display(created);
+       space.changed();
+       Project.getInstance().checkpoint();
+     } else {
+       JOptionPane.showMessageDialog(
+           null,
+           "The chosen space havn't been assigned to any surface", 
+           "No envolope surface error", JOptionPane.ERROR_MESSAGE);
+     }
+   }
  }  

[Bprocessor-commit] /facade/src/net/sourceforge/bprocessor/facade/modellor NetFacadeModellor.java, 1.25, 1.26 FacadeModellor.java, 1.30, 1.31 WindowModellor.java, 1.15, NONE ModelBathModellor.java, 1.1, NONE

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

Update of /cvsroot/bprocessor//facade/src/net/sourceforge/bprocessor/facade/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27415/src/net/sourceforge/bprocessor/facade/modellor

Modified Files:
	NetFacadeModellor.java FacadeModellor.java 
Removed Files:
	WindowModellor.java ModelBathModellor.java 
Log Message:
moved modellors not regarding Facade to the Modellor Package

Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor//facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** NetFacadeModellor.java	30 Mar 2007 11:11:47 -0000	1.25
--- NetFacadeModellor.java	10 Apr 2007 20:59:05 -0000	1.26
***************
*** 781,784 ****
--- 781,790 ----
    }
    
+   /** {@inheritDoc} */
+   @Override
+   public int getUseableLevel() {
+     return Space.SPACE_LEVEL;
+   }
+ 
    /** 
     * Generates a frame based an a surface descibing a cut of the frame

--- WindowModellor.java DELETED ---

--- ModelBathModellor.java DELETED ---

Index: FacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor//facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** FacadeModellor.java	2 Jan 2007 17:47:05 -0000	1.30
--- FacadeModellor.java	10 Apr 2007 20:59:05 -0000	1.31
***************
*** 834,836 ****
--- 834,842 ----
      this.horPosts = horPosts;
    }
+ 
+   /** {@inheritDoc} */
+   @Override
+   public int getUseableLevel() {
+     return Space.SPACE_LEVEL;
+   }
  }

[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model Cylinder.java, 1.2, NONE

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

Update of /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27279/src/net/sourceforge/bprocessor/model

Removed Files:
	Cylinder.java 
Log Message:
moved modellors not regarding Facade to the Modellor Package

--- Cylinder.java DELETED ---

[Bprocessor-commit] /facade/src/net/sourceforge/bprocessor/facade FacadeMain.java, 1.6, 1.7

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

Update of /cvsroot/bprocessor//facade/src/net/sourceforge/bprocessor/facade
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27415/src/net/sourceforge/bprocessor/facade

Modified Files:
	FacadeMain.java 
Log Message:
moved modellors not regarding Facade to the Modellor Package

Index: FacadeMain.java
===================================================================
RCS file: /cvsroot/bprocessor//facade/src/net/sourceforge/bprocessor/facade/FacadeMain.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FacadeMain.java	28 Mar 2007 21:33:27 -0000	1.6
--- FacadeMain.java	10 Apr 2007 20:59:06 -0000	1.7
***************
*** 8,13 ****
  
  import net.sourceforge.bprocessor.facade.modellor.FacadeModellor;
- import net.sourceforge.bprocessor.facade.modellor.ModelBathModellor;
  import net.sourceforge.bprocessor.facade.modellor.NetFacadeModellor;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
  
--- 8,13 ----
  
  import net.sourceforge.bprocessor.facade.modellor.FacadeModellor;
  import net.sourceforge.bprocessor.facade.modellor.NetFacadeModellor;
+ import net.sourceforge.bprocessor.model.modellor.ModelBathModellor;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
  

[Bprocessor-commit] /model/src/net/sourceforge/bprocessor/model/modellor TileModellor.java, NONE, 1.1 WindowModellor.java, NONE, 1.1 Cylinder.java, NONE, 1.1 ModelBathModellor.java, NONE, 1.1 Modellor.java, 1.6, 1.7 LayerModellor.java, 1.10, 1.11

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

Update of /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27279/src/net/sourceforge/bprocessor/model/modellor

Modified Files:
	Modellor.java LayerModellor.java 
Added Files:
	TileModellor.java WindowModellor.java Cylinder.java 
	ModelBathModellor.java 
Log Message:
moved modellors not regarding Facade to the Modellor Package

--- NEW FILE: ModelBathModellor.java ---
//---------------------------------------------------------------------------------
// $Id: ModelBathModellor.java,v 1.1 2007/04/10 20:59:01 rimestad Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------
package net.sourceforge.bprocessor.model.modellor;

import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;

import net.sourceforge.bprocessor.model.Attribute;
import net.sourceforge.bprocessor.model.Edge;
import net.sourceforge.bprocessor.model.Geometry;
import net.sourceforge.bprocessor.model.Space;
import net.sourceforge.bprocessor.model.Surface;
import net.sourceforge.bprocessor.model.Vertex;

import org.apache.log4j.Logger;

/** A modellor to make windows */
public class ModelBathModellor extends Modellor {
  /** Id */
  private static final long serialVersionUID = 1L;
  
  /** The logger */
  private static Logger log = Logger.getLogger(ModelBathModellor.class);

  private Space space;
  
  private Surface bottom;

  private Surface top;
  
  private double shaftOffset;
  
  private double length;
  
  private double width;
  
  private double height;

  private double floorThickness = 55;

  private double wallThickness = 55;

  private double ceilingThickness = 55;
  /**
   * the constructor
   */
  public ModelBathModellor() {
    super();
    shaftOffset = 100;
  }
  
  /**
   * the constructor
   * @param s the Space to realize the modellor in
   */
  public ModelBathModellor(Space s) {
    this();
    space = s;
    bottom = null;
    Collection<Surface> vertical = new HashSet<Surface>();
    Collection<Surface> horizontal = new HashSet<Surface>();
    Collection<Surface> surs = s.getEnvelope();
    if (surs.size() != 6) {
      log.info("Have to be a square box with 6 sides 4 vertical and 2 horizontal");
      return;
    }
    Vertex up = new Vertex(0, 0, 1);
    for (Surface sur : surs) {
      double dot = (sur.normal()).dot(up);
      if (Math.abs(dot) - 1 < 0.001) {
        horizontal.add(sur);
      } else if (dot < 0.001 && dot > -0.001) {
        vertical.add(sur);
      }
    }
    if (vertical.size() + horizontal.size() != surs.size()) {
      log.error("Sides were not vertical and top and bottom vertical");
      return;
    }
    for (Surface sur : horizontal) {
      if (bottom == null) {
        bottom = sur;
      } else {
        if (bottom.getFirstVertex().getZ() > sur.getFirstVertex().getZ()) {
          top = bottom;
          bottom = sur;
        } else {
          top = sur;
        }
      }
    }
    if (bottom == null || top == null) {
      log.error("Could not find at bottom surface");
      return;
    } else {
      List<Edge> edges = bottom.getEdges();
      width = edges.get(0).getLength() * 1000;
      length = edges.get(1).getLength() * 1000;
      height = bottom.plane().distance(top.getFirstVertex()) * 1000;
    }
    generate();
  }

  /**
   * 
   */
  private void generate() {
    Surface making = makeFloor();
    Space wallSystem = new Space("Vægsystem", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
    space.add(wallSystem);
    making.setBackDomain(wallSystem);
    {
      List<Edge> offset = Edge.offset(making.getEdges(), making, -wallThickness / 1000);
      Surface room = new Surface(offset);
      for (Edge e : offset) {
        space.add(e.getFrom());
        space.add(e.getTo());
        space.add(e);
      }
      space.add(room);
      room.setFrontDomain(making.getFrontDomain());
      room.setBackDomain(making.getBackDomain());
      
      Geometry.holeAnalysis(room);
      Space badkabine = new Space("Badekabine", Space.FUNCTIONAL, Space.ELEMENT_LEVEL, true);
      space.add(badkabine);
      room.setBackDomain(badkabine);
    }
    {
      Set<Surface> sides = new HashSet<Surface>();
      Set<Surface> tops = new HashSet<Surface>();
      Surface top = 
        making.extrusionall(-(height - floorThickness - ceilingThickness) / 1000, sides, tops);
      space.addAll(sides);
      space.addAll(tops);
      Space ceiling = new Space("Ceiling", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
      space.add(ceiling);
      for (Surface s : tops) {
        s.setFrontDomain(ceiling);
      }
      sides.clear();
      sides.add(top.extrusion(ceilingThickness / 1000, sides));
      space.addAll(sides);
    }
  }

  /**
   * 
   */
  private Surface makeFloor() {
    Space floor = new Space("Floor", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
    space.add(floor);
    bottom = bottom.copy(space);
    bottom.setFrontDomain(floor);
    Collection<Surface> geom = new LinkedList<Surface>();
    Surface floorTop = bottom.extrusion(floorThickness / 1000, geom);
    geom.add(floorTop);
    space.addAll(geom);
    return floorTop;
  }

  /** {@inheritDoc} */
  public void update(Object entity) {
    cleanUp();
    generate();
  }

  /** {@inheritDoc} */
  public Modellor newInstance(Space s) {
    if (s.getLevel() == Space.SPACE_LEVEL) {
      return new ModelBathModellor(s);
    } else {
      return null;
    }
  }

  /** {@inheritDoc} */
  public void delete() {
    space.setModellor(null);
  }
  
  /**
   * Clean up the constructed geometry
   */
  private void cleanUp() {
    space.clear();
  }

  /** {@inheritDoc} */
  public void setAttributes(List attributes) {
    update(space);
  }

  /** {@inheritDoc} */
  public List getAttributes() {
    List res = new LinkedList();
    res.add(new Attribute("Name", getName(), false));
    res.add(new Attribute("Length", length, true));
    res.add(new Attribute("Width", width, true));
    res.add(new Attribute("Height", height, true));
    res.add(new Attribute("Shaft-offset", shaftOffset, true));
    return res;
  }

  /** {@inheritDoc} */
  public String getName() {
    return "Bath-module";
  }
  
  /** {@inheritDoc} */
  public String getGeneralName() {
    return "Bath-module modellor";
  }
  
  /** {@inheritDoc} */
  public void setContent(Map m) {
    space = (Space)m.get("Space");
  }

  /** {@inheritDoc} */
  public Map getContent() {
    Map what = new HashMap();
    what.put("Space", space);
    return what;
  }

  /** {@inheritDoc} */
  @Override
  public int getUseableLevel() {
    return Space.PROJECT_LEVEL;
  }
}

--- NEW FILE: WindowModellor.java ---
//---------------------------------------------------------------------------------
// $Id: WindowModellor.java,v 1.1 2007/04/10 20:59:01 rimestad Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------
package net.sourceforge.bprocessor.model.modellor;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import net.sourceforge.bprocessor.model.Attribute;
import net.sourceforge.bprocessor.model.Edge;
import net.sourceforge.bprocessor.model.Geometry;
import net.sourceforge.bprocessor.model.Plane;
import net.sourceforge.bprocessor.model.Project;
import net.sourceforge.bprocessor.model.Space;
import net.sourceforge.bprocessor.model.Surface;
import net.sourceforge.bprocessor.model.Vertex;

import org.apache.log4j.Logger;

/** A modellor to make windows */
public class WindowModellor extends Modellor {
  /** Id */
  private static final long serialVersionUID = 1L;
  
  /** The logger */
  private static Logger log = Logger.getLogger(WindowModellor.class);
  
  /** The width of the frame */
  private double framewidth = 0.054;
  
  /** The depth of the frame */
  private double framedepth = 0.125;
  
  /** The offset in the window */
  private double offset = 0;
  
  /** The number of vertical sprosses */
  private int verticalSprosses = 0;
  
  /** The number of horizontal sprosses */
  private int horizontalSprosses = 0;
  
  /** The used space */
  private Space space;
  
  /** The bound surface */
  private Surface surface;
  
  /** The created bounding */
  private Surface opposite;

  /** The constructed geometry */
  private Set extension;

  /** The direction of action */
  private int sign;
  
  /**
   * the constructor
   */
  public WindowModellor() {
  }
  
  /**
   * the constructor
   * @param s The space this modellor makes
   * @param sur The surface in the given space is use as base
   */
  public WindowModellor(Space s, Surface sur) {
    space = s;
    surface = sur;
    extension = new HashSet();
    
    if (s.getEnvelope().size() == 1) {
      Surface ext = sur.getExterior();
      double minDist = Double.NaN;
      if (ext != null) {
        Collection tryout = new ArrayList(0);
        if (sur.getFrontDomain() == s) {
          Space front = ext.getFrontDomain();
          if (front != null) {
            tryout = front.getEnvelope();
          }
        } else {
          Space back = ext.getBackDomain();
          if (back != null) {
            tryout = back.getEnvelope();
          }
        }
        Iterator iter = tryout.iterator();
        Vertex normal = sur.normal();
        Vertex center = sur.center();
        while (iter.hasNext()) {
          Surface cur = (Surface)iter.next();
          Plane p = cur.plane();
          Vertex inter = p.intersection(center, normal, true);
          if (inter != null) {
            double dist = center.distance(inter);
            if (Double.isNaN(minDist) || (dist < minDist && dist > 0.00001)) {
              minDist = dist;
            }
          }
        }
      }
      if (Double.isNaN(minDist)) {
        minDist = framedepth + offset;
      }
      sign = 1;
      if (surface.getBackDomain() == space) {
        sign = -1;
      }
      opposite = sur.extrude(sign * minDist, extension);
      Geometry.holeAnalysis(opposite);
      extension.add(opposite);
    }
    
    drawWindow();
  }
  
  /** {@inheritDoc} */
  public void update(Object entity) {
    if (entity == space || entity == surface) {
      cleanUp();
      drawWindow();
    }
  }

  /** Draw the window */
  public void drawWindow() {
    Space frame = new Space("Frame", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
    Space glass = new Space("Glass", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true);
    glass.setTransparent(true);
    Surface inner = surface.copy(space);
    inner.setFrontDomain(frame);
    //make hole in frame
    Vertex normal = surface.normal();
    normal.scale(-offset);
    inner.move(normal.getX(), normal.getY(), normal.getZ());
    List holeedges = Edge.offset(inner.getEdges(), inner, -framewidth);
    Iterator iter = holeedges.iterator();
    space.add(((Edge)holeedges.get(0)).getTo());
    while (iter.hasNext()) {
      Edge e = (Edge)iter.next();
      space.add(e.getFrom());
      space.add(e);
    }
    Surface glasssurface = new Surface(holeedges);
    inner.addHole(glasssurface);
    space.add(glasssurface);
    glasssurface.setFrontDomain(glass);
    HashSet tmp = new HashSet();
    Surface frametop = inner.extrude(sign * framedepth, tmp);
    tmp.clear();
    Surface hole = glasssurface.extrude(sign * framedepth, tmp);
    frametop.addHole(hole);
    space.add(frame);
    space.add(glass);
  }
  
  /** {@inheritDoc} */
  public Modellor newInstance(Space s) {
    if (s.getLevel() == Space.SPACE_LEVEL) {
      return new WindowModellor(s, (Surface)(s.getEnvelope().iterator().next()));
    } else {
      
      return null;
    }
  }

  /** {@inheritDoc} */
  public void delete() {
    space.setModellor(null);
  }
  
  /**
   * Clean up the constructed geometry
   */
  private void cleanUp() {
    space.clear();
  }

  /** {@inheritDoc} */
  public void setAttributes(List attributes) {
    framewidth = ((Double)((Attribute)attributes.get(1)).getValue()).doubleValue();
    framedepth = ((Double)((Attribute)attributes.get(2)).getValue()).doubleValue();
    offset = ((Double)((Attribute)attributes.get(3)).getValue()).doubleValue();
    Iterator sit = Project.getInstance().getActiveSpace().getSurfaces().iterator(); 
    Object value = ((Attribute)attributes.get(4)).getValue();
    while (sit.hasNext()) {
      Project.getInstance().checkpoint();
      Surface s = (Surface)sit.next();
      if (s.getName().equals(value)) {
        surface = s;
      }
    }
    update(space);
  }

  /** {@inheritDoc} */
  public List getAttributes() {
    List res = new LinkedList();
    res.add(new Attribute("Name", getName(), false));
    res.add(new Attribute("Framewidth", new Double(framewidth)));
    res.add(new Attribute("Framedepth", new Double(framedepth)));
    res.add(new Attribute("Offset", new Double(offset)));
    res.add(new Attribute("Surface", surface));
    return res;
  }

  /** {@inheritDoc} */
  public String getName() {
    return "Window";
  }
  
  /** {@inheritDoc} */
  public String getGeneralName() {
    return "Window modellor";
  }
  
  /** {@inheritDoc} */
  public void setContent(Map m) {
    framewidth = ((Double)m.get("Framewidth")).doubleValue();
    framedepth = ((Double)m.get("Framedepth")).doubleValue();
    offset = ((Double)m.get("Offset")).doubleValue();
    sign = ((Integer)m.get("Sign")).intValue();
    surface = (Surface)m.get("Surface");
    space = (Space)m.get("Space");
  }

  /** {@inheritDoc} */
  public Map getContent() {
    Map what = new HashMap();
    what.put("Framewidth", new Double(framewidth));
    what.put("Framedepth", new Double(framedepth));
    what.put("Offset", new Double(offset));
    what.put("Sign", new Integer(sign));
    what.put("Space", space);
    what.put("Surface", surface);
    return what;
  }

  /** {@inheritDoc} */
  @Override
  public int getUseableLevel() {
    return Space.ELEMENT_LEVEL;
  }
}

--- NEW FILE: TileModellor.java ---
//---------------------------------------------------------------------------------
// $Id: TileModellor.java,v 1.1 2007/04/10 20:59:01 rimestad Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------
package net.sourceforge.bprocessor.model.modellor;

import java.awt.Dimension;
import java.util.ArrayList;
import java.util.List;

import net.sourceforge.bprocessor.model.CoordinateSystem;
import net.sourceforge.bprocessor.model.Edge;
import net.sourceforge.bprocessor.model.Material;
import net.sourceforge.bprocessor.model.Space;
import net.sourceforge.bprocessor.model.Surface;
import net.sourceforge.bprocessor.model.Vertex;

/**
 * @author rimestad
 * A modellor for filling a space with tiles in a ordered way
 */
public class TileModellor extends Modellor {

  private static final long serialVersionUID = 1L;

  /** tile dimension */
  private Dimension tileSize = new Dimension(100, 100);
  
  /** The width of the joint between tiles */
  private static int jointSize = 3;

  private Material tileColor = new Material("White", new float[]{.0f, .0f, .0f});
  
  private Surface surface;

  private CoordinateSystem startPoint;

  private Space space;

  /** tile thickness in mm */
  private static int tileThickness = 8;
  
  /**
   * Fill the give space with tiles
   * @param s The space
   */
  public TileModellor(Space s) {
    space = s;
    surface = s.getSurfaces().iterator().next();
    startPoint = surface.coordinateSystem();
  }
  
  /**
   * {@inheritDoc}
   */
  @Override
  public Modellor newInstance(Space s) {
    return new TileModellor(s);
  }

  /**
   * {@inheritDoc}
   */
  @Override
  public void update(Object entity) {
    Space tile = new Space("Tile", Space.CONSTRUCTION, Space.PART_LEVEL, true);
    tile.setUnion(true);
    space.add(tile);
    Vertex v1 = new Vertex(0, 0, 0);
    Vertex v2 = new Vertex(tileSize.width, 0, 0);
    Vertex v3 = new Vertex(tileSize.width, tileSize.height, 0);
    Vertex v4 = new Vertex(0, tileSize.height, 0);
    Edge e1 = new Edge(v1, v2);
    Edge e2 = new Edge(v2, v3);
    Edge e3 = new Edge(v3, v4);
    Edge e4 = new Edge(v4, v1);
    List<Edge> edges = new ArrayList<Edge>(4);
    edges.add(e1);
    edges.add(e2);
    edges.add(e3);
    edges.add(e4);
    Surface front = new Surface(edges);
    front.setFrontMaterial(tileColor);
    front.setFrontDomain(tile);
    space.insert(front);
    List<Surface> extrusion = new ArrayList<Surface>();
    front.extrusion(tileThickness  / 1000, extrusion);
    space.addAll(extrusion);
    
  }

  /**
   * {@inheritDoc}
   */
  @Override
  public void delete() {
    // TODO Auto-generated method stub

  }

  /** {@inheritDoc} */
  @Override
  public int getUseableLevel() {
    return Space.PART_LEVEL;
  }

}

Index: Modellor.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor/Modellor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Modellor.java	10 Apr 2007 13:19:52 -0000	1.6
--- Modellor.java	10 Apr 2007 20:59:01 -0000	1.7
***************
*** 87,90 ****
--- 87,96 ----
    
    /**
+    * The level this modellor is useable in (statics can be found in Space)
+    * @return The level
+    */
+   public abstract int getUseableLevel();
+   
+   /**
     * Get parameter block for element
     * @param element Space

Index: LayerModellor.java
===================================================================
RCS file: /cvsroot/bprocessor//model/src/net/sourceforge/bprocessor/model/modellor/LayerModellor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** LayerModellor.java	2 Jan 2007 17:48:58 -0000	1.10
--- LayerModellor.java	10 Apr 2007 20:59:01 -0000	1.11
***************
*** 238,240 ****
--- 238,246 ----
      return null;
    }
+ 
+   /** {@inheritDoc} */
+   @Override
+   public int getUseableLevel() {
+     return Space.PART_LEVEL;
+   }
  }

--- NEW FILE: Cylinder.java ---
//---------------------------------------------------------------------------------
// $Id: Cylinder.java,v 1.1 2007/04/10 20:59:01 rimestad Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------
package net.sourceforge.bprocessor.model.modellor;

import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;

import net.sourceforge.bprocessor.model.Edge;
import net.sourceforge.bprocessor.model.Project;
import net.sourceforge.bprocessor.model.Space;
import net.sourceforge.bprocessor.model.Surface;
import net.sourceforge.bprocessor.model.Vertex;

/**
 * The cylinder class parametrically generates a cylinder.
 */
public class Cylinder extends Modellor {

  /** Default */
  private static final long serialVersionUID = 1L;

  /** radius */
  private double radius = 1.0;
  
  /** height */
  private double height = 1.0;
  
  /** axis divisions */
  private int axisDivisions = 12;
  
  /***
   * Generate a Cylinder
   * @param entity Changed entity
   */
  public void update(Object entity) {
    /** Origin */
    Vertex o = new Vertex(0, 0, 0);
    /** Bottom vertices */
    Vertex[] bv = new Vertex[axisDivisions];
    /** Top vertices */
    Vertex[] tv = new Vertex[axisDivisions];
    /** Bottom edges */
    Edge[] be = new Edge[axisDivisions];
    /** Top edges */
    Edge te[] = new Edge[axisDivisions];
    /** Side edges */
    Edge se[] = new Edge[axisDivisions];
    /** Side faces */
    Surface sf[] = new Surface[axisDivisions];
    
    Surface top;
    Surface bottom;
    Space space = Project.getInstance().world();
    
    for (int i = 0; i < axisDivisions; i++) {
      double angle = ((2 * Math.PI) * i) / (double) axisDivisions;
      double x = radius * Math.cos(angle) + o.getX();
      double y = radius * Math.sin(angle) + o.getY();
      double z = o.getZ();
      bv[i] = new Vertex(x, y, z);
      tv[i] = new Vertex(x, y, z + height);
      space.add(bv[i]);
      space.add(tv[i]);
    }
    
    for (int i = 0; i < axisDivisions; i++) {
      be[i] = new Edge(bv[i], bv[(i + 1) % axisDivisions]);
      space.add(be[i]);
    }
    
    for (int i = 0; i < axisDivisions; i++) {
      te[i] = new Edge(tv[i], tv[(i + 1) % axisDivisions]);
      space.add(te[i]);
    }
    
    for (int i = 0; i < axisDivisions; i++) {
      se[i] = new Edge(bv[i], tv[i]);
      space.add(se[i]);
    }
    
    for (int i = 0; i < axisDivisions; i++) {
      List edges = new LinkedList();
      edges.add(be[i]);
      edges.add(se[(i + 1) % axisDivisions]);
      edges.add(te[i]);
      edges.add(se[i]);
      sf[i] = new Surface(edges);
      space.add(sf[i]);
    }
    {
      List edges = new LinkedList(Arrays.asList(be));
      bottom = new Surface(edges);
      space.add(bottom);
    }
    {
      List edges = new LinkedList(Arrays.asList(te));
      top = new Surface(edges);
      space.add(top);
    }
  }

  /**
   * Return null for center
   * @return Center
   */
  public Vertex center() {
    return null;
  }
  
  /**
   * FIXME: empty implementation to make compile
   * (pfff make sure stuff compiles before you check in please)
   */
  public void delete() {
    return;
  }

  /** {@inheritDoc} */
  public void setAttributes(List attributes) {
    // TODO Auto-generated method stub
  }

  /** {@inheritDoc} */
  public List getAttributes() {
    // TODO Auto-generated method stub
    return null;
  }
  
  /** {@inheritDoc} */
  public Modellor newInstance(Space s) {
    // TODO Auto-generated method stub
    return null;
  }
  
  /** {@inheritDoc} */
  public void setContent(Map m) {
    axisDivisions = ((Integer)m.get("Axis")).intValue();
    height = ((Double)m.get("Height")).doubleValue();
    radius = ((Double)m.get("Radius")).doubleValue();
  }
  
  /** {@inheritDoc} */
  public Map getContent() {
    Map m = new HashMap();
    m.put("Axis", new Integer(axisDivisions));
    m.put("Height", new Double(height));
    m.put("Radius", new Double(radius));
    return m;
  }

  /** {@inheritDoc} */
  @Override
  public int getUseableLevel() {
    return Space.PART_LEVEL;
  }
}

[Bprocessor-commit] /gl/src/net/sourceforge/bprocessor/gl/tool CreateSpaceActionListener.java, 1.16, 1.17

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

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

Modified Files:
	CreateSpaceActionListener.java 
Log Message:
removed code and altered to use of MouseAdapter

Index: CreateSpaceActionListener.java
===================================================================
RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/CreateSpaceActionListener.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CreateSpaceActionListener.java	31 Jan 2007 15:22:06 -0000	1.16
--- CreateSpaceActionListener.java	10 Apr 2007 20:57:44 -0000	1.17
***************
*** 16,21 ****
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  import java.awt.event.MouseEvent;
- import java.awt.event.MouseListener;
  
  import net.sourceforge.bprocessor.model.Project;
--- 16,21 ----
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
+ import java.awt.event.MouseAdapter;
  import java.awt.event.MouseEvent;
  
  import net.sourceforge.bprocessor.model.Project;
***************
*** 28,32 ****
   * The create functional space action listener for the domain popupmenu. 
   */
! public class CreateSpaceActionListener implements ActionListener, MouseListener {
    /** The logger */
    private static Logger log = Logger.getLogger(CreateSpaceActionListener.class);
--- 28,32 ----
   * The create functional space action listener for the domain popupmenu. 
   */
! public class CreateSpaceActionListener extends MouseAdapter implements ActionListener {
    /** The logger */
    private static Logger log = Logger.getLogger(CreateSpaceActionListener.class);
***************
*** 85,90 ****
      }
    }
-   
-   
  
    /**
--- 85,88 ----
***************
*** 92,95 ****
--- 90,94 ----
     * @param event The MouseEvent
     */
+   @Override
    public void mouseClicked(MouseEvent event) {
      cta.startEditing();
***************
*** 97,137 ****
    }
  
-   
-   /**
-    * Not in use
-    * @param event The MouseEvent
-    */
-   public void mouseEntered(MouseEvent event) {
-     // TODO Auto-generated method stub
-     
-   }
- 
-   /**
-    * Not in use
-    * @param event The MouseEvent
-    */
-   public void mouseExited(MouseEvent event) {
-     // TODO Auto-generated method stub
-     
-   }
- 
-   /**
-    * Not in use
-    * @param event The MouseEvent
-    */
-   public void mousePressed(MouseEvent event) {
-     // TODO Auto-generated method stub
-     
-   }
- 
-   /**
-    * Not in use
-    * @param event The MouseEvent
-    */
-   public void mouseReleased(MouseEvent event) {
-     // TODO Auto-generated method stub
-     
-   }
- 
    /**
     * My action listener
--- 96,99 ----
***************
*** 144,148 ****
       */
      public void actionPerformed(ActionEvent e) {
!       String name = ((JButton) e.getSource()).getLabel();
        if (name.equalsIgnoreCase("Ok")) {
          if (cta.attribute().getClassification() != null) {
--- 106,110 ----
       */
      public void actionPerformed(ActionEvent e) {
!       String name = ((JButton) e.getSource()).getText();
        if (name.equalsIgnoreCase("Ok")) {
          if (cta.attribute().getClassification() != null) {
***************
*** 169,178 ****
              }
            } 
!           dialog.show(false);
          }
        }
        
        if (name.equalsIgnoreCase("Cancel")) {
!         dialog.show(false);
          
        }
--- 131,140 ----
              }
            } 
!           dialog.setVisible(false);
          }
        }
        
        if (name.equalsIgnoreCase("Cancel")) {
!         dialog.setVisible(false);
          
        }

[Bprocessor-commit] /gl/src/net/sourceforge/bprocessor/gl/tool SpaceTool.java, 1.70, 1.71

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

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

Modified Files:
	SpaceTool.java 
Log Message:
removed superfluous imports

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** SpaceTool.java	22 Mar 2007 14:37:29 -0000	1.70
--- SpaceTool.java	10 Apr 2007 20:56:47 -0000	1.71
***************
*** 36,40 ****
  import net.sourceforge.bprocessor.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.Constructor;
- import net.sourceforge.bprocessor.model.Cylinder;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Entity;
--- 36,39 ----
***************
*** 54,57 ****
--- 53,57 ----
  import net.sourceforge.bprocessor.model.evaluator.Function;
  import net.sourceforge.bprocessor.model.evaluator.Invokable;
+ import net.sourceforge.bprocessor.model.modellor.Cylinder;
  import net.sourceforge.bprocessor.model.modellor.LayerModellor;
  import net.sourceforge.bprocessor.model.modellor.Modellor;

[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui PopupMenu.java, 1.28, 1.29

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

Update of /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26055/src/net/sourceforge/bprocessor/gui

Modified Files:
	PopupMenu.java 
Log Message:
refactored action to the ModellorMenuAction class

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** PopupMenu.java	6 Mar 2007 10:41:29 -0000	1.28
--- PopupMenu.java	10 Apr 2007 20:55:25 -0000	1.29
***************
*** 18,22 ****
  import javax.swing.JMenu;
  import javax.swing.JMenuItem;
- import javax.swing.JOptionPane;
  import javax.swing.JPopupMenu;
  
--- 18,21 ----
***************
*** 27,31 ****
  import net.sourceforge.bprocessor.gui.actions.ModellorMenuAction;
  import net.sourceforge.bprocessor.gui.actions.SpaceMenuAction;
- import net.sourceforge.bprocessor.gui.attrview.AttributeView;
  import net.sourceforge.bprocessor.model.Attribute;
  import net.sourceforge.bprocessor.model.Camera;
--- 26,29 ----
***************
*** 277,296 ****
          while (iter.hasNext()) {
            Modellor m = (Modellor)iter.next();
!           AbstractAction modellor = new ModellorMenuAction(sp, m) {
!             public void actionPerformed(ActionEvent arg0) {
!               Modellor created = modellor.newInstance(space);
!               if (created != null) {
!                 space.setModellor(created);
!                 AttributeView.instance().display(created);
!                 space.changed();
!                 Project.getInstance().checkpoint();
!               } else {
!                 JOptionPane.showMessageDialog(
!                     null,
!                     "The chosen space havn't been assigned to any surface", 
!                     "No envolope surface error", JOptionPane.ERROR_MESSAGE);
!               }
!             }
!           };
            mm.add(modellor);
          }
--- 275,279 ----
          while (iter.hasNext()) {
            Modellor m = (Modellor)iter.next();
!           AbstractAction modellor = new ModellorMenuAction(sp, m);
            mm.add(modellor);
          }