svn commit: r18638 - trunk/src/argouml-app/src/org/argouml/ui

Author: tfmorris
Date: 2010-08-12 12:38:22-0700
New Revision: 18638

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

Log:
RESOLVED - task 6118: Find dialog is missing TaggedValue in the type list 
http://argouml.tigris.org/issues/show_bug.cgi?id=6118

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=18638&r1=18637&r2=18638
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/FindDialog.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/FindDialog.java	2010-08-12 12:38:22-0700
@@ -424,11 +424,8 @@
                 Model.getMetaTypes().getStereotype()));
         type.addItem(PredicateMType.create(
                 Model.getMetaTypes().getTagDefinition()));
-        
-        // TODO: Doesn't work (perhaps because composite?), so disable for
-        // now so user isn't misled - tfm - 20070904
-//        type.addItem(PredicateMType.create(
-//                Model.getMetaTypes().getTaggedValue()));
+        type.addItem(PredicateMType.create(
+                Model.getMetaTypes().getTaggedValue()));
         
         // Not in UML 2.x (or Metatypes)
 //        type.addItem(PredicateMType.create(

Modified: trunk/src/argouml-app/src/org/argouml/ui/TabResults.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/TabResults.java?view=diff&pathrev=18638&r1=18637&r2=18638
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/TabResults.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/TabResults.java	2010-08-12 12:38:22-0700
@@ -64,6 +64,7 @@
 import org.apache.log4j.Logger;
 import org.argouml.application.api.AbstractArgoJPanel;
 import org.argouml.i18n.Translator;
+import org.argouml.model.Model;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.ChildGenRelated;
 import org.argouml.uml.PredicateSearch;
@@ -326,6 +327,12 @@
             LOG.debug("go " + sel + " in " + d.getName());
             TargetManager.getInstance().setTarget(d);
         }
+	if (Model.getFacade().isATaggedValue(sel)) {
+	    // For tagged values, use their containing ModelElement since they
+	    // don't have property panels of their own
+	    // TODO: May want to do this for other types too?
+	    sel = Model.getFacade().getModelElementContainer(sel);
+	}
 	TargetManager.getInstance().setTarget(sel);
     }

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

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