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

Author: bobtarling
Date: 2009-03-18 17:51:52-0700
New Revision: 16900

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

Log:
Issue 5729: Protect against null source node - this can be called during load then the edge hasn't been attached to the node yet

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=16900&r1=16899&r2=16900
==============================================================================
--- 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-03-18 17:51:52-0700
@@ -330,7 +330,8 @@
     
     public void calcBounds() {
         final FigPoly fp = (FigPoly) getFig();
-        if (isSelfMessage() && fp.isComplete()) {
+        final FigNode node = getSourceFigNode();
+        if (node != null && isSelfMessage() && fp.isComplete()) {
             // TODO: calcBounds is called by SelectionManager when the Fig is
             // dragged. This code is needed to reposition any self message
             // as they are become detached from their classifier role
@@ -341,7 +342,6 @@
             // ArgoUML can provide its own replacement SelectionManager for
             // sequence diagram requirements
             // See - http://gef.tigris.org/issues/show_bug.cgi?id=344
-            final FigNode node = getSourceFigNode();
             final int x =
                 node.getX()
                 + (node.getWidth() + FigActivation.DEFAULT_WIDTH) / 2;

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

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