Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java =================================================================== --- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java (revision 10537) +++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java (revision 10538) @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.validator; +import static org.openstreetmap.josm.tools.I18n.marktr; import static org.openstreetmap.josm.tools.I18n.tr; -import static org.openstreetmap.josm.tools.I18n.marktr; import java.awt.BorderLayout; @@ -9,14 +9,13 @@ import java.awt.event.ActionListener; import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseAdapter; import java.util.Collection; import java.util.Enumeration; import java.util.HashSet; -import java.util.Map.Entry; import java.util.Set; +import javax.swing.JOptionPane; import javax.swing.JPanel; -import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.event.TreeSelectionEvent; @@ -27,11 +26,12 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.command.Command; -import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.gui.SideButton; import org.openstreetmap.josm.gui.dialogs.ToggleDialog; -import org.openstreetmap.josm.plugins.validator.util.Bag; -import org.openstreetmap.josm.plugins.validator.util.Util; import org.openstreetmap.josm.tools.ImageProvider; @@ -40,358 +40,343 @@ * respects clicks into the selection list. Ctrl-click will remove entries from * the list while single click will make the clicked entry the only selection. - * + * * @author frsantos */ -public class ValidatorDialog extends ToggleDialog implements ActionListener -{ - private OSMValidatorPlugin plugin; - - /** Serializable ID */ - private static final long serialVersionUID = 2952292777351992696L; - - /** The display tree */ - protected ErrorTreePanel tree; - - private SideButton fixButton; /** The fix button */ - private SideButton ignoreButton; /** The ignore button */ - private SideButton selectButton; /** The select button */ - - /** Last selected element */ - private DefaultMutableTreeNode lastSelectedNode = null; - - /** - * Constructor - */ - public ValidatorDialog(OSMValidatorPlugin plugin) { - super(tr("Validation errors"), "validator", tr("Open the validation window."), KeyEvent.VK_V, 150); - - this.plugin = plugin; - - tree = new ErrorTreePanel(); - tree.addMouseListener(new ClickWatch()); - tree.addTreeSelectionListener(new SelectionWatch()); - - add(new JScrollPane(tree), BorderLayout.CENTER); - - JPanel buttonPanel = new JPanel(new GridLayout(1,3)); - - selectButton = new SideButton(marktr("Select"), "select", "Validator", - tr("Set the selected elements on the map to the selected items in the list above."), this); - selectButton.setEnabled(false); - buttonPanel.add(selectButton); - buttonPanel.add(new SideButton(marktr("Validate"), "refresh", "Validator", - tr("Validate either current selection or complete dataset."), this)); - fixButton = new SideButton(marktr("Fix"), "fix", "Validator", tr("Fix the selected errors."), this); - fixButton.setEnabled(false); - buttonPanel.add(fixButton); - if(Main.pref.getBoolean(PreferenceEditor.PREF_USE_IGNORE, true)) - { - ignoreButton = new SideButton(marktr("Ignore"), "delete", "Validator", tr("Ignore the selected errors next time."), this); - ignoreButton.setEnabled(false); - buttonPanel.add(ignoreButton); - } - else - { - ignoreButton = null; - } - add(buttonPanel, BorderLayout.SOUTH); - } - - @Override - public void setVisible(boolean v) - { - if( tree != null ) - tree.setVisible(v); - if( action != null && action.button != null ) - action.button.setSelected(v); - super.setVisible(v); - Main.map.repaint(); - } - - - /** - * Fix selected errors - * @param e - */ - @SuppressWarnings("unchecked") - private void fixErrors(ActionEvent e) - { - TreePath[] selectionPaths = tree.getSelectionPaths(); - if( selectionPaths == null ) - return; - - Set processedNodes = new HashSet(); - for( TreePath path : selectionPaths ) - { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)path.getLastPathComponent(); - if( node == null ) - continue; - - Enumeration children = node.breadthFirstEnumeration(); - while( children.hasMoreElements() ) - { - 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 ) - { - Main.main.undoRedo.add(fixCommand); - error.setIgnored(true); - } - } - } - } - - Main.map.repaint(); - tree.resetErrors(); - DataSet.fireSelectionChanged(Main.ds.getSelected()); - } - - /** - * Set selected errors to ignore state - * @param e - */ - @SuppressWarnings("unchecked") - private void ignoreErrors(ActionEvent e) - { - int asked = JOptionPane.DEFAULT_OPTION; - boolean changed = false; - TreePath[] selectionPaths = tree.getSelectionPaths(); - if( selectionPaths == null ) - return; - - Set processedNodes = new HashSet(); - for( TreePath path : selectionPaths ) - { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)path.getLastPathComponent(); - if( node == null ) - continue; - - Object mainNodeInfo = node.getUserObject(); - if(!(mainNodeInfo instanceof TestError)) - { - int depth = 1; - Set state = new HashSet(); - // ask if the whole set should be ignored - if(asked == JOptionPane.DEFAULT_OPTION) - { - String[] a = new String[]{tr("Whole group"), tr("Single elements"),tr("Nothing")}; - asked = JOptionPane.showOptionDialog(Main.parent, tr("Ignore whole group or individual elements?"), - tr("Ignoring elements"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, - ImageProvider.get("dialogs", "delete"), a, a[1]); - } - if(asked == JOptionPane.YES_NO_OPTION) - { - Enumeration children = node.breadthFirstEnumeration(); - while(children.hasMoreElements()) - { - DefaultMutableTreeNode childNode = children.nextElement(); - if(processedNodes.contains(childNode)) - continue; - - processedNodes.add(childNode); - Object nodeInfo = childNode.getUserObject(); - if(nodeInfo instanceof TestError) - { - TestError err = (TestError)nodeInfo; - err.setIgnored(true); - changed = true; - state.add(node.getDepth() == 1 ? err.getIgnoreSubGroup() : err.getIgnoreGroup()); - } - } - for(String s : state) - plugin.ignoredErrors.add(s); - continue; - } - else if(asked == JOptionPane.CANCEL_OPTION) - continue; - } - - Enumeration children = node.breadthFirstEnumeration(); - while( children.hasMoreElements() ) - { - DefaultMutableTreeNode childNode = children.nextElement(); - if( processedNodes.contains(childNode) ) - continue; - - processedNodes.add(childNode); - Object nodeInfo = childNode.getUserObject(); - if( nodeInfo instanceof TestError) - { - TestError error = (TestError)nodeInfo; - String state = error.getIgnoreState(); - if(state != null) - plugin.ignoredErrors.add(state); - changed = true; - error.setIgnored(true); - } - } - } - if(changed) - { - tree.resetErrors(); - plugin.saveIgnoredErrors(); - Main.map.repaint(); - } - } - - /** - * Sets the selection of the map to the current selected items. - */ - @SuppressWarnings("unchecked") - private void setSelectedItems() - { - if( tree == null ) - return; - - Collection sel = new HashSet(40); - - TreePath[] selectedPaths = tree.getSelectionPaths(); - if( selectedPaths == null) - return; - - for( TreePath path : selectedPaths) - { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)path.getLastPathComponent(); - Enumeration children = node.breadthFirstEnumeration(); - while( children.hasMoreElements() ) - { - DefaultMutableTreeNode childNode = children.nextElement(); - Object nodeInfo = childNode.getUserObject(); - if( nodeInfo instanceof TestError) - { - TestError error = (TestError)nodeInfo; - sel.addAll( error.getPrimitives() ); - } - } - } - - Main.ds.setSelected(sel); - } - - public void actionPerformed(ActionEvent e) - { - String actionCommand = e.getActionCommand(); - if( actionCommand.equals("Select")) - setSelectedItems(); - else if( actionCommand.equals("Validate")) - plugin.validateAction.actionPerformed(e); - else if( actionCommand.equals("Fix")) - fixErrors(e); - else if( actionCommand.equals("Ignore")) - ignoreErrors(e); - } - - /** - * Checks for fixes in selected element and, if needed, adds to the sel parameter all selected elements - * @param sel The collection where to add all selected elements - * @param addSelected if true, add all selected elements to collection - * @return whether the selected elements has any fix - */ - @SuppressWarnings("unchecked") - private boolean setSelection(Collection sel, boolean addSelected) - { - boolean hasFixes = false; - - DefaultMutableTreeNode node = (DefaultMutableTreeNode)tree.getLastSelectedPathComponent(); - if( lastSelectedNode != null && !lastSelectedNode.equals(node) ) - { - Enumeration children = lastSelectedNode.breadthFirstEnumeration(); - while( children.hasMoreElements() ) - { - DefaultMutableTreeNode childNode = children.nextElement(); - Object nodeInfo = childNode.getUserObject(); - if( nodeInfo instanceof TestError) - { - TestError error = (TestError)nodeInfo; - error.setSelected(false); - } - } - } - - lastSelectedNode = node; - if( node == null ) - return hasFixes; - - Enumeration children = node.breadthFirstEnumeration(); - while( children.hasMoreElements() ) - { - DefaultMutableTreeNode childNode = children.nextElement(); - Object nodeInfo = childNode.getUserObject(); - if( nodeInfo instanceof TestError) - { - TestError error = (TestError)nodeInfo; - error.setSelected(true); - - hasFixes = hasFixes || error.isFixable(); - if( addSelected ) - { - sel.addAll( error.getPrimitives() ); - } - } - } - selectButton.setEnabled(true); - if(ignoreButton != null) - ignoreButton.setEnabled(true); - - return hasFixes; - } - - /** - * Watches for clicks. - */ - public class ClickWatch extends MouseAdapter - { - @Override - public void mouseClicked(MouseEvent e) - { - fixButton.setEnabled(false); - if(ignoreButton != null) - ignoreButton.setEnabled(false); - selectButton.setEnabled(false); - - boolean isDblClick = e.getClickCount() > 1; - Collection sel = isDblClick ? new HashSet(40) : null; - - boolean hasFixes = setSelection(sel, isDblClick); - fixButton.setEnabled(hasFixes); - - if(isDblClick) - { - Main.ds.setSelected(sel); - } - } - } - - /** - * Watches for tree selection. - */ - public class SelectionWatch implements TreeSelectionListener - { - @SuppressWarnings("unchecked") - public void valueChanged(TreeSelectionEvent e) - { - fixButton.setEnabled(false); - if(ignoreButton != null) - ignoreButton.setEnabled(false); - selectButton.setEnabled(false); - - if(e.getSource() instanceof JScrollPane) - { - System.out.println(e.getSource()); - return; - } - - boolean hasFixes = setSelection(null, false); - fixButton.setEnabled(hasFixes); - Main.map.repaint(); - } - } +public class ValidatorDialog extends ToggleDialog implements ActionListener { + private OSMValidatorPlugin plugin; + + /** Serializable ID */ + private static final long serialVersionUID = 2952292777351992696L; + + /** The display tree */ + protected ErrorTreePanel tree; + + private SideButton fixButton; + /** The fix button */ + private SideButton ignoreButton; + /** The ignore button */ + private SideButton selectButton; + /** The select button */ + + /** Last selected element */ + private DefaultMutableTreeNode lastSelectedNode = null; + + /** + * Constructor + */ + public ValidatorDialog(OSMValidatorPlugin plugin) { + super(tr("Validation errors"), "validator", tr("Open the validation window."), KeyEvent.VK_V, 150); + + this.plugin = plugin; + + tree = new ErrorTreePanel(); + tree.addMouseListener(new ClickWatch()); + tree.addTreeSelectionListener(new SelectionWatch()); + + add(new JScrollPane(tree), BorderLayout.CENTER); + + JPanel buttonPanel = new JPanel(new GridLayout(1, 3)); + + selectButton = new SideButton(marktr("Select"), "select", "Validator", + tr("Set the selected elements on the map to the selected items in the list above."), this); + selectButton.setEnabled(false); + buttonPanel.add(selectButton); + buttonPanel.add(new SideButton(marktr("Validate"), "refresh", "Validator", + tr("Validate either current selection or complete dataset."), this)); + fixButton = new SideButton(marktr("Fix"), "fix", "Validator", tr("Fix the selected errors."), this); + fixButton.setEnabled(false); + buttonPanel.add(fixButton); + if (Main.pref.getBoolean(PreferenceEditor.PREF_USE_IGNORE, true)) { + ignoreButton = new SideButton(marktr("Ignore"), "delete", "Validator", + tr("Ignore the selected errors next time."), this); + ignoreButton.setEnabled(false); + buttonPanel.add(ignoreButton); + } else { + ignoreButton = null; + } + add(buttonPanel, BorderLayout.SOUTH); + } + + @Override + public void setVisible(boolean v) { + if (tree != null) + tree.setVisible(v); + if (action != null && action.button != null) + action.button.setSelected(v); + super.setVisible(v); + Main.map.repaint(); + } + + /** + * Fix selected errors + * + * @param e + */ + @SuppressWarnings("unchecked") + private void fixErrors(ActionEvent e) { + TreePath[] selectionPaths = tree.getSelectionPaths(); + if (selectionPaths == null) + return; + + Set processedNodes = new HashSet(); + for (TreePath path : selectionPaths) { + DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent(); + if (node == null) + continue; + + Enumeration children = node.breadthFirstEnumeration(); + while (children.hasMoreElements()) { + 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) { + Main.main.undoRedo.add(fixCommand); + error.setIgnored(true); + } + } + } + } + + Main.map.repaint(); + tree.resetErrors(); + DataSet.fireSelectionChanged(Main.ds.getSelected()); + } + + /** + * Set selected errors to ignore state + * + * @param e + */ + @SuppressWarnings("unchecked") + private void ignoreErrors(ActionEvent e) { + int asked = JOptionPane.DEFAULT_OPTION; + boolean changed = false; + TreePath[] selectionPaths = tree.getSelectionPaths(); + if (selectionPaths == null) + return; + + Set processedNodes = new HashSet(); + for (TreePath path : selectionPaths) { + DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent(); + if (node == null) + continue; + + Object mainNodeInfo = node.getUserObject(); + if (!(mainNodeInfo instanceof TestError)) { + Set state = new HashSet(); + // ask if the whole set should be ignored + if (asked == JOptionPane.DEFAULT_OPTION) { + String[] a = new String[] { tr("Whole group"), tr("Single elements"), tr("Nothing") }; + asked = JOptionPane.showOptionDialog(Main.parent, tr("Ignore whole group or individual elements?"), + tr("Ignoring elements"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, + ImageProvider.get("dialogs", "delete"), a, a[1]); + } + if (asked == JOptionPane.YES_NO_OPTION) { + Enumeration children = node.breadthFirstEnumeration(); + while (children.hasMoreElements()) { + DefaultMutableTreeNode childNode = children.nextElement(); + if (processedNodes.contains(childNode)) + continue; + + processedNodes.add(childNode); + Object nodeInfo = childNode.getUserObject(); + if (nodeInfo instanceof TestError) { + TestError err = (TestError) nodeInfo; + err.setIgnored(true); + changed = true; + state.add(node.getDepth() == 1 ? err.getIgnoreSubGroup() : err.getIgnoreGroup()); + } + } + for (String s : state) + plugin.ignoredErrors.add(s); + continue; + } else if (asked == JOptionPane.CANCEL_OPTION) + continue; + } + + Enumeration children = node.breadthFirstEnumeration(); + while (children.hasMoreElements()) { + DefaultMutableTreeNode childNode = children.nextElement(); + if (processedNodes.contains(childNode)) + continue; + + processedNodes.add(childNode); + Object nodeInfo = childNode.getUserObject(); + if (nodeInfo instanceof TestError) { + TestError error = (TestError) nodeInfo; + String state = error.getIgnoreState(); + if (state != null) + plugin.ignoredErrors.add(state); + changed = true; + error.setIgnored(true); + } + } + } + if (changed) { + tree.resetErrors(); + plugin.saveIgnoredErrors(); + Main.map.repaint(); + } + } + + /** + * Sets the selection of the map to the current selected items. + */ + @SuppressWarnings("unchecked") + private void setSelectedItems() { + if (tree == null) + return; + + Collection sel = new HashSet(40); + + TreePath[] selectedPaths = tree.getSelectionPaths(); + if (selectedPaths == null) + return; + + for (TreePath path : selectedPaths) { + DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent(); + Enumeration children = node.breadthFirstEnumeration(); + while (children.hasMoreElements()) { + DefaultMutableTreeNode childNode = children.nextElement(); + Object nodeInfo = childNode.getUserObject(); + if (nodeInfo instanceof TestError) { + TestError error = (TestError) nodeInfo; + sel.addAll(error.getPrimitives()); + } + } + } + + Main.ds.setSelected(sel); + } + + public void actionPerformed(ActionEvent e) { + String actionCommand = e.getActionCommand(); + if (actionCommand.equals("Select")) + setSelectedItems(); + else if (actionCommand.equals("Validate")) + plugin.validateAction.actionPerformed(e); + else if (actionCommand.equals("Fix")) + fixErrors(e); + else if (actionCommand.equals("Ignore")) + ignoreErrors(e); + } + + /** + * Checks for fixes in selected element and, if needed, adds to the sel + * parameter all selected elements + * + * @param sel + * The collection where to add all selected elements + * @param addSelected + * if true, add all selected elements to collection + * @return whether the selected elements has any fix + */ + @SuppressWarnings("unchecked") + private boolean setSelection(Collection sel, boolean addSelected) { + boolean hasFixes = false; + + DefaultMutableTreeNode node = (DefaultMutableTreeNode) tree.getLastSelectedPathComponent(); + if (lastSelectedNode != null && !lastSelectedNode.equals(node)) { + Enumeration children = lastSelectedNode.breadthFirstEnumeration(); + while (children.hasMoreElements()) { + DefaultMutableTreeNode childNode = children.nextElement(); + Object nodeInfo = childNode.getUserObject(); + if (nodeInfo instanceof TestError) { + TestError error = (TestError) nodeInfo; + error.setSelected(false); + } + } + } + + lastSelectedNode = node; + if (node == null) + return hasFixes; + + Enumeration children = node.breadthFirstEnumeration(); + while (children.hasMoreElements()) { + DefaultMutableTreeNode childNode = children.nextElement(); + Object nodeInfo = childNode.getUserObject(); + if (nodeInfo instanceof TestError) { + TestError error = (TestError) nodeInfo; + error.setSelected(true); + + hasFixes = hasFixes || error.isFixable(); + if (addSelected) { + sel.addAll(error.getPrimitives()); + } + } + } + selectButton.setEnabled(true); + if (ignoreButton != null) + ignoreButton.setEnabled(true); + + return hasFixes; + } + + /** + * Watches for clicks. + */ + public class ClickWatch extends MouseAdapter { + @Override + public void mouseClicked(MouseEvent e) { + fixButton.setEnabled(false); + if (ignoreButton != null) + ignoreButton.setEnabled(false); + selectButton.setEnabled(false); + + boolean isDblClick = e.getClickCount() > 1; + + Collection sel = isDblClick ? new HashSet(40) : null; + + boolean hasFixes = setSelection(sel, isDblClick); + fixButton.setEnabled(hasFixes); + + if (isDblClick) { + Main.ds.setSelected(sel); + if (sel.size() == 1) { + // Center the view on the selected item + double scale = Main.map.mapView.getScale(); + OsmPrimitive prim = sel.iterator().next(); + BoundingXYVisitor box = new BoundingXYVisitor(); + if (prim instanceof Way) { + Way way = (Way) prim; + way.visitNodes(box); + EastNorth center = new EastNorth(box.min.east() / 2 + box.max.east() / 2, box.min.north() / 2 + + box.max.north() / 2); + Main.map.mapView.zoomTo(center, scale); + } else if (prim instanceof Node) { + Node node = (Node) prim; + Main.map.mapView.zoomTo(node.eastNorth, scale); + } + } + } + } + } + + /** + * Watches for tree selection. + */ + public class SelectionWatch implements TreeSelectionListener { + public void valueChanged(TreeSelectionEvent e) { + fixButton.setEnabled(false); + if (ignoreButton != null) + ignoreButton.setEnabled(false); + selectButton.setEnabled(false); + + if (e.getSource() instanceof JScrollPane) { + System.out.println(e.getSource()); + return; + } + + boolean hasFixes = setSelection(null, false); + fixButton.setEnabled(hasFixes); + Main.map.repaint(); + } + } }