Changeset 34972 in osm

Timestamp:

2019-04-11T02:04:26+02:00 (5 years ago)

Author:

donvip

Message:

see #josm17580 #josm17581 #josm17582 #josm17583 #josm17584 #josm17585 #josm17586 #josm17587 #josm17588 - remove deprecated api (patches by taylor.smock)

Location:

applications/editors/josm/plugins

Files:

• merge-overlap/src/mergeoverlap/MergeOverlapAction.java (modified) (2 diffs)
• opendata/build.xml (modified) (1 diff)
• opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java (modified) (2 diffs)
• opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java (modified) (2 diffs)
• print/build.xml (modified) (1 diff)
• print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java (modified) (2 diffs)
• reltoolbox/src/relcontext/actions/SplittingMultipolygons.java (modified) (2 diffs)
• simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java (modified) (2 diffs)
• terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java (modified) (3 diffs)

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java

@@ -37 +37 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.UserCancelException;
+import org.openstreetmap.josm.tools.Utils;
 
 import mergeoverlap.hack.MyCombinePrimitiveResolverDialog;
@@ -80 +81 @@
                 ways.add(way);
                 List<Relation> rels = new ArrayList<>();
-                for (Relation r : OsmPrimitive.getFilteredList(way.getReferrers(), Relation.class)) {
+                for (Relation r : Utils.filteredCollection(way.getReferrers(), Relation.class)) {
                     rels.add(r);
                 }

applications/editors/josm/plugins/opendata/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="14347"/>
+    <property name="plugin.main.version" value="14977"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java

@@ -64 +64 @@
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.ReflectionUtils;
 import org.openstreetmap.josm.tools.UserCancelException;
 import org.openstreetmap.josm.tools.Utils;
@@ -354 +355 @@
                         try {
                             Field f = AbstractIdentifiedObject.class.getDeclaredField("identifiers");
-                            Utils.setObjectsAccessible(f);
+                            ReflectionUtils.setObjectsAccessible(f);
                             f.set(crs, Collections.singleton(new NamedIdentifier(Citations.fromName("EPSG"), epsgCode.toString())));
                         } catch (ReflectiveOperationException | SecurityException e) {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java

@@ -19 +19 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.ReflectionUtils;
 
 /**
@@ -40 +40 @@
         try {
             Field furls = ShpFiles.class.getDeclaredField("urls");
-            Utils.setObjectsAccessible(furls);
+            ReflectionUtils.setObjectsAccessible(furls);
             urls = (Map<ShpFileType, URL>) furls.get(this);
         } catch (ReflectiveOperationException e) {

applications/editors/josm/plugins/print/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Added a field to specify the map scale."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="14977"/>
 
     <property name="plugin.author" value="Kai Pastor"/>

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java

@@ -64 +64 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.ReflectionUtils;
 
 /**
@@ -524 +524 @@
                 Method getEnumValueTable = realClass.getDeclaredMethod("getEnumValueTable");
                 Constructor<? extends Attribute> constructor = realClass.getDeclaredConstructor(int.class);
-                Utils.setObjectsAccessible(getEnumValueTable, constructor);
+                ReflectionUtils.setObjectsAccessible(getEnumValueTable, constructor);
                 Attribute fakeInstance = constructor.newInstance(Integer.MAX_VALUE);
                 EnumSyntax[] enumTable = (EnumSyntax[]) getEnumValueTable.invoke(fakeInstance);

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java

@@ -31 +31 @@
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Geometry.PolygonIntersection;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -253 +254 @@
 
         List<Way> ways = intersection(
-                OsmPrimitive.getFilteredList(segment.firstNode().getReferrers(), Way.class),
-                OsmPrimitive.getFilteredList(segment.lastNode().getReferrers(), Way.class));
+                Utils.filteredCollection(segment.firstNode().getReferrers(), Way.class),
+                Utils.filteredCollection(segment.lastNode().getReferrers(), Way.class));
         ways.remove(segment);
         for (Iterator<Way> iter = ways.iterator(); iter.hasNext();) {

applications/editors/josm/plugins/simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java

@@ -40 +40 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 public final class SimplifyAreaAction extends JosmAction {
@@ -108 +109 @@
             }
         }
-        final Collection<Way> ways = OsmPrimitive.getFilteredSet(selection, Way.class);
+        final Collection<Way> ways = Utils.filteredCollection(selection, Way.class);
         if (ways.isEmpty()) {
             alertSelectAtLeastOneWay();

applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java

@@ -47 +47 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.UserCancelException;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -119 +120 @@
                 outline = (Way) prim;
             } else if (sel.size() > 1) {
-                List<Way> ways = OsmPrimitive.getFilteredList(sel, Way.class);
+                List<Way> ways = new ArrayList<>(Utils.filteredCollection(sel, Way.class));
                 Iterator<Way> wit = ways.iterator();
                 while (wit.hasNext()) {
@@ -143 +144 @@
                     throw new InvalidUserInputException("no outline way found");
 
-                List<Node> nodes = OsmPrimitive.getFilteredList(sel, Node.class);
+                List<Node> nodes = new ArrayList<>(Utils.filteredCollection(sel, Node.class));
                 Iterator<Node> nit = nodes.iterator();
                 // Actually this should test if the selected address nodes lie