Changeset 2798 in osm for applications/editors/josm/plugins/validator

Timestamp:

2007-05-06T20:32:32+02:00 (17 years ago)

Author:

frsantos

Message:

Fix all selected errors

File:

• applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java (modified) (1 diff)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java

@@ -97 +97 @@
         private void fixErrors(ActionEvent e) 
         {
-                DefaultMutableTreeNode node = (DefaultMutableTreeNode)tree.getLastSelectedPathComponent();
-        if( node == null )
-                return;
-
+        TreePath[] selectionPaths = tree.getSelectionPaths();
+        if( selectionPaths == null )
+            return;
+        
         Bag<String, Command> commands = new Bag<String, Command>();
-
-                Enumeration<DefaultMutableTreeNode> children = node.breadthFirstEnumeration();
-                while( children.hasMoreElements() )
-                {
-                DefaultMutableTreeNode childNode = children.nextElement();
-                Object nodeInfo = childNode.getUserObject();
-                if( nodeInfo instanceof TestError)
+        Set<DefaultMutableTreeNode> processedNodes = new HashSet<DefaultMutableTreeNode>();
+        for( TreePath path : selectionPaths )
+        {
+            DefaultMutableTreeNode node = (DefaultMutableTreeNode)path.getLastPathComponent();
+                if( node == null )
+                        continue;
+            
+                Enumeration<DefaultMutableTreeNode> children = node.breadthFirstEnumeration();
+                while( children.hasMoreElements() )
                 {
-                        TestError error = (TestError)nodeInfo;
-                        Command fixCommand = error.getFix();
-                        if( fixCommand != null )
-                        {
-                                commands.add(error.getMessage(), fixCommand);
-                        }
+                        DefaultMutableTreeNode childNode = children.nextElement();
+                if( processedNodes.contains(childNode) )
+                    continue;
+                
+                processedNodes.add(childNode);
+                        Object nodeInfo = childNode.getUserObject();
+                        if( nodeInfo instanceof TestError)
+                        {
+                                TestError error = (TestError)nodeInfo;
+                                Command fixCommand = error.getFix();
+                                if( fixCommand != null )
+                                {
+                                        commands.add(error.getMessage(), fixCommand);
+                                }
+                        }
                 }
-                }
-                
+        }
+                
                 Command fixCommand = null;
                 if( commands.size() == 0 )