Index: /applications/editors/josm/plugins/OsmInspectorPlugin/.classpath
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/.classpath	(revision 34142)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/.classpath	(revision 34143)
@@ -6,42 +6,42 @@
 	<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/"/>
Index: /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java	(revision 34142)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java	(revision 34143)
@@ -121,36 +121,3 @@
 		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();
-		// }
-	}
 }
Index: /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java	(revision 34142)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java	(revision 34143)
@@ -331,13 +331,4 @@
 	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,14 +384,4 @@
 	}
 
-	/**
-	 * 
-	 * @param wfsClient
-	 * @throws NoSuchAuthorityCodeException
-	 * @throws FactoryException
-	 * @throws IOException
-	 * @throws ParseException
-	 * @throws NoSuchElementException
-	 * @throws IndexOutOfBoundsException
-	 */
 	public void loadFeatures(GeoFabrikWFSClient wfsClient)
 			throws NoSuchAuthorityCodeException, FactoryException, IOException,