bprocessor-commit Mailing List for B-processor
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...> - 2013-06-02 06:35:29
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24539/src/net/sourceforge/bprocessor/model Modified Files: CoordinateSystem.java Log Message: Index: CoordinateSystem.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** CoordinateSystem.java 20 May 2010 10:58:45 -0000 1.79 --- CoordinateSystem.java 2 Jun 2013 06:35:27 -0000 1.80 *************** *** 797,801 **** /** {@inheritDoc} */ public String title() { ! return "B-System"; } --- 797,801 ---- /** {@inheritDoc} */ public String title() { ! return "CordinateSystem"; } |
|
From: Michael L. <he...@us...> - 2013-06-02 05:24:40
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21658/src/net/sourceforge/bprocessor/gui/attrview Modified Files: AttributeView.java GenericPanel.java Log Message: Index: GenericPanel.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** GenericPanel.java 15 May 2013 06:44:14 -0000 1.61 --- GenericPanel.java 2 Jun 2013 05:24:38 -0000 1.62 *************** *** 81,87 **** add(BorderLayout.NORTH, title); add(BorderLayout.CENTER, this.content); - //JPanel vfiller = new JPanel(); - //vfiller.setPreferredSize(new Dimension(2000, 2000)); - //add(BorderLayout.SOUTH, vfiller); addMouseListener(this); } --- 81,84 ---- Index: AttributeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/AttributeView.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** AttributeView.java 27 Jul 2011 07:19:36 -0000 1.49 --- AttributeView.java 2 Jun 2013 05:24:38 -0000 1.50 *************** *** 99,102 **** --- 99,104 ---- if (selection.size() == 1) { geometric = selection.iterator().next(); + } else { + display(null); } if (geometric instanceof Parametric) { |
|
From: Michael L. <he...@us...> - 2013-06-02 05:24:38
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21645/src/net/sourceforge/bprocessor/model Modified Files: Persistence.java Surface.java Grid.java Item.java Log Message: Index: Item.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Item.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Item.java 30 Dec 2011 12:53:24 -0000 1.12 --- Item.java 2 Jun 2013 05:24:34 -0000 1.13 *************** *** 544,582 **** res.add(new Attribute("Name", getName())); - if (getOwner() == Project.getInstance().world()) { - if (isConstructionSpace()) { - res.add(new Attribute("Classification", - Project.getConstructionClas(), getClassification(), true)); - } else { - res.add(new Attribute("Classification", - Project.getFunctionalClas(), getClassification(), true)); - } - } else { - if (isConstructionSpace()) { - if (getOwner() != null && getOwner().getClassification() != null) { - res.add(new Attribute("Classification", - getOwner().getClassification(), getClassification(), true)); - } else { - res.add(new Attribute("Classification", - Project.getConstructionClas(), getClassification(), true)); - } - } else { - if (getOwner() != null && getOwner().getClassification() != null) { - res.add(new Attribute("Classification", - getOwner().getClassification(), getClassification(), true)); - } else { - res.add(new Attribute("Classification", - Project.getFunctionalClas(), getClassification(), true)); - } - } - } - if (getClassification() != null && getClassificationType() != null) { - res.add(new Attribute("Type", getClassification().getPossibleTypes(), - getClassificationType(), true)); - HashMap<String, Object> param = getOwnParameters(); - for (String s : param.keySet()) { - res.add(new Attribute(s, param.get(s))); - } - } res.add(new Attribute("ID", getId() != null ? getId().toString() : "", false)); res.add(new Attribute("Owner", getOwner(), false)); --- 544,547 ---- Index: Surface.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v retrieving revision 1.230 retrieving revision 1.231 diff -C2 -d -r1.230 -r1.231 *** Surface.java 30 Dec 2011 12:53:24 -0000 1.230 --- Surface.java 2 Jun 2013 05:24:34 -0000 1.231 *************** *** 1921,1926 **** public List<Attribute> getAttributes() { ArrayList<Attribute> res = new ArrayList<Attribute>(); - List<Material> materials = new LinkedList(Project.getInstance().getMaterials()); - Entity.sort(materials); res.add(new Attribute("Name", getName(), false)); --- 1921,1924 ---- *************** *** 1931,1940 **** res.add(new Attribute("Owner", getOwner(), false)); } ! ! res.add(new Attribute("Space1", getFrontDomain(), true)); ! res.add(new Attribute("Front Material", new Reference(frontMaterial(), materials))); ! res.add(new Attribute("Space2", getBackDomain(), true)); ! res.add(new Attribute("Back Material", new Reference(backMaterial(), materials))); ! if (exterior != null) { res.add(new Attribute("Exterior", getExterior(), false)); --- 1929,1933 ---- res.add(new Attribute("Owner", getOwner(), false)); } ! if (exterior != null) { res.add(new Attribute("Exterior", getExterior(), false)); Index: Grid.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Grid.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Grid.java 23 Sep 2009 07:50:21 -0000 1.12 --- Grid.java 2 Jun 2013 05:24:34 -0000 1.13 *************** *** 81,84 **** --- 81,100 ---- } + /** + * + * @return subdivisions + */ + public int getSubdivisions() { + return subdivisions; + } + + /** + * + * @param value new value of subdivisions + */ + public void setSubdivisions(int value) { + subdivisions = value; + } + /** {@inheritDoc} */ @Override Index: Persistence.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Persistence.java,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** Persistence.java 24 May 2011 13:57:24 -0000 1.94 --- Persistence.java 2 Jun 2013 05:24:34 -0000 1.95 *************** *** 602,605 **** --- 602,610 ---- res.setHeight(height); } + int subdivisions = xml.getSubdivisions(); + if (subdivisions > 0) { + res.setSubdivisions(subdivisions); + } + res.setId(xml.getProgid()); mapper.put(xml.getId(), res); *************** *** 1324,1327 **** --- 1329,1333 ---- xml.setWidth((float) grid.getWidth()); xml.setHeight((float) grid.getHeight()); + xml.setSubdivisions(grid.getSubdivisions()); xml.setVertex(externalizeVertex(grid.getOrigin(), new HashMap())); |
|
From: Michael L. <he...@us...> - 2013-06-02 05:24:37
|
Update of /cvsroot/bprocessor/model/src/etc In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21645/src/etc Modified Files: bprocessor.xsd Log Message: Index: bprocessor.xsd =================================================================== RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** bprocessor.xsd 24 May 2011 13:57:25 -0000 1.51 --- bprocessor.xsd 2 Jun 2013 05:24:35 -0000 1.52 *************** *** 211,214 **** --- 211,215 ---- <xsd:attribute name="height" type="xsd:double" use="optional"/> <xsd:attribute name="distance" type="xsd:double" use="optional"/> + <xsd:attribute name="subdivisions" type="xsd:int" use="optional"/> </xsd:extension> </xsd:complexContent> |
|
From: Michael L. <he...@us...> - 2013-06-01 08:02:37
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv922/src/net/sourceforge/bprocessor/gl/view Modified Files: PopupMenu.java Log Message: Cleanup Index: PopupMenu.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/PopupMenu.java,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** PopupMenu.java 6 Mar 2012 09:28:16 -0000 1.58 --- PopupMenu.java 1 Jun 2013 08:02:32 -0000 1.59 *************** *** 102,133 **** }; menu.add(focus); - AbstractAction holeanalysis = new EntityMenuAction(s, "Hole analysis") { - public void actionPerformed(ActionEvent arg0) { - Surface surface = (Surface)entity; - Geometry.holeAnalysis(surface); - } - }; - menu.add(holeanalysis); - /* - AbstractAction flip = new EntityMenuAction(s, "Flip") { - public void actionPerformed(ActionEvent arg0) { - Surface surface = (Surface) entity; - surface.flip(); - } - }; - menu.add(flip); - */ - { - AbstractAction action = new EntityMenuAction(s, "Assign from Neighbours") { - public void actionPerformed(ActionEvent event) { - Surface surface = (Surface) entity; - SpaceAnalysis analysis = new SpaceAnalysis(); - analysis.subsume(surface, 1); - analysis.subsume(surface, -1); - } - }; - menu.add(action); - } - { AbstractAction action = new GeometricMenuAction(surfaces, "Offset Planar...") { --- 102,105 ---- *************** *** 328,355 **** menu.add(action); } - { - AbstractAction action = new CollectionMenuAction(s, "Remove Instances") { - public void actionPerformed(ActionEvent event) { - List<Space> spaces = new LinkedList(col); - for (Space space : spaces) { - List<Instance> instances = space.collectInstances(); - for (Instance current : instances) { - Space duplicate = current.duplicate(); - Space owner = current.getOwner(); - owner.add(duplicate); - current.delete(); - } - } - Project.getInstance().changed(); - Project.getInstance().checkpoint(); - } - }; - menu.add(action); - } if (s.size() == 1) { // Some options do only apply to one space Space target = (Space) s.iterator().next(); ! AbstractAction edit = new SpaceMenuAction(target, "Edit") { public void actionPerformed(ActionEvent arg0) { space.edit(); --- 300,308 ---- menu.add(action); } if (s.size() == 1) { // Some options do only apply to one space Space target = (Space) s.iterator().next(); ! AbstractAction edit = new SpaceMenuAction(target, "Enter Space") { public void actionPerformed(ActionEvent arg0) { space.edit(); *************** *** 367,401 **** menu.add(action); } - { - AbstractAction action = new SpaceMenuAction(target, "Clear") { - public void actionPerformed(ActionEvent event) { - space.clear(); - Project.getInstance().changed(); - Project.getInstance().checkpoint(); - } - }; - menu.add(action); - } - if (CHECKS) { - AbstractAction action = new SpaceMenuAction(target, "Normals") { - public void actionPerformed(ActionEvent event) { - Space union = Space.createConstructionSpace("Normals"); - for (Surface surface : space.getSurfaces()) { - Vertex normal = surface.normal(); - Vertex origin = surface.center(); - CoordinateSystem system = CoordinateSystem.systemFor(origin, normal); - Space pyramid = Command.Pyramid.pyramid(0.05, 0.05, 0.2); - for (Vertex current : pyramid.getVertices()) { - current.set(system.unTranslate(current)); - } - union.add(pyramid); - } - Project.getInstance().world().add(union); - Project.getInstance().changed(); - Project.getInstance().checkpoint(); - } - }; - menu.add(action); - } { --- 320,323 ---- *************** *** 433,453 **** }; menu.add(check); - AbstractAction modCheck = new SpaceMenuAction(target, "Modellor Check") { - public void actionPerformed(ActionEvent arg0) { - log.info(space.getModellor()); - } - }; - menu.add(modCheck); - { - AbstractAction action = new SpaceMenuAction(target, "Print Classification") { - public void actionPerformed(ActionEvent event) { - Classification classification = space.getClassification(); - System.out.println("id " + classification.getFullId(space)); - ClassificationType type = space.getClassificationType(); - System.out.println("type " + type.getIndex()); - } - }; - menu.add(action); - } } --- 355,358 ---- *************** *** 478,491 **** } } - - JMenu mm = new JMenu("Modellors"); - Collection c = Modellor.getRegisteredModellors(); - Iterator iter = c.iterator(); - while (iter.hasNext()) { - Modellor m = (Modellor)iter.next(); - AbstractAction modellor = new ModellorMenuAction(target, m); - mm.add(modellor); - } - menu.add(mm); } return menu; --- 383,386 ---- *************** *** 531,550 **** }; menu.add(delete); { ! AbstractAction flip = new GeometricMenuAction(arguments, "flip normals") { ! public void actionPerformed(ActionEvent arg0) { ! //Selection.primary().clear(); ! for (Geometric current : entities) { ! if (current instanceof Surface) { ! Surface surface = (Surface) current; ! surface.flip(); } ! } } - }; - menu.add(flip); } //Submenu for normal flip algorithms ! { JMenu normalMenu = new JMenu("normals"); { --- 426,454 ---- }; menu.add(delete); + boolean containsSurface = false; + for (Geometric current : arguments) { + if (current instanceof Surface) { + containsSurface = true; + } + } { ! ! if (containsSurface) { ! AbstractAction flip = new GeometricMenuAction(arguments, "flip normals") { ! public void actionPerformed(ActionEvent arg0) { ! //Selection.primary().clear(); ! for (Geometric current : entities) { ! if (current instanceof Surface) { ! Surface surface = (Surface) current; ! surface.flip(); ! } ! } } ! }; ! menu.add(flip); } } //Submenu for normal flip algorithms ! if (containsSurface) { JMenu normalMenu = new JMenu("normals"); { |
|
From: Michael L. <he...@us...> - 2013-05-31 16:07:14
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16266/src/net/sourceforge/bprocessor/gui Modified Files: GUI.java Log Message: Clean up Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** GUI.java 31 May 2013 08:01:03 -0000 1.132 --- GUI.java 31 May 2013 16:07:12 -0000 1.133 *************** *** 49,60 **** import net.sourceforge.bprocessor.gui.actions.FileCloseActionListener; import net.sourceforge.bprocessor.gui.actions.FileExitActionListener; - import net.sourceforge.bprocessor.gui.actions.FileExportActionListener; import net.sourceforge.bprocessor.gui.actions.FileImportActionListener; import net.sourceforge.bprocessor.gui.actions.FileLoadActionListener; import net.sourceforge.bprocessor.gui.actions.FileNewActionListener; - import net.sourceforge.bprocessor.gui.actions.FilePropertiesActionListener; import net.sourceforge.bprocessor.gui.actions.FileSaveActionListener; import net.sourceforge.bprocessor.gui.actions.FileSaveAsActionListener; - import net.sourceforge.bprocessor.gui.actions.ToolsEnergyActionListener; import net.sourceforge.bprocessor.gui.attrview.AttributeView; import net.sourceforge.bprocessor.gui.splash.SplashWindow; --- 49,57 ---- *************** *** 81,86 **** private static final long serialVersionUID = 1L; - private static final boolean IMPORT = false; - private boolean isMac; --- 78,81 ---- *************** *** 290,294 **** JPopupMenu.setDefaultLightWeightPopupEnabled(false); ! // File menu JMenu file = createFileMenu(); menu.registerMenu(file); --- 285,289 ---- JPopupMenu.setDefaultLightWeightPopupEnabled(false); ! // File menu GL Colors JMenu file = createFileMenu(); menu.registerMenu(file); *************** *** 301,322 **** JMenu create = createCreateMenu(); 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"); --- 296,300 ---- JMenu create = createCreateMenu(); menu.registerMenu(create); ! // Help menu JMenu help = new JMenu("Help"); *************** *** 570,574 **** file.add(fileNew); ! JMenuItem fileLoad = new JMenuItem("Open"); fileLoad.addActionListener(new FileLoadActionListener()); fileLoad.setMnemonic(KeyEvent.VK_L); --- 548,552 ---- file.add(fileNew); ! JMenuItem fileLoad = new JMenuItem("Open..."); fileLoad.addActionListener(new FileLoadActionListener()); fileLoad.setMnemonic(KeyEvent.VK_L); *************** *** 594,598 **** file.add(fileSave); ! JMenuItem fileSaveAs = new JMenuItem("Save As"); fileSaveAs.addActionListener(new FileSaveAsActionListener()); fileSaveAs.setMnemonic(KeyEvent.VK_A); --- 572,576 ---- file.add(fileSave); ! JMenuItem fileSaveAs = new JMenuItem("Save As..."); fileSaveAs.addActionListener(new FileSaveAsActionListener()); fileSaveAs.setMnemonic(KeyEvent.VK_A); *************** *** 601,618 **** file.addSeparator(); - { - JMenuItem item = new JMenuItem("Import Data..."); - item.addActionListener(new AbstractAction() { - public void actionPerformed(ActionEvent e) { - JFileChooser chooser = new JFileChooser(Project.getInstance().getDefaultPath()); - int state = chooser.showOpenDialog(null); - File file = chooser.getSelectedFile(); - } - }); - file.add(item); - } - - file.addSeparator(); - JMenuItem fileImport = new JMenuItem("Import..."); fileImport.addActionListener(new FileImportActionListener()); --- 579,582 ---- *************** *** 620,650 **** fileImport.setEnabled(true); file.add(fileImport); ! ! if (IMPORT) { ! JMenuItem item = new JMenuItem("Import Library..."); ! item.addActionListener(new AbstractAction() { ! public void actionPerformed(ActionEvent e) { ! File file = chooseFile(""); ! if (file != null) { ! try { ! Project.getInstance().importLibrary(file); ! } catch (Exception e1) { ! // TODO Auto-generated catch block ! e1.printStackTrace(); ! } ! } ! } ! }); ! file.add(item); ! } ! ! JMenuItem fileExport = new JMenuItem("Export"); ! fileExport.addActionListener(new FileExportActionListener()); ! fileExport.setMnemonic(KeyEvent.VK_E); ! fileExport.setEnabled(false); ! file.add(fileExport); ! { ! JMenuItem item = new JMenuItem("Export OBJ"); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { --- 584,592 ---- fileImport.setEnabled(true); file.add(fileImport); ! ! file.addSeparator(); ! { ! JMenuItem item = new JMenuItem("Export OBJ..."); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { *************** *** 667,671 **** } { ! JMenuItem item = new JMenuItem("Export XML"); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { --- 609,613 ---- } { ! JMenuItem item = new JMenuItem("Export XML..."); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { *************** *** 687,696 **** file.add(item); } - file.addSeparator(); - - JMenuItem fileProperties = new JMenuItem("Properties"); - fileProperties.setMnemonic(KeyEvent.VK_P); - fileProperties.addActionListener(new FilePropertiesActionListener()); - file.add(fileProperties); if (!isMac) { --- 629,632 ---- |
|
From: Michael L. <he...@us...> - 2013-05-31 16:07:11
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16253/src/net/sourceforge/bprocessor/gl/tool Modified Files: ToolFactory.java Log Message: Clean up Index: ToolFactory.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** ToolFactory.java 31 May 2013 08:01:07 -0000 1.113 --- ToolFactory.java 31 May 2013 16:07:09 -0000 1.114 *************** *** 47,52 **** private List<JComponent> modellingset; - private List<JComponent> viewingset; - /** glv */ private Editor editor; --- 47,50 ---- *************** *** 68,73 **** private AbstractTool select; private AbstractTool assign; - private AbstractTool spaceselect; - private AbstractTool four; private Pencil pencil; --- 66,69 ---- *************** *** 82,89 **** private RectTool rectangle; private ArcTool arc; - private ExtendTool extend; private ConstructorTool constructor; - private RelationTool relation; private FocusTool focus; --- 78,83 ---- *************** *** 104,108 **** private ToolFactory(Editor editor) { modellingset = new LinkedList(); - viewingset = new LinkedList(); tools = new HashMap(); buttons = new HashMap(); --- 98,101 ---- *************** *** 112,117 **** ClassLoader cl = Thread.currentThread().getContextClassLoader(); - - URL url = cl.getResource("Bcursorpen1.gif"); Image pencilimage = Toolkit.getDefaultToolkit().getImage(url); --- 105,108 ---- *************** *** 143,147 **** select = new SelectTool(editor, null); assign = new SpaceTool(editor, null); - spaceselect = new SpaceSelectTool(editor, null); pencil = new Pencil(editor, pencilcursor); --- 134,137 ---- *************** *** 150,158 **** rotation = new RotationTool(editor, null); extrude = new ExtrusionTool(editor, pencilcursor); - extend = new ExtendTool(editor, pencilcursor); clipplane = new ClipplaneTool(editor, pencilcursor); ruler = new TapeMeasure(editor, pencilcursor); protractor = new Protractor(editor, pencilcursor); - relation = new RelationTool(editor, arrowAddCursor); orbit = new CameraTool(editor, rotationCursor); constructor = new ConstructorTool(editor, pencilcursor); --- 140,146 ---- *************** *** 163,170 **** pan = new PanTool(editor, panCursor); zoom = new ZoomTool(editor, zoomCursor); ! ! viewingset.add(registerTool(Tool.SPACE_SELECT, spaceselect, ! "Biconselecttool2.gif", "Sensor Select")); ! modellingset.add(registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select")); modellingset.add(registerTool(Tool.ASSIGN_TOOL, assign, "assign-icon-3.png", "Assign")); --- 151,155 ---- pan = new PanTool(editor, panCursor); zoom = new ZoomTool(editor, zoomCursor); ! modellingset.add(registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select")); modellingset.add(registerTool(Tool.ASSIGN_TOOL, assign, "assign-icon-3.png", "Assign")); *************** *** 178,183 **** modellingset.add(registerTool(Tool.TAPE_MEASURE_TOOL, ruler, "ruler-icon.png", "Ruler")); ! modellingset.add(registerTool(Tool.PROTRACTOR_TOOL, protractor, ! "protractor-icon.png", "Protractor")); modellingset.add(addSeparator(2)); --- 163,167 ---- modellingset.add(registerTool(Tool.TAPE_MEASURE_TOOL, ruler, "ruler-icon.png", "Ruler")); ! modellingset.add(registerTool(Tool.PROTRACTOR_TOOL, protractor, "protractor-icon.png", "Protractor")); modellingset.add(addSeparator(2)); *************** *** 197,209 **** modellingset.add(addSeparator(2)); ! ! modellingset.add(registerTool(Tool.EXTEND_TOOL, extend, "Biconextrudetool2.gif", "Extend")); ! modellingset.add(addSeparator(10)); ! modellingset.add(registerTool(Tool.CONSTRUCTOR_TOOL, constructor, ! "constructor-icon.png", "Constructor")); ! modellingset.add(registerTool(Tool.RELATION_TOOL, relation, "chaintool.gif", "Relate")); ! modellingset.add(addSeparator(10)); --- 181,192 ---- modellingset.add(addSeparator(2)); ! modellingset.add(addSeparator(10)); ! modellingset.add(registerTool(Tool.CONSTRUCTOR_TOOL, ! constructor, ! "constructor-icon.png", ! "Constructor")); ! modellingset.add(addSeparator(10)); *************** *** 285,339 **** perspBut.setSelected(true); - { - ButtonGroup group = new ButtonGroup(); - JToggleButton modelling; - JToggleButton viewing; - { - Action action = new ToolAction(editor, "modelling", "modellingicon.gif") { - public void actionPerformed(ActionEvent event) { - modelling(); - } - }; - modelling = Toolbar.getInstance().registerAction(action); - group.add(modelling); - modellingset.add(modelling); - viewingset.add(modelling); - } - { - Action action = new ToolAction(editor, "viewing", "viewingicon.gif") { - public void actionPerformed(ActionEvent event) { - viewing(); - } - }; - viewing = Toolbar.getInstance().registerAction(action); - group.add(viewing); - modellingset.add(viewing); - viewingset.add(viewing); - } - modelling.setSelected(true); - } - setup(); ! } ! ! private void modelling() { ! Toolbar toolbar = Toolbar.getInstance(); ! toolbar.clear(); ! for (JComponent current : modellingset) { ! toolbar.addButton(current); ! } ! ViewToolbarFactory.instance().setup(); ! Editor.setViewing(false); ! } ! ! private void viewing() { ! Toolbar toolbar = Toolbar.getInstance(); ! toolbar.clear(); ! for (JComponent current : viewingset) { ! toolbar.addButton(current); ! } ! ViewToolbarFactory.instance().setup(); ! Editor.setViewing(true); ! } --- 268,273 ---- perspBut.setSelected(true); setup(); ! } |
|
From: Michael L. <he...@us...> - 2013-05-31 08:01:13
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11138/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: Cleaning up Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.213 retrieving revision 1.214 diff -C2 -d -r1.213 -r1.214 *** Project.java 18 May 2013 07:53:48 -0000 1.213 --- Project.java 31 May 2013 08:01:11 -0000 1.214 *************** *** 17,21 **** import java.util.ArrayList; import java.util.Collection; - import java.util.Date; import java.util.HashMap; import java.util.HashSet; --- 17,20 ---- *************** *** 28,33 **** import java.util.StringTokenizer; - import javax.swing.SwingUtilities; - import net.sourceforge.bprocessor.model.plugin.CirclePackage; import net.sourceforge.bprocessor.model.plugin.FacadePackage; --- 27,30 ---- *************** *** 54,58 **** private Tesselator tesselator; private Shell shell; ! private List staticObservers; private static Classification constructionClas = null; --- 51,55 ---- private Tesselator tesselator; private Shell shell; ! private List<Observer> staticObservers; private static Classification constructionClas = null; *************** *** 102,189 **** private long nextMaterialId; ! private List<Component> catalog; ! ! private Space findIn(Item item, String name) { ! if (item instanceof Space) { ! Space space = (Space) item; ! if (space.getName().equals(name)) { ! return space; ! } else { ! for (Item current : space.getElements()) { ! Space result = findIn(current, name); ! if (result != null) { ! return result; ! } ! } ! } ! } ! return null; ! } ! ! /** ! * ! * @param name String ! * @return space ! */ ! public Space find(String name) { ! return findIn(world, name); ! } ! ! /** ! * ! * @param name name ! * @return material ! */ ! public Material findMaterial(String name) { ! for (Material current : getMaterials()) { ! if (current.getName().equals(name)) { ! return current; ! } ! } ! return null; ! } ! ! /** ! * ! */ ! public void updateSensorData() { ! } ! ! /** ! * ! */ ! public void forward() { ! } ! ! /** ! * ! */ ! public void backward() { ! } ! ! /** ! * ! * @return date ! */ ! public Date getDate() { ! return new Date(); ! } - /** - * - * @return boolean - */ - public static boolean doDisplayGeometry() { - return Project.doDisplayGeometry; - } /** ! * ! * @return boolean */ - public static boolean useDisplayLists() { - return Project.useDisplayLists; - } - /** --- 99,108 ---- private long nextMaterialId; ! private List<Component> catalog; /** ! * Global application static methods */ /** *************** *** 225,228 **** --- 144,176 ---- } + + /** + * + * @return boolean + */ + public static boolean doDisplayGeometry() { + return Project.doDisplayGeometry; + } + + /** + * + * @return boolean + */ + public static boolean useDisplayLists() { + return Project.useDisplayLists; + } + + /** + * Global application methods + */ + + /** + * Project control methods + */ + + /** + * Project data methods + */ + /** * Constructor for Project *************** *** 240,243 **** --- 188,210 ---- /** * + * @param name name + * @return material + */ + public Material findMaterial(String name) { + for (Material current : getMaterials()) { + if (current.getName().equals(name)) { + return current; + } + } + return null; + } + + /** + * Unsorted methods + */ + + + /** + * */ public void initialize() { |
|
From: Michael L. <he...@us...> - 2013-05-31 08:01:10
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11124/src/net/sourceforge/bprocessor/gl/tool Modified Files: ToolFactory.java Log Message: Cleaning up Index: ToolFactory.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** ToolFactory.java 15 May 2013 06:44:06 -0000 1.112 --- ToolFactory.java 31 May 2013 08:01:07 -0000 1.113 *************** *** 286,309 **** { - { - Action action = new ToolAction(editor, "backward", "backwardicon.gif") { - public void actionPerformed(ActionEvent arg0) { - Project.getInstance().backward(); - } - }; - viewingset.add(Toolbar.getInstance().registerPushButtonAction(action, "Back")); - } - - { - Action action = new ToolAction(editor, "forward", "forwardicon.gif") { - public void actionPerformed(ActionEvent arg0) { - Project.getInstance().forward(); - } - }; - viewingset.add(Toolbar.getInstance().registerPushButtonAction(action, "Forward")); - } - } - - { ButtonGroup group = new ButtonGroup(); JToggleButton modelling; --- 286,289 ---- |
|
From: Michael L. <he...@us...> - 2013-05-31 08:01:05
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11090/src/net/sourceforge/bprocessor/gui Modified Files: Toolbar.java GUI.java Log Message: Cleaning up Index: Toolbar.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/Toolbar.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Toolbar.java 14 Sep 2009 16:22:52 -0000 1.10 --- Toolbar.java 31 May 2013 08:01:03 -0000 1.11 *************** *** 39,42 **** --- 39,43 ---- ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false); toolBar = new JToolBar(); + toolBar.setFloatable(false); add(toolBar); content = new LinkedList(); Index: GUI.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v retrieving revision 1.131 retrieving revision 1.132 diff -C2 -d -r1.131 -r1.132 *** GUI.java 15 May 2013 06:44:14 -0000 1.131 --- GUI.java 31 May 2013 08:01:03 -0000 1.132 *************** *** 20,27 **** import java.io.File; import java.util.Collection; - import java.util.HashSet; import java.util.LinkedList; import java.util.List; - import java.util.Set; import javax.swing.AbstractAction; --- 20,25 ---- *************** *** 82,88 **** /** */ private static final long serialVersionUID = 1L; ! private static final boolean IMPORT = false; ! private boolean isMac; --- 80,86 ---- /** */ private static final long serialVersionUID = 1L; ! private static final boolean IMPORT = false; ! private boolean isMac; *************** *** 92,100 **** /** The instance */ private static GUI instance; ! /** Presented */ private boolean presented = false; ! ! /** The main split pane */ private JSplitPane splitPaneLeftRight; --- 90,98 ---- /** The instance */ private static GUI instance; ! /** Presented */ private boolean presented = false; ! ! /** The main split pane */ private JSplitPane splitPaneLeftRight; *************** *** 102,109 **** /** The middle/right split pane */ private JSplitPane splitPaneMiddleRight; ! private Box controlPanels; private List<Component> panels; ! /** The splash */ private SplashWindow plash; --- 100,107 ---- /** The middle/right split pane */ private JSplitPane splitPaneMiddleRight; ! private Box controlPanels; private List<Component> panels; ! /** The splash */ private SplashWindow plash; *************** *** 117,123 **** /** SPLIT_RIGHT */ public static final Integer SPLIT_RIGHT = new Integer(2); - - /** closed spaces */ - private Set<Space> closedSpaces = new HashSet<Space>(); /** The browsing tree */ --- 115,118 ---- *************** *** 127,131 **** private JPanel alertPanel; ! private JTextArea textArea; --- 122,126 ---- private JPanel alertPanel; ! private JTextArea textArea; *************** *** 135,141 **** private MenuFactory menuFactory; ! private List<Operation> operations; ! /** * Constructor for GUI --- 130,136 ---- private MenuFactory menuFactory; ! private List<Operation> operations; ! /** * Constructor for GUI *************** *** 145,153 **** super("B-processor"); String os = System.getProperty("os.name"); ! if (os.startsWith("Mac")) { isMac = true; } ! setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); instance = this; --- 140,148 ---- super("B-processor"); String os = System.getProperty("os.name"); ! if (os.startsWith("Mac")) { isMac = true; } ! setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); instance = this; *************** *** 169,173 **** return instance; } ! /** * --- 164,168 ---- return instance; } ! /** * *************** *** 181,188 **** int result = JOptionPane.showConfirmDialog(parent, message, "", type); System.out.println("Result from the dialog."); ! return result; } ! /** * --- 176,183 ---- int result = JOptionPane.showConfirmDialog(parent, message, "", type); System.out.println("Result from the dialog."); ! return result; } ! /** * *************** *** 191,199 **** public static int confirmSave() { String message = "Do you want to save the changes you made in project \"" ! + Project.getInstance().getName() ! + "\"?"; return GUI.confirm(message); } ! /** * --- 186,194 ---- public static int confirmSave() { String message = "Do you want to save the changes you made in project \"" ! + Project.getInstance().getName() ! + "\"?"; return GUI.confirm(message); } ! /** * *************** *** 212,216 **** } } ! /** * --- 207,211 ---- } } ! /** * *************** *** 226,230 **** return true; } ! /** * --- 221,225 ---- return true; } ! /** * *************** *** 234,238 **** public static boolean userSaveAs() throws Exception { File file = GUI.chooseFile("Save"); ! if (file != null) { if (file.getName().lastIndexOf('.') != -1) { --- 229,233 ---- public static boolean userSaveAs() throws Exception { File file = GUI.chooseFile("Save"); ! if (file != null) { if (file.getName().lastIndexOf('.') != -1) { *************** *** 246,250 **** } } ! /** * --- 241,245 ---- } } ! /** * *************** *** 255,259 **** if (Project.getInstance().isDirty()) { int result = GUI.confirmSave(); ! if (result == JOptionPane.YES_OPTION) { if (userSave()) { --- 250,254 ---- if (Project.getInstance().isDirty()) { int result = GUI.confirmSave(); ! if (result == JOptionPane.YES_OPTION) { if (userSave()) { *************** *** 272,276 **** return true; } ! /** * --- 267,271 ---- return true; } ! /** * *************** *** 283,289 **** /** Abstract action */ private abstract class EditAction implements ActionListener { ! } ! /** * Create menus --- 278,284 ---- /** Abstract action */ private abstract class EditAction implements ActionListener { ! } ! /** * Create menus *************** *** 310,319 **** 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); --- 305,314 ---- 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); *************** *** 357,361 **** private abstract class ModellorAction extends AbstractAction { protected Modellor modellor; ! public ModellorAction(Modellor modellor) { super(modellor.title()); --- 352,356 ---- private abstract class ModellorAction extends AbstractAction { protected Modellor modellor; ! public ModellorAction(Modellor modellor) { super(modellor.title()); *************** *** 363,367 **** } } ! private JMenu createCreateMenu() { JMenu create = new JMenu("Create"); --- 358,362 ---- } } ! private JMenu createCreateMenu() { JMenu create = new JMenu("Create"); *************** *** 449,456 **** return create; } ! class CommandAction extends AbstractAction { private Class<? extends Command> clarse; ! public CommandAction(Class<? extends Command> clarse) { super(clarse.getSimpleName()); --- 444,451 ---- return create; } ! class CommandAction extends AbstractAction { private Class<? extends Command> clarse; ! public CommandAction(Class<? extends Command> clarse) { super(clarse.getSimpleName()); *************** *** 491,495 **** editUndo.setMnemonic(KeyEvent.VK_N); editUndo.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Z, ! Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); editUndo.addActionListener(new EditAction() { public void actionPerformed(ActionEvent arg0) { --- 486,490 ---- editUndo.setMnemonic(KeyEvent.VK_N); editUndo.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Z, ! Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); editUndo.addActionListener(new EditAction() { public void actionPerformed(ActionEvent arg0) { *************** *** 528,532 **** editCopy.addActionListener(new EditAction() { public void actionPerformed(ActionEvent arg0) { ! } }); --- 523,527 ---- editCopy.addActionListener(new EditAction() { public void actionPerformed(ActionEvent arg0) { ! } }); *************** *** 540,544 **** editPaste.addActionListener(new EditAction() { public void actionPerformed(ActionEvent arg0) { ! } }); --- 535,539 ---- editPaste.addActionListener(new EditAction() { public void actionPerformed(ActionEvent arg0) { ! } }); *************** *** 559,573 **** editDelete.setEnabled(false); edit.add(editDelete); - - edit.addSeparator(); - - JMenuItem refreshDataView = new JMenuItem("Refresh Data View"); - refreshDataView.setEnabled(true); - refreshDataView.addActionListener(new EditAction() { - public void actionPerformed(ActionEvent event) { - makeTree(); - }; - }); - edit.add(refreshDataView); Selection.primary().addObserver(new EditMenuListener(edit)); return edit; --- 554,557 ---- *************** *** 593,599 **** fileLoad.setEnabled(true); file.add(fileLoad); ! file.addSeparator(); ! JMenuItem fileClose = new JMenuItem("Close"); fileClose.addActionListener(new FileCloseActionListener()); --- 577,583 ---- fileLoad.setEnabled(true); file.add(fileLoad); ! file.addSeparator(); ! JMenuItem fileClose = new JMenuItem("Close"); fileClose.addActionListener(new FileCloseActionListener()); *************** *** 601,605 **** fileClose.setEnabled(true); file.add(fileClose); ! JMenuItem fileSave = new JMenuItem("Save"); fileSave.addActionListener(new FileSaveActionListener()); --- 585,589 ---- fileClose.setEnabled(true); file.add(fileClose); ! JMenuItem fileSave = new JMenuItem("Save"); fileSave.addActionListener(new FileSaveActionListener()); *************** *** 609,613 **** fileSave.setEnabled(true); file.add(fileSave); ! JMenuItem fileSaveAs = new JMenuItem("Save As"); fileSaveAs.addActionListener(new FileSaveAsActionListener()); --- 593,597 ---- fileSave.setEnabled(true); file.add(fileSave); ! JMenuItem fileSaveAs = new JMenuItem("Save As"); fileSaveAs.addActionListener(new FileSaveAsActionListener()); *************** *** 616,620 **** file.add(fileSaveAs); file.addSeparator(); ! { JMenuItem item = new JMenuItem("Import Data..."); --- 600,604 ---- file.add(fileSaveAs); file.addSeparator(); ! { JMenuItem item = new JMenuItem("Import Data..."); *************** *** 628,634 **** file.add(item); } ! file.addSeparator(); ! JMenuItem fileImport = new JMenuItem("Import..."); fileImport.addActionListener(new FileImportActionListener()); --- 612,618 ---- file.add(item); } ! file.addSeparator(); ! JMenuItem fileImport = new JMenuItem("Import..."); fileImport.addActionListener(new FileImportActionListener()); *************** *** 636,640 **** fileImport.setEnabled(true); file.add(fileImport); ! if (IMPORT) { JMenuItem item = new JMenuItem("Import Library..."); --- 620,624 ---- fileImport.setEnabled(true); file.add(fileImport); ! if (IMPORT) { JMenuItem item = new JMenuItem("Import Library..."); *************** *** 670,674 **** if (file != null && ! state == JFileChooser.APPROVE_OPTION) { try { Project.getInstance().exportObjAll(file.getPath()); --- 654,658 ---- if (file != null && ! state == JFileChooser.APPROVE_OPTION) { try { Project.getInstance().exportObjAll(file.getPath()); *************** *** 691,695 **** if (file != null && ! state == JFileChooser.APPROVE_OPTION) { try { Project.getInstance().exportXmlAll(file.getPath()); --- 675,679 ---- if (file != null && ! state == JFileChooser.APPROVE_OPTION) { try { Project.getInstance().exportXmlAll(file.getPath()); *************** *** 720,724 **** return file; } ! /** * Print a alert message in the gui --- 704,708 ---- return file; } ! /** * Print a alert message in the gui *************** *** 746,750 **** alert(string, where); } ! /** * Print a alert message in the gui --- 730,734 ---- alert(string, where); } ! /** * Print a alert message in the gui *************** *** 781,785 **** alertTimer.stop(); } ! @Override public void mouseExited(MouseEvent e) { --- 765,769 ---- alertTimer.stop(); } ! @Override public void mouseExited(MouseEvent e) { *************** *** 819,823 **** } ! /** * Register menu factory --- 803,807 ---- } ! /** * Register menu factory *************** *** 827,831 **** this.menuFactory = factory; } ! /** * Give menuFactory --- 811,815 ---- this.menuFactory = factory; } ! /** * Give menuFactory *************** *** 835,839 **** return this.menuFactory; } ! /** * Adds a menu to the menu bar. --- 819,823 ---- return this.menuFactory; } ! /** * Adds a menu to the menu bar. *************** *** 844,871 **** menu.registerMenu(extraMenu); } - - /** - * - */ - public void doNew() { - - } - - - /** * Create the main view */ ! public void createMainView() { panels = new LinkedList<Component>(); ! splitPaneMiddleRight = new JSplitPane(); splitPaneMiddleRight.setResizeWeight(1.0); splitPaneLeftRight = new JSplitPane(); splitPaneLeftRight.setDividerSize(7); splitPaneLeftRight.setRightComponent(splitPaneMiddleRight); ! JPanel holder = new JPanel(new BorderLayout()); controlPanels = Box.createVerticalBox(); --- 828,848 ---- menu.registerMenu(extraMenu); } /** * Create the main view */ ! private void createMainView() { panels = new LinkedList<Component>(); ! ! makeTree(); ! splitPaneMiddleRight = new JSplitPane(); splitPaneMiddleRight.setResizeWeight(1.0); splitPaneLeftRight = new JSplitPane(); + splitPaneLeftRight.setLeftComponent(tree); splitPaneLeftRight.setDividerSize(7); splitPaneLeftRight.setRightComponent(splitPaneMiddleRight); ! JPanel holder = new JPanel(new BorderLayout()); controlPanels = Box.createVerticalBox(); *************** *** 874,878 **** vfiller.setPreferredSize(new Dimension(240, 640)); holder.add(BorderLayout.SOUTH, vfiller); ! splitPaneMiddleRight.setRightComponent(new JScrollPane(holder)); --- 851,855 ---- vfiller.setPreferredSize(new Dimension(240, 640)); holder.add(BorderLayout.SOUTH, vfiller); ! splitPaneMiddleRight.setRightComponent(new JScrollPane(holder)); *************** *** 881,885 **** getContentPane().add(splitPaneLeftRight, BorderLayout.CENTER); getContentPane().add(StatusBar.instance(), BorderLayout.SOUTH); ! makeTree(); registerControlPanel(AttributeView.instance()); --- 858,862 ---- getContentPane().add(splitPaneLeftRight, BorderLayout.CENTER); getContentPane().add(StatusBar.instance(), BorderLayout.SOUTH); ! registerControlPanel(AttributeView.instance()); *************** *** 890,896 **** */ private void makeTree() { - if (tree != null) { - tree.removeAll(); - } Font font = new Font("Sans-serif", Font.BOLD, 12); tree = new JTabbedPane(JTabbedPane.TOP); --- 867,870 ---- *************** *** 905,912 **** tree.setMinimumSize(new Dimension(140, 240)); tree.setPreferredSize(new Dimension(275, 240)); - registerPanel(tree, SPLIT_LEFT); } ! /** * --- 879,885 ---- tree.setMinimumSize(new Dimension(140, 240)); tree.setPreferredSize(new Dimension(275, 240)); } ! /** * *************** *** 923,927 **** operations.remove(operation); } ! private void performOperations() { for (Operation current : operations) { --- 896,900 ---- operations.remove(operation); } ! private void performOperations() { for (Operation current : operations) { *************** *** 930,947 **** } } ! /** * Register panel * @param panel The panel component - * @param placement The panel placement */ ! public void registerPanel(Component panel, Integer placement) { ! if (placement.equals(SPLIT_LEFT)) { ! splitPaneLeftRight.setLeftComponent(panel); ! } else if (placement.equals(SPLIT_MIDDLE)) { ! splitPaneMiddleRight.setLeftComponent(panel); ! } else { ! controlPanels.add(panel); ! } } --- 903,913 ---- } } ! /** * Register panel * @param panel The panel component */ ! public void registerPanel(Component panel) { ! splitPaneMiddleRight.setLeftComponent(panel); } *************** *** 959,963 **** } } ! /** * --- 925,929 ---- } } ! /** * *************** *** 974,978 **** } } ! /** * --- 940,944 ---- } } ! /** * *************** *** 986,990 **** } } ! /** * Start the GUI --- 952,956 ---- } } ! /** * Start the GUI *************** *** 994,998 **** setSize(800, 600); } ! /** * Show the GUI --- 960,964 ---- setSize(800, 600); } ! /** * Show the GUI *************** *** 1009,1013 **** Project.getInstance().checkpoint(); Project.getInstance().changed(false); ! Timer animator = new Timer(1000 / 30, new ActionListener() { public void actionPerformed(ActionEvent arg0) { --- 975,979 ---- Project.getInstance().checkpoint(); Project.getInstance().changed(false); ! Timer animator = new Timer(1000 / 30, new ActionListener() { public void actionPerformed(ActionEvent arg0) { *************** *** 1016,1019 **** --- 982,986 ---- }); animator.start(); + System.out.println(this.getSize().width + " , " + this.getSize().height); } /** *************** *** 1025,1038 **** } } ! ! /** ! * Tells if a space is closed. ! * @param sp the space ! * @return wherther or not the space is closed. ! */ ! public boolean isClosed(Space sp) { ! boolean closed = closedSpaces.contains(sp); ! return closed; ! } /** --- 992,996 ---- } } ! /** |
|
From: Michael L. <he...@us...> - 2013-05-31 08:01:01
|
Update of /cvsroot/bprocessor/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11075 Modified Files: output.txt Log Message: Cleaning up Index: output.txt =================================================================== RCS file: /cvsroot/bprocessor/build/output.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** output.txt 29 Dec 2011 17:59:53 -0000 1.1 --- output.txt 31 May 2013 08:00:59 -0000 1.2 *************** *** 1,3 **** ! C:\Program Files\Java\jdk1.6.0_17 Buildfile: build.xml --- 1,3 ---- ! /System/Library/Frameworks/JavaVM.framework/Home Buildfile: build.xml *************** *** 5,52 **** [...1637 lines suppressed...] ! [copy] Copying 1 file to /Users/michaellassen/Documents/workspace/build/dist/core ! [copy] Copying 1 file to /Users/michaellassen/Documents/workspace/build/dist/core ! [copy] Copying 1 file to /Users/michaellassen/Documents/workspace/build/dist/library ! [copy] Copying 16 files to /Users/michaellassen/Documents/workspace/build/dist/library ! [copy] Copying 1 file to /Users/michaellassen/Documents/workspace/build/dist/library ! [copy] Copying 2 files to /Users/michaellassen/Documents/workspace/build/dist/library ! [copy] Copying 1 file to /Users/michaellassen/Documents/workspace/build/dist/core ! [copy] Copying 1 file to /Users/michaellassen/Documents/workspace/build/dist/core ! ! release: ! [move] Moving 52 files to /Users/michaellassen/Documents/workspace/build/archive/bprocessor-M11 ! [tar] Building tar: /Users/michaellassen/Documents/workspace/build/bprocessor-M11.tar ! [gzip] Building: /Users/michaellassen/Documents/workspace/build/bprocessor-M11.tar.gz ! [bzip2] Building: /Users/michaellassen/Documents/workspace/build/bprocessor-M11.tar.bz2 ! [zip] Building zip: /Users/michaellassen/Documents/workspace/build/bprocessor-M11.zip ! [delete] Deleting directory /Users/michaellassen/Documents/workspace/build/archive ! [delete] Deleting: /Users/michaellassen/Documents/workspace/build/bprocessor-M11.tar ! ! BUILD SUCCESSFUL ! Total time: 27 seconds |
|
From: Michael L. <he...@us...> - 2013-05-31 08:00:58
|
Update of /cvsroot/bprocessor/tools/mysql In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11063/mysql Added Files: mysql-connector-java-5.1.25-bin.jar Log Message: Cleaning up --- NEW FILE: mysql-connector-java-5.1.25-bin.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Michael L. <he...@us...> - 2013-05-31 08:00:48
|
Update of /cvsroot/bprocessor/tools/mysql In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11056/mysql Log Message: Directory /cvsroot/bprocessor/tools/mysql added to the repository |
|
From: Michael L. <he...@us...> - 2013-05-18 07:53:53
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15464/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.212 retrieving revision 1.213 diff -C2 -d -r1.212 -r1.213 *** Project.java 16 May 2013 08:26:15 -0000 1.212 --- Project.java 18 May 2013 07:53:48 -0000 1.213 *************** *** 75,80 **** private List<Observer> observers; ! private Stack undoStack; ! private Stack redoStack; private Bmodel currentState; --- 75,80 ---- private List<Observer> observers; ! private Stack<Bmodel> undoStack; ! private Stack<Bmodel> redoStack; private Bmodel currentState; *************** *** 90,94 **** private CoordinateSystem activeCoordinateSystem; ! private HashMap cameras = new HashMap(); private long nextCameraID; private Camera currentCamera; --- 90,94 ---- private CoordinateSystem activeCoordinateSystem; ! private Map<Long, Camera> cameras; private long nextCameraID; private Camera currentCamera; *************** *** 98,111 **** private String name; private Description script; - - /** Flag set when updating */ - private boolean updating = false; private Map<Long, Material> materials; private long nextMaterialId; ! private List<Component> catalog; ! ! private Space findIn(Item item, String name) { --- 98,106 ---- private String name; private Description script; private Map<Long, Material> materials; private long nextMaterialId; ! private List<Component> catalog; private Space findIn(Item item, String name) { |
|
From: Michael L. <he...@us...> - 2013-05-16 08:26:17
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13879/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.211 retrieving revision 1.212 diff -C2 -d -r1.211 -r1.212 *** Project.java 15 May 2013 06:44:11 -0000 1.211 --- Project.java 16 May 2013 08:26:15 -0000 1.212 *************** *** 44,136 **** */ public class Project implements Parametric { ! /** The logger */ private static Logger log = Logger.getLogger(Project.class); ! /** The instance */ ! private static Project instance; ! private Tesselator tesselator; - private Shell shell; - - /** The observers */ - private List<Observer> observers; - - /** Static observers */ private List staticObservers; ! /** The scheduled observers */ ! private List scheduledObservers; ! ! /** The toplevel space */ ! private Space world; ! ! /** The classification */ ! private static Classification constructionClas = null; ! ! /** The classification */ private static Classification functionalClas = null; - private static Collection<ClassificationType> classificationTypes; private static Collection<Component> library; private static boolean doDisplayGeometry; private static boolean useDisplayLists = false; - private static boolean doExport; ! private HashMap cameras = new HashMap(); ! private long nextCameraID; - /** The globals */ - private ParameterBlock globals; ! /** Has changes been made */ ! private boolean dirty; ! private boolean isExporting; ! /** The path to the current project */ ! private String savePath; ! /** The last used path for for loading and saving */ ! private String defaultPath; ! /** The current project camera */ ! private Camera currentCamera; ! /** The active space */ private Space activeSpace; - - /** The undo stack */ - private Stack undoStack; - - /** The redo stack */ - private Stack redoStack; - - /** The current state */ - private Bmodel currentState; - - /** The activeCoordinateSystem */ private CoordinateSystem activeCoordinateSystem; ! /** The name of the project */ ! private String name; ! /** The script of the Project */ private Description script; - private String exportPath; - /** Flag set when updating */ private boolean updating = false; private Map<Long, Material> materials; - private long nextMaterialId; private List<Component> catalog; private Space findIn(Item item, String name) { if (item instanceof Space) { --- 44,112 ---- */ public class Project implements Parametric { ! /** The Logger */ private static Logger log = Logger.getLogger(Project.class); ! /** ! * Global application state ! */ + private static Project instance; private Tesselator tesselator; private Shell shell; private List staticObservers; ! private static Classification constructionClas = null; private static Classification functionalClas = null; private static Collection<ClassificationType> classificationTypes; + private static Collection<Component> library; private static boolean doDisplayGeometry; private static boolean useDisplayLists = false; ! private String defaultPath; ! /** ! * Non persistent per-project state ! */ ! private List<Observer> observers; ! private Stack undoStack; ! private Stack redoStack; ! private Bmodel currentState; ! private boolean dirty; ! private String savePath; ! /** ! * Persistent project state ! */ ! private Space world; private Space activeSpace; private CoordinateSystem activeCoordinateSystem; ! private HashMap cameras = new HashMap(); ! private long nextCameraID; ! private Camera currentCamera; ! private ParameterBlock globals; ! ! private String name; private Description script; /** Flag set when updating */ private boolean updating = false; private Map<Long, Material> materials; private long nextMaterialId; private List<Component> catalog; + + private Space findIn(Item item, String name) { if (item instanceof Space) { *************** *** 272,280 **** public void initialize() { name = "New Project"; - exportPath = "b-export"; script = new Description(""); observers = new LinkedList(); - scheduledObservers = new LinkedList(); catalog = new LinkedList(); --- 248,254 ---- *************** *** 410,434 **** /** - * Schedule adding an observer. Will be added at a safe time. - * @param observer The observer - */ - public void scheduleObserver(Observer observer) { - scheduledObservers.add(observer); - if (!updating) { - addSchedule(); - } - } - - /** - * Adds observers scheduled. - */ - private void addSchedule() { - Iterator it = scheduledObservers.iterator(); - while (it.hasNext()) { - addObserver((Observer)it.next()); - } - } - - /** * Remove observer * @param observer The observer --- 384,387 ---- *************** *** 472,482 **** allObservers.addAll(staticObservers); Iterator iter = allObservers.iterator(); - updating = true; while (iter.hasNext()) { Observer current = (Observer) iter.next(); current.update(entity); } - updating = false; - addSchedule(); makeDirty(); } --- 425,432 ---- *************** *** 662,678 **** public void makeDirty() { dirty = true; - if (doExport) { - if (!isExporting) { - isExporting = true; - SwingUtilities.invokeLater( - new Runnable() { - public void run() { - export(); - isExporting = false; - } - } - ); - } - } } --- 612,615 ---- *************** *** 983,990 **** } else if (a.getName().equals("Use display lists")) { useDisplayLists = ((Boolean) a.getValue()).booleanValue(); - } else if (a.getName().equals("Export")) { - doExport = ((Boolean) a.getValue()).booleanValue(); - } else if (a.getName().equals("Export Path")) { - setExportPath((String)a.getValue()); } } --- 920,923 ---- *************** *** 1027,1046 **** /** - * - * @return Export Path - */ - public String getExportPath() { - return exportPath; - } - - /** - * Set export path - * @param value new export path - */ - public void setExportPath(String value) { - exportPath = value; - } - - /** * String representation of the object * @return The string --- 960,963 ---- *************** *** 1470,1483 **** } - /** - * - */ - public void export() { - try { - export(getExportPath()); - } catch (Exception e) { - // empty - } - } /** --- 1387,1390 ---- |
|
From: Michael L. <he...@us...> - 2013-05-15 07:38:49
|
Update of /cvsroot/bprocessor/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26800 Modified Files: build.xml Log Message: Cleaning up code Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/build/build.xml,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** build.xml 14 May 2013 21:13:22 -0000 1.44 --- build.xml 15 May 2013 07:38:47 -0000 1.45 *************** *** 16,20 **** <property name="bprocessor.dir" value="${basedir}/../bprocessor"/> <property name="bproc.dir" value="${basedir}/../bprocessor"/> - <property name="sensobyg.dir" value="${basedir}/../sensobyg"/> <property name="release.dir" value="${basedir}/dist"/> --- 16,19 ---- *************** *** 98,106 **** </fileset> </copy> - <copy todir="${release.dir}/core"> - <fileset dir="${sensobyg.dir}/dist"> - <include name="**/*"/> - </fileset> - </copy> <chmod dir="${release.dir}" perm="ugo+rx" --- 97,100 ---- |
|
From: Michael L. <he...@us...> - 2013-05-15 07:38:46
|
Update of /cvsroot/bprocessor/gui In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26793 Modified Files: .classpath build.xml Log Message: Cleaning up code Index: .classpath =================================================================== RCS file: /cvsroot/bprocessor/gui/.classpath,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** .classpath 17 Dec 2010 12:16:40 -0000 1.7 --- .classpath 15 May 2013 07:38:44 -0000 1.8 *************** *** 5,9 **** <classpathentry kind="src" path="/model"/> <classpathentry kind="src" path="/bscript"/> - <classpathentry combineaccessrules="false" kind="src" path="/sensobyg"/> <classpathentry kind="output" path="build"/> </classpath> --- 5,8 ---- Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/gui/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** build.xml 17 Dec 2010 12:16:40 -0000 1.7 --- build.xml 15 May 2013 07:38:44 -0000 1.8 *************** *** 15,19 **** <property name="lib.dir" value="${basedir}/lib"/> <property name="dist.dir" value="${basedir}/dist"/> - <property name="sensobyg.dir" value="${basedir}/../sensobyg"/> <property name="gfx.dir" value="${src.dir}/gfx"/> --- 15,18 ---- *************** *** 71,79 **** </fileset> </copy> - <copy todir="${lib.dir}"> - <fileset dir="${sensobyg.dir}/dist"> - <include name="**/sensobyg*"/> - </fileset> - </copy> </target> --- 70,73 ---- |
|
From: Michael L. <he...@us...> - 2013-05-15 07:38:43
|
Update of /cvsroot/bprocessor/model In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26786 Modified Files: build.xml .classpath Log Message: Cleaning up code Index: .classpath =================================================================== RCS file: /cvsroot/bprocessor/model/.classpath,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** .classpath 17 Dec 2010 12:16:46 -0000 1.15 --- .classpath 15 May 2013 07:38:41 -0000 1.16 *************** *** 8,12 **** <classpathentry kind="lib" path="/tools/junit/junit.jar"/> <classpathentry exported="true" kind="lib" path="xml"/> - <classpathentry combineaccessrules="false" kind="src" path="/sensobyg"/> <classpathentry kind="output" path="build"/> </classpath> --- 8,11 ---- Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/model/build.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** build.xml 17 Dec 2010 12:16:46 -0000 1.26 --- build.xml 15 May 2013 07:38:41 -0000 1.27 *************** *** 15,20 **** <property name="dist.dir" value="${basedir}/dist"/> <property name="test.doc.api.dir" value="${doc.dir}/testapi"/> ! <property name="sensobyg.dir" value="${basedir}/../sensobyg"/> ! <property name="checkstyle-results" value="${build.dir}/checkstyle-results.txt" /> --- 15,19 ---- <property name="dist.dir" value="${basedir}/dist"/> <property name="test.doc.api.dir" value="${doc.dir}/testapi"/> ! <property name="checkstyle-results" value="${build.dir}/checkstyle-results.txt" /> *************** *** 71,79 **** </fileset> </copy> - <copy todir="${lib.dir}"> - <fileset dir="${sensobyg.dir}/dist"> - <include name="**/sensobyg*"/> - </fileset> - </copy> </target> --- 70,73 ---- |
|
From: Michael L. <he...@us...> - 2013-05-15 07:38:40
|
Update of /cvsroot/bprocessor/gl In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26776 Modified Files: .classpath build.xml Log Message: Cleaning up code Index: .classpath =================================================================== RCS file: /cvsroot/bprocessor/gl/.classpath,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** .classpath 17 Dec 2010 12:16:37 -0000 1.8 --- .classpath 15 May 2013 07:38:38 -0000 1.9 *************** *** 8,12 **** <classpathentry combineaccessrules="false" kind="src" path="/bscript"/> <classpathentry kind="lib" path="/tools/jogl/gluegen-rt.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/sensobyg"/> <classpathentry kind="output" path="build"/> </classpath> --- 8,11 ---- Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/gl/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** build.xml 21 Dec 2011 12:55:06 -0000 1.10 --- build.xml 15 May 2013 07:38:38 -0000 1.11 *************** *** 18,22 **** <property name="lib.dir" value="${basedir}/lib"/> <property name="dist.dir" value="${basedir}/dist"/> - <property name="sensobyg.dir" value="${basedir}/../sensobyg"/> <property name="checkstyle-results" value="${build.dir}/checkstyle-results.txt" /> --- 18,21 ---- *************** *** 77,85 **** </fileset> </copy> - <copy todir="${lib.dir}"> - <fileset dir="${sensobyg.dir}/dist"> - <include name="**/sensobyg*"/> - </fileset> - </copy> </target> --- 76,79 ---- |
|
From: Michael L. <he...@us...> - 2013-05-15 06:44:17
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22908/src/net/sourceforge/bprocessor/gui/attrview Modified Files: GenericPanel.java Removed Files: GraphAttribute.java Log Message: Removed some sensobyg code --- GraphAttribute.java DELETED --- Index: GenericPanel.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** GenericPanel.java 18 May 2011 22:08:38 -0000 1.60 --- GenericPanel.java 15 May 2013 06:44:14 -0000 1.61 *************** *** 35,39 **** import net.sourceforge.bprocessor.model.Selector; import net.sourceforge.bprocessor.model.Structure; - import net.sourceforge.bprocessor.model.sense.monitor.Graph; /** --- 35,38 ---- *************** *** 208,217 **** } - private void handleGraph(Attribute attribute, JComponent where) { - GenericAttribute generic = new GraphAttribute(attribute); - genAttributes.add(generic); - where.add(new AttributeRow(generic)); - } - private void generateContent(List what, JComponent where) { Iterator iter = what.iterator(); --- 207,210 ---- *************** *** 230,235 **** } else if (a.getValue() instanceof Boolean) { handleBoolean(a, where); - } else if (a.getValue() instanceof Graph) { - handleGraph(a, where); } else if (a.getValue() instanceof Component) { handleComponent(a, where); --- 223,226 ---- |
|
From: Michael L. <he...@us...> - 2013-05-15 06:44:13
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense/brunata In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22879/src/net/sourceforge/bprocessor/model/sense/brunata Removed Files: BrunataHistory.java TargetManager.java Log Message: Removed some sensobyg code --- TargetManager.java DELETED --- --- BrunataHistory.java DELETED --- |
|
From: Michael L. <he...@us...> - 2013-05-15 06:44:12
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/sense In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22879/src/net/sourceforge/bprocessor/model/sense Removed Files: package.html Log Message: Removed some sensobyg code --- package.html DELETED --- |
|
From: Michael L. <he...@us...> - 2013-05-15 06:44:08
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22862/src/net/sourceforge/bprocessor/gl/tool Modified Files: ToolFactory.java SpaceSelectTool.java Removed Files: FourTool.java Log Message: Removed some sensobyg code Index: ToolFactory.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** ToolFactory.java 1 Dec 2010 11:52:26 -0000 1.111 --- ToolFactory.java 15 May 2013 06:44:06 -0000 1.112 *************** *** 144,148 **** assign = new SpaceTool(editor, null); spaceselect = new SpaceSelectTool(editor, null); - four = new FourTool(editor, null); pencil = new Pencil(editor, pencilcursor); --- 144,147 ---- *************** *** 167,174 **** viewingset.add(registerTool(Tool.SPACE_SELECT, spaceselect, "Biconselecttool2.gif", "Sensor Select")); ! ! viewingset.add(registerTool("four", four, ! "four.png", "Mold ~ Four Weeks")); ! modellingset.add(registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select")); modellingset.add(registerTool(Tool.ASSIGN_TOOL, assign, "assign-icon-3.png", "Assign")); --- 166,170 ---- viewingset.add(registerTool(Tool.SPACE_SELECT, spaceselect, "Biconselecttool2.gif", "Sensor Select")); ! modellingset.add(registerTool(Tool.SELECT_TOOL, select, "Biconselecttool.gif", "Select")); modellingset.add(registerTool(Tool.ASSIGN_TOOL, assign, "assign-icon-3.png", "Assign")); Index: SpaceSelectTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceSelectTool.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SpaceSelectTool.java 26 Nov 2010 14:20:27 -0000 1.6 --- SpaceSelectTool.java 15 May 2013 06:44:06 -0000 1.7 *************** *** 51,55 **** public void prepare() { Selection.primary().clear(); - Project.getInstance().clearHistoriuc(); } --- 51,54 ---- --- FourTool.java DELETED --- |
|
From: Michael L. <he...@us...> - 2013-05-14 21:13:24
|
Update of /cvsroot/bprocessor/build In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23056 Modified Files: build.xml Log Message: Removing code that does not work well Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/build/build.xml,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** build.xml 14 May 2013 15:47:07 -0000 1.43 --- build.xml 14 May 2013 21:13:22 -0000 1.44 *************** *** 14,18 **** <property name="gui.dir" value="${basedir}/../gui"/> <property name="gl.dir" value="${basedir}/../gl"/> - <property name="facade.dir" value="${basedir}/../facade"/> <property name="bprocessor.dir" value="${basedir}/../bprocessor"/> <property name="bproc.dir" value="${basedir}/../bprocessor"/> --- 14,17 ---- *************** *** 35,39 **** <ant dir="${gui.dir}" target="clean"/> <ant dir="${gl.dir}" target="clean"/> - <ant dir="${facade.dir}" target="clean"/> <ant dir="${bprocessor.dir}" target="clean"/> </target> --- 34,37 ---- *************** *** 50,54 **** <ant dir="${gui.dir}" target="dist"/> <ant dir="${gl.dir}" target="dist"/> - <ant dir="${facade.dir}" target="dist"/> <ant dir="${bprocessor.dir}" target="dist"/> <copy todir="${release.dir}"> --- 48,51 ---- |
|
From: Michael L. <he...@us...> - 2013-05-14 21:13:21
|
Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23040/src/net/sourceforge/bprocessor Modified Files: Main.java Log Message: Removing code that does not work well Index: Main.java =================================================================== RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/Main.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Main.java 23 May 2011 12:25:17 -0000 1.6 --- Main.java 14 May 2013 21:13:19 -0000 1.7 *************** *** 1,5 **** package net.sourceforge.bprocessor; - import net.sourceforge.bprocessor.facade.FacadeMain; import net.sourceforge.bprocessor.gl.Editor; import net.sourceforge.bprocessor.gui.GUI; --- 1,4 ---- *************** *** 22,26 **** public void run() { - shell.add(new FacadeMain()); shell.prepare(); shell.start(); --- 21,24 ---- |
