Changeset 35123 in osm for applications/editors/josm/plugins/OsmInspectorPlugin

Timestamp:

2019-09-26T13:14:00+02:00 (5 years ago)

Author:

donvip

Message:

see #josm17933 - see #josm17976 - upgrade to GeoTools 22.0

Location:

applications/editors/josm/plugins/OsmInspectorPlugin

Files:

• .classpath (modified) (1 diff)
• lib/gt-app-schema-resolver-19.0.jar (deleted)
• lib/gt-app-schema-resolver-22.0.jar (added)
• lib/gt-cql-19.0.jar (deleted)
• lib/gt-cql-22.0.jar (added)
• lib/gt-referencing3D-19.0.jar (deleted)
• lib/gt-render-19.0.jar (deleted)
• lib/gt-render-22.0.jar (added)
• lib/gt-wfs-ng-19.0.jar (deleted)
• lib/gt-wfs-ng-22.0.jar (added)
• lib/gt-xml-19.0.jar (deleted)
• lib/gt-xml-22.0.jar (added)
• lib/gt-xsd-core-19.0.jar (deleted)
• lib/gt-xsd-core-22.0.jar (added)
• lib/gt-xsd-wfs-19.0.jar (deleted)
• lib/gt-xsd-wfs-22.0.jar (added)
• src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java (modified) (3 diffs)

applications/editors/josm/plugins/OsmInspectorPlugin/.classpath

@@ -8 +8 @@
         <classpathentry kind="lib" path="lib/commons-collections-3.2.2.jar"/>
         <classpathentry kind="lib" path="lib/commons-jxpath-1.3.jar"/>
-        <classpathentry kind="lib" path="lib/gt-app-schema-resolver-19.0.jar">
+        <classpathentry kind="lib" path="lib/gt-app-schema-resolver-22.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-cql-19.0.jar">
+        <classpathentry kind="lib" path="lib/gt-cql-22.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-render-19.0.jar">
+        <classpathentry kind="lib" path="lib/gt-render-22.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-referencing3D-19.0.jar">
+        <classpathentry kind="lib" path="lib/gt-wfs-ng-22.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-wfs-ng-19.0.jar">
+        <classpathentry kind="lib" path="lib/gt-xml-22.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-xml-19.0.jar">
+        <classpathentry kind="lib" path="lib/gt-xsd-core-22.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-xsd-core-19.0.jar">
-                <attributes>
-                        <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
-                </attributes>
-        </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-xsd-wfs-19.0.jar">
+        <classpathentry kind="lib" path="lib/gt-xsd-wfs-22.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java

@@ -12 +12 @@
 import org.geotools.data.FeatureSource;
 import org.geotools.factory.CommonFactoryFinder;
-import org.geotools.factory.GeoTools;
 import org.geotools.feature.FeatureCollection;
 import org.geotools.geometry.jts.ReferencedEnvelope;
@@ -80 +79 @@
                 // Ask WFS service for typeName data constrained by bboxRef
                 //
-                FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(GeoTools
-                                .getDefaultHints());
+                FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2();
                 Filter filterBB = ff.bbox(ff.property(geomName), bboxRef);
                 FeatureCollection<SimpleFeatureType, SimpleFeature> features = source

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java

@@ -19 +19 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-import com.vividsolutions.jts.io.ParseException;
+import org.locationtech.jts.io.ParseException;
 
 public class ImportOsmInspectorBugsAction extends JosmAction {

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java

@@ -60 +60 @@
 import org.openstreetmap.josm.tools.Logging;
 
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.ParseException;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
 
 public class OsmInspectorLayer extends Layer {

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java

@@ -32 +32 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.Point;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Point;
 
 public class OsmInspectorDialog extends ToggleDialog implements LayerChangeListener, ActiveLayerChangeListener {
@@ -233 +233 @@
         @Override
         public void layerAdded(LayerAddEvent e) {
-                if (layer instanceof OsmInspectorLayer) {
+                if (layer != null) {
                         refreshModel();
                         refreshBugList();
@@ -241 +241 @@
         @Override
         public void layerRemoving(LayerRemoveEvent e) {
-                if (layer instanceof OsmInspectorLayer) {
+                if (layer != null) {
                         bugsList.clearSelection();
                         model.clear();