Index: applications/editors/josm/plugins/OsmInspectorPlugin/.classpath
===================================================================
--- applications/editors/josm/plugins/OsmInspectorPlugin/.classpath	(revision 35092)
+++ applications/editors/josm/plugins/OsmInspectorPlugin/.classpath	(revision 35123)
@@ -8,40 +8,35 @@
 	<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/"/>
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 35092)
+++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java	(revision 35123)
@@ -12,5 +12,4 @@
 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,6 +79,5 @@
 		// 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
Index: applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java
===================================================================
--- applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java	(revision 35092)
+++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java	(revision 35123)
@@ -19,5 +19,5 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-import com.vividsolutions.jts.io.ParseException;
+import org.locationtech.jts.io.ParseException;
 
 public class ImportOsmInspectorBugsAction extends JosmAction {
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 35092)
+++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java	(revision 35123)
@@ -60,7 +60,7 @@
 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 {
Index: applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java
===================================================================
--- applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java	(revision 35092)
+++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java	(revision 35123)
@@ -32,6 +32,6 @@
 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,5 +233,5 @@
 	@Override
 	public void layerAdded(LayerAddEvent e) {
-		if (layer instanceof OsmInspectorLayer) {
+		if (layer != null) {
 			refreshModel();
 			refreshBugList();
@@ -241,5 +241,5 @@
 	@Override
 	public void layerRemoving(LayerRemoveEvent e) {
-		if (layer instanceof OsmInspectorLayer) {
+		if (layer != null) {
 			bugsList.clearSelection();
 			model.clear();