svn commit: r15587 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java

Author: tfmorris
Date: 2008-08-19 11:48:26-0700
New Revision: 15587

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

Log:
RESOLVED - task 5328: NullPointerException from ModeCreateGraphEdge.isConnectionValid on dangling connections 
http://argouml.tigris.org/issues/show_bug.cgi?id=5328

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java?view=diff&rev=15587&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java&r1=15586&r2=15587
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java	2008-08-19 11:48:26-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2005-2007 The Regents of the University of California. All
+// Copyright (c) 2005-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
@@ -30,7 +30,6 @@
 import java.awt.event.MouseListener;
 
 import org.apache.log4j.Logger;
-import org.argouml.model.IllegalModelElementConnectionException;
 import org.argouml.model.Model;
 import org.argouml.uml.diagram.static_structure.ui.FigEdgeNote;
 import org.tigris.gef.base.Layer;
@@ -56,11 +55,6 @@
      */
     private Fig sourceFig;
     
-    /**
-     * The port where the edge was dropped.
-     */
-    private Fig endPort;
-
     /*
      * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
      */
@@ -167,7 +161,6 @@
                 return;
             }
             if (foundPort != null) {
-                Fig destPortFig = destFigNode.getPortFig(foundPort);
                 FigPoly p = (FigPoly) _newItem;
                 if (foundPort == getStartPort() && _npoints >= 4) {
                     p.setSelfLoop(true);
@@ -232,18 +225,20 @@
     protected boolean isConnectionValid(Fig source, Fig dest) {
 	return Model.getUmlFactory().isConnectionValid(
 		getMetaType(), 
-		source.getOwner(), 
-		dest.getOwner(),
+		source == null ? null : source.getOwner(), 
+		dest == null ? null : dest.getOwner(),
                 true);
     }
     
     /**
      * Create an edge of the given type and connect it to the
      * given nodes.
-     *
+     * 
+     * @param graphModel the GraphModel containing the objects
      * @param edgeType       the UML object type of the connection
-     * @param fromElement    the UML object for the "from" element
-     * @param toElement      the UML object for the "to" element
+     * @param fromElement    the Fig for the "from" element
+     * @param destFigNode    the Fig for the "to" element
+     * @return a newly created FigEdge
      */
     protected FigEdge buildConnection(
             MutableGraphModel graphModel,