svn commit: r18647 - trunk/src/argouml-app/src/org/argouml/ui/FindDialog.java

Author: bobtarling
Date: 2010-08-16 17:25:51-0700
New Revision: 18647

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

Log:
Leave at non-UML2 element types if in UML2 mode (a method on the model facade to return all relevant types might be more useful)

Modified: trunk/src/argouml-app/src/org/argouml/ui/FindDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/FindDialog.java?view=diff&pathrev=18647&r1=18646&r2=18647
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/FindDialog.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/FindDialog.java	2010-08-16 17:25:51-0700
@@ -411,8 +411,6 @@
         type.addItem(PredicateMType.create(
                 Model.getMetaTypes().getOperation()));
         type.addItem(PredicateMType.create(
-                Model.getMetaTypes().getSimpleState()));
-        type.addItem(PredicateMType.create(
                 Model.getMetaTypes().getSignal()));
         type.addItem(PredicateMType.create(
                 Model.getMetaTypes().getState()));
@@ -424,8 +422,6 @@
                 Model.getMetaTypes().getStereotype()));
         type.addItem(PredicateMType.create(
                 Model.getMetaTypes().getTagDefinition()));
-        type.addItem(PredicateMType.create(
-                Model.getMetaTypes().getTaggedValue()));
         
         // Not in UML 2.x (or Metatypes)
 //        type.addItem(PredicateMType.create(
@@ -437,6 +433,14 @@
                 Model.getMetaTypes().getTransition()));
         type.addItem(PredicateMType.create(
                 Model.getMetaTypes().getUseCase()));
+        
+        // TODO: Can we move this knowledge behind model facade rather than have a condition here?
+        if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
+            type.addItem(PredicateMType.create(
+                    Model.getMetaTypes().getSimpleState()));
+            type.addItem(PredicateMType.create(
+                    Model.getMetaTypes().getTaggedValue()));
+        }
     }
 
     /*

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

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