svn commit: r16579 - trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java

Author: bobtarling
Date: 2009-01-11 17:13:16-0800
New Revision: 16579

Modified:
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java

Log:
Make isSelfMessage safer

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java?view=diff&pathrev=16579&r1=16578&r2=16579
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/FigMessage.java	2009-01-11 17:13:16-0800
@@ -210,7 +210,15 @@
      * @return true if they are the same, otherwise false. 
      */
     boolean isSelfMessage() {
-        return getDestination().equals(getSource());
+        // If possible we determine this by checking the destination
+        // and source Figs are the same. If this is not possible
+        // because the edge is not yet connected then we check the
+        // model.
+        if (getDestPortFig() == null || getSourcePortFig() == null) {
+            return getDestination().equals(getSource());
+        } else {
+            return (getDestPortFig().equals(getSourcePortFig()));
+        }
     }
     
     /**

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

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