svn commit: r18640 - trunk/src/argouml-app/src/org/argouml/ui/TabResults.java

Author: tfmorris
Date: 2010-08-12 15:21:43-0700
New Revision: 18640

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

Log:
RESOLVED - task 6119: Find dialog lists elements multiple times 
http://argouml.tigris.org/issues/show_bug.cgi?id=6119

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=18640&r1=18639&r2=18640
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/TabResults.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/TabResults.java	2010-08-12 15:21:43-0700
@@ -48,8 +48,10 @@
 import java.awt.event.MouseListener;
 import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -105,6 +107,7 @@
     private Object root;
     private JSplitPane mainPane;
     private List results = new ArrayList();
+    private Set diagramResults = new HashSet();
     private List related = new ArrayList();
     private List<ArgoDiagram> diagrams = new ArrayList<ArgoDiagram>();
     private boolean relatedShown;
@@ -420,6 +423,7 @@
     private void depthFirst(Object node, ArgoDiagram lastDiagram) {
 	if (node instanceof ArgoDiagram) {
 	    lastDiagram = (ArgoDiagram) node;
+	    diagramResults.clear();
 	    if (!pred.matchDiagram(lastDiagram)) {
                 return;
             }
@@ -430,9 +434,15 @@
 	    Object child = iterator.next();
 	    if (pred.evaluate(child)
                     && (lastDiagram != null || pred.matchDiagram(""))) {
-		results.add(child);
-		diagrams.add(lastDiagram);
-	    }
+	        // Only return once per diagram so we don't, for example, find
+	        // a class as a diagram element and also as a child of a package
+	        // which is on the diagram
+                if (!diagramResults.contains(child)) {
+                    diagramResults.add(child);
+                    results.add(child);
+                    diagrams.add(lastDiagram);
+                }
+            }
 	    depthFirst(child, lastDiagram);
 	}
     }

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

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