bprocessor-commit Mailing List for B-processor (Page 98)
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
bprocessor-commit — Commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(12) |
Jul
(117) |
Aug
(151) |
Sep
(157) |
Oct
(81) |
Nov
(117) |
Dec
(119) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(183) |
Feb
(130) |
Mar
(117) |
Apr
(61) |
May
(82) |
Jun
(45) |
Jul
(149) |
Aug
(173) |
Sep
(199) |
Oct
(165) |
Nov
(107) |
Dec
(137) |
| 2007 |
Jan
(124) |
Feb
(58) |
Mar
(123) |
Apr
(80) |
May
(130) |
Jun
(64) |
Jul
(31) |
Aug
(42) |
Sep
(114) |
Oct
(167) |
Nov
(239) |
Dec
(200) |
| 2008 |
Jan
(43) |
Feb
(43) |
Mar
(4) |
Apr
(9) |
May
(5) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(13) |
Oct
(9) |
Nov
(12) |
Dec
|
| 2009 |
Jan
|
Feb
(20) |
Mar
(7) |
Apr
(12) |
May
(34) |
Jun
(72) |
Jul
|
Aug
(3) |
Sep
(31) |
Oct
(2) |
Nov
(8) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(32) |
Mar
(8) |
Apr
(7) |
May
(36) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(7) |
Oct
(2) |
Nov
(13) |
Dec
(80) |
| 2011 |
Jan
|
Feb
|
Mar
(8) |
Apr
(12) |
May
(32) |
Jun
(9) |
Jul
(5) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(8) |
| 2012 |
Jan
|
Feb
|
Mar
(3) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(22) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael L. <he...@us...> - 2006-10-05 11:27:03
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17172/src/net/sourceforge/bprocessor/gl/tool Modified Files: ExtrudeTool.java Pencil.java Log Message: Removed methods from Project to add, remove and delete geometry Index: Pencil.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Pencil.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Pencil.java 29 Sep 2006 13:40:11 -0000 1.13 --- Pencil.java 5 Oct 2006 11:26:59 -0000 1.14 *************** *** 92,97 **** start = current; incident = null; ! Collection vColl = Project.getInstance().getVertices(); ! Collection eColl = Project.getInstance().getEdges(); boolean exsGeometry = ((current.type() == Intersection.VERTEX && vColl.contains(current.object())) || --- 92,97 ---- start = current; incident = null; ! Collection vColl = Project.getInstance().getActiveSpace().getVertices(); ! Collection eColl = Project.getInstance().getActiveSpace().getEdges(); boolean exsGeometry = ((current.type() == Intersection.VERTEX && vColl.contains(current.object())) || Index: ExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrudeTool.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ExtrudeTool.java 18 Sep 2006 14:09:58 -0000 1.23 --- ExtrudeTool.java 5 Oct 2006 11:26:59 -0000 1.24 *************** *** 301,305 **** } if (LIMIT) { ! Collection surfaces = Project.getInstance().getSurfaces(); Iterator iter = surfaces.iterator(); Vertex normal = top.normal(); --- 301,305 ---- } if (LIMIT) { ! Collection surfaces = Project.getInstance().getActiveSpace().getSurfaces(); Iterator iter = surfaces.iterator(); Vertex normal = top.normal(); |
|
From: Michael L. <he...@us...> - 2006-10-05 11:26:58
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17151/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java GUI.java Log Message: Removed methods from Project to add, remove and delete geometry Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PopupMenu.java 3 Oct 2006 10:04:09 -0000 1.7 --- PopupMenu.java 5 Oct 2006 11:26:56 -0000 1.8 *************** *** 169,183 **** pm.add(edit); } ! if (s.getEnvelope().isEmpty()) { ! AbstractAction envelope = new SpaceMenuAction(s, "Compute Envelope") { ! public void actionPerformed(ActionEvent arg0) { ! if (space != null) { ! space.computeEnvelope(); ! Project.getInstance().changed(Project.getInstance()); ! } } ! }; ! pm.add(envelope); ! } AbstractAction flip = new SpaceMenuAction(s, "Rotate 90 degrees CCW") { public void actionPerformed(ActionEvent arg0) { --- 169,181 ---- pm.add(edit); } ! AbstractAction envelope = new SpaceMenuAction(s, "Compute Envelope") { ! public void actionPerformed(ActionEvent arg0) { ! if (space != null) { ! space.computeEnvelope(); ! Project.getInstance().changed(Project.getInstance()); } ! } ! }; ! pm.add(envelope); AbstractAction flip = new SpaceMenuAction(s, "Rotate 90 degrees CCW") { public void actionPerformed(ActionEvent arg0) { Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** GUI.java 26 Sep 2006 09:50:55 -0000 1.43 --- GUI.java 5 Oct 2006 11:26:56 -0000 1.44 *************** *** 19,25 **** import net.sourceforge.bprocessor.gui.actions.FileSaveActionListener; import net.sourceforge.bprocessor.gui.actions.FileSaveAsActionListener; - import net.sourceforge.bprocessor.gui.actions.ToolsDetachActionListener; import net.sourceforge.bprocessor.gui.actions.ToolsEnergyActionListener; - import net.sourceforge.bprocessor.gui.actions.ToolsJoinActionListener; import net.sourceforge.bprocessor.gui.attrview.AttributeView; import net.sourceforge.bprocessor.gui.splash.SplashWindow; --- 19,23 ---- *************** *** 306,321 **** JMenu tools = new JMenu("Tools"); tools.setMnemonic(KeyEvent.VK_T); - - JMenuItem toolsJoin = new JMenuItem("Join"); - toolsJoin.setMnemonic(KeyEvent.VK_J); - toolsJoin.addActionListener(new ToolsJoinActionListener()); - tools.add(toolsJoin); - - JMenuItem toolsDetach = new JMenuItem("Detach"); - toolsDetach.setMnemonic(KeyEvent.VK_D); - toolsDetach.addActionListener(new ToolsDetachActionListener()); - tools.add(toolsDetach); - - tools.addSeparator(); JMenuItem toolsEnergy = new JMenuItem("Energy calc"); --- 304,307 ---- |
|
From: Michael L. <he...@us...> - 2006-10-05 07:46:41
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27594/src/net/sourceforge/bprocessor/gui/actions Modified Files: CreateConstructorActionListener.java CreateSurfaceActionListener.java Log Message: Removed some unecessary code Index: CreateConstructorActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateConstructorActionListener.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CreateConstructorActionListener.java 24 Jan 2006 14:10:37 -0000 1.7 --- CreateConstructorActionListener.java 5 Oct 2006 07:46:31 -0000 1.8 *************** *** 8,13 **** import net.sourceforge.bprocessor.gui.GUI; - import net.sourceforge.bprocessor.model.Project; - import net.sourceforge.bprocessor.model.Surface; import java.awt.event.ActionEvent; --- 8,11 ---- *************** *** 42,52 **** log.debug("Input: " + result); } - - if (result != null && !result.trim().equals("")) { - Surface s = new Surface(); - s.setConstructor(true); - - Project.getInstance().add(s); - } } } --- 40,43 ---- Index: CreateSurfaceActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateSurfaceActionListener.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CreateSurfaceActionListener.java 24 Jan 2006 14:10:37 -0000 1.8 --- CreateSurfaceActionListener.java 5 Oct 2006 07:46:31 -0000 1.9 *************** *** 46,50 **** Surface s = new Surface(); ! Project.getInstance().add(s); } } --- 46,50 ---- Surface s = new Surface(); ! Project.getInstance().world().add(s); } } |
|
From: Michael L. <he...@us...> - 2006-10-05 07:46:37
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27604/src/net/sourceforge/bprocessor/gl/tool Modified Files: SpaceTool.java Log Message: Removed some unecessary code Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** SpaceTool.java 3 Oct 2006 10:03:59 -0000 1.43 --- SpaceTool.java 5 Oct 2006 07:46:35 -0000 1.44 *************** *** 290,293 **** --- 290,294 ---- Surface top; Surface bottom; + Space space = Project.getInstance().world(); for (int i = 0; i < axisDivisions; i++) { *************** *** 298,318 **** bv[i] = new Vertex(x, y, z); tv[i] = new Vertex(x, y, z + height); ! Project.getInstance().add(bv[i]); ! Project.getInstance().add(tv[i]); } for (int i = 0; i < axisDivisions; i++) { be[i] = new Edge(bv[i], bv[(i + 1) % axisDivisions]); ! Project.getInstance().add(be[i]); } for (int i = 0; i < axisDivisions; i++) { te[i] = new Edge(tv[i], tv[(i + 1) % axisDivisions]); ! Project.getInstance().add(te[i]); } for (int i = 0; i < axisDivisions; i++) { se[i] = new Edge(bv[i], tv[i]); ! Project.getInstance().add(se[i]); } --- 299,319 ---- 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]); } *************** *** 324,338 **** edges.add(se[i]); sf[i] = new Surface(edges); ! Project.getInstance().world().insert(sf[i]); } { List edges = new LinkedList(Arrays.asList(be)); bottom = new Surface(edges); ! Project.getInstance().world().insert(bottom); } { List edges = new LinkedList(Arrays.asList(te)); top = new Surface(edges); ! Project.getInstance().world().insert(top); } } --- 325,339 ---- edges.add(se[i]); sf[i] = new Surface(edges); ! space.insert(sf[i]); } { List edges = new LinkedList(Arrays.asList(be)); bottom = new Surface(edges); ! space.insert(bottom); } { List edges = new LinkedList(Arrays.asList(te)); top = new Surface(edges); ! space.insert(top); } } |
|
From: Michael L. <he...@us...> - 2006-10-05 07:46:36
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27584/src/net/sourceforge/bprocessor/model Modified Files: Space.java Project.java Log Message: Removed some unecessary code Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Space.java 4 Oct 2006 14:46:22 -0000 1.71 --- Space.java 5 Oct 2006 07:46:23 -0000 1.72 *************** *** 1364,1368 **** public void delete() { clear(); ! Project.getInstance().delete(this); } --- 1364,1369 ---- public void delete() { clear(); ! Space owner = this.getOwner(); ! owner.remove(this); } Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** Project.java 4 Oct 2006 14:32:07 -0000 1.79 --- Project.java 5 Oct 2006 07:46:23 -0000 1.80 *************** *** 370,383 **** } - - /** - * Create a space - * @param space The space - */ - public void add(Space space) { - world.add(space); - changed(this); - } - /** * Find all construction spaces --- 370,373 ---- *************** *** 403,424 **** return world.getElements(); } - - /** - * Intern an edge - * @param edge The edge - */ - public void add(Edge edge) { - world.add(edge); - changed(this); - } - - /** - * Delete an Edge - * @param edge The edge - */ - public void delete(Edge edge) { - remove(edge); - changed(this); - } /** --- 393,396 ---- *************** *** 455,468 **** /** - * Delete a space and call changed - * @param space The space to delete - */ - public void delete(Space space) { - remove(space); - changed(this); - } - - - /** * Find all functional spaces * @return The functional spaces --- 427,430 ---- *************** *** 479,491 **** return result; } - - /** - * Add a surface - * @param surface The surface - */ - public void add(Surface surface) { - world.add(surface); - changed(this); - } /** --- 441,444 ---- *************** *** 496,508 **** surface.delete(); } - - /** - * Delete a surface - * @param surface The surface to delete - */ - public void delete(Surface surface) { - remove(surface); - changed(this); - } /** --- 449,452 ---- *************** *** 523,536 **** } - - /** - * Intern a vertex - * @param vertex The vertex - */ - public void add(Vertex vertex) { - world.add(vertex); - changed(this); - } - /** * Remove a vertex dont call changed --- 467,470 ---- *************** *** 542,554 **** } } - - /** - * Delete a vertex and call changed - * @param vertex The vertex to delete - */ - public void delete(Vertex vertex) { - remove(vertex); - changed(this); - } /** --- 476,479 ---- |
|
From: rimestad <rim...@us...> - 2006-10-04 14:46:24
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12178/src/net/sourceforge/bprocessor/model Modified Files: Space.java Log Message: when a space is cleared the void space in it is in the correct level now Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** Space.java 3 Oct 2006 10:04:04 -0000 1.70 --- Space.java 4 Oct 2006 14:46:22 -0000 1.71 *************** *** 84,88 **** */ private Space proto; ! /** The empty space in this space (also called void) */ protected Space empty; --- 84,88 ---- */ private Space proto; ! /** The empty space in this space (also called void) */ protected Space empty; *************** *** 169,173 **** Space() { } ! /** * Constructor for space --- 169,173 ---- Space() { } ! /** * Constructor for space *************** *** 307,311 **** return proto; } ! /** * --- 307,311 ---- return proto; } ! /** * *************** *** 332,336 **** return name; } ! /** * Set the name --- 332,336 ---- return name; } ! /** * Set the name *************** *** 362,367 **** return empty; } ! ! /** * Set the discription --- 362,367 ---- return empty; } ! ! /** * Set the discription *************** *** 371,375 **** this.description = new Description(des); } ! /** * Set the description --- 371,375 ---- this.description = new Description(des); } ! /** * Set the description *************** *** 397,401 **** constructors.clear(); nextConstructorId = 1; ! empty = new Space("Void", FUNCTIONAL, this.level, false); this.add(empty); } --- 397,401 ---- constructors.clear(); nextConstructorId = 1; ! empty = new Space("Void", FUNCTIONAL, this.level + 1, false); this.add(empty); } *************** *** 1085,1088 **** --- 1085,1091 ---- } } + if (element.getModellor() != null) { + element.getModellor().delete(); + } } *************** *** 1355,1359 **** } } ! /** * Delete the entity --- 1358,1362 ---- } } ! /** * Delete the entity |
|
From: rimestad <rim...@us...> - 2006-10-04 14:44:19
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11300/src/net/sourceforge/bprocessor/facade/modellor Modified Files: WindowModellor.java Log Message: The modellor do not remove created geomerty at deletion and made some simplifications Index: WindowModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/WindowModellor.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** WindowModellor.java 3 Oct 2006 09:53:26 -0000 1.10 --- WindowModellor.java 4 Oct 2006 14:44:07 -0000 1.11 *************** *** 58,64 **** /** The created bounding */ private Surface opposite; - - /** the constructed spaces */ - private List elements; /** The constructed geometry */ --- 58,61 ---- *************** *** 82,86 **** space = s; surface = sur; - elements = new LinkedList(); extension = new HashSet(); --- 79,82 ---- *************** *** 147,151 **** glass.setTransparent(true); Surface inner = surface.copy(space); - elements.add(inner); inner.setFrontDomain(frame); //make hole in frame --- 143,146 ---- *************** *** 162,166 **** } Surface glasssurface = new Surface(holeedges); - elements.add(glasssurface); inner.addHole(glasssurface); space.add(glasssurface); --- 157,160 ---- *************** *** 168,178 **** HashSet tmp = new HashSet(); Surface frametop = inner.extrude(sign * framedepth, tmp); - elements.addAll(tmp); - elements.add(frametop); tmp.clear(); Surface hole = glasssurface.extrude(sign * framedepth, tmp); - elements.add(hole); frametop.addHole(hole); - elements.addAll(tmp); space.add(frame); space.add(glass); --- 162,168 ---- *************** *** 195,205 **** */ public void delete() { - cleanUp(); - - Iterator iter = extension.iterator(); - while (iter.hasNext()) { - Surface s = (Surface)iter.next(); - s.delete(); - } space.setModellor(null); } --- 185,188 ---- *************** *** 209,218 **** */ private void cleanUp() { - Iterator it = elements.iterator(); - while (it.hasNext()) { - ((Surface)it.next()).delete(); - } - elements = new LinkedList(); - extension = new HashSet(); space.clear(); } --- 192,195 ---- |
|
From: rimestad <rim...@us...> - 2006-10-04 14:43:26
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10945/src/net/sourceforge/bprocessor/gui/actions Modified Files: CreateConstructionSpaceActionListener.java CreateFunctionalSpaceActionListener.java Log Message: now the menu possibilities create functional space and create constructional space do the same, they create a space, element or part in the active space of the chosen type Index: CreateFunctionalSpaceActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateFunctionalSpaceActionListener.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CreateFunctionalSpaceActionListener.java 29 Sep 2006 14:57:15 -0000 1.10 --- CreateFunctionalSpaceActionListener.java 4 Oct 2006 14:43:24 -0000 1.11 *************** *** 46,51 **** try { Space fs = Project.getInstance().getActiveSpace().createFunctionalSpace(result.trim()); ! Project.getInstance().add(fs); ! Project.getInstance().changed(Project.getInstance()); Project.getInstance().checkpoint(); } catch (Exception ex) { --- 46,51 ---- try { Space fs = Project.getInstance().getActiveSpace().createFunctionalSpace(result.trim()); ! Project.getInstance().getActiveSpace().add(fs); ! Project.getInstance().changed(Project.getInstance().getActiveSpace()); Project.getInstance().checkpoint(); } catch (Exception ex) { Index: CreateConstructionSpaceActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateConstructionSpaceActionListener.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CreateConstructionSpaceActionListener.java 26 Sep 2006 09:50:54 -0000 1.10 --- CreateConstructionSpaceActionListener.java 4 Oct 2006 14:43:24 -0000 1.11 *************** *** 47,51 **** Space cs = Project.getInstance().getActiveSpace().createConstructionSpace(result.trim()); Project.getInstance().getActiveSpace().add(cs); ! Project.getInstance().changed(Project.getInstance()); Project.getInstance().checkpoint(); } catch (Exception ex) { --- 47,51 ---- Space cs = Project.getInstance().getActiveSpace().createConstructionSpace(result.trim()); Project.getInstance().getActiveSpace().add(cs); ! Project.getInstance().changed(Project.getInstance().getActiveSpace()); Project.getInstance().checkpoint(); } catch (Exception ex) { |
|
From: rimestad <rim...@us...> - 2006-10-04 14:32:15
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6553/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: fixes problem of space menu with create new construction project and the like Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** Project.java 3 Oct 2006 10:04:04 -0000 1.78 --- Project.java 4 Oct 2006 14:32:07 -0000 1.79 *************** *** 201,205 **** public void clear() { world.clear(); ! this.setActiveSpace(null); CoordinateSystem cs = new CoordinateSystem(new Vertex(1, 0, 0), new Vertex(0, 1, 0), new Vertex(0, 0, 1), new Vertex(0, 0, 0)); --- 201,205 ---- public void clear() { world.clear(); ! this.setActiveSpace(world); CoordinateSystem cs = new CoordinateSystem(new Vertex(1, 0, 0), new Vertex(0, 1, 0), new Vertex(0, 0, 1), new Vertex(0, 0, 0)); |
|
From: rimestad <rim...@us...> - 2006-10-03 10:04:18
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11602/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java Log Message: comit Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PopupMenu.java 3 Oct 2006 09:19:20 -0000 1.6 --- PopupMenu.java 3 Oct 2006 10:04:09 -0000 1.7 *************** *** 110,115 **** if (space != null) { Space spaceCopy = space.copy(); ! Selection.primary().clear(); ! Selection.primary().add(spaceCopy); } } --- 110,114 ---- if (space != null) { Space spaceCopy = space.copy(); ! Selection.primary().set(spaceCopy); } } |
|
From: rimestad <rim...@us...> - 2006-10-03 10:04:18
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11602/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java SpaceTreeView.java Log Message: comit Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** GenericTreeView.java 2 Oct 2006 14:20:38 -0000 1.52 --- GenericTreeView.java 3 Oct 2006 10:04:08 -0000 1.53 *************** *** 35,38 **** --- 35,39 ---- import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeModel; + import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; *************** *** 48,51 **** --- 49,53 ---- import net.sourceforge.bprocessor.model.Observer; import net.sourceforge.bprocessor.model.ParameterBlock; + import net.sourceforge.bprocessor.model.Parametric; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Selection; *************** *** 64,70 **** /** The logger */ private static Logger log = Logger.getLogger(GenericTreeView.class); ! /** ! * ! */ private static final long serialVersionUID = 1L; --- 66,70 ---- /** The logger */ private static Logger log = Logger.getLogger(GenericTreeView.class); ! /** UID */ private static final long serialVersionUID = 1L; *************** *** 529,532 **** --- 529,546 ---- ((GenericNode)getChildAt(1)).update(s.getElements()); ((GenericNode)getChildAt(2)).update(s); + if (s.getModellor() != null) { + if (getChildCount() == 4) { + ((GenericNode)getChildAt(3)).update(s.getModellor()); + } else { + add(new ModellorNode(s.getModellor())); + model.nodesWereInserted(this, new int[]{3}); + } + } else { + if (getChildCount() == 4) { + TreeNode node = getChildAt(3); + remove(3); + model.nodesWereRemoved(this, new int[]{3}, new Object[]{node}); + } + } } } *************** *** 851,858 **** */ public void update(Object o) { ! Space s = (Space)o; ! ((SurfaceContainer)this.getChildAt(0)).update(s.getSurfaces()); ! ((EdgeContainer)this.getChildAt(1)).update(s.getEdges()); ! ((VertexContainer)this.getChildAt(2)).update(s.getVertices()); } } --- 865,876 ---- */ public void update(Object o) { ! if (o instanceof Space) { ! Space s = (Space)o; ! ((SurfaceContainer)this.getChildAt(0)).update(s.getSurfaces()); ! ((EdgeContainer)this.getChildAt(1)).update(s.getEdges()); ! ((VertexContainer)this.getChildAt(2)).update(s.getVertices()); ! } else { ! log.warn("Expected a Space but found a " + o); ! } } } *************** *** 958,961 **** --- 976,1025 ---- * CameraNode */ + public class ProjectNode extends ContainerNode { + /** */ + private static final long serialVersionUID = 1L; + + /** + * Constructor for EdgeContainer + * @param p The project + */ + public ProjectNode(Project p) { + super(p); + update(p); + } + + /** + * Update the node with the given object + * @param o The object + */ + public void update(Object o) { + if (o instanceof Project) { + super.update(((Project)o).getSpaces()); + } else { + log.warn("Were a " + o + " not a Project"); + } + } + + /** + * Insert the given object into the node + * @param elem the elements + */ + public void insertChildren(Collection elem) { + int[] ins = new int[elem.size()]; + int i = 0; + Iterator iter = elem.iterator(); + while (iter.hasNext()) { + Space s = (Space)iter.next(); + this.add(new SpaceNode(s)); + ins[i] = this.getChildCount() - 1; + i++; + } + model.nodesWereInserted(this, ins); + } + } + + /** + * CameraNode + */ public class CameraNode extends ContainerNode { /** */ *************** *** 1146,1162 **** public void valueChanged(TreeSelectionEvent event) { if (event.isAddedPath()) { - TreePath path = event.getPath(); GenericTreeView gtv = (GenericTreeView)event.getSource(); ! if (gtv.getSelectionPaths().length == 1) { ! Selection.primary().clear(); ! } ! Object object = path.getLastPathComponent(); ! if (object instanceof DefaultMutableTreeNode) { ! DefaultMutableTreeNode node = (DefaultMutableTreeNode) object; ! Object target = node.getUserObject(); ! select(target); } } else { TreePath[] path = event.getPaths(); for (int i = 0; i < path.length; i++) { Object object = path[i].getLastPathComponent(); --- 1210,1233 ---- public void valueChanged(TreeSelectionEvent event) { if (event.isAddedPath()) { GenericTreeView gtv = (GenericTreeView)event.getSource(); ! TreePath[] paths = gtv.getSelectionPaths(); ! LinkedList select = new LinkedList(); ! for (int i = 0; i < paths.length; i++) { ! Object o = paths[i].getLastPathComponent(); ! if (o instanceof DefaultMutableTreeNode) { ! DefaultMutableTreeNode node = (DefaultMutableTreeNode) o; ! Object target = node.getUserObject(); ! if (target instanceof Geometric) { ! select.add(target); ! } else if (paths.length == 1 && target instanceof Parametric) { ! AttributeView.instance().display(target); ! } ! ! } } + Selection.primary().retainAll(select); } else { TreePath[] path = event.getPaths(); + LinkedList deselect = new LinkedList(); for (int i = 0; i < path.length; i++) { Object object = path[i].getLastPathComponent(); *************** *** 1164,1170 **** DefaultMutableTreeNode node = (DefaultMutableTreeNode) object; Object target = node.getUserObject(); ! deselect(target); } } } } --- 1235,1244 ---- DefaultMutableTreeNode node = (DefaultMutableTreeNode) object; Object target = node.getUserObject(); ! if (target instanceof Geometric) { ! deselect.add(target); ! } } } + Selection.primary().removeAll(deselect); } } Index: SpaceTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpaceTreeView.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** SpaceTreeView.java 29 Sep 2006 15:07:28 -0000 1.15 --- SpaceTreeView.java 3 Oct 2006 10:04:08 -0000 1.16 *************** *** 38,42 **** public void update() { if (root.getChildCount() == 5) { ! ((GenericNode)root.getChildAt(0)).update(Project.getInstance().getSpaces()); ((GenericNode)root.getChildAt(1)).update(Project.getInstance().getConstraints()); ((GenericNode)root.getChildAt(2)).update(Project.getInstance().getGlobals()); --- 38,42 ---- public void update() { if (root.getChildCount() == 5) { ! ((GenericNode)root.getChildAt(0)).update(Project.getInstance()); ((GenericNode)root.getChildAt(1)).update(Project.getInstance().getConstraints()); ((GenericNode)root.getChildAt(2)).update(Project.getInstance().getGlobals()); *************** *** 47,51 **** Object[] paths = findPaths(e); root.removeAllChildren(); ! root.add(new ElementContainer("Project", Project.getInstance().getSpaces())); root.add(new ConstraintContainer("Constraints", Project.getInstance().getConstraints())); root.add(new ParameterBlockNode("Globals", Project.getInstance().getGlobals())); --- 47,51 ---- Object[] paths = findPaths(e); root.removeAllChildren(); ! root.add(new ProjectNode(Project.getInstance())); root.add(new ConstraintContainer("Constraints", Project.getInstance().getConstraints())); root.add(new ParameterBlockNode("Globals", Project.getInstance().getGlobals())); |
|
From: rimestad <rim...@us...> - 2006-10-03 10:04:13
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11296/src/net/sourceforge/bprocessor/model Modified Files: Space.java Project.java Selection.java Log Message: comit Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** Space.java 29 Sep 2006 14:57:24 -0000 1.69 --- Space.java 3 Oct 2006 10:04:04 -0000 1.70 *************** *** 1225,1229 **** } else { ! if (getOwner().getOwner() == Project.getInstance().world()) { if (isConstructionSpace()) { res.add(new Attribute("Classification", elementConstructionOptions, getClassification())); --- 1225,1229 ---- } else { ! if (getLevel() == Space.ELEMENT_LEVEL) { if (isConstructionSpace()) { res.add(new Attribute("Classification", elementConstructionOptions, getClassification())); *************** *** 1231,1235 **** res.add(new Attribute("Classification", elementFunctionalOptions, getClassification())); } ! } else { if (isConstructionSpace()) { res.add(new Attribute("Classification", partConstructionOptions, getClassification())); --- 1231,1235 ---- res.add(new Attribute("Classification", elementFunctionalOptions, getClassification())); } ! } else if (getLevel() == Space.PART_LEVEL) { if (isConstructionSpace()) { res.add(new Attribute("Classification", partConstructionOptions, getClassification())); *************** *** 1238,1242 **** } } - } if (isConstructionSpace()) { --- 1238,1241 ---- *************** *** 1251,1255 **** res.add(new Attribute("Modellor", getModellor())); } ! if (getOwner().getModellor() != null) { log.info("owner has modellor"); Parametric parameters = getOwner().getModellor().get(this); --- 1250,1254 ---- res.add(new Attribute("Modellor", getModellor())); } ! if (getOwner() != null && getOwner().getModellor() != null) { log.info("owner has modellor"); Parametric parameters = getOwner().getModellor().get(this); Index: Selection.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Selection.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Selection.java 28 Aug 2006 06:51:29 -0000 1.14 --- Selection.java 3 Oct 2006 10:04:04 -0000 1.15 *************** *** 70,73 **** --- 70,76 ---- */ public boolean add(Object object) { + if (object == null) { + return false; + } if (!(object instanceof Geometric)) { throw new Error("Illegal object added to selection " + object.getClass().getName()); *************** *** 99,107 **** /** * Clear the selection */ public void clear() { mark.clear(); selection.clear(); - changed(); } --- 102,119 ---- /** * Clear the selection + * ONLY TO BE USED IF NOTHING IS ADDED TO THE SELECTION */ public void clear() { + clean(); + changed(); + } + + /** + * dont call clean + * + */ + private void clean() { mark.clear(); selection.clear(); } *************** *** 111,117 **** */ public void set(Object object) { ! clear(); add(object); - changed(); } --- 123,128 ---- */ public void set(Object object) { ! clean(); add(object); } *************** *** 203,206 **** --- 214,220 ---- while (iter.hasNext()) { Object current = iter.next(); + if (!(current instanceof Geometric)) { + throw new Error("Illegal object added to selection " + current.getClass().getName()); + } if (mark.add(current)) { selection.add(current); *************** *** 245,251 **** */ public boolean retainAll(Collection objects) { ! clear(); addAll(objects); - changed(); return true; } --- 259,264 ---- */ public boolean retainAll(Collection objects) { ! clean(); addAll(objects); return true; } Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** Project.java 2 Oct 2006 06:10:10 -0000 1.77 --- Project.java 3 Oct 2006 10:04:04 -0000 1.78 *************** *** 939,942 **** --- 939,943 ---- } } + changed(this); } *************** *** 984,987 **** --- 985,996 ---- /** + * String representation of the object + * @return The string + */ + public String toString() { + return getName(); + } + + /** * * @param object Object |
|
From: rimestad <rim...@us...> - 2006-10-03 10:04:12
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11255/src/net/sourceforge/bprocessor/gl/tool Modified Files: SpaceTool.java Log Message: comit Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** SpaceTool.java 27 Sep 2006 08:36:38 -0000 1.42 --- SpaceTool.java 3 Oct 2006 10:03:59 -0000 1.43 *************** *** 515,520 **** if (space != null) { Space spaceCopy = space.copy(); ! Selection.primary().clear(); ! Selection.primary().add(spaceCopy); glv.changeTool(Tool.MOVE_TOOL); } --- 515,519 ---- if (space != null) { Space spaceCopy = space.copy(); ! Selection.primary().set(spaceCopy); glv.changeTool(Tool.MOVE_TOOL); } |
|
From: Nordholt <nor...@us...> - 2006-10-03 09:53:29
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7257/src/net/sourceforge/bprocessor/facade/modellor Modified Files: WindowModellor.java Log Message: presentation ready Index: WindowModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/WindowModellor.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** WindowModellor.java 26 Sep 2006 10:01:11 -0000 1.9 --- WindowModellor.java 3 Oct 2006 09:53:26 -0000 1.10 *************** *** 234,238 **** } } ! update(this); } --- 234,238 ---- } } ! update(space); } |
|
From: Nordholt <nor...@us...> - 2006-10-03 09:52:58
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6873/src/net/sourceforge/bprocessor/facade/modellor Modified Files: FacadeModellor.java Log Message: presentation ready Index: FacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** FacadeModellor.java 2 Oct 2006 14:32:23 -0000 1.19 --- FacadeModellor.java 3 Oct 2006 09:52:56 -0000 1.20 *************** *** 726,731 **** if (this.vertPostWidth != vertPostWidth) { this.vertPostWidth = vertPostWidth; ! removeWindows(); ! createWindows(); } } --- 726,732 ---- if (this.vertPostWidth != vertPostWidth) { this.vertPostWidth = vertPostWidth; ! //removeWindows(); ! //createWindows(); ! createFacade(); } } *************** *** 744,749 **** if (this.horPostWidth != horPostWidth) { this.horPostWidth = horPostWidth; ! removeWindows(); ! createWindows(); } } --- 745,751 ---- if (this.horPostWidth != horPostWidth) { this.horPostWidth = horPostWidth; ! //removeWindows(); ! //createWindows(); ! createFacade(); } } |
|
From: Michael L. <he...@us...> - 2006-10-03 09:19:29
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25945/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java Log Message: Startet implemention of union Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PopupMenu.java 2 Oct 2006 06:10:15 -0000 1.5 --- PopupMenu.java 3 Oct 2006 09:19:20 -0000 1.6 *************** *** 9,13 **** --- 9,15 ---- import java.awt.event.ActionEvent; import java.util.Collection; + import java.util.HashSet; import java.util.Iterator; + import java.util.Set; import javax.swing.AbstractAction; *************** *** 24,27 **** --- 26,30 ---- import net.sourceforge.bprocessor.model.Attribute; import net.sourceforge.bprocessor.model.Entity; + import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Project; *************** *** 30,33 **** --- 33,37 ---- import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Space; + import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Translate; import net.sourceforge.bprocessor.model.Vertex; *************** *** 124,127 **** --- 128,164 ---- }; pm.add(instantiate); + AbstractAction makeunion = new AbstractAction("Make Union") { + public void actionPerformed(ActionEvent arg0) { + Set internal = new HashSet(); + { + Iterator iter = Selection.primary().iterator(); + while (iter.hasNext()) { + Geometric current = (Geometric) iter.next(); + if (current instanceof Space) { + internal.add(current); + } + } + } + Set envelope = new HashSet(); + { + Iterator iter = internal.iterator(); + while (iter.hasNext()) { + Space current = (Space) iter.next(); + Iterator sit = current.getEnvelope().iterator(); + while (sit.hasNext()) { + Surface surface = (Surface) sit.next(); + if (!internal.contains(surface.getBackDomain())) { + envelope.add(surface); + } else if (!internal.contains(surface.getFrontDomain())) { + envelope.add(surface); + } + } + } + } + Selection.primary().clear(); + Selection.primary().addAll(envelope); + } + }; + pm.add(makeunion); if (s.getLevel() < Space.PART_LEVEL) { AbstractAction edit = new SpaceMenuAction(s, "Edit") { |
|
From: Nordholt <nor...@us...> - 2006-10-02 14:32:25
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32328/src/net/sourceforge/bprocessor/facade/modellor Modified Files: FacadeModellor.java Log Message: another change to make ready for presentation Index: FacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** FacadeModellor.java 2 Oct 2006 14:19:26 -0000 1.18 --- FacadeModellor.java 2 Oct 2006 14:32:23 -0000 1.19 *************** *** 289,293 **** } attributes.add(new Attribute("Depth", new Double(depth))); ! attributes.add(new Attribute("Single bars", Boolean.valueOf(bars))); return attributes; } --- 289,293 ---- } attributes.add(new Attribute("Depth", new Double(depth))); ! attributes.add(new Attribute("Single posted", Boolean.valueOf(bars))); return attributes; } |
|
From: Nordholt <nor...@us...> - 2006-10-02 14:20:40
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27395/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java Log Message: removed writeout Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** GenericTreeView.java 29 Sep 2006 15:07:28 -0000 1.51 --- GenericTreeView.java 2 Oct 2006 14:20:38 -0000 1.52 *************** *** 808,812 **** while (iter.hasNext()) { Space s = (Space)iter.next(); - log.info("interted " + s); this.add(new SpaceNode(s)); ins[i] = this.getChildCount() - 1; --- 808,811 ---- |
|
From: Nordholt <nor...@us...> - 2006-10-02 14:19:36
|
Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26958/src/net/sourceforge/bprocessor/facade/modellor Modified Files: FacadeModellor.java Log Message: Made ready for presentation Index: FacadeModellor.java =================================================================== RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** FacadeModellor.java 29 Sep 2006 13:41:27 -0000 1.17 --- FacadeModellor.java 2 Oct 2006 14:19:26 -0000 1.18 *************** *** 7,10 **** --- 7,11 ---- package net.sourceforge.bprocessor.facade.modellor; + import java.util.Collection; import java.util.HashMap; import java.util.List; *************** *** 170,175 **** createWindows(); } - - /** * Removes constructors from the facade --- 171,174 ---- *************** *** 191,195 **** } } - /** * Set the attributes of the object to the values in the list --- 190,193 ---- *************** *** 251,255 **** createFacade(); } ! } else if (a.getName().equals("Single bars")) { boolean b = ((Boolean)a.getValue()).booleanValue(); if (b && type != SINGLE_BAR) { --- 249,253 ---- createFacade(); } ! } else if (a.getName().equals("Single posted")) { boolean b = ((Boolean)a.getValue()).booleanValue(); if (b && type != SINGLE_BAR) { *************** *** 270,274 **** Project.getInstance().changed(space); } - /** * Retrn a list of the attributes in the object --- 268,271 ---- *************** *** 295,299 **** return attributes; } - /** * Get the name --- 292,295 ---- *************** *** 303,307 **** return name; } - /** * @see net.sourceforge.bprocessor.model.Parametric#getGeneralName() --- 299,302 ---- *************** *** 310,319 **** return "Facade Modellor"; } - /** Delete */ public void delete() { space.setModellor(null); } - /** * Creates the frame for this facade based on frame thickness and depth. --- 305,312 ---- *************** *** 341,345 **** } } - /** * Removes the current frame so a new one can be created. --- 334,337 ---- *************** *** 358,365 **** removeWindows(); removeConstructors(); space.clear(); } - - /** * Creates the post constructors for this facade based on the number of posts. --- 350,356 ---- removeWindows(); removeConstructors(); + removeSegmentLines(); space.clear(); } /** * Creates the post constructors for this facade based on the number of posts. *************** *** 478,481 **** --- 469,473 ---- horSegs[i][j] = hSeg; vertSegs[i][j] = vSeg; + /* if (j > 0 && i < vertPosts + 1 && j < horPosts + 1 && i % 2 == 0) { *************** *** 484,487 **** --- 476,481 ---- drawSeg.put(hSeg, Boolean.TRUE); } + */ + drawSeg.put(hSeg, Boolean.TRUE); drawSeg.put(vSeg, Boolean.TRUE); h.connect(hSeg); *************** *** 507,511 **** for (int i = 0; i < vertPosts; i++) { for (int j = 0; j < horPosts; j++) { ! if (vertSegs[i][j] != null && horSegs[i][j] != null) { vertSegs[i][j].delete(); horSegs[i][j].delete(); --- 501,508 ---- for (int i = 0; i < vertPosts; i++) { for (int j = 0; j < horPosts; j++) { ! if (vertSegs[i][j] != null && ! vertSegs[i][j].getOwner() != null && ! horSegs[i][j] != null && ! horSegs[i][j].getOwner() != null) { vertSegs[i][j].delete(); horSegs[i][j].delete(); *************** *** 516,521 **** vertSegs = new Line[vertPosts + 2][horPosts + 2]; drawSeg = new HashMap(); ! } ! /** * Creates the holes for windows in the facade based on the post constructors, --- 513,517 ---- vertSegs = new Line[vertPosts + 2][horPosts + 2]; drawSeg = new HashMap(); ! } /** * Creates the holes for windows in the facade based on the post constructors, *************** *** 530,534 **** Vertex hDir = horSegs[0][0].getDirection(); hDir = hDir.copy((horPostWidth / 2) / hDir.length()); ! //List slist = new LinkedList(); for (int i = 0; i < vertPosts + 1; i++) { for (int j = 0; j < horPosts + 1; j++) { --- 526,531 ---- Vertex hDir = horSegs[0][0].getDirection(); hDir = hDir.copy((horPostWidth / 2) / hDir.length()); ! List slist = new LinkedList(); ! Map connectMap = new HashMap(); for (int i = 0; i < vertPosts + 1; i++) { for (int j = 0; j < horPosts + 1; j++) { *************** *** 545,558 **** Vertex start = h.intersection(v); start = start.add(vDir).add(hDir); ! Vertex last = start = Geometry.insertVertex(start, false); Vertex next = vertSegs[i + di][j].intersection(h); ! next = Geometry.insertVertex(next.add(vDir), false); ! Map connectMap = new HashMap(); //make edges till we are back at the start-vertex while (di != 0 || dj != 0) { boolean dirChanged = false; ! next = Geometry.insertVertex(next, false); Edge e = new Edge(last, next); edges.add(e); if (stepI == 1) { //stepped right --- 542,556 ---- Vertex start = h.intersection(v); start = start.add(vDir).add(hDir); ! Vertex last = start; //= Geometry.insertVertex(start, false); ! space.add(start); Vertex next = vertSegs[i + di][j].intersection(h); ! next = next.add(vDir); //make edges till we are back at the start-vertex while (di != 0 || dj != 0) { boolean dirChanged = false; ! space.add(next); Edge e = new Edge(last, next); edges.add(e); + space.add(e); if (stepI == 1) { //stepped right *************** *** 617,649 **** } Edge e = new Edge(last, start); connectMap.put(e, vertSegs[i + di][j + dj]); edges.add(e); ! List surface = Geometry.insertEdges(edges); ! if (surface.isEmpty()) { ! log.info("NO SURFACE FROM EDGES :'-("); ! } else { ! Set sides = new HashSet(); ! Geometry.holeAnalysis(extrudeIntoSpace((Surface)surface.iterator().next(), ! depth, ! sides)); ! Iterator it = sides.iterator(); ! while (it.hasNext()) { ! Surface side = (Surface)it.next(); ! Iterator sIt = side.getEdges().iterator(); ! while (sIt.hasNext()) { ! Line seg = (Line)connectMap.get(sIt.next()); ! if (seg != null) { ! seg.connect(side); ! } ! } ! } ! } } } } Project.getInstance().setActiveSpace(oldActive); } } ! /** * Removes the windows of the facade. --- 615,675 ---- } Edge e = new Edge(last, start); + space.add(e); connectMap.put(e, vertSegs[i + di][j + dj]); edges.add(e); ! Surface s = new Surface(edges); ! space.add(s); ! slist.add(s); ! Geometry.holeAnalysis(s); } } } + extrudeWindows(slist, connectMap); Project.getInstance().setActiveSpace(oldActive); } } ! ! /** ! * extrudes the window surfaces and does the appropriate connections between ! * segment constructors and windows. ! * @param surfaces the window surfaces ! * @param connectMap the map describing the segment constructor that ! * each edge should be connected to ! */ ! private void extrudeWindows(Collection surfaces, Map connectMap) { ! Iterator it = surfaces.iterator(); ! while (it.hasNext()) { ! Surface s = (Surface)it.next(); ! Set sides = new HashSet(); ! if (type == SINGLE_BAR) { ! Geometry.holeAnalysis(extrudeIntoSpace(s, depth, sides)); ! } else if (type == DOUBLE_BAR) { ! Space w = new Space("Window", Space.CONSTRUCTION, Space.ELEMENT_LEVEL, true); ! double u = s.normal().dot(front.normal()); ! if ((u > 0 && front.getBackDomain() == space) || ! u < 0 && front.getFrontDomain() == space) { ! s.setBackDomain(w); ! } else { ! s.setFrontDomain(w); ! } ! space.add(w); ! Modellor wm = new WindowModellor(w, s); ! w.setModellor(wm); ! sides.addAll(w.getEnvelope()); ! sides.remove(s); ! } ! Iterator sideIt = sides.iterator(); ! while (sideIt.hasNext()) { ! Surface side = (Surface)sideIt.next(); ! Iterator sIt = side.getEdges().iterator(); ! while (sIt.hasNext()) { ! Line seg = (Line)connectMap.get(sIt.next()); ! if (seg != null) { ! seg.connect(side); ! } ! } ! } ! } ! } /** * Removes the windows of the facade. *************** *** 668,672 **** windows = new HashSet(); } - /** * Makes sure to extrude the a surface to the right side --- 694,697 ---- |
|
From: Michael L. <he...@us...> - 2006-10-02 06:10:24
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24585/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Reorganised Space Menu Draw coordinatesystem and grid in the transformed system Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.155 retrieving revision 1.156 diff -C2 -d -r1.155 -r1.156 *** View.java 29 Sep 2006 12:09:50 -0000 1.155 --- View.java 2 Oct 2006 06:10:21 -0000 1.156 *************** *** 20,24 **** import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Line; - import net.sourceforge.bprocessor.model.Matrix; import net.sourceforge.bprocessor.model.Plane; import net.sourceforge.bprocessor.model.Camera; --- 20,23 ---- *************** *** 932,936 **** CoordinateSystem cs = Project.getInstance().getActiveCoordinateSystem(); ! grid(cs); drawConstructorPlanes(); --- 931,935 ---- CoordinateSystem cs = Project.getInstance().getActiveCoordinateSystem(); ! //grid(cs); drawConstructorPlanes(); *************** *** 1025,1039 **** double yaxis[] = new double[]{0, 1, 0, 0}; double zaxis[] = new double[]{0, 0, 1, 0}; - - Matrix zmatrix = Matrix.rotation(Math.PI * rotate.rz() / 180, - zaxis[0], zaxis[1], zaxis[2]); - xaxis = zmatrix.multiply(xaxis); - yaxis = zmatrix.multiply(yaxis); - Matrix ymatrix = Matrix.rotation(Math.PI * rotate.ry() / 180, - yaxis[0], yaxis[1], yaxis[2]); - xaxis = ymatrix.multiply(xaxis); - gl.glRotated(rotate.rx(), xaxis[0], xaxis[1], xaxis[2]); - gl.glRotated(rotate.ry(), yaxis[0], yaxis[1], yaxis[2]); gl.glRotated(rotate.rz(), zaxis[0], zaxis[1], zaxis[2]); } if (current instanceof AxisRotate) { --- 1024,1030 ---- double yaxis[] = new double[]{0, 1, 0, 0}; double zaxis[] = new double[]{0, 0, 1, 0}; gl.glRotated(rotate.rz(), zaxis[0], zaxis[1], zaxis[2]); + gl.glRotated(rotate.ry(), yaxis[0], yaxis[1], yaxis[2]); + gl.glRotated(rotate.rx(), xaxis[0], xaxis[1], xaxis[2]); } if (current instanceof AxisRotate) { *************** *** 1193,1196 **** --- 1184,1195 ---- double scale = (camera.getFocalwidth() / 65) * (500 / height); double dist = v.minus(new Vertex(camera.getCenter())).length() * scale; + if (active != null) { + gl.glPushMatrix(); + transformTo(active); + drawGeneralConstructor(Project.getInstance().getActiveCoordinateSystem(), + dist, true, OBJECTS); + grid(Project.getInstance().getActiveCoordinateSystem()); + gl.glPopMatrix(); + } while (true) { if (active != null) { *************** *** 1206,1210 **** } if (target != c && !highligts.contains(c)) { ! drawGeneralConstructor(c, dist, true, OBJECTS); } } --- 1205,1211 ---- } if (target != c && !highligts.contains(c)) { ! if (c != Project.getInstance().getActiveCoordinateSystem()) { ! drawGeneralConstructor(c, dist, true, OBJECTS); ! } } } |
|
From: Michael L. <he...@us...> - 2006-10-02 06:10:24
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24554/src/net/sourceforge/bprocessor/gui/attrview Modified Files: AttributeView.java Log Message: Reorganised Space Menu Draw coordinatesystem and grid in the transformed system Index: AttributeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/AttributeView.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** AttributeView.java 28 Aug 2006 05:54:04 -0000 1.37 --- AttributeView.java 2 Oct 2006 06:10:15 -0000 1.38 *************** *** 71,74 **** --- 71,79 ---- */ public void display(Object object) { + if (object != null) { + Project.info("display " + object.getClass().getName()); + } else { + Project.info("display null"); + } this.removeAll(); if (object != null) { |
|
From: Michael L. <he...@us...> - 2006-10-02 06:10:24
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24554/src/net/sourceforge/bprocessor/gui Modified Files: PopupMenu.java Log Message: Reorganised Space Menu Draw coordinatesystem and grid in the transformed system Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PopupMenu.java 29 Sep 2006 07:13:12 -0000 1.4 --- PopupMenu.java 2 Oct 2006 06:10:15 -0000 1.5 *************** *** 24,28 **** import net.sourceforge.bprocessor.model.Attribute; import net.sourceforge.bprocessor.model.Entity; - import net.sourceforge.bprocessor.model.AxisRotate; import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Project; --- 24,27 ---- *************** *** 41,44 **** --- 40,95 ---- /** + * @param s Space + * @return Transform Menu + */ + public static JMenu getTransformMenu(Space s) { + JMenu pm = new JMenu("Transform"); + AbstractAction translate = new SpaceMenuAction(s, "Translate") { + public void actionPerformed(ActionEvent arg0) { + space.addTransform(new Translate()); + space.changed(); + } + }; + pm.add(translate); + AbstractAction rotate = new SpaceMenuAction(s, "Rotate") { + public void actionPerformed(ActionEvent arg0) { + space.addTransform(new Rotate()); + space.changed(); + } + }; + pm.add(rotate); + AbstractAction scale = new SpaceMenuAction(s, "Scale") { + public void actionPerformed(ActionEvent arg0) { + space.addTransform(new Scale()); + space.changed(); + } + }; + pm.add(scale); + AbstractAction translatelocal = new SpaceMenuAction(s, "Translate Local") { + public void actionPerformed(ActionEvent arg0) { + space.pushTransform(new Translate()); + space.changed(); + } + }; + pm.add(translatelocal); + AbstractAction rotatelocal = new SpaceMenuAction(s, "Rotate Local") { + public void actionPerformed(ActionEvent arg0) { + space.pushTransform(new Rotate()); + space.changed(); + } + }; + pm.add(rotatelocal); + AbstractAction scalelocal = new SpaceMenuAction(s, "Scale Local") { + public void actionPerformed(ActionEvent arg0) { + space.pushTransform(new Scale()); + space.changed(); + } + }; + pm.add(scalelocal); + + return pm; + } + + /** * A popup generator for a space * @param s the space *************** *** 113,152 **** }; pm.add(check); ! AbstractAction translate = new SpaceMenuAction(s, "Translate") { ! public void actionPerformed(ActionEvent arg0) { ! space.addTransform(new Translate()); ! space.changed(); ! } ! }; ! pm.add(translate); ! AbstractAction rotate = new SpaceMenuAction(s, "Rotate") { ! public void actionPerformed(ActionEvent arg0) { ! space.addTransform(new Rotate()); ! space.changed(); ! } ! }; ! pm.add(rotate); ! AbstractAction scale = new SpaceMenuAction(s, "Scale") { ! public void actionPerformed(ActionEvent arg0) { ! space.addTransform(new Scale()); ! space.changed(); ! } ! }; ! pm.add(scale); ! AbstractAction axisrotate = new SpaceMenuAction(s, "Axis Rotate") { ! public void actionPerformed(ActionEvent arg0) { ! space.addTransform(new AxisRotate()); ! space.changed(); ! } ! }; ! pm.add(axisrotate); ! AbstractAction axisrotatelocal = new SpaceMenuAction(s, "Local Axis Rotate") { ! public void actionPerformed(ActionEvent arg0) { ! space.pushTransform(new AxisRotate()); ! space.changed(); ! } ! }; ! pm.add(axisrotatelocal); ! // Adding all modellors JMenu mm = new JMenu("Modellors"); Collection c = Modellor.getRegisteredModellors(); --- 164,168 ---- }; pm.add(check); ! pm.add(getTransformMenu(s)); JMenu mm = new JMenu("Modellors"); Collection c = Modellor.getRegisteredModellors(); |
|
From: Michael L. <he...@us...> - 2006-10-02 06:10:21
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24356/src/net/sourceforge/bprocessor/model Modified Files: TransformStack.java AxisRotate.java Project.java Log Message: Reorganised Space Menu Draw coordinatesystem and grid in the transformed system Index: TransformStack.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/TransformStack.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TransformStack.java 27 Sep 2006 08:36:25 -0000 1.1 --- TransformStack.java 2 Oct 2006 06:10:10 -0000 1.2 *************** *** 53,56 **** --- 53,64 ---- /** + * + * @return true if empty + */ + public boolean empty() { + return stack.empty(); + } + + /** * Insert a transform * @param transform Transform Index: AxisRotate.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/AxisRotate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AxisRotate.java 27 Sep 2006 08:36:25 -0000 1.1 --- AxisRotate.java 2 Oct 2006 06:10:10 -0000 1.2 *************** *** 121,129 **** while (iter.hasNext()) { Attribute a = (Attribute)iter.next(); ! if (a.getName().equals("Rotate X")) { rx(((Double)a.getValue()).doubleValue()); ! } else if (a.getName().equals("Rotate Y")) { ry(((Double)a.getValue()).doubleValue()); ! } else if (a.getName().equals("Rotate Z")) { rz(((Double)a.getValue()).doubleValue()); } else if (a.getName().equals("Angle")) { --- 121,129 ---- while (iter.hasNext()) { Attribute a = (Attribute)iter.next(); ! if (a.getName().equals("Axis X")) { rx(((Double)a.getValue()).doubleValue()); ! } else if (a.getName().equals("Axis Y")) { ry(((Double)a.getValue()).doubleValue()); ! } else if (a.getName().equals("Axis Z")) { rz(((Double)a.getValue()).doubleValue()); } else if (a.getName().equals("Angle")) { *************** *** 140,146 **** public List getAttributes() { ArrayList res = new ArrayList(); ! res.add(new Attribute("Rotate X", new Double(rx()))); ! res.add(new Attribute("Rotate Y", new Double(ry()))); ! res.add(new Attribute("Rotate Z", new Double(rz()))); res.add(new Attribute("Angle", new Double(angle()))); return res; --- 140,146 ---- public List getAttributes() { ArrayList res = new ArrayList(); ! res.add(new Attribute("Axis X", new Double(rx()))); ! res.add(new Attribute("Axis Y", new Double(ry()))); ! res.add(new Attribute("Axis Z", new Double(rz()))); res.add(new Attribute("Angle", new Double(angle()))); return res; *************** *** 168,172 **** */ public String getGeneralName() { ! return "Rotate"; } } --- 168,172 ---- */ public String getGeneralName() { ! return "General Rotate"; } } Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** Project.java 29 Sep 2006 14:57:24 -0000 1.76 --- Project.java 2 Oct 2006 06:10:10 -0000 1.77 *************** *** 982,984 **** --- 982,992 ---- this.name = name; } + + /** + * + * @param object Object + */ + public static void info(Object object) { + log.info(object); + } } |
|
From: rimestad <rim...@us...> - 2006-09-29 15:07:41
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13579/src/net/sourceforge/bprocessor/model Modified Files: Camera.java Log Message: Forgot to use checkstyle Index: Camera.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Camera.java 29 Sep 2006 14:57:24 -0000 1.23 --- Camera.java 29 Sep 2006 15:07:32 -0000 1.24 *************** *** 100,104 **** this.setFocalwidth(c.getFocalwidth()); Iterator clips = c.getClipplanes().iterator(); ! while(clips.hasNext()) { ClippingPlane clip = (ClippingPlane)clips.next(); this.addClipplane(clip); --- 100,104 ---- this.setFocalwidth(c.getFocalwidth()); Iterator clips = c.getClipplanes().iterator(); ! while (clips.hasNext()) { ClippingPlane clip = (ClippingPlane)clips.next(); this.addClipplane(clip); |
|
From: rimestad <rim...@us...> - 2006-09-29 15:07:31
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13563/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java SpaceTreeView.java CameraTreeView.java Log Message: Forgot to use checkstyle Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** GenericTreeView.java 29 Sep 2006 14:57:15 -0000 1.50 --- GenericTreeView.java 29 Sep 2006 15:07:28 -0000 1.51 *************** *** 232,236 **** /** * Update the TreeView - * */ public void update() { --- 232,235 ---- *************** *** 375,379 **** Object[] rem = new Object[children.size()]; int[] indices = new int[children.size()]; ! int i= 0,reach = 0; for (int n = 0; n < this.children.size(); n++) { GenericNode s = (GenericNode)this.getChildAt(n); --- 374,378 ---- Object[] rem = new Object[children.size()]; int[] indices = new int[children.size()]; ! int i = 0; for (int n = 0; n < this.children.size(); n++) { GenericNode s = (GenericNode)this.getChildAt(n); *************** *** 384,388 **** } } ! for(int k=0; k < rem.length; k++) { this.remove((GenericNode)rem[k]); } --- 383,387 ---- } } ! for (int k = 0; k < rem.length; k++) { this.remove((GenericNode)rem[k]); } *************** *** 393,397 **** /** ! * Update the container */ public void update(Object o) { --- 392,397 ---- /** ! * Update the node with the given object ! * @param o The object */ public void update(Object o) { *************** *** 484,488 **** /** ! * */ public void update(Object o) { --- 484,489 ---- /** ! * Update the node with the given object ! * @param o The object */ public void update(Object o) { *************** *** 518,521 **** --- 519,526 ---- } + /** + * Update the node with the given object + * @param o The object + */ public void update(Object o) { if (o instanceof Space) { *************** *** 587,591 **** /** ! * */ public void update(Object o) { --- 592,597 ---- /** ! * Update the node with the given object ! * @param o The object */ public void update(Object o) { *************** *** 650,653 **** --- 656,663 ---- } + /** + * Update the node with the given object + * @param o The object + */ public void update(Object o) { if (o instanceof Edge) { *************** *** 777,781 **** * Constructor * @param name The name ! * @param space The space */ public ElementContainer(String name, Collection elements) { --- 787,791 ---- * Constructor * @param name The name ! * @param elements The elements */ public ElementContainer(String name, Collection elements) { *************** *** 837,840 **** --- 847,854 ---- } + /** + * Update the node with the given object + * @param o The object + */ public void update(Object o) { Space s = (Space)o; *************** *** 951,956 **** /** * Constructor for EdgeContainer ! * @param name The name ! * @param vertices The edges */ public CameraNode(Camera c) { --- 965,969 ---- /** * Constructor for EdgeContainer ! * @param c The camera */ public CameraNode(Camera c) { *************** *** 959,962 **** --- 972,979 ---- } + /** + * Update the node with the given object + * @param o The object + */ public void update(Object o) { if (o instanceof Camera) { *************** *** 1041,1044 **** --- 1058,1065 ---- } + /** + * Update the node with the given object + * @param o The object + */ public void update(Object o) { if (o instanceof ParameterBlock) { Index: CameraTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/CameraTreeView.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CameraTreeView.java 29 Sep 2006 14:57:15 -0000 1.7 --- CameraTreeView.java 29 Sep 2006 15:07:28 -0000 1.8 *************** *** 21,25 **** import net.sourceforge.bprocessor.model.Camera; import net.sourceforge.bprocessor.model.Project; - import net.sourceforge.bprocessor.model.Selection; /** --- 21,24 ---- *************** *** 44,52 **** * Remove the children from container node * @param children the children to remove */ private void removeChildren(Collection children, DefaultMutableTreeNode where) { Object[] rem = new Object[children.size()]; int[] indices = new int[children.size()]; ! int i= 0; for (int n = 0; n < where.getChildCount(); n++) { GenericNode s = (GenericNode)where.getChildAt(n); --- 43,52 ---- * Remove the children from container node * @param children the children to remove + * @param where The node to update on */ private void removeChildren(Collection children, DefaultMutableTreeNode where) { Object[] rem = new Object[children.size()]; int[] indices = new int[children.size()]; ! int i = 0; for (int n = 0; n < where.getChildCount(); n++) { GenericNode s = (GenericNode)where.getChildAt(n); *************** *** 57,61 **** } } ! for(int k=0; k < rem.length; k++) { where.remove((GenericNode)rem[k]); } --- 57,61 ---- } } ! for (int k = 0; k < rem.length; k++) { where.remove((GenericNode)rem[k]); } *************** *** 67,70 **** --- 67,72 ---- /** * Update the container + * @param o The collection to update with + * @param where the node to udpate on */ private void update(Object o, DefaultMutableTreeNode where) { *************** *** 93,98 **** /** ! * Insert the given object into the node ! * @param elem the elements */ private void insertChildren(Collection elem, DefaultMutableTreeNode where) { --- 95,101 ---- /** ! * Update the container ! * @param elem The collection to update with ! * @param where the node to udpate on */ private void insertChildren(Collection elem, DefaultMutableTreeNode where) { Index: SpaceTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/SpaceTreeView.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** SpaceTreeView.java 29 Sep 2006 14:57:15 -0000 1.14 --- SpaceTreeView.java 29 Sep 2006 15:07:28 -0000 1.15 *************** *** 14,18 **** import javax.swing.tree.TreePath; - import net.sourceforge.bprocessor.model.Entity; import net.sourceforge.bprocessor.model.Project; --- 14,17 ---- *************** *** 58,66 **** } - public DefaultMutableTreeNode handleNode(DefaultMutableTreeNode node, Object which) { - - return null; - } - /** * Find the paths --- 57,60 ---- |
