svn commit: r17412 - trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewStereotype.java

Author: thn
Date: 2009-10-19 09:58:02-0700
New Revision: 17412

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewStereotype.java

Log:
fixing non-robust order of statements (case: newStereo == null)

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewStereotype.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewStereotype.java?view=diff&pathrev=17412&r1=17411&r2=17412
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewStereotype.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewStereotype.java	2009-10-19 09:58:02-0700
@@ -72,16 +72,17 @@
                     model,
                     models
             );
-        if (newStereo == null) {
-            LOG.error("We failed to create a stereotype");
-        }
-        if (Model.getFacade().isAModelElement(t)) {
-            Object ns = Model.getFacade().getNamespace(t);
-            if (Model.getFacade().isANamespace(ns)) {
-                Model.getCoreHelper().setNamespace(newStereo, ns);
+        if (newStereo != null) {
+            if (Model.getFacade().isAModelElement(t)) {
+                Object ns = Model.getFacade().getNamespace(t);
+                if (Model.getFacade().isANamespace(ns)) {
+                    Model.getCoreHelper().setNamespace(newStereo, ns);
+                }
             }
+            TargetManager.getInstance().setTarget(newStereo);
+        } else {
+            LOG.error("We failed to create a stereotype");
         }
-        TargetManager.getInstance().setTarget(newStereo);
         super.actionPerformed(e);
     }
 }

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

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