Thread: [Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/actions ToolsDetachActionListener.java,1.
Status: Pre-Alpha
Brought to you by:
henryml
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31695/src/net/sourceforge/bprocessor/gui/actions Modified Files: ToolsDetachActionListener.java CreateElementActionListener.java CreatePartActionListener.java ToolsJoinActionListener.java Log Message: Removed part and element Index: CreatePartActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreatePartActionListener.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CreatePartActionListener.java 2 Oct 2005 14:37:10 -0000 1.6 --- CreatePartActionListener.java 11 Dec 2005 17:27:54 -0000 1.7 *************** *** 8,13 **** import net.sourceforge.bprocessor.gui.GUI; - import net.sourceforge.bprocessor.model.Part; import net.sourceforge.bprocessor.model.Project; import java.awt.event.ActionEvent; --- 8,13 ---- import net.sourceforge.bprocessor.gui.GUI; import net.sourceforge.bprocessor.model.Project; + import net.sourceforge.bprocessor.model.Space; import java.awt.event.ActionEvent; *************** *** 44,49 **** if (result != null && !result.trim().equals("")) { ! Part p = new Part(result.trim()); ! Project.getInstance().intern(p); } } --- 44,49 ---- if (result != null && !result.trim().equals("")) { ! Space space = new Space(result.trim()); ! Project.getInstance().intern(space); } } Index: ToolsDetachActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ToolsDetachActionListener.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ToolsDetachActionListener.java 2 Oct 2005 14:37:10 -0000 1.4 --- ToolsDetachActionListener.java 11 Dec 2005 17:27:54 -0000 1.5 *************** *** 7,16 **** package net.sourceforge.bprocessor.gui.actions; - import net.sourceforge.bprocessor.model.ConstructionSpace; - import net.sourceforge.bprocessor.model.Element; import net.sourceforge.bprocessor.model.FunctionalSpace; - import net.sourceforge.bprocessor.model.Part; import net.sourceforge.bprocessor.model.Project; - import net.sourceforge.bprocessor.model.Surface; import java.awt.BorderLayout; --- 7,12 ---- *************** *** 190,280 **** String rsname = (String)rightSelector.getSelectedItem(); ValueHolder lsvalue = (ValueHolder)leftValues.getSelectedValue(); - - if (lsvalue != null) { - if (lsname.equals(FUNCTIONAL_SPACES)) { - FunctionalSpace fs = - Project.getInstance().findFunctionalSpaceById(lsvalue.getId()); - - if (rsname.equals(SURFACES)) { - Vector rightValuesData = new Vector(); - Collection surfaces = fs.getSurfaces(); - Iterator it = surfaces.iterator(); - while (it.hasNext()) { - Surface s = (Surface)it.next(); - rightValuesData.add(new ValueHolder(s.getId(), s.getName())); - } - rightValues.setListData(rightValuesData); - - } else if (rsname.equals(ELEMENTS)) { - Vector rightValuesData = new Vector(); - Collection elements = fs.getElements(); - Iterator it = elements.iterator(); - while (it.hasNext()) { - Element e = (Element)it.next(); - rightValuesData.add(new ValueHolder(e.getId(), e.getName())); - } - rightValues.setListData(rightValuesData); - } - } else if (lsname.equals(CONSTRUCTION_SPACES)) { - ConstructionSpace cs = Project.getInstance().findConstructionSpaceById(lsvalue.getId()); - - if (rsname.equals(SURFACES)) { - Vector rightValuesData = new Vector(); - Collection surfaces = cs.getSurfaces(); - Iterator it = surfaces.iterator(); - while (it.hasNext()) { - Surface s = (Surface)it.next(); - rightValuesData.add(new ValueHolder(s.getId(), s.getName())); - } - rightValues.setListData(rightValuesData); - - } else if (rsname.equals(ELEMENTS)) { - Vector rightValuesData = new Vector(); - Collection elements = cs.getElements(); - Iterator it = elements.iterator(); - while (it.hasNext()) { - Element e = (Element)it.next(); - rightValuesData.add(new ValueHolder(e.getId(), e.getName())); - } - rightValues.setListData(rightValuesData); - } - } else if (lsname.equals(ELEMENTS)) { - Element e = Project.getInstance().findElementById(lsvalue.getId()); - - if (rsname.equals(SURFACES)) { - Vector rightValuesData = new Vector(); - Collection surfaces = e.getSurfaces(); - Iterator it = surfaces.iterator(); - while (it.hasNext()) { - Surface s = (Surface)it.next(); - rightValuesData.add(new ValueHolder(s.getId(), s.getName())); - } - rightValues.setListData(rightValuesData); - - } else if (rsname.equals(PARTS)) { - Vector rightValuesData = new Vector(); - Collection elements = e.getParts(); - Iterator it = elements.iterator(); - while (it.hasNext()) { - Part p = (Part)it.next(); - rightValuesData.add(new ValueHolder(p.getId(), p.getName())); - } - rightValues.setListData(rightValuesData); - } - } else if (lsname.equals(PARTS)) { - Part p = Project.getInstance().findPartById(lsvalue.getId()); - - if (rsname.equals(SURFACES)) { - Vector rightValuesData = new Vector(); - Collection surfaces = p.getSurfaces(); - Iterator it = surfaces.iterator(); - while (it.hasNext()) { - Surface s = (Surface)it.next(); - rightValuesData.add(new ValueHolder(s.getId(), s.getName())); - } - rightValues.setListData(rightValuesData); - } - } - } } } --- 186,189 ---- *************** *** 314,371 **** public void itemStateChanged(ItemEvent event) { String current = (String)leftSelector.getSelectedItem(); ! if (!current.equals(last)) { ! Vector leftValuesData = new Vector(); ! if (current.equals(FUNCTIONAL_SPACES)) { ! Collection spaces = Project.getInstance().getFunctionalSpaces(); ! Iterator it = spaces.iterator(); ! while (it.hasNext()) { ! FunctionalSpace fs = (FunctionalSpace)it.next(); ! leftValuesData.add(new ValueHolder(fs.getId(), fs.getName())); ! } ! ! rightSelector.removeAllItems(); ! rightSelector.addItem(SURFACES); ! rightSelector.addItem(ELEMENTS); ! ! } else if (current.equals(CONSTRUCTION_SPACES)) { ! Collection spaces = Project.getInstance().getConstructionSpaces(); ! Iterator it = spaces.iterator(); ! while (it.hasNext()) { ! ConstructionSpace cs = (ConstructionSpace)it.next(); ! leftValuesData.add(new ValueHolder(cs.getId(), cs.getName())); ! } ! ! rightSelector.removeAllItems(); ! rightSelector.addItem(SURFACES); ! rightSelector.addItem(ELEMENTS); ! ! } else if (current.equals(ELEMENTS)) { ! Collection elements = Project.getInstance().getElements(); ! Iterator it = elements.iterator(); ! while (it.hasNext()) { ! Element e = (Element)it.next(); ! leftValuesData.add(new ValueHolder(e.getId(), e.getName())); ! } ! ! rightSelector.removeAllItems(); ! rightSelector.addItem(SURFACES); ! rightSelector.addItem(PARTS); ! ! } else if (current.equals(PARTS)) { ! Collection parts = Project.getInstance().getParts(); ! Iterator it = parts.iterator(); ! while (it.hasNext()) { ! Part p = (Part)it.next(); ! leftValuesData.add(new ValueHolder(p.getId(), p.getName())); ! } ! ! rightSelector.removeAllItems(); ! rightSelector.addItem(SURFACES); ! } ! ! leftValues.setListData(leftValuesData); ! ! last = current; ! } } } --- 223,227 ---- public void itemStateChanged(ItemEvent event) { String current = (String)leftSelector.getSelectedItem(); ! } } *************** *** 411,494 **** public void itemStateChanged(ItemEvent event) { String current = (String)rightSelector.getSelectedItem(); ! if (current != null && !current.equals(last)) { ! Vector rightValuesData = new Vector(); ! ValueHolder lsvalue = (ValueHolder)leftValues.getSelectedValue(); ! if (lsvalue != null) { ! String lsname = (String)leftSelector.getSelectedItem(); ! String rsname = (String)rightSelector.getSelectedItem(); ! if (lsname.equals(FUNCTIONAL_SPACES)) { ! FunctionalSpace fs = Project.getInstance().findFunctionalSpaceById(lsvalue.getId()); ! ! if (rsname.equals(SURFACES)) { ! Collection surfaces = fs.getSurfaces(); ! Iterator it = surfaces.iterator(); ! while (it.hasNext()) { ! Surface s = (Surface)it.next(); ! rightValuesData.add(new ValueHolder(s.getId(), s.getName())); ! } ! ! } else if (rsname.equals(ELEMENTS)) { ! Collection elements = fs.getElements(); ! Iterator it = elements.iterator(); ! while (it.hasNext()) { ! Element e = (Element)it.next(); ! rightValuesData.add(new ValueHolder(e.getId(), e.getName())); ! } ! } ! } else if (lsname.equals(CONSTRUCTION_SPACES)) { ! ConstructionSpace cs = Project.getInstance().findConstructionSpaceById(lsvalue.getId()); ! ! if (rsname.equals(SURFACES)) { ! Collection surfaces = cs.getSurfaces(); ! Iterator it = surfaces.iterator(); ! while (it.hasNext()) { ! Surface s = (Surface)it.next(); ! rightValuesData.add(new ValueHolder(s.getId(), s.getName())); ! } ! ! } else if (rsname.equals(ELEMENTS)) { ! Collection elements = cs.getElements(); ! Iterator it = elements.iterator(); ! while (it.hasNext()) { ! Element e = (Element)it.next(); ! rightValuesData.add(new ValueHolder(e.getId(), e.getName())); ! } ! } ! } else if (lsname.equals(ELEMENTS)) { ! Element e = Project.getInstance().findElementById(lsvalue.getId()); ! ! if (rsname.equals(SURFACES)) { ! Collection surfaces = e.getSurfaces(); ! Iterator it = surfaces.iterator(); ! while (it.hasNext()) { ! Surface s = (Surface)it.next(); ! rightValuesData.add(new ValueHolder(s.getId(), s.getName())); ! } ! ! } else if (rsname.equals(PARTS)) { ! Collection elements = e.getParts(); ! Iterator it = elements.iterator(); ! while (it.hasNext()) { ! Part p = (Part)it.next(); ! rightValuesData.add(new ValueHolder(p.getId(), p.getName())); ! } ! } ! } else if (lsname.equals(PARTS)) { ! Part p = Project.getInstance().findPartById(lsvalue.getId()); ! ! if (rsname.equals(SURFACES)) { ! Collection surfaces = p.getSurfaces(); ! Iterator it = surfaces.iterator(); ! while (it.hasNext()) { ! Surface s = (Surface)it.next(); ! rightValuesData.add(new ValueHolder(s.getId(), s.getName())); ! } ! } ! } ! } ! rightValues.setListData(rightValuesData); ! ! last = current; ! } } } --- 267,271 ---- public void itemStateChanged(ItemEvent event) { String current = (String)rightSelector.getSelectedItem(); ! } } *************** *** 542,603 **** ValueHolder rsvalue = (ValueHolder)rightValues.getSelectedValue(); ! if (lsvalue != null && rsvalue != null) { ! if (lsname.equals(FUNCTIONAL_SPACES)) { ! FunctionalSpace fs = Project.getInstance().findFunctionalSpaceById(lsvalue.getId()); ! ! if (rsname.equals(SURFACES)) { ! Surface s = Project.getInstance().findSurfaceById(rsvalue.getId()); ! ! s.removeDomain(fs); ! fs.getSurfaces().remove(s); ! Project.getInstance().update(fs); ! } else if (rsname.equals(ELEMENTS)) { ! Element e = Project.getInstance().findElementById(rsvalue.getId()); ! ! fs.getElements().remove(e); ! Project.getInstance().update(fs); ! } ! } else if (lsname.equals(CONSTRUCTION_SPACES)) { ! ConstructionSpace cs = Project.getInstance().findConstructionSpaceById(lsvalue.getId()); ! ! if (rsname.equals(SURFACES)) { ! Surface s = Project.getInstance().findSurfaceById(rsvalue.getId()); ! ! s.removeDomain(cs); ! cs.getSurfaces().remove(s); ! Project.getInstance().update(cs); ! } else if (rsname.equals(ELEMENTS)) { ! Element e = Project.getInstance().findElementById(rsvalue.getId()); ! ! cs.getElements().remove(e); ! Project.getInstance().update(cs); ! } ! } else if (lsname.equals(ELEMENTS)) { ! Element e = Project.getInstance().findElementById(lsvalue.getId()); ! ! if (rsname.equals(SURFACES)) { ! Surface s = Project.getInstance().findSurfaceById(rsvalue.getId()); ! ! s.removeDomain(e); ! e.getSurfaces().remove(s); ! Project.getInstance().update(e); ! } else if (rsname.equals(PARTS)) { ! Part p = Project.getInstance().findPartById(rsvalue.getId()); ! ! e.getParts().remove(p); ! Project.getInstance().update(e); ! } ! } else if (lsname.equals(PARTS)) { ! Part p = Project.getInstance().findPartById(lsvalue.getId()); ! ! if (rsname.equals(SURFACES)) { ! Surface s = Project.getInstance().findSurfaceById(rsvalue.getId()); ! ! s.removeDomain(p); ! p.getSurfaces().remove(s); ! Project.getInstance().update(p); ! } ! } ! } if (log.isDebugEnabled()) { log.debug("Detaching: " + rsvalue + " from " + lsvalue); --- 319,323 ---- ValueHolder rsvalue = (ValueHolder)rightValues.getSelectedValue(); ! if (log.isDebugEnabled()) { log.debug("Detaching: " + rsvalue + " from " + lsvalue); Index: CreateElementActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateElementActionListener.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CreateElementActionListener.java 2 Oct 2005 14:37:10 -0000 1.6 --- CreateElementActionListener.java 11 Dec 2005 17:27:54 -0000 1.7 *************** *** 8,13 **** import net.sourceforge.bprocessor.gui.GUI; - import net.sourceforge.bprocessor.model.Element; import net.sourceforge.bprocessor.model.Project; import java.awt.event.ActionEvent; --- 8,13 ---- import net.sourceforge.bprocessor.gui.GUI; import net.sourceforge.bprocessor.model.Project; + import net.sourceforge.bprocessor.model.Space; import java.awt.event.ActionEvent; *************** *** 44,50 **** if (result != null && !result.trim().equals("")) { ! Element el = new Element(result.trim()); ! Project.getInstance().intern(el); } } --- 44,50 ---- if (result != null && !result.trim().equals("")) { ! Space space = new Space(result.trim()); ! Project.getInstance().intern(space); } } Index: ToolsJoinActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/ToolsJoinActionListener.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ToolsJoinActionListener.java 2 Oct 2005 14:37:10 -0000 1.4 --- ToolsJoinActionListener.java 11 Dec 2005 17:27:54 -0000 1.5 *************** *** 7,17 **** package net.sourceforge.bprocessor.gui.actions; ! import net.sourceforge.bprocessor.model.ConstructionSpace; ! import net.sourceforge.bprocessor.model.Element; import net.sourceforge.bprocessor.model.FunctionalSpace; - import net.sourceforge.bprocessor.model.Part; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Surface; - import net.sourceforge.bprocessor.model.Domain; import java.awt.BorderLayout; --- 7,14 ---- package net.sourceforge.bprocessor.gui.actions; ! import net.sourceforge.bprocessor.model.FunctionalSpace; import net.sourceforge.bprocessor.model.Project; import net.sourceforge.bprocessor.model.Surface; import java.awt.BorderLayout; *************** *** 22,26 **** import java.awt.event.ItemListener; import java.util.Collection; - import java.util.HashSet; import java.util.Iterator; import java.util.Vector; --- 19,22 ---- *************** *** 187,234 **** public void itemStateChanged(ItemEvent event) { String current = (String)leftSelector.getSelectedItem(); - if (!current.equals(last)) { - Vector leftValuesData = new Vector(); - if (current.equals(SURFACES)) { - Collection surfaces = Project.getInstance().getSurfaces(); - Iterator it = surfaces.iterator(); - while (it.hasNext()) { - Surface s = (Surface)it.next(); - leftValuesData.add(new ValueHolder(s.getId(), s.getName())); - } - - rightSelector.removeAllItems(); - rightSelector.addItem(FUNCTIONAL_SPACES); - rightSelector.addItem(CONSTRUCTION_SPACES); - rightSelector.addItem(ELEMENTS); - rightSelector.addItem(PARTS); - - } else if (current.equals(ELEMENTS)) { - Collection elements = Project.getInstance().getElements(); - Iterator it = elements.iterator(); - while (it.hasNext()) { - Element e = (Element)it.next(); - leftValuesData.add(new ValueHolder(e.getId(), e.getName())); - } - - rightSelector.removeAllItems(); - rightSelector.addItem(FUNCTIONAL_SPACES); - rightSelector.addItem(CONSTRUCTION_SPACES); - - } else if (current.equals(PARTS)) { - Collection parts = Project.getInstance().getParts(); - Iterator it = parts.iterator(); - while (it.hasNext()) { - Part p = (Part)it.next(); - leftValuesData.add(new ValueHolder(p.getId(), p.getName())); - } - - rightSelector.removeAllItems(); - rightSelector.addItem(ELEMENTS); - } - - leftValues.setListData(leftValuesData); - - last = current; - } } } --- 183,186 ---- *************** *** 263,302 **** public void itemStateChanged(ItemEvent event) { String current = (String)rightSelector.getSelectedItem(); ! if (current != null && !current.equals(last)) { ! Vector rightValuesData = new Vector(); ! if (current.equals(FUNCTIONAL_SPACES)) { ! Collection fss = Project.getInstance().getFunctionalSpaces(); ! Iterator it = fss.iterator(); ! while (it.hasNext()) { ! FunctionalSpace fs = (FunctionalSpace)it.next(); ! rightValuesData.add(new ValueHolder(fs.getId(), fs.getName())); ! } ! } else if (current.equals(CONSTRUCTION_SPACES)) { ! Collection css = Project.getInstance().getConstructionSpaces(); ! Iterator it = css.iterator(); ! while (it.hasNext()) { ! ConstructionSpace cs = (ConstructionSpace)it.next(); ! rightValuesData.add(new ValueHolder(cs.getId(), cs.getName())); ! } ! } else if (current.equals(ELEMENTS)) { ! Collection elements = Project.getInstance().getElements(); ! Iterator it = elements.iterator(); ! while (it.hasNext()) { ! Element e = (Element)it.next(); ! rightValuesData.add(new ValueHolder(e.getId(), e.getName())); ! } ! } else if (current.equals(PARTS)) { ! Collection parts = Project.getInstance().getParts(); ! Iterator it = parts.iterator(); ! while (it.hasNext()) { ! Part p = (Part)it.next(); ! rightValuesData.add(new ValueHolder(p.getId(), p.getName())); ! } ! } ! ! rightValues.setListData(rightValuesData); ! ! last = current; ! } } } --- 215,219 ---- public void itemStateChanged(ItemEvent event) { String current = (String)rightSelector.getSelectedItem(); ! } } *************** *** 350,452 **** ValueHolder rsvalue = (ValueHolder)rightValues.getSelectedValue(); ! if (lsvalue != null && rsvalue != null) { ! if (lsname.equals(SURFACES)) { ! Surface s = Project.getInstance().findSurfaceById(lsvalue.getId()); ! ! if (rsname.equals(FUNCTIONAL_SPACES)) { ! FunctionalSpace fs = Project.getInstance().findFunctionalSpaceById(rsvalue.getId()); ! ! if (fs.getSurfaces() == null) { ! fs.setSurfaces(new HashSet()); ! } ! //this is temporary until front and back domains are supported better. ! //this will set the front domain to this domain ! Domain front = s.getFrontDomain(); ! if (front != null) { ! front.removeSurface(s); ! } ! s.setFrontDomain(fs); ! fs.getSurfaces().add(s); ! Project.getInstance().update(fs); ! } else if (rsname.equals(CONSTRUCTION_SPACES)) { ! ConstructionSpace cs = Project.getInstance().findConstructionSpaceById(rsvalue.getId()); ! ! if (cs.getSurfaces() == null) { ! cs.setSurfaces(new HashSet()); ! } ! //this is temporary until front and back domains are supported better. ! //this will set the front domain to this domain ! Domain front = s.getFrontDomain(); ! if (front != null) { ! front.removeSurface(s); ! } ! s.setFrontDomain(cs); ! cs.getSurfaces().add(s); ! Project.getInstance().update(cs); ! } else if (rsname.equals(ELEMENTS)) { ! Element e = Project.getInstance().findElementById(rsvalue.getId()); ! ! if (e.getSurfaces() == null) { ! e.setSurfaces(new HashSet()); ! } ! //this is temporary until front and back domains are supported better. ! //this will set the front domain to this domain ! Domain front = s.getFrontDomain(); ! if (front != null) { ! front.removeSurface(s); ! } ! s.setFrontDomain(e); ! e.getSurfaces().add(s); ! Project.getInstance().update(e); ! } else if (rsname.equals(PARTS)) { ! Part p = Project.getInstance().findPartById(rsvalue.getId()); ! ! if (p.getSurfaces() == null) { ! p.setSurfaces(new HashSet()); ! } ! //this is temporary until front and back domains are supported better. ! //this will set the front domain to this domain ! Domain front = s.getFrontDomain(); ! if (front != null) { ! front.removeSurface(s); ! } ! s.setFrontDomain(p); ! p.getSurfaces().add(s); ! Project.getInstance().update(p); ! } ! } else if (lsname.equals(ELEMENTS)) { ! Element e = Project.getInstance().findElementById(lsvalue.getId()); ! ! if (rsname.equals(FUNCTIONAL_SPACES)) { ! FunctionalSpace fs = Project.getInstance().findFunctionalSpaceById(rsvalue.getId()); ! ! if (fs.getElements() == null) { ! fs.setElements(new HashSet()); ! } ! fs.getElements().add(e); ! Project.getInstance().update(fs); ! } else if (rsname.equals(CONSTRUCTION_SPACES)) { ! ConstructionSpace cs = Project.getInstance().findConstructionSpaceById(rsvalue.getId()); ! ! if (cs.getElements() == null) { ! cs.setElements(new HashSet()); ! } ! cs.getElements().add(e); ! Project.getInstance().update(cs); ! } ! } else if (lsname.equals(PARTS)) { ! Part p = Project.getInstance().findPartById(lsvalue.getId()); ! ! if (rsname.equals(ELEMENTS)) { ! Element e = Project.getInstance().findElementById(rsvalue.getId()); ! ! if (e.getParts() == null) { ! e.setParts(new HashSet()); ! } ! e.getParts().add(p); ! Project.getInstance().update(e); ! } ! } ! } if (log.isDebugEnabled()) { log.debug("Joining: " + lsvalue + " with " + rsvalue); --- 267,271 ---- ValueHolder rsvalue = (ValueHolder)rightValues.getSelectedValue(); ! if (log.isDebugEnabled()) { log.debug("Joining: " + lsvalue + " with " + rsvalue); |