Changeset 8682 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-08-22T21:43:53+02:00 (9 years ago)

Author:

simon04

Message:

fix #11790 - Validator dialog: lookup test errors for selected primitives

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• ValidatorDialog.java (modified) (2 diffs)
• validator/ValidatorTreePanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -77 +77 @@
     /** The select button */
     private SideButton selectButton;
+    /** The lookup button */
+    private SideButton lookupButton;
 
     private final JPopupMenu popupMenu = new JPopupMenu();
@@ -114 +116 @@
         selectButton.setEnabled(false);
         buttons.add(selectButton);
+
+        lookupButton = new SideButton(new AbstractAction() {
+            {
+                putValue(NAME, tr("Lookup"));
+                putValue(SHORT_DESCRIPTION, tr("Looks up the the selected primitives in the error list."));
+                putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
+            }
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                final DataSet ds = Main.main.getCurrentDataSet();
+                if (ds == null) {
+                    return;
+                }
+                tree.selectRelatedErrors(ds.getSelected());
+            }
+        });
+
+        buttons.add(lookupButton);
 
         buttons.add(new SideButton(Main.main.validator.validateAction));

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -7 +7 @@
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumMap;
@@ -35 +36 @@
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.MultiMap;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Predicates;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -343 +347 @@
 
     /**
+     * Selects all errors related to the specified {@code primitives}, i.e. where {@link TestError#getPrimitives()}
+     * returns a primitive present in {@code primitives}.
+     */
+    public void selectRelatedErrors(final Collection<OsmPrimitive> primitives) {
+        final Collection<TreePath> paths = new ArrayList<>();
+        walkAndSelectRelatedErrors(new TreePath(getRoot()), Predicates.inCollection(new HashSet<>(primitives)), paths);
+        getSelectionModel().clearSelection();
+        for (TreePath path : paths) {
+            expandPath(path);
+            getSelectionModel().addSelectionPath(path);
+        }
+    }
+
+    private void walkAndSelectRelatedErrors(final TreePath p, final Predicate<OsmPrimitive> isRelevant, final Collection<TreePath> paths) {
+        final int count = getModel().getChildCount(p.getLastPathComponent());
+        for (int i = 0; i < count; i++) {
+            final Object child = getModel().getChild(p.getLastPathComponent(), i);
+            if (getModel().isLeaf(child) && child instanceof DefaultMutableTreeNode
+                    && ((DefaultMutableTreeNode) child).getUserObject() instanceof TestError) {
+                final TestError error = (TestError) ((DefaultMutableTreeNode) child).getUserObject();
+                if (error.getPrimitives() != null) {
+                    if (Utils.exists(error.getPrimitives(), isRelevant)) {
+                        paths.add(p.pathByAddingChild(child));
+                    }
+                }
+            } else {
+                walkAndSelectRelatedErrors(p.pathByAddingChild(child), isRelevant, paths);
+            }
+        }
+    }
+
+    /**
      * Returns the filter list
      * @return the list of primitives used for filtering