svn commit: r16683 - trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java

Author: bobtarling
Date: 2009-01-20 15:20:48-0800
New Revision: 16683

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java

Log:
Issue 5643: Leave navigation settings alone when dragging associations.

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java?view=diff&pathrev=16683&r1=16682&r2=16683
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java	2009-01-20 15:20:48-0800
@@ -548,6 +548,8 @@
      *
      * delegates to rerouteXXX(,,,) for each of the 4 possible edges in
      * a class diagram: Association, Dependency, Generalization, Link.
+     * TODO: This should probably be in superclass. Many Figs can be on
+     * several diagram types.
      *
      * @param newNode this is the new node that one of the ends is dragged to.
      * @param oldNode this is the existing node that is already connected.
@@ -569,7 +571,9 @@
     }
 
     /**
-     * helper method for changeConnectedNode.
+     * Helper method for changeConnectedNode.
+     * TODO: This should probably be in superclass. Associations can be on
+     * several diagram types.
      */
     private void rerouteAssociation(Object newNode, Object oldNode,
 				    Object edge, boolean isSource) {
@@ -612,17 +616,6 @@
             theEnd = iter.next();
         }
 
-        // set the ends navigability see also Class ActionNavigability
-        if (Model.getFacade().isAInterface(newNode)) {
-            Model.getCoreHelper().setNavigable(theEnd, true);
-            Model.getCoreHelper().setNavigable(theOtherEnd, false);
-        }
-
-        if (Model.getFacade().isAInterface(otherNode)) {
-            Model.getCoreHelper().setNavigable(theOtherEnd, true);
-            Model.getCoreHelper().setNavigable(theEnd, false);
-        }
-
         //set the new end type!
         Model.getCoreHelper().setType(theEnd, newNode);
     }
@@ -657,5 +650,4 @@
         // empty at the moment
 
     }
-
 }

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1039690

To unsubscribe from this discussion, e-mail: [[email protected]].