[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java,1.51,1.52 PencilTool
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2006-01-23 10:16:31
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28525/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java PencilTool.java ExtrudeTool.java SpaceTool.java Log Message: Startet implementation of Mesh. Changed uses of Set to Collection. Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SpaceTool.java 18 Jan 2006 11:56:20 -0000 1.7 --- SpaceTool.java 23 Jan 2006 10:16:22 -0000 1.8 *************** *** 252,256 **** JPopupMenu pp = new JPopupMenu(side); SpacePopupListener spl = new SpacePopupListener(side.equals("front"), glv.getView()); ! Set domains = Project.getInstance().getSpaces(); Iterator domIt = domains.iterator(); Iterator selIt = new HashSet(selection).iterator(); --- 252,256 ---- JPopupMenu pp = new JPopupMenu(side); SpacePopupListener spl = new SpacePopupListener(side.equals("front"), glv.getView()); ! Collection domains = Project.getInstance().getSpaces(); Iterator domIt = domains.iterator(); Iterator selIt = new HashSet(selection).iterator(); Index: ExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrudeTool.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ExtrudeTool.java 10 Jan 2006 08:47:41 -0000 1.6 --- ExtrudeTool.java 23 Jan 2006 10:16:22 -0000 1.7 *************** *** 11,14 **** --- 11,15 ---- import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; + import java.util.Collection; import java.util.HashSet; import java.util.Iterator; *************** *** 174,178 **** } ! Set surfaces = Project.getInstance().getSurfaces(); Iterator iter = surfaces.iterator(); Vertex normal = top.normal(); --- 175,179 ---- } ! Collection surfaces = Project.getInstance().getSurfaces(); Iterator iter = surfaces.iterator(); Vertex normal = top.normal(); Index: PencilTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** PencilTool.java 10 Jan 2006 14:35:37 -0000 1.56 --- PencilTool.java 23 Jan 2006 10:16:22 -0000 1.57 *************** *** 11,14 **** --- 11,15 ---- import java.awt.event.KeyEvent; import java.util.ArrayList; + import java.util.Collection; import java.util.List; import java.util.Set; *************** *** 786,790 **** */ private Space findSpace(Surface s) { ! Set set = Project.getInstance().getFunctionalSpaces(); Iterator it = set.iterator(); while (it.hasNext()) { --- 787,791 ---- */ private Space findSpace(Surface s) { ! Collection set = Project.getInstance().getFunctionalSpaces(); Iterator it = set.iterator(); while (it.hasNext()) { Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** AbstractTool.java 18 Jan 2006 11:56:20 -0000 1.51 --- AbstractTool.java 23 Jan 2006 10:16:22 -0000 1.52 *************** *** 165,169 **** */ protected void holeAnalysis(Surface surface) { ! Set surfaces = Project.getInstance().getSurfaces(); Iterator iter = surfaces.iterator(); while (iter.hasNext()) { --- 165,169 ---- */ protected void holeAnalysis(Surface surface) { ! Collection surfaces = Project.getInstance().getSurfaces(); Iterator iter = surfaces.iterator(); while (iter.hasNext()) { |