Changeset 32427 in osm for applications/editors

Timestamp:

2016-06-28T23:29:54+02:00 (9 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

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

Files:

• actions/FixTask.java (modified) (3 diffs)
• validation/DirectionTest.java (modified) (2 diffs)
• validation/GapTest.java (modified) (1 diff)
• validation/PTAssitantValidatorTest.java (modified) (3 diffs)
• validation/RoadTypeTest.java (modified) (2 diffs)
• validation/RouteChecker.java (modified) (1 diff)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/FixTask.java

@@ -73 +73 @@
                                 @Override
                                 public void run() {
-                                        Main.main.getCurrentDataSet().beginUpdate();
+                                        Main.getLayerManager().getEditDataSet().beginUpdate();
                                 }
                         });
@@ -89 +89 @@
                                         @Override
                                         public void run() {
-                                                Main.main.getCurrentDataSet().endUpdate();
+                                                Main.getLayerManager().getEditDataSet().endUpdate();
                                         }
                                 });
@@ -100 +100 @@
                                         Main.map.repaint();
                                         // tree.resetErrors();
-                                        Main.main.getCurrentDataSet().fireSelectionChanged();
+                                        Main.getLayerManager().getEditDataSet().fireSelectionChanged();
                                 }
                         });

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

@@ -4 +4 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
@@ -122 +123 @@
 
                 if (testError.getTester().getClass().equals(DirectionTest.class) && testError.isFixable()) {
-                        List<OsmPrimitive> primitives = (List<OsmPrimitive>) testError.getPrimitives();
-                        Relation originalRelation = (Relation) primitives.get(0);
-                        List<OsmPrimitive> highlightedList = (List<OsmPrimitive>) testError.getHighlighted();
-                        Way wayToRemove = (Way) highlightedList.get(0);
+                    Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
+                        Relation originalRelation = (Relation) primitives.iterator().next();
+                        Collection<?> highlightedList = testError.getHighlighted();
+                        Way wayToRemove = (Way) highlightedList.iterator().next();
 
                         Relation modifiedRelation = new Relation(originalRelation);

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

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.List;
-
-import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.command.ChangeCommand;

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

@@ -4 +4 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
@@ -288 +288 @@
                 }
 
-                List<OsmPrimitive> primitives = (List<OsmPrimitive>) testError.getPrimitives();
-                Relation originalRelation = (Relation) primitives.get(0);
-                List<OsmPrimitive> highlighted = (List<OsmPrimitive>) testError.getHighlighted();
-                Way wayToRemove = (Way) highlighted.get(0);
+                Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
+                Relation originalRelation = (Relation) primitives.iterator().next();
+                Collection<?> highlighted = testError.getHighlighted();
+                Way wayToRemove = (Way) highlighted.iterator().next();
 
                 Relation modifiedRelation = new Relation(originalRelation);
@@ -344 +344 @@
                 }
 
-                List<OsmPrimitive> primitives = (List<OsmPrimitive>) testError.getPrimitives();
-                Relation originalRelation = (Relation) primitives.get(0);
+                Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
+                Relation originalRelation = (Relation) primitives.iterator().next();
 
                 // separate ways from stops (because otherwise the order of

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

@@ -4 +4 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
@@ -135 +136 @@
 
                 if (testError.getTester().getClass().equals(RoadTypeTest.class) && testError.isFixable()) {
-                        List<OsmPrimitive> primitives = (List<OsmPrimitive>) testError.getPrimitives();
-                        Relation originalRelation = (Relation) primitives.get(0);
-                        List<OsmPrimitive> highlighted = (List<OsmPrimitive>) testError.getHighlighted();
-                        Way wayToRemove = (Way) highlighted.get(0);
+                        Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
+                        Relation originalRelation = (Relation) primitives.iterator().next();
+                        Collection<?> highlighted = testError.getHighlighted();
+                        Way wayToRemove = (Way) highlighted.iterator().next();
 
                         Relation modifiedRelation = new Relation(originalRelation);

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

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.List;
-
-import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;