svn commit: r14585 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui

Author: tfmorris
Date: 2008-05-01 17:06:44-0700
New Revision: 14585

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionRerouteEdge.java

Log:
TODOs for issue 5059

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=14585&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=14584&r2=14585
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	2008-05-01 17:06:44-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -202,11 +202,6 @@
             edgePort.setVisible(false);
             addPathItem(edgePort,
                     new PathConvPercent(this, 50, 0));
-
-	    // According to Bob Tarling, removing this fixes issue 4599.
-	    // Changed by Linus Tolke just before 0.24.alpha3 without
-	    // time to investigate.
-            // computeRoute();
         }
     }
 
@@ -468,6 +463,8 @@
      */
     @Override
     public Selection makeSelection() {
+        // TODO: There is a cyclic dependency between SelectionRerouteEdge
+        // and FigEdgeModelElement
         return new SelectionRerouteEdge(this);
     }
 

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionRerouteEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionRerouteEdge.java?view=diff&rev=14585&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionRerouteEdge.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionRerouteEdge.java&r1=14584&r2=14585
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionRerouteEdge.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SelectionRerouteEdge.java	2008-05-01 17:06:44-0700
@@ -90,7 +90,8 @@
      * @param feme the given Fig
      */
     public SelectionRerouteEdge(FigEdgeModelElement feme) {
-
+        // TODO: There is a cyclic dependency between SelectionRerouteEdge
+        // and FigEdgeModelElement
         super(feme);
 
         // set it to an invalid number by default
@@ -220,6 +221,8 @@
 
         editor.getSelectionManager().deselect(getContent());
         armed = false;
+        // TODO: There is a cyclic dependency between SelectionRerouteEdge
+        // and FigEdgeModelElement
         FigEdgeModelElement figEdge = (FigEdgeModelElement) getContent();
         figEdge.determineFigNodes();
         figEdge.computeRoute();