Author: bobtarling Date: 2008-04-13 15:27:56-0700 New Revision: 14337 Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigLifeLine.java
Log: Make equals safer against npe Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigLifeLine.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigLifeLine.java?view=diff&rev=14337&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigLifeLine.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigLifeLine.java&r1=14336&r2=14337 ============================================================================== --- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigLifeLine.java (original) +++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigLifeLine.java 2008-04-13 15:27:56-0700 @@ -212,8 +212,8 @@ final FigClassifierRole cr = (FigClassifierRole) getGroup(); for (FigMessage message : messages) { - if (message.getDestFigNode().equals(cr) - && !message.getSourceFigNode().equals(cr) + if (cr.equals(message.getDestFigNode()) + && !cr.equals(message.getSourceFigNode()) && Model.getFacade().isACallAction(message.getAction())) { found = true; break; @@ -228,8 +228,8 @@ (FigClassifierRole) getGroup(); for (FigMessage message : messages) { Object action = message.getAction(); - if (message.getSourceFigNode().equals(cr) - && !message.getDestFigNode().equals(cr) + if (cr.equals(message.getSourceFigNode()) + && !cr.equals(message.getDestFigNode()) && Model.getFacade().isADestroyAction(action)) { found = true; break; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
