svn commit: r18404 - trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java

Author: bobtarling
Date: 2010-05-26 00:42:05-0700
New Revision: 18404

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

Log:
Issue 6090: The FigPool that contains all swimlanes has a null owner. So swap order of equals operands so that we avoid an NPE by calling null.equals()

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java?view=diff&pathrev=18404&r1=18403&r2=18404
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java	2010-05-26 00:42:05-0700
@@ -334,7 +334,7 @@
         for (Object fig : lay.getContentsNoEdges()) {
  
             if (fig instanceof FigNode
-                    && ((FigNode) fig).getOwner().equals(modelElement)) {
+                    && modelElement.equals(((FigNode) fig).getOwner())) {
                 return ((FigNode) fig);
             }
         }

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

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