svn commit: r15407 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java

Author: tfmorris
Date: 2008-07-30 07:24:27-0700
New Revision: 15407

Modified:
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java

Log:
Fix wrong OR operator -- caught by FindBugs

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java?view=diff&rev=15407&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java&r1=15406&r2=15407
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java	2008-07-30 07:24:27-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-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
@@ -381,7 +381,7 @@
             return false;
         }
         for (ClassifierRole cr : roles) {
-            if (cr.getName() == null | cr.getName().equals("")) {
+            if (cr.getName() == null || cr.getName().equals("")) {
                 return false;
             }
         }
@@ -412,7 +412,7 @@
             return false;
         }
         for (AssociationRole ar : roles) {
-            if (ar.getName() == null | ar.getName().equals("")) {
+            if (ar.getName() == null || ar.getName().equals("")) {
                 return false;
             }
         }