Author: tfmorris Date: 2008-09-22 16:37:17-0700 New Revision: 15773 Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionSetClassifierRoleMultiplicity.java trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetAssociationEndMultiplicity.java trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetStructuralFeatureMultiplicity.java trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionSetTagDefinitionMultiplicity.java
Log: RESOLVED - task 5384: Fix uses of Multiplicity to deal with null values. Invert order of equalities checking to avoid NPEs. http://argouml.tigris.org/issues/show_bug.cgi?id=5384 Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionSetClassifierRoleMultiplicity.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionSetClassifierRoleMultiplicity.java?view=diff&rev=15773&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionSetClassifierRoleMultiplicity.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionSetClassifierRoleMultiplicity.java&r1=15772&r2=15773 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionSetClassifierRoleMultiplicity.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionSetClassifierRoleMultiplicity.java 2008-09-22 16:37:17-0700 @@ -1,5 +1,5 @@ // $Id$ -// Copyright (c) 2003-2006 The Regents of the University of California. All +// Copyright (c) 2003-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 @@ -54,7 +54,7 @@ if (target != null && Model.getFacade().isAClassifierRole(target)) { if (Model.getFacade().isAMultiplicity(item)) { - if (!Model.getFacade().getMultiplicity(target).equals(item)) { + if (!item.equals(Model.getFacade().getMultiplicity(target))) { Model.getCoreHelper().setMultiplicity(target, item); } } else if (item instanceof String) { Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetAssociationEndMultiplicity.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetAssociationEndMultiplicity.java?view=diff&rev=15773&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetAssociationEndMultiplicity.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetAssociationEndMultiplicity.java&r1=15772&r2=15773 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetAssociationEndMultiplicity.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetAssociationEndMultiplicity.java 2008-09-22 16:37:17-0700 @@ -1,5 +1,5 @@ // $Id$ -// Copyright (c) 2003-2006 The Regents of the University of California. All +// Copyright (c) 2003-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 @@ -51,7 +51,7 @@ public void setSelectedItem(Object item, Object target) { if (target != null && Model.getFacade().isAAssociationEnd(target)) { if (Model.getFacade().isAMultiplicity(item)) { - if (!Model.getFacade().getMultiplicity(target).equals(item)) { + if (!item.equals(Model.getFacade().getMultiplicity(target))) { Model.getCoreHelper().setMultiplicity(target, item); } } else if (item instanceof String) { Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetStructuralFeatureMultiplicity.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetStructuralFeatureMultiplicity.java?view=diff&rev=15773&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetStructuralFeatureMultiplicity.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetStructuralFeatureMultiplicity.java&r1=15772&r2=15773 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetStructuralFeatureMultiplicity.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionSetStructuralFeatureMultiplicity.java 2008-09-22 16:37:17-0700 @@ -1,5 +1,5 @@ // $Id$ -// Copyright (c) 1996-2006 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 @@ -53,7 +53,7 @@ if (target != null && Model.getFacade().isAStructuralFeature(target)) { if (Model.getFacade().isAMultiplicity(item)) { - if (!Model.getFacade().getMultiplicity(target).equals(item)) { + if (!item.equals(Model.getFacade().getMultiplicity(target))) { Model.getCoreHelper().setMultiplicity(target, item); } } else if (item instanceof String) { Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionSetTagDefinitionMultiplicity.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionSetTagDefinitionMultiplicity.java?view=diff&rev=15773&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionSetTagDefinitionMultiplicity.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionSetTagDefinitionMultiplicity.java&r1=15772&r2=15773 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionSetTagDefinitionMultiplicity.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionSetTagDefinitionMultiplicity.java 2008-09-22 16:37:17-0700 @@ -1,5 +1,5 @@ // $Id$ -// Copyright (c) 2003-2006 The Regents of the University of California. All +// Copyright (c) 2003-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 @@ -52,7 +52,7 @@ if (target != null && Model.getFacade().isATagDefinition(target)) { if (Model.getFacade().isAMultiplicity(item)) { - if (!Model.getFacade().getMultiplicity(target).equals(item)) { + if (!item.equals(Model.getFacade().getMultiplicity(target))) { Model.getCoreHelper().setMultiplicity(target, item); } } else if (item instanceof String) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
