svn commit: r18382 - trunk/src/argouml-app/src/org/argouml/uml/ui

Author: thn
Date: 2010-05-07 01:15:57-0700
New Revision: 18382

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

Log:
UML2: re-enable tagged value tab, but without "create new TD"

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/InitUmlUI.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/InitUmlUI.java?view=diff&pathrev=18382&r1=18381&r2=18382
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/InitUmlUI.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/InitUmlUI.java	2010-05-07 01:15:57-0700
@@ -73,10 +73,7 @@
         result.add(new TabSrc());
         result.add(new TabConstraints());
         result.add(new TabStereotype());
-        // Add the tagged values for UML 1.x
-        if( Model.getFacade().getUmlVersion().charAt(0) == '1') {
-            result.add(new TabTaggedValues());
-        }
+        result.add(new TabTaggedValues());
         return result;
     }
 

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=18382&r1=18381&r2=18382
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/TabTaggedValues.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/TabTaggedValues.java	2010-05-07 01:15:57-0700
@@ -109,11 +109,15 @@
         buttonPanel.setName(getTitle());
         buttonPanel.setFloatable(false);
 
-        JButton b = new JButton();
-        buttonPanel.add(b);
-        b.setAction(new ActionNewTagDefinition());
-        b.setText("");
-        b.setFocusable(false);
+        JButton b = null;
+        if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
+            // in UML2, a td is a property of a stereotype in a profile
+            b = new JButton();
+            buttonPanel.add(b);
+            b.setAction(new ActionNewTagDefinition());
+            b.setText("");
+            b.setFocusable(false);
+        }
 
         b = new JButton();
         buttonPanel.add(b);

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

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