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

Timestamp:

2018-04-08T02:35:46+02:00 (7 years ago)

Author:

donvip

Message:

update to GeoTools 19.0, fix javadoc warnings

Location:

applications/editors/josm/plugins/OsmInspectorPlugin

Files:

• .classpath (modified) (1 diff)
• lib/commons-collections-3.1.jar (deleted)
• lib/commons-collections-3.2.2.jar (added)
• lib/gt-app-schema-resolver-12.1.jar (deleted)
• lib/gt-app-schema-resolver-19.0.jar (added)
• lib/gt-cql-12.1.jar (deleted)
• lib/gt-cql-19.0.jar (added)
• lib/gt-referencing3D-12.1.jar (deleted)
• lib/gt-referencing3D-19.0.jar (added)
• lib/gt-render-12.1.jar (deleted)
• lib/gt-render-19.0.jar (added)
• lib/gt-wfs-12.1.jar (deleted)
• lib/gt-wfs-ng-19.0.jar (added)
• lib/gt-xml-12.1.jar (deleted)
• lib/gt-xml-19.0.jar (added)
• lib/gt-xsd-core-12.1.jar (deleted)
• lib/gt-xsd-core-19.0.jar (added)
• lib/gt-xsd-wfs-12.1.jar (deleted)
• lib/gt-xsd-wfs-19.0.jar (added)
• src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java (modified) (2 diffs)

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

@@ -6 +6 @@
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-GeoTools"/>
-        <classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/>
+        <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-12.1.jar">
+        <classpathentry kind="lib" path="lib/gt-app-schema-resolver-19.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-cql-12.1.jar">
+        <classpathentry kind="lib" path="lib/gt-cql-19.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-render-12.1.jar">
+        <classpathentry kind="lib" path="lib/gt-render-19.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-referencing3D-12.1.jar">
+        <classpathentry kind="lib" path="lib/gt-referencing3D-19.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-wfs-12.1.jar">
+        <classpathentry kind="lib" path="lib/gt-wfs-ng-19.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-xml-12.1.jar">
+        <classpathentry kind="lib" path="lib/gt-xml-19.0.jar">
                 <attributes>
                         <attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/gt-xsd-core-12.1.jar">
+        <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-12.1.jar">
+        <classpathentry kind="lib" path="lib/gt-xsd-wfs-19.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

@@ -121 +121 @@
                 this.data = data;
         }
-
-        /**
-         * @param args
-         */
-        public static void main(String[] args) {
-
-                // try {
-                // CoordinateReferenceSystem targetCRS = CRS.decode("EPSG:4326");
-                // GeoFabrikWFSClient theTest = new GeoFabrikWFSClient( new
-                // Bounds(-124.0, -120.0, 32.0, 36.0));
-                // theTest.initializeDataStore();
-                // FeatureCollection<SimpleFeatureType, SimpleFeature> features =
-                // theTest.getFeatures();
-                // OsmInspectorLayer inspector = new OsmInspectorLayer(
-                // theTest.getData());
-                // inspector.setVisible(true);
-
-                // ReferencedEnvelope bounds = new ReferencedEnvelope();
-                // Iterator<SimpleFeature> iterator = features.iterator();
-                // try {
-                // while (iterator.hasNext()) {
-                // Feature feature = iterator.next();
-                // bounds.include(feature.getBounds());
-                // }
-                // Main.info("Calculated Bounds:" + bounds);
-                // } finally {
-                // features.close(iterator);
-                // }
-                // } catch (Exception e) {
-                // // TODO Auto-generated catch block
-                // e.printStackTrace();
-                // }
-        }
 }

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

@@ -331 +331 @@
         private static final float POINT_SIZE = 10.0f;
 
-        /**
-         * 
-         * @param wfsClient
-         * @throws NoSuchAuthorityCodeException
-         * @throws FactoryException
-         * @throws IOException
-         * @throws IndexOutOfBoundsException
-         * @throws ParseException
-         */
         public OsmInspectorLayer(GeoFabrikWFSClient wfsClient,
                         ProgressMonitor monitor) throws NoSuchAuthorityCodeException,
@@ -393 +384 @@
         }
 
-        /**
-         * 
-         * @param wfsClient
-         * @throws NoSuchAuthorityCodeException
-         * @throws FactoryException
-         * @throws IOException
-         * @throws ParseException
-         * @throws NoSuchElementException
-         * @throws IndexOutOfBoundsException
-         */
         public void loadFeatures(GeoFabrikWFSClient wfsClient)
                         throws NoSuchAuthorityCodeException, FactoryException, IOException,