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

Author: bobtarling
Date: 2011-05-18 15:23:06-0700
New Revision: 19460

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

Log:
Protect against a UML1.4 metatype that doesn't exist in UML2 - issue 6279 suggests a better fix.

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=19460&r1=19459&r2=19460
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/FindDialog.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/FindDialog.java	2011-05-18 15:23:06-0700
@@ -386,8 +386,10 @@
                 Model.getMetaTypes().getGeneralization()));
         type.addItem(PredicateMType.create(
                 Model.getMetaTypes().getInclude()));
-        type.addItem(PredicateMType.create(
-                Model.getMetaTypes().getInstance()));
+        if (Model.getFacade().getUmlVersion().startsWith("1")) {
+            type.addItem(PredicateMType.create(
+                    Model.getMetaTypes().getInstance()));
+        }
         type.addItem(PredicateMType.create(
                 Model.getMetaTypes().getInteraction()));
         type.addItem(PredicateMType.create(
@@ -422,13 +424,10 @@
                 Model.getMetaTypes().getStereotype()));
         type.addItem(PredicateMType.create(
                 Model.getMetaTypes().getTagDefinition()));
-        
-        // Not in UML 2.x (or Metatypes)
-//        type.addItem(PredicateMType.create(
-//                Model.getMetaTypes().getTemplateArgument()));
-//        type.addItem(PredicateMType.create(
-//                Model.getMetaTypes().getTemplateParameter()));
-        
+        type.addItem(PredicateMType.create(
+                Model.getMetaTypes().getTemplateArgument()));
+        type.addItem(PredicateMType.create(
+                Model.getMetaTypes().getTemplateParameter()));
         type.addItem(PredicateMType.create(
                 Model.getMetaTypes().getTransition()));
         type.addItem(PredicateMType.create(

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

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