|
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) { |