Changeset 12667 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-08-26T21:28:55+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14704 - allow to export validator errors ("Save as" in validator layer contextual menu). Same format than Osmose

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/validator/ValidatorTreePanel.java (modified) (5 diffs)
• layer/NoteLayer.java (modified) (1 diff)
• layer/ValidatorLayer.java (modified) (4 diffs)

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

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumMap;
 import java.util.Enumeration;
 import java.util.HashSet;
@@ -15 +14 @@
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import javax.swing.JTree;
@@ -40 +37 @@
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
+import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
@@ -45 +43 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ListenerList;
@@ -191 +188 @@
         }
         Map<Severity, Map<String, Map<String, List<TestError>>>> errorsBySeverityMessageDescription
-            = errors.stream().filter(filterToUse).collect(
-                    Collectors.groupingBy(TestError::getSeverity, () -> new EnumMap<>(Severity.class),
-                            Collectors.groupingBy(TestError::getMessage, () -> new TreeMap<>(AlphanumComparator.getInstance()),
-                                    Collectors.groupingBy(e -> e.getDescription() == null ? "" : e.getDescription(),
-                                            () -> new TreeMap<>(AlphanumComparator.getInstance()),
-                                            Collectors.toList()
-                                    ))));
+            = OsmValidator.getErrorsBySeverityMessageDescription(errors, filterToUse);
 
         final List<TreePath> expandedPaths = new ArrayList<>();

trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java

@@ -275 +275 @@
     @Override
     public File createAndOpenSaveFileChooser() {
-        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save GPX file"), NoteExporter.FILE_FILTER);
+        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save Note file"), NoteExporter.FILE_FILTER);
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java

@@ -5 +5 @@
 
 import java.awt.Graphics2D;
+import java.io.File;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -15 +16 @@
 
 import org.openstreetmap.josm.actions.RenameLayerAction;
+import org.openstreetmap.josm.actions.SaveActionBase;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -29 +31 @@
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
+import org.openstreetmap.josm.io.ValidatorErrorExporter;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -140 +143 @@
                 new RenameLayerAction(null, this),
                 SeparatorLayerAction.INSTANCE,
-                new LayerListPopup.InfoAction(this) };
+                new LayerListPopup.InfoAction(this),
+                new LayerSaveAsAction(this)
+                };
+    }
+
+    @Override
+    public File createAndOpenSaveFileChooser() {
+        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save Validation errors file"), ValidatorErrorExporter.FILE_FILTER);
     }