Changeset 33347 in osm for applications/editors/josm/plugins/pt_assistant/src/org

Timestamp:

2017-05-31T10:40:14+02:00 (8 years ago)

Author:

giackserva

Message:

applied #josm14861

Location:

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation

Files:

• Checker.java (modified) (6 diffs)
• PTAssistantValidatorTest.java (modified) (2 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/Checker.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -133 +132 @@
                 && testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_DIRECTION
                 && testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_CONSTRUCTION
-                && testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_ROAD_TYPE) {
+                && testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_ROAD_TYPE
+                && testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_END_STOP) {
             return null;
         }
@@ -155 +155 @@
 
                 if (SwingUtilities.isEventDispatchThread()) {
-
                     showRelationEditorAndZoom(layerParameter, relationParameter, zoomParameter);
 
@@ -163 +162 @@
                         @Override
                         public void run() {
-
                             showRelationEditorAndZoom(layerParameter, relationParameter, zoomParameter);
-
                         }
                     });
-
                 }
-
                 return command;
             }
@@ -176 +171 @@
 
         return null;
-
     }
 
@@ -190 +184 @@
 
         // create editor:
-        GenericRelationEditor editor = (GenericRelationEditor) RelationEditor.getEditor(layer, r,
+        RelationEditor editor = RelationEditor.getEditor(layer, r,
                 r.getMembersFor(primitives));
 

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java

@@ -465 +465 @@
         @Override
         public boolean isFixable(TestError testError) {
-                if (testError.getCode() == ERROR_CODE_DIRECTION || testError.getCode() == ERROR_CODE_ROAD_TYPE
-                                || testError.getCode() == ERROR_CODE_CONSTRUCTION || testError.getCode() == ERROR_CODE_SORTING
-                                || testError.getCode() == PTAssistantValidatorTest.ERROR_CODE_SOLITARY_STOP_POSITION
-                                || testError.getCode() == PTAssistantValidatorTest.ERROR_CODE_PLATFORM_PART_OF_HIGHWAY) {
+                if (testError.getCode() == ERROR_CODE_DIRECTION
+                                || testError.getCode() == ERROR_CODE_ROAD_TYPE
+                                || testError.getCode() == ERROR_CODE_CONSTRUCTION
+                                || testError.getCode() == ERROR_CODE_SORTING
+                                || testError.getCode() == ERROR_CODE_END_STOP
+                                || testError.getCode() == ERROR_CODE_PLATFORM_PART_OF_HIGHWAY) {
                         return true;
                 }
@@ -496 +498 @@
                 List<Command> commands = new ArrayList<>();
 
-                if (testError.getCode() == ERROR_CODE_ROAD_TYPE || testError.getCode() == ERROR_CODE_CONSTRUCTION) {
+                if (testError.getCode() == ERROR_CODE_ROAD_TYPE
+                                || testError.getCode() == ERROR_CODE_CONSTRUCTION
+                                || testError.getCode() == ERROR_CODE_DIRECTION
+                                || testError.getCode() == ERROR_CODE_END_STOP) {
                         commands.add(WayChecker.fixErrorByZooming(testError));
-                }
-
-                if (testError.getCode() == ERROR_CODE_DIRECTION) {
-                        commands.add(WayChecker.fixErrorByZooming(testError));
-
                 }