svn commit: r18733 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java

Author: bobtarling
Date: 2010-09-12 23:56:30-0700
New Revision: 18733

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java

Log:
The target is never null

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java?view=diff&pathrev=18733&r1=18732&r2=18733
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java	2010-09-12 23:56:30-0700
@@ -127,12 +127,10 @@
         /* TODO: Enhance the isValidNamespace function so
          * that this never happens.
          */
-        if (target != null) {
-            Object namespace = Model.getFacade().getNamespace(target);
-            if (namespace != null && !elements.contains(namespace)) {
-                elements.add(namespace);
-                LOG.warn("The current namespace is not a valid one!");
-            }
+        Object namespace = Model.getFacade().getNamespace(target);
+        if (namespace != null && !elements.contains(namespace)) {
+            elements.add(namespace);
+            LOG.warn("The current namespace is not a valid one!");
         }
 
         // Our comparator will throw an InvalidElementException if the old

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

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