svn commit: r17057 - trunk/src/argouml-app/src/org/argouml/uml/ui/TabTaggedValues.java

Author: tfmorris
Date: 2009-04-06 12:07:54-0700
New Revision: 17057

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/TabTaggedValues.java

Log:
Remove (most of) TemplateParameter special case code

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/TabTaggedValues.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/TabTaggedValues.java?view=diff&pathrev=17057&r1=17056&r2=17057
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/TabTaggedValues.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/TabTaggedValues.java	2009-04-06 12:07:54-0700
@@ -163,17 +163,17 @@
 
         Object t = (theTarget instanceof Fig)
                     ? ((Fig) theTarget).getOwner() : theTarget;
-        if ((Model.getFacade().isATemplateParameter(t))) {
-            target = Model.getFacade().getParameter(t);
-            shouldBeEnabled = true;
-            return;
-        }
-        if (!(Model.getFacade().isAModelElement(t))) {
+        if (!Model.getFacade().isAUMLElement(t)) {
             target = null;
             shouldBeEnabled = false;
             return;
         }
-        target = t;
+        // TODO: What is the purpose of this special case? - tfm
+        if (Model.getFacade().isATemplateParameter(t)) {
+            target = Model.getFacade().getParameter(t);
+        } else {
+            target = t;
+        }
         shouldBeEnabled = true;
 
         // Only update our model if we're visible
@@ -242,16 +242,8 @@
     public boolean shouldBeEnabled(Object theTarget) {
         Object t = (theTarget instanceof Fig)
             ? ((Fig) theTarget).getOwner() : theTarget;
-        if ((Model.getFacade().isATemplateParameter(t))) {
-            shouldBeEnabled = true;
-            return shouldBeEnabled;
-        }
-        if (!(Model.getFacade().isAModelElement(t))) {
-            shouldBeEnabled = false;
-            return shouldBeEnabled;
-        }
-        shouldBeEnabled = true;
-        return true;
+        shouldBeEnabled = Model.getFacade().isAUMLElement(t);
+        return shouldBeEnabled;
     }
 
     /*

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

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