Menu
▾
▴
tcotool-cvs — Inform changes in CVS-Repository.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(20) |
Oct
(2) |
Nov
(22) |
Dec
(38) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(12) |
Feb
|
Mar
(7) |
Apr
|
May
(18) |
Jun
(7) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(34) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
(24) |
Jun
(45) |
Jul
(4) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Hirzel P. <ph...@us...> - 2005-09-20 19:11:34
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv350 Modified Files: DependencyView.java NodeFigure.java Log Message: Refactoring Index: DependencyView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/DependencyView.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DependencyView.java 17 Sep 2005 17:19:44 -0000 1.3 --- DependencyView.java 20 Sep 2005 19:11:17 -0000 1.4 *************** *** 86,89 **** --- 86,90 ---- int index = diagram.getPresentationElement().indexOf(((NodeFigure)figure).getNode()); if (index < 0) { + // not layout yet List elements = new ArrayList(diagram.getPresentationElement()); elements.add(((NodeFigure)figure).getNode()); Index: NodeFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/NodeFigure.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** NodeFigure.java 17 Sep 2005 17:19:44 -0000 1.3 --- NodeFigure.java 20 Sep 2005 19:11:17 -0000 1.4 *************** *** 34,37 **** --- 34,38 ---- import ch.softenvironment.util.AmountFormat; + import ch.softenvironment.util.DeveloperException; import ch.softenvironment.util.Tracer; import ch.softenvironment.view.*; *************** *** 65,68 **** --- 66,72 ---- while (iterator.hasNext()) { PresentationElement tmp = (PresentationElement)iterator.next(); + if (tmp.getSubject() == null) { + throw new DeveloperException(this, "NodeFigure()", "XML does not contain Subject-REF or reading failure"); + } if (tmp.getSubject().equals(element)) { node = (PresentationNode)tmp; *************** *** 72,76 **** if (node == null) { // not yet displayed ! node = (PresentationNode)((TcoObject)element).getObjectServer().createInstance(PresentationNode.class); node.setSubject(element); } --- 76,80 ---- if (node == null) { // not yet displayed ! node = (PresentationNode)LauncherView.getInstance().getUtility().createDbObject(((TcoObject)element).getObjectServer(), PresentationNode.class); node.setSubject(element); } *************** *** 141,144 **** --- 145,150 ---- node.setEast(new Long(node.getEast().longValue() + dx)); node.setSouth(new Long(node.getSouth().longValue() + dy)); + + LauncherView.getInstance().setModelChanged(true); } protected void defineComposite(int gap) { |
|
From: Hirzel P. <ph...@us...> - 2005-09-20 19:11:09
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32648 Modified Files: ModelUtility.java Log Message: Refactoring Index: ModelUtility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/tools/ModelUtility.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ModelUtility.java 29 Aug 2005 09:41:10 -0000 1.1.1.1 --- ModelUtility.java 20 Sep 2005 19:10:56 -0000 1.2 *************** *** 22,25 **** --- 22,26 ---- import ch.softenvironment.jomm.DbObjectServer; import ch.softenvironment.jomm.mvc.model.DbChangeableBean; + import ch.softenvironment.jomm.mvc.model.DbObject; import ch.softenvironment.util.AmountFormat; import ch.softenvironment.util.StringUtils; *************** *** 136,139 **** --- 137,148 ---- return 0; } + public DbChangeableBean createDbObject(ch.softenvironment.jomm.DbObjectServer server, java.lang.Class element) throws Throwable { + // 1) create persistently + DbChangeableBean object = (DbChangeableBean)server.createInstance(element); + // 2) make sure a Unique TID is set + object.save(); + + return object; + } /** * Create a new TcoObject of given type. *************** *** 142,146 **** public TcoObject createTcoObject(ch.softenvironment.jomm.DbObjectServer server, java.lang.Class element) throws Throwable { // 1) create persistently ! TcoObject object = (TcoObject)server.createInstance(element); // 2) set default data --- 151,155 ---- public TcoObject createTcoObject(ch.softenvironment.jomm.DbObjectServer server, java.lang.Class element) throws Throwable { // 1) create persistently ! TcoObject object = (TcoObject)createDbObject(server, element); // 2) set default data *************** *** 168,173 **** object.setName("*" + getTypeString(element) + "*"); } - // 3) make sure a Unique TID is set - object.save(); // object.setBaseDate(sysParams.getDefaultBaseDate()); --- 177,180 ---- |
|
From: Hirzel P. <ph...@us...> - 2005-09-20 19:10:18
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/presentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32329 Modified Files: PresentationElement.java Log Message: Refactoring Index: PresentationElement.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/presentation/PresentationElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PresentationElement.java 16 Sep 2005 14:53:53 -0000 1.1 --- PresentationElement.java 20 Sep 2005 19:10:09 -0000 1.2 *************** *** 8,12 **** * @author generated by the umleditor */ ! public class PresentationElement extends DbEntityBean { public PresentationElement(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); --- 8,12 ---- * @author generated by the umleditor */ ! public abstract class PresentationElement extends DbEntityBean { public PresentationElement(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); |
|
From: Hirzel P. <ph...@us...> - 2005-09-20 19:09:13
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31796 Modified Files: TcotoolUtility.java Log Message: Feature: adding org.tcotool.presentation.* registries Index: TcotoolUtility.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/TcotoolUtility.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** TcotoolUtility.java 29 Aug 2005 09:40:24 -0000 1.1.1.1 --- TcotoolUtility.java 20 Sep 2005 19:09:04 -0000 1.2 *************** *** 1,14 **** package org.tcotool; ! ! ! import org.tcotool.model.Branch; import ch.softenvironment.jomm.DbObjectRegistry; /** ! * @author generated by the umleditor */ public class TcotoolUtility { private TcotoolUtility() {} public static void registerClasses() { DbObjectRegistry.registerClass(org.tcotool.model.TcoObject.class,"tcotool.model.TcoObject"); DbObjectRegistry.registerClass(org.tcotool.model.SystemParameter.class,"tcotool.model.SystemParameter"); --- 1,29 ---- package org.tcotool; ! /* ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! */ import ch.softenvironment.jomm.DbObjectRegistry; /** ! * Registry of all persistent Classes for JOMM. ! * @author Peter Hirzel <i>soft</i>Environment ! * @version $Revision$ $Date$ */ public class TcotoolUtility { private TcotoolUtility() {} public static void registerClasses() { + // Basket MODEL DbObjectRegistry.registerClass(org.tcotool.model.TcoObject.class,"tcotool.model.TcoObject"); DbObjectRegistry.registerClass(org.tcotool.model.SystemParameter.class,"tcotool.model.SystemParameter"); *************** *** 38,41 **** DbObjectRegistry.registerClass(org.tcotool.model.Occurance.class,"tcotool.model.Occurance"); DbObjectRegistry.registerClass(org.tcotool.model.Branch.class,"tcotool.model.Branch"); } ! } --- 53,64 ---- DbObjectRegistry.registerClass(org.tcotool.model.Occurance.class,"tcotool.model.Occurance"); DbObjectRegistry.registerClass(org.tcotool.model.Branch.class,"tcotool.model.Branch"); + + // Basket PRESENTATION + DbObjectRegistry.registerClass(org.tcotool.presentation.PresentationNode.class,"tcotool.presentation.PresentationNode"); + // DbObjectRegistry.registerClass(org.tcotool.presentation.EdgeEnd.class,"tcotool.presentation.EdgeEnd"); + // DbObjectRegistry.registerClass(org.tcotool.presentation.PresentationElement.class,"tcotool.presentation.PresentationElement"); + DbObjectRegistry.registerClass(org.tcotool.presentation.Diagram.class,"tcotool.presentation.Diagram"); + DbObjectRegistry.registerClass(org.tcotool.presentation.PresentationEdge.class,"tcotool.presentation.PresentationEdge"); + DbObjectRegistry.registerClass(org.tcotool.presentation.WayPoint.class,"tcotool.presentation.WayPoint"); } ! } \ No newline at end of file |
|
From: Hirzel P. <ph...@us...> - 2005-09-20 19:08:27
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31543 Modified Files: LauncherView.java Added Files: ModelBasket.java PresentationBasket.java Log Message: Feature: supporting Multi INTERLIS-Basket structures in XML-instances --- NEW FILE: PresentationBasket.java --- package org.tcotool.application; /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. */ import java.util.Set; import org.tcotool.presentation.Diagram; import ch.softenvironment.jomm.DbObjectId; import ch.softenvironment.jomm.target.xml.IliBasket; /** * Encapsulates the org.tcotool.presentation.* Classes in an INTERLIS Basket. * @author Peter Hirzel <i>soft</i>Environment * @version $Revision: 1.1 $ $Date: 2005/09/20 19:08:14 $ */ public class PresentationBasket implements IliBasket { private Object diagram = null; public PresentationBasket() { super(); } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#getElementName() */ public String getElementName() { return "tcotool.presentation"; } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#getInitialComment() */ public String getComment() { return "Basket of DependencyGraph-Objects of org.tcotool.presentation.*"; } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#getCodes() */ public Set getCodes() { // no codes here return null; } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#getModelRoot() */ public Object getModelRoot() { return diagram; } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#getObjectId() */ public DbObjectId getObjectId() { return new DbObjectId(Diagram.class, new Long(-1 /*Unknown*/)); } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#setModelRoot(java.lang.Object) */ public void setModelRoot(Object root) { this.diagram = root; } } --- NEW FILE: ModelBasket.java --- package org.tcotool.application; /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. */ import java.util.Set; import org.tcotool.model.TcoModel; import ch.softenvironment.jomm.DbObjectId; import ch.softenvironment.jomm.DbObjectServer; import ch.softenvironment.jomm.target.xml.IliBasket; import ch.softenvironment.jomm.target.xml.XmlObjectServer; /** * Encapsulates the org.tcotool.model.* Classes in an INTERLIS Basket. * @author Peter Hirzel <i>soft</i>Environment * @version $Revision: 1.1 $ $Date: 2005/09/20 19:08:14 $ */ public class ModelBasket implements IliBasket { private DbObjectServer server = null; private Object modelRoot = null; public ModelBasket(DbObjectServer server) { super(); this.server = server; } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#getElementName() */ public String getElementName() { return server.getPersistenceManagerFactory().getConnectionURL(); } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#getInitialComment() */ public String getComment() { return "Basket of Configuration-Objects of org.tcotool.model.*"; } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#getCodes() */ public Set getCodes() { return ((XmlObjectServer)server).getCodeTypes(); } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#getModelRoot() */ public Object getModelRoot() { return modelRoot; } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#getObjectId() */ public DbObjectId getObjectId() { return new DbObjectId(TcoModel.class, new Long(-1 /*Unknown*/)); } /* (non-Javadoc) * @see ch.softenvironment.jomm.target.xml.IliBasket#setModelRoot(java.lang.Object) */ public void setModelRoot(Object root) { this.modelRoot = root; } } Index: LauncherView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/LauncherView.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LauncherView.java 17 Sep 2005 17:18:19 -0000 1.3 --- LauncherView.java 20 Sep 2005 19:08:14 -0000 1.4 *************** *** 31,34 **** --- 31,35 ---- import java.io.FileNotFoundException; import java.util.ArrayList; + import java.util.List; import java.util.Locale; *************** *** 68,72 **** private java.util.List fileFilter = null; private Image image = null; ! private Diagram dependencyDiagram = null; private JMenu mnuEdit = null; private JMenuItem mniFind = null; --- 69,73 ---- private java.util.List fileFilter = null; private Image image = null; ! protected Diagram dependencyDiagram = null; private JMenu mnuEdit = null; private JMenuItem mniFind = null; *************** *** 1927,1934 **** } /** ! * Return Version */ public static String getVersion() { ! return "V1.3.1"; } /** --- 1928,1935 ---- } /** ! * Return Version. */ public static String getVersion() { ! return "V1.4.0"; } /** *************** *** 2335,2339 **** if (saveCurrentChanges()) { server.reconnect(); ! // set the Default Model setUtility(ModelUtility.createDefaultConfiguration(server) /*createTestTemplate(server*/, null); --- 2336,2340 ---- if (saveCurrentChanges()) { server.reconnect(); ! dependencyDiagram = null; // set the Default Model setUtility(ModelUtility.createDefaultConfiguration(server) /*createTestTemplate(server*/, null); *************** *** 2354,2361 **** server.setUserObject(new ch.softenvironment.jomm.target.xml.XmlUserObject(filename)); ! TcoModel root = (TcoModel)server.getObjectById(new DbObjectId(TcoModel.class, new Long(-1 /* will return model-root independent of T_Id*/)), true); server.setUserObject(null); - //TODO load Diagram-Basket - dependencyDiagram = null; return root; } catch(javax.jdo.JDODataStoreException e) { --- 2355,2364 ---- server.setUserObject(new ch.softenvironment.jomm.target.xml.XmlUserObject(filename)); ! List baskets = ListUtils.createList(new ModelBasket(server)); ! baskets.add(new PresentationBasket()); ! server.retrieveAll(baskets); ! TcoModel root = (TcoModel)((IliBasket)baskets.get(0)).getModelRoot(); ! dependencyDiagram = (Diagram)((IliBasket)baskets.get(1)).getModelRoot(); server.setUserObject(null); return root; } catch(javax.jdo.JDODataStoreException e) { *************** *** 2480,2488 **** ch.softenvironment.jomm.target.xml.XmlUserObject userObject = new ch.softenvironment.jomm.target.xml.XmlUserObject(filename); userObject.setSender("www.tcotool.org (" + getVersion() + ")"); server.setUserObject(userObject); final DbUserTransactionBlock block = server.createUserTransactionBlock(true); block.execute(new Runnable() { public void run() { ! block.getObjectServer().makePersistent(getUtility().getRoot()); } }); --- 2483,2500 ---- ch.softenvironment.jomm.target.xml.XmlUserObject userObject = new ch.softenvironment.jomm.target.xml.XmlUserObject(filename); userObject.setSender("www.tcotool.org (" + getVersion() + ")"); + userObject.setXsd("http://www.interlis.ch/INTERLIS2.2 TcoTool.xsd"); server.setUserObject(userObject); final DbUserTransactionBlock block = server.createUserTransactionBlock(true); block.execute(new Runnable() { public void run() { ! IliBasket basket = new ModelBasket(server); ! basket.setModelRoot(LauncherView.getInstance().getUtility().getRoot()); ! List baskets = ListUtils.createList(basket); ! if (dependencyDiagram != null) { ! basket = new PresentationBasket(); ! basket.setModelRoot(dependencyDiagram); ! baskets.add(basket); ! } ! block.getObjectServer().makePersistentAll(baskets); } }); *************** *** 2614,2618 **** //TODO NYI: multiple views of dependencies for large or imported Configurations if (dependencyDiagram == null) { ! dependencyDiagram = (Diagram)server.createInstance((Diagram.class)); } return dependencyDiagram; --- 2626,2630 ---- //TODO NYI: multiple views of dependencies for large or imported Configurations if (dependencyDiagram == null) { ! dependencyDiagram = (Diagram)getUtility().createDbObject(server, Diagram.class); } return dependencyDiagram; |
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17670 Modified Files: DependencyLineConnection.java DependencyView.java EdgeFigure.java Layout.java NodeFigure.java PackageFigure.java ServiceFigure.java Log Message: Refactoring Index: NodeFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/NodeFigure.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NodeFigure.java 16 Sep 2005 14:54:37 -0000 1.2 --- NodeFigure.java 17 Sep 2005 17:19:44 -0000 1.3 *************** *** 51,56 **** // Composites ! protected TextFigure nameFigure; ! protected TextFigure costFigure; /** * NodeFigure constructor. --- 51,56 ---- // Composites ! protected TextFigure nameFigure = null; ! protected TextFigure costFigure = null; /** * NodeFigure constructor. *************** *** 102,106 **** protected void addFormatMenu(javax.swing.JPopupMenu popupMenu) { JMenu formatMenu = new JMenu(CommonUserAccess.getMnuFormatText()); ! formatMenu.add(new AbstractAction(CommonUserAccess.getMniFormatLineColorText()) { public void actionPerformed(ActionEvent event) { --- 102,106 ---- protected void addFormatMenu(javax.swing.JPopupMenu popupMenu) { JMenu formatMenu = new JMenu(CommonUserAccess.getMnuFormatText()); ! /* formatMenu.add(new AbstractAction(CommonUserAccess.getMniFormatLineColorText()) { public void actionPerformed(ActionEvent event) { *************** *** 108,111 **** --- 108,112 ---- } }); + */ formatMenu.add(new AbstractAction(CommonUserAccess.getMniFormatFillColorText()) { public void actionPerformed(ActionEvent event) { *************** *** 116,119 **** --- 117,145 ---- popupMenu.add(formatMenu); } + /** + * Overwrites (JHotDraw mechanism). + * Keep presentation model coordinates. + * + public void basicDisplayBox(Point origin, Point corner) { + super.basicDisplayBox(origin, corner); + + if ((node.getEast() == null) || (node.getEast().longValue() != origin.x)) { + node.setEast(new Long((long)origin.x)); + } + if ((node.getSouth() == null) || (node.getSouth().longValue() != origin.y)) { + node.setSouth(new Long((long)origin.y)); + } + } + */ + /** + * Overwrites (JHotDraw mechanism). + * Keep presentation model coordinates. + */ + protected void basicMoveBy(int dx, int dy) { + super.basicMoveBy(dx, dy); + + node.setEast(new Long(node.getEast().longValue() + dx)); + node.setSouth(new Long(node.getSouth().longValue() + dy)); + } protected void defineComposite(int gap) { // start with an empty Composite *************** *** 179,192 **** } } protected abstract Color getDefaultFillColor(); /** * Return the DependencyDiagram where this Figure is shown. */ ! protected DependencyView getDiagram() { return view; } ! public final int getEast() { ! return (int)getPresentationFigure().displayBox().getX(); ! } /** * Return the nodes Fill-Color. --- 205,221 ---- } } + /** + * @deprecated + */ protected abstract Color getDefaultFillColor(); /** * Return the DependencyDiagram where this Figure is shown. */ ! private DependencyView getDiagram() { return view; } ! public final int getEast() { ! return (int)getPresentationFigure().displayBox().getX(); ! } /** * Return the nodes Fill-Color. *************** *** 232,236 **** return node.getSubject(); } ! protected PresentationNode getNode() { return node; } --- 261,269 ---- return node.getSubject(); } ! /** ! * Return the model of PresentationElement. ! * @return ! */ ! protected final PresentationNode getNode() { return node; } *************** *** 279,285 **** setAttribute(FigureAttributeConstant.FRAME_COLOR, Color.black); } ! public final boolean isMoveable() { ! return true; ! } /** * Figure's FillColor Action. --- 312,322 ---- setAttribute(FigureAttributeConstant.FRAME_COLOR, Color.black); } ! /** ! * NodeFigure's are moveable by default. ! * @return ! */ ! public final boolean isMoveable() { ! return true; ! } /** * Figure's FillColor Action. *************** *** 295,298 **** --- 332,336 ---- * Line-Color Action. * @see addEditMenu(..) + * @deprecated */ private void mniLineColor() { *************** *** 321,345 **** LauncherView.getInstance().getPnlNavigation().selectElement(getModelElement()); } public final void setEast(int value) { ! if (value != getEast()) { ! //Tracer.getInstance().debug(((TcoObject)getModelElement()).getName() + "->move east=" + value); ! Rectangle rectangle = getPresentationFigure().displayBox(); ! getPresentationFigure().displayBox(new Rectangle(value, (int)rectangle.getY(), (int)rectangle.getWidth(), (int)rectangle.getHeight())); ! updateView(); ! } ! } /** * Set the Fill Color. * @see EdgeFigure ! * @see setAttribute(..) */ protected void setFillColor(java.awt.Color color) { setAttribute(FigureAttributeConstant.FILL_COLOR, color); ! /* ! if ((getNode() != null) && (!ColorConverter.isSame(getNode().getBackground(), color))) { ! // prevent ping-pong with MetaModelChange ! getNode().setBackground(ColorConverter.createColor(color)); ! } ! */ updateView(); } --- 359,387 ---- LauncherView.getInstance().getPnlNavigation().selectElement(getModelElement()); } + /** + * Set new east-Position for Figure. + * @param value + */ public final void setEast(int value) { ! if (value != getEast()) { ! //Tracer.getInstance().debug(((TcoObject)getModelElement()).getName() + "->NEW east=" + value); ! Rectangle rectangle = getPresentationFigure().displayBox(); ! getPresentationFigure().displayBox(new Rectangle(value, (int)rectangle.getY(), (int)rectangle.getWidth(), (int)rectangle.getHeight())); ! // if ((node.getEast() == null) || (node.getEast().longValue() != value)) { ! node.setEast(new Long((long)value)); ! // } ! updateView(); ! } ! } /** * Set the Fill Color. * @see EdgeFigure ! * @see #setAttribute(..) */ protected void setFillColor(java.awt.Color color) { setAttribute(FigureAttributeConstant.FILL_COLOR, color); ! ! getNode().setBackground(new Long((long)color.getRGB())); ! updateView(); } *************** *** 358,372 **** */ } ! public final void setSouth(int value) { ! if (value != getSouth()) { ! //Tracer.getInstance().debug(((TcoObject)getModelElement()).getName() + "->move south=" + value); ! Rectangle rectangle = getPresentationFigure().displayBox(); ! getPresentationFigure().displayBox(new Rectangle((int)rectangle.getX(), value, (int)rectangle.getWidth(), (int)rectangle.getHeight())); ! updateView(); ! } ! } /** * Update Attribute name of ModelElement. - * @see updateModel() */ protected boolean updateName(String newName) { --- 400,420 ---- */ } ! /** ! * Set new south-Position for Figure. ! * @param value ! */ ! public final void setSouth(int value) { ! if (value != getSouth()) { ! //Tracer.getInstance().debug(((TcoObject)getModelElement()).getName() + "->NEW south=" + value); ! Rectangle rectangle = getPresentationFigure().displayBox(); ! getPresentationFigure().displayBox(new Rectangle((int)rectangle.getX(), value, (int)rectangle.getWidth(), (int)rectangle.getHeight())); ! // if ((node.getSouth() == null) || (node.getSouth().longValue() != origin.y)) { ! node.setSouth(new Long((long)value)); ! // } ! updateView(); ! } ! } /** * Update Attribute name of ModelElement. */ protected boolean updateName(String newName) { *************** *** 384,396 **** // TUNE!!! - // update coordinates - Rectangle rectangle = getPresentationFigure().displayBox(); - if ((getNode().getEast() == null) || (getNode().getEast().longValue() != (long)rectangle.getX())) { - getNode().setEast(new Long((long)rectangle.getX())); - } - if ((getNode().getSouth() == null) || (getNode().getSouth().longValue() != (long)rectangle.getY())) { - getNode().setSouth(new Long((long)rectangle.getY())); - } - // show the saved colors -> should precede setNode(node) ! // if (getNode().getBackground() != null) { --- 432,435 ---- Index: DependencyLineConnection.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/DependencyLineConnection.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DependencyLineConnection.java 16 Sep 2005 14:54:37 -0000 1.2 --- DependencyLineConnection.java 17 Sep 2005 17:19:44 -0000 1.3 *************** *** 35,39 **** * @version $Revision$ $Date$ */ ! public class DependencyLineConnection extends EdgeFigure { /** --- 35,39 ---- * @version $Revision$ $Date$ */ ! class DependencyLineConnection extends EdgeFigure { /** Index: PackageFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/PackageFigure.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PackageFigure.java 16 Sep 2005 14:54:37 -0000 1.2 --- PackageFigure.java 17 Sep 2005 17:19:44 -0000 1.3 *************** *** 27,31 **** * @version $Revision$ $Date$ */ ! public class PackageFigure extends NodeFigure { /** * Create a new instance of PackageFigure with a RectangleFigure as presentation figure. --- 27,31 ---- * @version $Revision$ $Date$ */ ! class PackageFigure extends NodeFigure { /** * Create a new instance of PackageFigure with a RectangleFigure as presentation figure. *************** *** 86,89 **** --- 86,90 ---- /* (non-Javadoc) * @see org.tcotool.drawing.NodeFigure#getDefaultFillColor() + * @deprecated */ protected Color getDefaultFillColor() { Index: Layout.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/Layout.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Layout.java 16 Sep 2005 14:54:37 -0000 1.2 --- Layout.java 17 Sep 2005 17:19:44 -0000 1.3 *************** *** 12,17 **** import ch.softenvironment.util.Tracer; ! public class Layout { private static double delta1 = 1.0;// node_distribution private static double delta2 = 0.01;// borderline --- 12,22 ---- import ch.softenvironment.util.Tracer; ! /** ! * Layout algorithm to auto-layout several nodes in 2D space. ! * @author ce ! * @author Peter Hirzel <i>soft</i>Environment ! */ public class Layout { + //TODO make this class reusable for other similar graphic-tasks private static double delta1 = 1.0;// node_distribution private static double delta2 = 0.01;// borderline *************** *** 64,73 **** return sum; } ! private double cost() ! { // node distribution double a = 0.0; if(delta1>0.0){ ! a=node_distribution(); } // borderline --- 69,77 ---- return sum; } ! private double cost() { // node distribution double a = 0.0; if(delta1>0.0){ ! a=nodeDistribution(); } // borderline *************** *** 92,100 **** return a + b + c + d; } ! private void doit() ! { double temp = 1.0; ! //ch.softenvironment.util.Tracer.getInstance().debug(dumpNodes()); maxdist = getdist(min_x, min_y, max_x, max_y); --- 96,103 ---- return a + b + c + d; } ! private void doit() { double temp = 1.0; ! //ch.softenvironment.util.Tracer.getInstance().debug(dumpNodes()); maxdist = getdist(min_x, min_y, max_x, max_y); *************** *** 133,147 **** temp = temp * delta10; } - return; } ! public static void doLayout(DependencyView diagView) { ! // run it java.util.Vector edgev=new java.util.Vector(30); java.util.Vector nodev=new java.util.Vector(30); // collect nodes and edges from current diagram ! if(diagView!=null){ ! //ch.softenvironment.util.Tracer.getInstance().debug("current ClassDiagramView found"); ! ! /* org.tcotool.presentation.Diagram diag=diagView.getDiagram(); java.util.Iterator elei=diag.getPresentationElement().iterator(); while(elei.hasNext()){ --- 136,151 ---- temp = temp * delta10; } } ! /** ! * Layout the Figures within the given view. ! * @param diagView ! */ ! public static void doLayout(DependencyView view) { java.util.Vector edgev=new java.util.Vector(30); java.util.Vector nodev=new java.util.Vector(30); // collect nodes and edges from current diagram ! /* ! // Var. I: collect by model ! org.tcotool.presentation.Diagram diag=view.getDiagram(); java.util.Iterator elei=diag.getPresentationElement().iterator(); while(elei.hasNext()){ *************** *** 154,158 **** } */ ! FigureEnumeration enum = diagView.drawing().figures(); while (enum.hasNextFigure()) { Figure figure = enum.nextFigure(); --- 158,163 ---- } */ ! // Var.II: collect by Figure's ! FigureEnumeration enum = view.drawing().figures(); while (enum.hasNextFigure()) { Figure figure = enum.nextFigure(); *************** *** 165,182 **** //dumpNodes(nodev.iterator()); // before Layout model=new Layout(); ! // Tracer.getInstance().debug("layout diagram","H "+diagView.getMaximumSize().getHeight()+", W"+diagView.getMaximumSize().getWidth()); model.layout(nodev, edgev, 0, 0, ! diagView.getWidth(), diagView.getHeight()); //dumpNodes(nodev.iterator()); // after ! ! diagView.refresh(); ! }else{ ! Tracer.getInstance().developerWarning(Layout.class, "Layout", "Failed"); ! } ! return; ! // -end- 3CDA3DB3002F body3CDA3DA10173 "layoutCurrentDiagram" ! } /** * Test-Method. --- 170,180 ---- //dumpNodes(nodev.iterator()); // before Layout model=new Layout(); ! // Tracer.getInstance().debug("layout diagram","H "+view.getMaximumSize().getHeight()+", W"+view().getWidth()); model.layout(nodev, edgev, 0, 0, ! view.getWidth(), view.getHeight()); //dumpNodes(nodev.iterator()); // after ! } /** * Test-Method. *************** *** 286,295 **** return Math.sqrt(d1 * d1 + d2 * d2); } ! private EdgeFigure getEdge(int i) ! { return (EdgeFigure)edgev.get(i); } ! private NodeFigure getEndNode(int edgeIdx) ! { /* PresentationEdge edge=getEdge(edgeIdx); java.util.Iterator it=edge.iteratorEndpoint(); --- 284,291 ---- return Math.sqrt(d1 * d1 + d2 * d2); } ! private EdgeFigure getEdge(int i) { return (EdgeFigure)edgev.get(i); } ! private NodeFigure getEndNode(int edgeIdx) { /* PresentationEdge edge=getEdge(edgeIdx); java.util.Iterator it=edge.iteratorEndpoint(); *************** *** 300,309 **** return (NodeFigure)edge.endFigure(); } ! private NodeFigure getNode(int i) ! { return (NodeFigure)nodev.get(i); } ! private void layout(java.util.List nodev,java.util.List edgev, double min_x1, double min_y1, double max_x1, double max_y1) ! { Layout utility=new Layout(); utility.nodev=nodev; --- 296,303 ---- return (NodeFigure)edge.endFigure(); } ! private NodeFigure getNode(int i) { return (NodeFigure)nodev.get(i); } ! private void layout(java.util.List nodev,java.util.List edgev, double min_x1, double min_y1, double max_x1, double max_y1) { Layout utility=new Layout(); utility.nodev=nodev; *************** *** 322,334 **** utility.doit(); } ! private void moveback() ! { int i = oldpos_i; ! getNode(i).setEast((int)( oldpos_x)); getNode(i).setSouth((int)(oldpos_y)); - return; } ! private void neighborhood(double radius) ! { int new_x; int new_y; --- 316,325 ---- utility.doit(); } ! private void moveback() { int i = oldpos_i; ! getNode(i).setEast((int)(oldpos_x)); getNode(i).setSouth((int)(oldpos_y)); } ! private void neighborhood(double radius) { int new_x; int new_y; *************** *** 352,361 **** if(new_y > max_y) new_y=((int)(max_y)); }while(new_x==oldpos_x && new_y==oldpos_y); ! node.setEast(new_x); ! node.setSouth(new_y); ! return; } ! private double node_distribution() ! { double sum = 0.0; for(int i = 0;i<nodev.size();i++){ --- 343,350 ---- if(new_y > max_y) new_y=((int)(max_y)); }while(new_x==oldpos_x && new_y==oldpos_y); ! node.setEast(new_x); ! node.setSouth(new_y); } ! private double nodeDistribution() { double sum = 0.0; for(int i = 0;i<nodev.size();i++){ *************** *** 377,382 **** return sum; } ! private double nodeedgedistances() ! { double sum = 0; for(int j = 0;j<nodev.size();j++){ --- 366,370 ---- return sum; } ! private double nodeEdgeDistances() { double sum = 0; for(int j = 0;j<nodev.size();j++){ *************** *** 395,400 **** return sum; } ! private double pt2line(double x1,double y1,double xa, double ya, double xb, double yb) ! { double dx=xb-xa; if(dx==0){ --- 383,387 ---- return sum; } ! private double pt2line(double x1,double y1,double xa, double ya, double xb, double yb) { double dx=xb-xa; if(dx==0){ *************** *** 409,416 **** return getdist(x1,y1,xs,ys); } ! private int random(int lb, int ub) ! { double d=ub - lb + 1; return (int)(Math.random()*d) + lb; } ! } --- 396,402 ---- return getdist(x1,y1,xs,ys); } ! private int random(int lb, int ub) { double d=ub - lb + 1; return (int)(Math.random()*d) + lb; } ! } \ No newline at end of file Index: EdgeFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/EdgeFigure.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdgeFigure.java 16 Sep 2005 14:54:37 -0000 1.2 --- EdgeFigure.java 17 Sep 2005 17:19:44 -0000 1.3 *************** *** 98,106 **** } }); - formatMenu.add(new AbstractAction(CommonUserAccess.getMniFormatFillColorText()) { - public void actionPerformed(ActionEvent event) { - mniFillColor(); - } - }); popupMenu.add(formatMenu); --- 98,101 ---- *************** *** 178,182 **** * Return the classDiagram where this Figure is shown. */ ! protected DependencyView getDiagram() { return view; } --- 173,177 ---- * Return the classDiagram where this Figure is shown. */ ! private DependencyView getDiagram() { return view; } *************** *** 250,261 **** } /** - * FillColor Action. - * @see addEditMenu(..) - */ - private void mniFillColor() { - // makes no sense here - mniLineColor(); - } - /** * LineColor Action. * @see addEditMenu(..) --- 245,248 ---- Index: DependencyView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/DependencyView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DependencyView.java 16 Sep 2005 14:54:37 -0000 1.2 --- DependencyView.java 17 Sep 2005 17:19:44 -0000 1.3 *************** *** 1,4 **** package org.tcotool.standard.drawing; - /* * This library is free software; you can redistribute it and/or --- 1,3 ---- *************** *** 17,20 **** --- 16,20 ---- */ import java.util.*; + import java.awt.Color; import java.awt.event.*; *************** *** 25,28 **** --- 25,29 ---- import org.tcotool.model.TcoPackage; import org.tcotool.presentation.Diagram; + import org.tcotool.presentation.PresentationNode; import org.tcotool.tools.Calculator; *************** *** 43,47 **** */ public class DependencyView extends org.jhotdraw.contrib.zoom.ZoomDrawingView implements DrawingEditor { ! // private ToolButton defaultToolButton = null; // private ToolButton selectedToolButton = null; private Tool tool = null; --- 44,48 ---- */ public class DependencyView extends org.jhotdraw.contrib.zoom.ZoomDrawingView implements DrawingEditor { ! // private ToolButton defaultToolButton = null; // private ToolButton selectedToolButton = null; private Tool tool = null; *************** *** 49,55 **** private Calculator calculator = new Calculator(LauncherView.getInstance().getUtility()); private Diagram diagram = null; ! // private Element parentElement = null; // Menu Checkboxes ! private boolean showDependencyDistribution = false; private boolean showCosts = true; /** --- 50,56 ---- private Calculator calculator = new Calculator(LauncherView.getInstance().getUtility()); private Diagram diagram = null; ! // Menu Checkboxes ! private boolean showDependencyDistribution = true; private boolean showCosts = true; /** *************** *** 70,73 **** --- 71,76 ---- addDependency((Dependency)iterator.next()); } + + refresh(); } /** *************** *** 81,92 **** super.add(figure); if (figure instanceof NodeFigure) { ! if (!diagram.getPresentationElement().contains(((NodeFigure)figure).getNode())) { List elements = new ArrayList(diagram.getPresentationElement()); elements.add(((NodeFigure)figure).getNode()); diagram.setPresentationElement(elements); } ((NodeFigure)figure).updateView(); } ! } catch(Throwable e) { BaseDialog.showError(LauncherView.getInstance(), "error", "CEFigureNotCreated", e); //$NON-NLS-1$ } --- 84,105 ---- super.add(figure); if (figure instanceof NodeFigure) { ! int index = diagram.getPresentationElement().indexOf(((NodeFigure)figure).getNode()); ! if (index < 0) { List elements = new ArrayList(diagram.getPresentationElement()); elements.add(((NodeFigure)figure).getNode()); diagram.setPresentationElement(elements); + } else { + // reuse layout from previously showing diagram + PresentationNode node = (PresentationNode)diagram.getPresentationElement().get(index); + ((NodeFigure)figure).setEast(node.getEast().intValue()); + ((NodeFigure)figure).setSouth(node.getSouth().intValue()); + if (node.getBackground() != null) { + ((NodeFigure)figure).setFillColor(new Color(node.getBackground().intValue())); + } + //TODO Font; Width x Height } ((NodeFigure)figure).updateView(); } ! } catch(Throwable e) { BaseDialog.showError(LauncherView.getInstance(), "error", "CEFigureNotCreated", e); //$NON-NLS-1$ } *************** *** 111,118 **** return add(new PackageFigure(this, element)); } else { ! throw new DeveloperException( ! this, ! "add(Element)",//$NON-NLS-1$ ! "wrong type", element.toString()); } } --- 124,128 ---- return add(new PackageFigure(this, element)); } else { ! throw new DeveloperException(this, "add(TcoObject)", "wrong type", element.toString()); } } *************** *** 142,152 **** public void figureSelectionChanged(DrawingView view) { - } /** ! * Find the ClassFigure in this DrawingView at the given coordinates. ! * @return ClassFigure */ ! protected ServiceFigure findClassFigure(int x, int y) { FigureEnumeration enum = drawing().figures(); while (enum.hasNextFigure()) { --- 152,162 ---- public void figureSelectionChanged(DrawingView view) { } /** ! * Find the ServiceFigure in this DrawingView at the given coordinates. ! * @return ServiceFigure ! * @deprecated */ ! protected ServiceFigure findServiceFigure(int x, int y) { FigureEnumeration enum = drawing().figures(); while (enum.hasNextFigure()) { *************** *** 254,257 **** --- 264,268 ---- */ protected boolean isShowDependencyDistribution() { + //TODO return showDependencyDistribution; } *************** *** 293,314 **** } /** - * Draw a node out of Model on this Diagram. - */ - private NodeFigure loadNode(Figure figure) { - // set model - // ((NodeFigure)figure).setDiagram(this); - // ((NodeFigure)figure).setNode(node); - - // show Figure - super.add(figure); - - // move the figure to the last saved coordinates - // java.awt.Point origin = new java.awt.Point(node.getEast(), node.getSouth()); - // java.awt.Point corner = new java.awt.Point(node.getEast() + node.getWidth(), node.getSouth() + node.getHeight()); - // figure.displayBox(origin, corner); - - return (NodeFigure)figure; - } - /** * Show a simple Edge by means plain EdgeFigure as Dependency or Generalization. */ --- 304,307 ---- *************** *** 366,370 **** public void removeViewChangeListener(ViewChangeListener vsl) { // TODO Auto-generated method stub - } /** --- 359,362 ---- Index: ServiceFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/ServiceFigure.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ServiceFigure.java 16 Sep 2005 14:54:37 -0000 1.2 --- ServiceFigure.java 17 Sep 2005 17:19:44 -0000 1.3 *************** *** 29,33 **** * @version $Revision$ $Date$ */ ! public class ServiceFigure extends NodeFigure implements ActionListener { // PopupMenu private static String SUPPRESS_ATTRIBUTES_ACTION_COMMAND = "SUPPRESS_ATTRIBUTES";//$NON-NLS-1$ --- 29,33 ---- * @version $Revision$ $Date$ */ ! class ServiceFigure extends NodeFigure implements ActionListener { // PopupMenu private static String SUPPRESS_ATTRIBUTES_ACTION_COMMAND = "SUPPRESS_ATTRIBUTES";//$NON-NLS-1$ *************** *** 66,87 **** /** * Add individual PopupMenu items for this class. ! * @see #createPopupMenu() */ protected void addSpecialMenu(javax.swing.JPopupMenu popupMenu) { // popupMenu.add(new JSeparator()); ! //TODO NLS chxSuppressAttributes = new javax.swing.JCheckBoxMenuItem("Kosten unterdrücken"); //$NON-NLS-1$ chxSuppressAttributes.setActionCommand(SUPPRESS_ATTRIBUTES_ACTION_COMMAND); chxSuppressAttributes.addActionListener(this); - chxSuppressAttributes.setSelected(false); - popupMenu.add(chxSuppressAttributes); - } /* (non-Javadoc) * @see org.tcotool.drawing.NodeFigure#getDefaultFillColor() */ protected Color getDefaultFillColor() { --- 66,85 ---- /** * Add individual PopupMenu items for this class. ! * @see NodeFigure#adaptPopupMenu() */ protected void addSpecialMenu(javax.swing.JPopupMenu popupMenu) { // popupMenu.add(new JSeparator()); ! //TODO NYI chxSuppressAttributes = new javax.swing.JCheckBoxMenuItem("Kosten unterdrücken"); //$NON-NLS-1$ chxSuppressAttributes.setActionCommand(SUPPRESS_ATTRIBUTES_ACTION_COMMAND); chxSuppressAttributes.addActionListener(this); chxSuppressAttributes.setSelected(false); popupMenu.add(chxSuppressAttributes); } /* (non-Javadoc) * @see org.tcotool.drawing.NodeFigure#getDefaultFillColor() + * @deprecated */ protected Color getDefaultFillColor() { |
|
From: Hirzel P. <ph...@us...> - 2005-09-17 17:18:27
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17362 Modified Files: LauncherView.java Log Message: Refactoring Index: LauncherView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/LauncherView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LauncherView.java 16 Sep 2005 14:55:07 -0000 1.2 --- LauncherView.java 17 Sep 2005 17:18:19 -0000 1.3 *************** *** 2155,2158 **** --- 2155,2159 ---- // only do it the very first time (otherwise User-Layout should be available) Layout.doLayout(depView); + depView.refresh(); } addReport(depView, getResourceString("MniDependencyGraph_text"), getDtpRoot().getWidth(), getDtpRoot().getHeight()); |
|
From: Hirzel P. <ph...@us...> - 2005-09-17 17:17:27
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/presentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17112 Modified Files: PresentationNode.java Log Message: Test-Code added Index: PresentationNode.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/presentation/PresentationNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PresentationNode.java 16 Sep 2005 14:53:53 -0000 1.1 --- PresentationNode.java 17 Sep 2005 17:17:19 -0000 1.2 *************** *** 1,5 **** package org.tcotool.presentation; ! import ch.softenvironment.jomm.mvc.model.*; import ch.softenvironment.jomm.descriptor.*; /** * The root of symbol-style presentations. --- 1,8 ---- package org.tcotool.presentation; ! ! ! import ch.softenvironment.jomm.descriptor.*; + /** * The root of symbol-style presentations. *************** *** 42,45 **** --- 45,49 ---- fieldEast=east; firePropertyChange("east", oldValue, fieldEast); + //ch.softenvironment.util.Tracer.getInstance().debug(((TcoObject)getSubject()).getName() + "->east=" + east.intValue()); } *************** *** 53,56 **** --- 57,61 ---- fieldSouth=south; firePropertyChange("south", oldValue, fieldSouth); + //ch.softenvironment.util.Tracer.getInstance().debug(((TcoObject)getSubject()).getName() + "->south=" + south.intValue()); } public static DbDescriptor createDescriptor() { |
|
From: Hirzel P. <ph...@us...> - 2005-09-17 17:13:23
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16292 Removed Files: DrawingFrame.java Log Message: OBSOLETE --- DrawingFrame.java DELETED --- |
|
From: Hirzel P. <ph...@us...> - 2005-09-16 14:57:01
|
Update of /cvsroot/tcotool/TCO-Tool/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32549 Modified Files: TCO-Model.uml Log Message: Refactoring: Topic "presentation" Index: TCO-Model.uml =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/model/TCO-Model.uml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TCO-Model.uml 29 Aug 2005 12:22:19 -0000 1.3 --- TCO-Model.uml 16 Sep 2005 14:56:40 -0000 1.4 *************** *** 1,5 **** <?xml version="1.0" encoding="UTF-8" ?> <ch.ehi.umleditor.1> ! <ch.ehi.uml1_4.foundation.core.ElementOwnership TID="3"> <Namespace>0</Namespace> <OwnedElement>10</OwnedElement> --- 1,5 ---- <?xml version="1.0" encoding="UTF-8" ?> <ch.ehi.umleditor.1> ! <ch.ehi.uml1_4.foundation.core.ElementOwnership TID="4"> <Namespace>0</Namespace> [...30454 lines suppressed...] ! <Multiplicity>2822</Multiplicity> ! <Lower>1</Lower> ! <Upper>1</Upper> ! </ch.ehi.uml1_4.implementation.UmlMultiplicityRange> ! <ch.ehi.basics.types.NlsString TID="2246"> ! <Entry TID="3369" language="de" translation="[IMPL: DbEnumeration]"/> </ch.ehi.basics.types.NlsString> + <ch.ehi.basics.types.NlsString TID="2178"> + <Entry TID="3370" language="de" translation="fieldSupport"/> + </ch.ehi.basics.types.NlsString> + <ch.ehi.uml1_4.implementation.UmlMultiplicity TID="1203"> + <Range>3371</Range> + </ch.ehi.uml1_4.implementation.UmlMultiplicity> + <ch.ehi.uml1_4.implementation.UmlMultiplicityRange TID="3371"> + <Multiplicity>1203</Multiplicity> + <Lower>1</Lower> + <Upper>1</Upper> + </ch.ehi.uml1_4.implementation.UmlMultiplicityRange> <ch.ehi.uml1_4.implementation.UmlModel TID="0"> <Abstract>false</Abstract> |
|
From: Hirzel P. <ph...@us...> - 2005-09-16 14:55:14
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32335 Modified Files: LauncherView.java Log Message: Refactoring: persistent Dependency-Diagram Layout Index: LauncherView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/LauncherView.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** LauncherView.java 29 Aug 2005 09:40:52 -0000 1.1.1.1 --- LauncherView.java 16 Sep 2005 14:55:07 -0000 1.2 *************** *** 46,49 **** --- 46,50 ---- import org.tcotool.model.*; import org.tcotool.pluginsupport.PluginUtility; + import org.tcotool.presentation.Diagram; import org.tcotool.tools.ModelUtility; *************** *** 67,70 **** --- 68,72 ---- private java.util.List fileFilter = null; private Image image = null; + private Diagram dependencyDiagram = null; private JMenu mnuEdit = null; private JMenuItem mniFind = null; *************** *** 2145,2153 **** } else { showProgress(30, getResourceString("CIInitGraph")); ! org.tcotool.standard.drawing.DependencyView depView = new org.tcotool.standard.drawing.DependencyView(dependencies, getDtpRoot().getWidth(), getDtpRoot().getHeight()); showProgress(50, getResourceString("CIReportInit")); showProgress(65, getResourceString("CIAutoLayout")); depView.setSize(getDtpRoot().getWidth()-70, getDtpRoot().getHeight()-60); ! Layout.doLayout(depView); addReport(depView, getResourceString("MniDependencyGraph_text"), getDtpRoot().getWidth(), getDtpRoot().getHeight()); } --- 2147,2159 ---- } else { showProgress(30, getResourceString("CIInitGraph")); ! boolean doLayout = (dependencyDiagram == null); ! org.tcotool.standard.drawing.DependencyView depView = new org.tcotool.standard.drawing.DependencyView(getDependencyDiagram(), dependencies, getDtpRoot().getWidth(), getDtpRoot().getHeight()); showProgress(50, getResourceString("CIReportInit")); showProgress(65, getResourceString("CIAutoLayout")); depView.setSize(getDtpRoot().getWidth()-70, getDtpRoot().getHeight()-60); ! if (doLayout) { ! // only do it the very first time (otherwise User-Layout should be available) ! Layout.doLayout(depView); ! } addReport(depView, getResourceString("MniDependencyGraph_text"), getDtpRoot().getWidth(), getDtpRoot().getHeight()); } *************** *** 2349,2352 **** --- 2355,2360 ---- TcoModel root = (TcoModel)server.getObjectById(new DbObjectId(TcoModel.class, new Long(-1 /* will return model-root independent of T_Id*/)), true); server.setUserObject(null); + //TODO load Diagram-Basket + dependencyDiagram = null; return root; } catch(javax.jdo.JDODataStoreException e) { *************** *** 2598,2600 **** --- 2606,2619 ---- setModelChanged(false); } + /** + * One Dependency-Graph may be drawn per configuration. + * @return + */ + public Diagram getDependencyDiagram() throws Throwable { + //TODO NYI: multiple views of dependencies for large or imported Configurations + if (dependencyDiagram == null) { + dependencyDiagram = (Diagram)server.createInstance((Diagram.class)); + } + return dependencyDiagram; + } } |
|
From: Hirzel P. <ph...@us...> - 2005-09-16 14:54:45
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32258 Modified Files: DependencyLineConnection.java DependencyView.java DrawingFrame.java EdgeFigure.java Layout.java NodeFigure.java PackageFigure.java SeparatorFigure.java ServiceFigure.java Log Message: Refactoring: persistent Dependency-Diagram Layout Index: NodeFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/NodeFigure.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** NodeFigure.java 29 Aug 2005 09:41:16 -0000 1.1.1.1 --- NodeFigure.java 16 Sep 2005 14:54:37 -0000 1.2 *************** *** 1,4 **** package org.tcotool.standard.drawing; - /* * This library is free software; you can redistribute it and/or --- 1,3 ---- *************** *** 18,21 **** --- 17,22 ---- import java.awt.*; import java.awt.event.*; + import java.util.Iterator; + import javax.swing.*; *************** *** 23,26 **** --- 24,29 ---- import org.tcotool.application.ServiceDetailView; import org.tcotool.model.TcoObject; + import org.tcotool.presentation.PresentationElement; + import org.tcotool.presentation.PresentationNode; import org.jhotdraw.standard.*; *************** *** 34,60 **** import ch.softenvironment.view.*; /** ! * Fiure Specification for all Elements treated as Nodes * (analog a Class Symbol in an UML-Class-Diagram). * @see EdgeFigure * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ ! abstract class NodeFigure extends GraphicalCompositeFigure implements PresentationNode { ! private DependencyView diagram = null; ! protected Object modelElement = null; ! private String totalCost = null; ! // Composites protected TextFigure nameFigure; protected TextFigure costFigure; /** ! * UmlFigure constructor comment. * @param newPresentationFigure ch.ifa.draw.framework.Figure */ ! public NodeFigure(DependencyView diagram, Figure newPresentationFigure, Object element) { super(newPresentationFigure); ! this.diagram = diagram; ! modelElement = element; } /** --- 37,78 ---- import ch.softenvironment.view.*; /** ! * Figure Specification for all Elements treated as Nodes * (analog a Class Symbol in an UML-Class-Diagram). * @see EdgeFigure * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ ! abstract class NodeFigure extends GraphicalCompositeFigure { ! private DependencyView view = null; ! private PresentationNode node = null; // persistent ! private String totalCost = null; ! ! // Composites protected TextFigure nameFigure; protected TextFigure costFigure; /** ! * NodeFigure constructor. * @param newPresentationFigure ch.ifa.draw.framework.Figure */ ! public NodeFigure(DependencyView view, Figure newPresentationFigure, Object element) throws Throwable { super(newPresentationFigure); ! this.view = view; ! ! // modelElement = element; ! Iterator iterator = view.getDiagram().getPresentationElement().iterator(); ! while (iterator.hasNext()) { ! PresentationElement tmp = (PresentationElement)iterator.next(); ! if (tmp.getSubject().equals(element)) { ! node = (PresentationNode)tmp; ! break; ! } ! } ! if (node == null) { ! // not yet displayed ! node = (PresentationNode)((TcoObject)element).getObjectServer().createInstance(PresentationNode.class); ! node.setSubject(element); ! } } /** *************** *** 163,170 **** protected abstract Color getDefaultFillColor(); /** ! * Return the classDiagram where this Figure is shown. */ protected DependencyView getDiagram() { ! return diagram; } public final int getEast() { --- 181,188 ---- protected abstract Color getDefaultFillColor(); /** ! * Return the DependencyDiagram where this Figure is shown. */ protected DependencyView getDiagram() { ! return view; } public final int getEast() { *************** *** 211,216 **** * @return ModelElement */ ! public Object getModelElement() { ! return modelElement; } public final int getSouth() { --- 229,237 ---- * @return ModelElement */ ! public final Object getModelElement() { ! return node.getSubject(); ! } ! protected PresentationNode getNode() { ! return node; } public final int getSouth() { *************** *** 337,348 **** */ } ! public final void setSouth(int value) { ! if (value != getSouth()) { ! //Tracer.getInstance().debug(((TcoObject)getModelElement()).getName() + "->move south=" + value); ! Rectangle rectangle = getPresentationFigure().displayBox(); ! getPresentationFigure().displayBox(new Rectangle((int)rectangle.getX(), value, (int)rectangle.getWidth(), (int)rectangle.getHeight())); ! updateView(); } - } /** * Update Attribute name of ModelElement. --- 358,369 ---- */ } ! public final void setSouth(int value) { ! if (value != getSouth()) { ! //Tracer.getInstance().debug(((TcoObject)getModelElement()).getName() + "->move south=" + value); ! Rectangle rectangle = getPresentationFigure().displayBox(); ! getPresentationFigure().displayBox(new Rectangle((int)rectangle.getX(), value, (int)rectangle.getWidth(), (int)rectangle.getHeight())); ! updateView(); ! } } /** * Update Attribute name of ModelElement. *************** *** 358,366 **** } /** ! * ModelElement changed from outside. Therefore a refresh of the View is needed. */ public void updateView() { // TUNE!!! // show the saved colors -> should precede setNode(node) ! // if (getNode().getBackground() != null) { --- 379,396 ---- } /** ! * Refresh the view respectively this Figure within the view. */ public void updateView() { // TUNE!!! + // update coordinates + Rectangle rectangle = getPresentationFigure().displayBox(); + if ((getNode().getEast() == null) || (getNode().getEast().longValue() != (long)rectangle.getX())) { + getNode().setEast(new Long((long)rectangle.getX())); + } + if ((getNode().getSouth() == null) || (getNode().getSouth().longValue() != (long)rectangle.getY())) { + getNode().setSouth(new Long((long)rectangle.getY())); + } + // show the saved colors -> should precede setNode(node) ! // if (getNode().getBackground() != null) { *************** *** 376,380 **** nameFigure.setText(((TcoObject)getModelElement()).getName()); if (totalCost == null) { ! totalCost = ch.softenvironment.client.ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text") + " = " + AmountFormat.toString(diagram.getCalculator().calcTcoOverall((TcoObject)getModelElement())); } costFigure.setText(totalCost); --- 406,410 ---- nameFigure.setText(((TcoObject)getModelElement()).getName()); if (totalCost == null) { ! totalCost = ch.softenvironment.client.ResourceManager.getResource(ServiceDetailView.class, "PnlCost_text") + " = " + AmountFormat.toString(view.getCalculator().calcTcoOverall((TcoObject)getModelElement())); } costFigure.setText(totalCost); Index: DrawingFrame.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/DrawingFrame.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DrawingFrame.java 29 Aug 2005 09:41:14 -0000 1.1.1.1 --- DrawingFrame.java 16 Sep 2005 14:54:37 -0000 1.2 *************** *** 20,24 **** * This class represents a JInternalFrame with a JHotDraw drawing area. * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ --- 20,24 ---- * This class represents a JInternalFrame with a JHotDraw drawing area. * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ Index: PackageFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/PackageFigure.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PackageFigure.java 29 Aug 2005 09:41:15 -0000 1.1.1.1 --- PackageFigure.java 16 Sep 2005 14:54:37 -0000 1.2 *************** *** 24,28 **** * in Dependency-Diagram. * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ --- 24,28 ---- * in Dependency-Diagram. * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ *************** *** 31,35 **** * Create a new instance of PackageFigure with a RectangleFigure as presentation figure. */ ! public PackageFigure(DependencyView diagram, Object element) { // this(new RectangleFigure(new Point(0,0), new Point(200, 150))); super(diagram, new RectangleFigure(), element); --- 31,35 ---- * Create a new instance of PackageFigure with a RectangleFigure as presentation figure. */ ! public PackageFigure(DependencyView diagram, Object element) throws Throwable { // this(new RectangleFigure(new Point(0,0), new Point(200, 150))); super(diagram, new RectangleFigure(), element); Index: DependencyLineConnection.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/DependencyLineConnection.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DependencyLineConnection.java 29 Aug 2005 09:41:14 -0000 1.1.1.1 --- DependencyLineConnection.java 16 Sep 2005 14:54:37 -0000 1.2 *************** *** 32,36 **** * A DependencyLineConnection has an arrow at the end point and is dotted (analog UML). * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ --- 32,36 ---- * A DependencyLineConnection has an arrow at the end point and is dotted (analog UML). * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ Index: Layout.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/Layout.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Layout.java 29 Aug 2005 09:41:15 -0000 1.1.1.1 --- Layout.java 16 Sep 2005 14:54:37 -0000 1.2 *************** *** 14,23 **** public class Layout { ! public static double delta1 = 1.0;// node_distribution ! public static double delta2 = 0.01;// borderline ! public static double delta3 = 0.0001;// edgelength ! public static double delta4 = 100.0;// edgecrossing ! public static double delta10 = 0.75;// cooling 0.6..0.95 ! public static double delta11 = 0.75;// cooling 0.6..0.95 private double min_x; private double max_x; --- 14,23 ---- public class Layout { ! private static double delta1 = 1.0;// node_distribution ! private static double delta2 = 0.01;// borderline ! private static double delta3 = 0.0001;// edgelength ! private static double delta4 = 100.0;// edgecrossing ! private static double delta10 = 0.75;// cooling 0.6..0.95 ! private static double delta11 = 0.75;// cooling 0.6..0.95 private double min_x; private double max_x; *************** *** 143,153 **** //ch.softenvironment.util.Tracer.getInstance().debug("current ClassDiagramView found"); ! /* ch.ehi.umleditor.umlpresentation.Diagram diag=diagView.getDiagram(); ! java.util.Iterator elei=diag.iteratorPresentationElement(); while(elei.hasNext()){ Object obj=elei.next(); ! if(obj instanceof ch.ehi.umleditor.umlpresentation.PresentationEdge){ edgev.add(obj); ! }else if(obj instanceof ch.ehi.umleditor.umlpresentation.PresentationNode){ nodev.add(obj); } --- 143,153 ---- //ch.softenvironment.util.Tracer.getInstance().debug("current ClassDiagramView found"); ! /* org.tcotool.presentation.Diagram diag=diagView.getDiagram(); ! java.util.Iterator elei=diag.getPresentationElement().iterator(); while(elei.hasNext()){ Object obj=elei.next(); ! if(obj instanceof org.tcotool.presentation.PresentationEdge){ edgev.add(obj); ! }else if(obj instanceof org.tcotool.presentation.PresentationNode){ nodev.add(obj); } *************** *** 157,163 **** while (enum.hasNextFigure()) { Figure figure = enum.nextFigure(); ! if (figure instanceof PresentationEdge) { edgev.add(figure); ! } else if(figure instanceof PresentationNode){ nodev.add(figure); } --- 157,163 ---- while (enum.hasNextFigure()) { Figure figure = enum.nextFigure(); ! if (figure instanceof EdgeFigure) { edgev.add(figure); ! } else if (figure instanceof NodeFigure){ nodev.add(figure); } *************** *** 165,169 **** //dumpNodes(nodev.iterator()); // before Layout model=new Layout(); ! // ch.ehi.umleditor.application.LauncherView.getInstance().log("layout diagram","H "+diagView.getMaximumSize().getHeight()+", W"+diagView.getMaximumSize().getWidth()); model.layout(nodev, edgev, 0, 0, --- 165,169 ---- //dumpNodes(nodev.iterator()); // before Layout model=new Layout(); ! // Tracer.getInstance().debug("layout diagram","H "+diagView.getMaximumSize().getHeight()+", W"+diagView.getMaximumSize().getWidth()); model.layout(nodev, edgev, 0, 0, *************** *** 174,178 **** diagView.refresh(); }else{ ! Tracer.getInstance().runtimeWarning(Layout.class, "Layout", "Failed"); } return; --- 174,178 ---- diagView.refresh(); }else{ ! Tracer.getInstance().developerWarning(Layout.class, "Layout", "Failed"); } return; *************** *** 271,275 **** return sum; } ! private PresentationNode getBeginNode(int edgeIdx) { /* PresentationEdge edge=getEdge(edgeIdx); --- 271,275 ---- return sum; } ! private NodeFigure getBeginNode(int edgeIdx) { /* PresentationEdge edge=getEdge(edgeIdx); *************** *** 278,282 **** */ EdgeFigure edge = (EdgeFigure)getEdge(edgeIdx); ! return (PresentationNode)edge.startFigure(); } private double getdist(double x1, double y1, double x2, double y2) --- 278,282 ---- */ EdgeFigure edge = (EdgeFigure)getEdge(edgeIdx); ! return (NodeFigure)edge.startFigure(); } private double getdist(double x1, double y1, double x2, double y2) *************** *** 286,294 **** return Math.sqrt(d1 * d1 + d2 * d2); } ! private PresentationEdge getEdge(int i) { ! return (PresentationEdge)edgev.get(i); } ! private PresentationNode getEndNode(int edgeIdx) { /* PresentationEdge edge=getEdge(edgeIdx); --- 286,294 ---- return Math.sqrt(d1 * d1 + d2 * d2); } ! private EdgeFigure getEdge(int i) { ! return (EdgeFigure)edgev.get(i); } ! private NodeFigure getEndNode(int edgeIdx) { /* PresentationEdge edge=getEdge(edgeIdx); *************** *** 298,306 **** */ EdgeFigure edge = (EdgeFigure)getEdge(edgeIdx); ! return (PresentationNode)edge.endFigure(); } ! private PresentationNode getNode(int i) { ! return (PresentationNode)nodev.get(i); } private void layout(java.util.List nodev,java.util.List edgev, double min_x1, double min_y1, double max_x1, double max_y1) --- 298,306 ---- */ EdgeFigure edge = (EdgeFigure)getEdge(edgeIdx); ! return (NodeFigure)edge.endFigure(); } ! private NodeFigure getNode(int i) { ! return (NodeFigure)nodev.get(i); } private void layout(java.util.List nodev,java.util.List edgev, double min_x1, double min_y1, double max_x1, double max_y1) *************** *** 333,337 **** int new_x; int new_y; ! PresentationNode node; do{ int i; --- 333,337 ---- int new_x; int new_y; ! NodeFigure node = null; do{ int i; *************** *** 381,389 **** double sum = 0; for(int j = 0;j<nodev.size();j++){ ! PresentationNode node=getNode(j); for(int i = 0;i<edgev.size();i++){ ! PresentationNode begNode=getBeginNode(i); if(begNode==node)continue; ! PresentationNode endNode=getEndNode(i); if(endNode==node)continue; double dist=pt2line(node.getEast(),node.getSouth() --- 381,389 ---- double sum = 0; for(int j = 0;j<nodev.size();j++){ ! NodeFigure node=getNode(j); for(int i = 0;i<edgev.size();i++){ ! NodeFigure begNode=getBeginNode(i); if(begNode==node)continue; ! NodeFigure endNode=getEndNode(i); if(endNode==node)continue; double dist=pt2line(node.getEast(),node.getSouth() Index: SeparatorFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/SeparatorFigure.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SeparatorFigure.java 29 Aug 2005 09:41:14 -0000 1.1.1.1 --- SeparatorFigure.java 16 Sep 2005 14:54:37 -0000 1.2 *************** *** 23,27 **** * from other figures beneath in addition. * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ --- 23,27 ---- * from other figures beneath in addition. * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ Index: EdgeFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/EdgeFigure.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** EdgeFigure.java 29 Aug 2005 09:41:16 -0000 1.1.1.1 --- EdgeFigure.java 16 Sep 2005 14:54:37 -0000 1.2 *************** *** 1,4 **** package org.tcotool.standard.drawing; - /* * This library is free software; you can redistribute it and/or --- 1,3 ---- *************** *** 24,31 **** --- 23,33 ---- import org.tcotool.model.Dependency; import org.tcotool.model.TcoObject; + import org.tcotool.presentation.WayPoint; import org.jhotdraw.framework.*; import org.jhotdraw.figures.*; import ch.softenvironment.view.*; + import ch.softenvironment.jomm.DbObjectServer; + import ch.softenvironment.jomm.mvc.model.DbObject; import ch.softenvironment.util.*; /** *************** *** 33,49 **** * @see NodeFigure * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ ! abstract class EdgeFigure extends LineConnection implements PresentationEdge{ // keep reference to real model's presentation ! private DependencyView diagram = null; ! // protected PresentationEdge edge = null; ! protected Object modelElement = null; // mouse-Event suppression - // private EdgeFigure lastInvalidEdge = null; protected NodeFigure startFigure = null; protected NodeFigure endFigure = null; ! private Vector wayPoints = new Vector(); /** * EdgeFigure constructor comment. --- 35,52 ---- * @see NodeFigure * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ ! abstract class EdgeFigure extends LineConnection { // keep reference to real model's presentation ! private DependencyView view = null; ! private Object modelElement = null; ! //TODO protected PresentationEdge edge = null; // persistent ! private Vector wayPoints = new Vector(); //TODO wayPoints => edge#wayPoint-List ! // mouse-Event suppression protected NodeFigure startFigure = null; protected NodeFigure endFigure = null; ! /** * EdgeFigure constructor comment. *************** *** 58,64 **** * EdgeFigure constructor comment. */ ! public EdgeFigure(DependencyView diagram, NodeFigure start, NodeFigure end, Dependency dependency) { this(); ! this.diagram = diagram; this.startFigure = start; this.endFigure = end; --- 61,67 ---- * EdgeFigure constructor comment. */ ! public EdgeFigure(DependencyView view, NodeFigure start, NodeFigure end, Dependency dependency) { this(); ! this.view = view; this.startFigure = start; this.endFigure = end; *************** *** 120,124 **** // removeVisually(); } else { ! wayPoints.add(createWayPoint(startPoint())); Connector end = getDiagram().findNodeConnector(getEndElement(), x, y); if (end == null) { --- 123,127 ---- // removeVisually(); } else { ! wayPoints.add(createWayPoint(((DbObject)getStartElement()).getObjectServer(), startPoint())); Connector end = getDiagram().findNodeConnector(getEndElement(), x, y); if (end == null) { *************** *** 127,131 **** // removeVisually(); } else { ! wayPoints.add(createWayPoint(endPoint())); connectStart(start); setEndConnector(end); --- 130,134 ---- // removeVisually(); } else { ! wayPoints.add(createWayPoint(((DbObject)getEndElement()).getObjectServer(), endPoint())); connectStart(start); setEndConnector(end); *************** *** 134,138 **** for (int i=0; i<wayPoints.size()-1; i++) { WayPoint currentPoint = (WayPoint)wayPoints.get(i); ! insertPointAt(new Point(currentPoint.getEast(), currentPoint.getSouth()), i + 1); } --- 137,141 ---- for (int i=0; i<wayPoints.size()-1; i++) { WayPoint currentPoint = (WayPoint)wayPoints.get(i); ! insertPointAt(new Point(currentPoint.getEast().intValue(), currentPoint.getSouth().intValue()), i + 1); } *************** *** 150,157 **** * @param p Coordinates of WayPoint */ ! protected final static WayPoint createWayPoint(Point p) { ! WayPoint wayPoint = new WayPoint(); ! wayPoint.setEast(p.x); ! wayPoint.setSouth(p.y); return wayPoint; --- 153,160 ---- * @param p Coordinates of WayPoint */ ! protected final static WayPoint createWayPoint(DbObjectServer server, Point p) throws Throwable { ! WayPoint wayPoint = (WayPoint)server.createInstance(WayPoint.class); ! wayPoint.setEast(new Long(p.x)); ! wayPoint.setSouth(new Long(p.y)); return wayPoint; *************** *** 176,180 **** */ protected DependencyView getDiagram() { ! return diagram; } /** --- 179,183 ---- */ protected DependencyView getDiagram() { ! return view; } /** Index: DependencyView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/DependencyView.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DependencyView.java 29 Aug 2005 09:41:15 -0000 1.1.1.1 --- DependencyView.java 16 Sep 2005 14:54:37 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- import org.tcotool.model.TcoObject; import org.tcotool.model.TcoPackage; + import org.tcotool.presentation.Diagram; import org.tcotool.tools.Calculator; *************** *** 37,41 **** * (related to UML-Classdiagram's with Package-Dependencies). * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ * @see CustomSelectionTool#handleMousePopupMenu(..) --- 38,42 ---- * (related to UML-Classdiagram's with Package-Dependencies). * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ * @see CustomSelectionTool#handleMousePopupMenu(..) *************** *** 44,51 **** // private ToolButton defaultToolButton = null; // private ToolButton selectedToolButton = null; ! Tool tool = null; ! UndoManager undoManager = new UndoManager(); private Calculator calculator = new Calculator(LauncherView.getInstance().getUtility()); ! // private Diagram diagram = null; // private Element parentElement = null; // Menu Checkboxes --- 45,52 ---- // private ToolButton defaultToolButton = null; // private ToolButton selectedToolButton = null; ! private Tool tool = null; ! private UndoManager undoManager = new UndoManager(); private Calculator calculator = new Calculator(LauncherView.getInstance().getUtility()); ! private Diagram diagram = null; // private Element parentElement = null; // Menu Checkboxes *************** *** 58,65 **** * @param height int */ ! public DependencyView(Set dependencies, int width, int height) { // @see LauncherView.addInternalFrame(..) for setting the Editor super(null, width, height); setDrawing(new StandardDrawing()); // setBackground(ch.ehi.umleditor.application.LauncherView.getSettings().getBackgroundColor()); --- 59,67 ---- * @param height int */ ! public DependencyView(Diagram diagram, Set dependencies, int width, int height) throws Throwable { // @see LauncherView.addInternalFrame(..) for setting the Editor super(null, width, height); setDrawing(new StandardDrawing()); + this.diagram = diagram; // setBackground(ch.ehi.umleditor.application.LauncherView.getSettings().getBackgroundColor()); *************** *** 73,82 **** * Called by UML-Toolbox. * @return the added figure. ! * @see EdgeFigure.handleConnection(Figure, Figure) */ public Figure add(Figure figure) { try { super.add(figure); ! ((NodeFigure)figure).updateView(); } catch(Throwable e) { BaseDialog.showError(LauncherView.getInstance(), "error", "CEFigureNotCreated", e); //$NON-NLS-1$ --- 75,91 ---- * Called by UML-Toolbox. * @return the added figure. ! * @see EdgeFigure#handleConnection(Figure, Figure) */ public Figure add(Figure figure) { try { super.add(figure); ! if (figure instanceof NodeFigure) { ! if (!diagram.getPresentationElement().contains(((NodeFigure)figure).getNode())) { ! List elements = new ArrayList(diagram.getPresentationElement()); ! elements.add(((NodeFigure)figure).getNode()); ! diagram.setPresentationElement(elements); ! } ! ((NodeFigure)figure).updateView(); ! } } catch(Throwable e) { BaseDialog.showError(LauncherView.getInstance(), "error", "CEFigureNotCreated", e); //$NON-NLS-1$ *************** *** 90,94 **** * @see NavigationView#mniAddToDiagram() */ ! private Figure add(TcoObject element) { Figure figure = findFigure(element); if (figure != null) { --- 99,103 ---- * @see NavigationView#mniAddToDiagram() */ ! private Figure add(TcoObject element) throws Throwable { Figure figure = findFigure(element); if (figure != null) { *************** *** 108,112 **** } } ! private void addDependency(Dependency dependency) { Figure client = add(LauncherView.getInstance().getUtility().findClient(dependency)); Figure supplier = add(LauncherView.getInstance().getUtility().findSupplier(dependency)); --- 117,121 ---- } } ! private void addDependency(Dependency dependency) throws Throwable { Figure client = add(LauncherView.getInstance().getUtility().findClient(dependency)); Figure supplier = add(LauncherView.getInstance().getUtility().findSupplier(dependency)); *************** *** 413,415 **** --- 422,427 ---- return null; } + protected Diagram getDiagram() { + return diagram; + } } Index: ServiceFigure.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing/ServiceFigure.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ServiceFigure.java 29 Aug 2005 09:41:14 -0000 1.1.1.1 --- ServiceFigure.java 16 Sep 2005 14:54:37 -0000 1.2 *************** *** 26,30 **** * Graphical representation for a TCO-Service in a Dependency Diagram. * ! * @author: Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ --- 26,30 ---- * Graphical representation for a TCO-Service in a Dependency Diagram. * ! * @author Peter Hirzel <i>soft</i>Environment * @version $Revision$ $Date$ */ *************** *** 40,44 **** * Create a new instance of ClassFigure with a RectangleFigure as presentation figure */ ! public ServiceFigure(DependencyView diagram, Object element) { super(diagram, new RectangleFigure(), element); defineComposite(0); --- 40,44 ---- * Create a new instance of ClassFigure with a RectangleFigure as presentation figure */ ! public ServiceFigure(DependencyView diagram, Object element) throws Throwable { super(diagram, new RectangleFigure(), element); defineComposite(0); *************** *** 66,70 **** /** * Add individual PopupMenu items for this class. ! * @see createPopupMenu() */ protected void addSpecialMenu(javax.swing.JPopupMenu popupMenu) { --- 66,70 ---- /** * Add individual PopupMenu items for this class. ! * @see #createPopupMenu() */ protected void addSpecialMenu(javax.swing.JPopupMenu popupMenu) { |
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/presentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32154 Added Files: Diagram.java EdgeEnd.java PresentationEdge.java PresentationElement.java PresentationNode.java WayPoint.java Log Message: Refactoring: persistent Dependency-Diagram Layout --- NEW FILE: EdgeEnd.java --- package org.tcotool.presentation; import ch.softenvironment.jomm.mvc.model.*; import ch.softenvironment.jomm.descriptor.*; /** * @author generated by the umleditor */ public class EdgeEnd extends DbRelationshipBean { public EdgeEnd(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); } public java.lang.Long fieldEdgeId; public java.lang.Long getEdgeId() { refresh(false); // read lazy initialized objects return fieldEdgeId; } public void setEdgeId(java.lang.Long edge) { java.lang.Long oldValue=fieldEdgeId; fieldEdgeId=edge; firePropertyChange("edgeId", oldValue, fieldEdgeId); } public java.lang.Long fieldEndPointId; public java.lang.Long getEndPointId() { refresh(false); // read lazy initialized objects return fieldEndPointId; } public void setEndPointId(java.lang.Long endPoint) { java.lang.Long oldValue=fieldEndPointId; fieldEndPointId=endPoint; firePropertyChange("endPointId", oldValue, fieldEndPointId); } public static DbDescriptor createDescriptor() { DbDescriptor descriptor = new DbDescriptor(EdgeEnd.class); descriptor.addAssociationEnd(PresentationEdge.class,"edgeId","T_Id_edge"); descriptor.addAssociationEnd(PresentationElement.class,"endPointId","T_Id_endPoint"); return descriptor; } } --- NEW FILE: PresentationEdge.java --- package org.tcotool.presentation; import ch.softenvironment.jomm.mvc.model.*; import ch.softenvironment.jomm.descriptor.*; /** * The root of line-style presentations. * @author generated by the umleditor */ public class PresentationEdge extends PresentationElement { public PresentationEdge(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); } public java.util.List fieldEndPointId=new java.util.ArrayList(); public java.util.List getEndPointId() { refresh(false); // read lazy initialized objects return fieldEndPointId; } public void setEndPointId(java.util.List endPoint) { java.util.List oldValue=fieldEndPointId; fieldEndPointId=endPoint; firePropertyChange("endPointId", oldValue, fieldEndPointId); } public java.util.List fieldWayPoint=new java.util.ArrayList(); public java.util.List getWayPoint() { refresh(false); // read lazy initialized objects return fieldWayPoint; } public void setWayPoint(java.util.List wayPoint) { java.util.List oldValue=fieldWayPoint; fieldWayPoint=wayPoint; firePropertyChange("wayPoint", oldValue, fieldWayPoint); } public static DbDescriptor createDescriptor() { DbDescriptor descriptor = new DbDescriptor(PresentationEdge.class); descriptor.addAssociationAttributed(DbDescriptor.ASSOCIATION, "endPointId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(2,DbMultiplicityRange.UNBOUND), EdgeEnd.class, "edgeId"); descriptor.addOneToMany(DbDescriptor.COMPOSITION, "wayPoint", "edgeId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), WayPoint.class, false); return descriptor; } } --- NEW FILE: Diagram.java --- package org.tcotool.presentation; import ch.softenvironment.jomm.mvc.model.*; import ch.softenvironment.jomm.descriptor.*; /** * A Diagram groups different PresentationElement's in graphical manner. * @author generated by the umleditor */ public class Diagram extends DbEntityBean { public Diagram(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); } public String fieldName; public String getName() { refresh(false); // read lazy initialized objects return fieldName; } public void setName(String name){ String oldValue=fieldName; fieldName=name; firePropertyChange("name", oldValue, fieldName); } public java.util.List fieldPresentationElement=new java.util.ArrayList(); public java.util.List getPresentationElement() { refresh(false); // read lazy initialized objects return fieldPresentationElement; } public void setPresentationElement(java.util.List presentationElement) { java.util.List oldValue=fieldPresentationElement; fieldPresentationElement=presentationElement; firePropertyChange("presentationElement", oldValue, fieldPresentationElement); } public static DbDescriptor createDescriptor() { DbDescriptor descriptor = new DbDescriptor(Diagram.class); descriptor.add("name","name",new DbTextFieldDescriptor(255),new DbMultiplicityRange(0,1)); descriptor.addOneToMany(DbDescriptor.COMPOSITION, "presentationElement", "diagramId", new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), PresentationElement.class, false); return descriptor; } } --- NEW FILE: PresentationNode.java --- package org.tcotool.presentation; import ch.softenvironment.jomm.mvc.model.*; import ch.softenvironment.jomm.descriptor.*; /** * The root of symbol-style presentations. * @author generated by the umleditor */ public class PresentationNode extends PresentationElement { public PresentationNode(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); } public java.lang.Long fieldWidth; public java.lang.Long getWidth() { refresh(false); // read lazy initialized objects return fieldWidth; } public void setWidth(java.lang.Long width){ java.lang.Long oldValue=fieldWidth; fieldWidth=width; firePropertyChange("width", oldValue, fieldWidth); } public java.lang.Long fieldHeight; public java.lang.Long getHeight() { refresh(false); // read lazy initialized objects return fieldHeight; } public void setHeight(java.lang.Long height){ java.lang.Long oldValue=fieldHeight; fieldHeight=height; firePropertyChange("height", oldValue, fieldHeight); } public java.lang.Long fieldEast; public java.lang.Long getEast() { refresh(false); // read lazy initialized objects return fieldEast; } public void setEast(java.lang.Long east){ java.lang.Long oldValue=fieldEast; fieldEast=east; firePropertyChange("east", oldValue, fieldEast); } public java.lang.Long fieldSouth; public java.lang.Long getSouth() { refresh(false); // read lazy initialized objects return fieldSouth; } public void setSouth(java.lang.Long south){ java.lang.Long oldValue=fieldSouth; fieldSouth=south; firePropertyChange("south", oldValue, fieldSouth); } public static DbDescriptor createDescriptor() { DbDescriptor descriptor = new DbDescriptor(PresentationNode.class); descriptor.add("width","width",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,999999.0,0),new DbMultiplicityRange(0,1)); descriptor.add("height","height",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,999999.0,0),new DbMultiplicityRange(0,1)); descriptor.add("east","east",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,999999.0,0),new DbMultiplicityRange(0,1)); descriptor.add("south","south",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,999999.0,0),new DbMultiplicityRange(0,1)); return descriptor; } } --- NEW FILE: WayPoint.java --- package org.tcotool.presentation; import ch.softenvironment.jomm.mvc.model.*; import ch.softenvironment.jomm.descriptor.*; /** * A WayPoint is a constraint on the geometry of the actual presentation of this Edge (the "zick-zack position of a line"). * @author generated by the umleditor */ public class WayPoint extends DbEntityBean { public WayPoint(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); } public java.lang.Long fieldEast; public java.lang.Long getEast() { refresh(false); // read lazy initialized objects return fieldEast; } public void setEast(java.lang.Long east){ java.lang.Long oldValue=fieldEast; fieldEast=east; firePropertyChange("east", oldValue, fieldEast); } public java.lang.Long fieldSouth; public java.lang.Long getSouth() { refresh(false); // read lazy initialized objects return fieldSouth; } public void setSouth(java.lang.Long south){ java.lang.Long oldValue=fieldSouth; fieldSouth=south; firePropertyChange("south", oldValue, fieldSouth); } public java.lang.Long fieldEdgeId; public java.lang.Long getEdgeId() { refresh(false); // read lazy initialized objects return fieldEdgeId; } public void setEdgeId(java.lang.Long edge) { java.lang.Long oldValue=fieldEdgeId; fieldEdgeId=edge; firePropertyChange("edgeId", oldValue, fieldEdgeId); } public static DbDescriptor createDescriptor() { DbDescriptor descriptor = new DbDescriptor(WayPoint.class); descriptor.add("east","east",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,999999.0,0),new DbMultiplicityRange(0,1)); descriptor.add("south","south",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,999999.0,0),new DbMultiplicityRange(0,1)); descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "edgeId", "T_Id_edge", new DbMultiplicityRange(1,1)); return descriptor; } } --- NEW FILE: PresentationElement.java --- package org.tcotool.presentation; import ch.softenvironment.jomm.mvc.model.*; import ch.softenvironment.jomm.descriptor.*; /** * A presentation element is a textual or graphical presentation of a model element. (To be found in UML-core 1.4 model.) * @author generated by the umleditor */ public class PresentationElement extends DbEntityBean { public PresentationElement(ch.softenvironment.jomm.DbObjectServer objectServer) { super(objectServer); } public String fieldFont; public String getFont() { refresh(false); // read lazy initialized objects return fieldFont; } public void setFont(String font){ String oldValue=fieldFont; fieldFont=font; firePropertyChange("font", oldValue, fieldFont); } public java.lang.Long fieldForeground; public java.lang.Long getForeground() { refresh(false); // read lazy initialized objects return fieldForeground; } public void setForeground(java.lang.Long foreground){ java.lang.Long oldValue=fieldForeground; fieldForeground=foreground; firePropertyChange("foreground", oldValue, fieldForeground); } public java.lang.Long fieldBackground; public java.lang.Long getBackground() { refresh(false); // read lazy initialized objects return fieldBackground; } public void setBackground(java.lang.Long background){ java.lang.Long oldValue=fieldBackground; fieldBackground=background; firePropertyChange("background", oldValue, fieldBackground); } public java.lang.Object fieldSubject; public java.lang.Object getSubject() { refresh(false); // read lazy initialized objects return fieldSubject; } public void setSubject(java.lang.Object subject) { java.lang.Object oldValue=fieldSubject; fieldSubject=subject; firePropertyChange("subjectId", oldValue, fieldSubject); } public java.util.List fieldEdgeId=new java.util.ArrayList(); public java.util.List getEdgeId() { refresh(false); // read lazy initialized objects return fieldEdgeId; } public void setEdgeId(java.util.List edge) { java.util.List oldValue=fieldEdgeId; fieldEdgeId=edge; firePropertyChange("edgeId", oldValue, fieldEdgeId); } public java.lang.Long fieldDiagramId; public java.lang.Long getDiagramId() { refresh(false); // read lazy initialized objects return fieldDiagramId; } public void setDiagramId(java.lang.Long diagram) { java.lang.Long oldValue=fieldDiagramId; fieldDiagramId=diagram; firePropertyChange("diagramId", oldValue, fieldDiagramId); } public static DbDescriptor createDescriptor() { DbDescriptor descriptor = new DbDescriptor(PresentationElement.class); descriptor.add("font","font",new DbTextFieldDescriptor(255),new DbMultiplicityRange(0,1)); descriptor.add("foreground","foreground",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,1.6777215E7,0),new DbMultiplicityRange(0,1)); descriptor.add("background","background",new DbNumericFieldDescriptor(java.lang.Long.class,0.0,1.6777215E7,0),new DbMultiplicityRange(0,1)); descriptor.addManyToOneReference(DbDescriptor.AGGREGATION, "subject", "T_Id_subject", new DbMultiplicityRange(1,1)); descriptor.addAssociationAttributed(DbDescriptor.ASSOCIATION, "edgeId", new DbMultiplicityRange(2,DbMultiplicityRange.UNBOUND), new DbMultiplicityRange(0,DbMultiplicityRange.UNBOUND), EdgeEnd.class, "endPointId"); descriptor.addManyToOneReferenceId(DbDescriptor.ASSOCIATION, "diagramId", "T_Id_diagram", new DbMultiplicityRange(1,1)); return descriptor; } } |
|
From: Hirzel P. <ph...@us...> - 2005-09-16 14:52:59
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/presentation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32003/presentation Log Message: Directory /cvsroot/tcotool/TCO-Tool/src/org/tcotool/presentation added to the repository |
|
From: Hirzel P. <ph...@us...> - 2005-09-16 11:54:01
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22345 Modified Files: NavigationView.java Log Message: Tracer#nyi() replaced by //TODO Index: NavigationView.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/NavigationView.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** NavigationView.java 29 Aug 2005 09:40:43 -0000 1.1.1.1 --- NavigationView.java 16 Sep 2005 11:53:46 -0000 1.2 *************** *** 1430,1434 **** exportRoot.setService(object.getService()); // RELINK to new Group: exportRoot.setSystemParameter(((TcoUtility)utility).getSystemParameter()); ! ch.softenvironment.util.Tracer.getInstance().nyi(this, "mniExportConfiguration()", "Dependencies"); object.getObjectServer().setUserObject(new ch.softenvironment.jomm.target.xml.XmlUserObject(saveDialog.getSelectedFile().getAbsolutePath())); --- 1430,1434 ---- exportRoot.setService(object.getService()); // RELINK to new Group: exportRoot.setSystemParameter(((TcoUtility)utility).getSystemParameter()); ! //TODO NYI: Dependencies object.getObjectServer().setUserObject(new ch.softenvironment.jomm.target.xml.XmlUserObject(saveDialog.getSelectedFile().getAbsolutePath())); |
|
From: Hirzel P. <ph...@us...> - 2005-09-16 11:20:28
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16587 Removed Files: PresentationEdge.java PresentationNode.java Log Message: Refactoring: moved to org.tcotool.presentation --- PresentationEdge.java DELETED --- --- PresentationNode.java DELETED --- |
|
From: Hirzel P. <ph...@us...> - 2005-09-16 09:12:24
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/drawing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24234 Removed Files: WayPoint.java Log Message: Replaced by org.tcotool.presentation.WayPoint --- WayPoint.java DELETED --- |
