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 30736)
+++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java	(revision 30737)
@@ -95,5 +95,5 @@
 		String getCapabilities = "http://tools.geofabrik.de/osmi/view/routing_non_eu/wxs?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetCapabilities";
 		@SuppressWarnings("rawtypes")
-		Map<String, Comparable> connectionParameters = new HashMap<String, Comparable>();
+		Map<String, Comparable> connectionParameters = new HashMap<>();
 		connectionParameters.put("WFSDataStoreFactory:GET_CAPABILITIES_URL",
 				getCapabilities);
Index: applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OSMIFeatureTracker.java
===================================================================
--- applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OSMIFeatureTracker.java	(revision 30736)
+++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OSMIFeatureTracker.java	(revision 30737)
@@ -16,5 +16,5 @@
 	public OSMIFeatureTracker(
 			FeatureCollection<SimpleFeatureType, SimpleFeature> featuresIn) {
-		hashFeatures = new HashMap<Long, SimpleFeature>();
+		hashFeatures = new HashMap<>();
 		features = new MemoryFeatureCollection(featuresIn.getSchema());
 
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 30736)
+++ applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java	(revision 30737)
@@ -200,5 +200,5 @@
 
 			bugId = idx;
-			attributes = new HashMap<String, String>();
+			attributes = new HashMap<>();
 			Collection<Property> properties = next.getProperties();
 			Iterator<Property> it = properties.iterator();
@@ -261,5 +261,5 @@
 
 		public BugIndex(Map<BugInfo, Long> bugs) {
-			osmBugs = new ArrayList<BugInfo>(bugs.keySet());
+			osmBugs = new ArrayList<>(bugs.keySet());
 			nextIndex = 0;
 			previousIndex = -1;
@@ -267,5 +267,5 @@
 
 		public BugIndex(Map<BugInfo, Long> bugs, int n, int p) {
-			osmBugs = new ArrayList<BugInfo>(bugs.keySet());
+			osmBugs = new ArrayList<>(bugs.keySet());
 			nextIndex = n;
 			previousIndex = p;
@@ -345,7 +345,7 @@
 		super("OsmInspector");
 
-		arrFeatures = new ArrayList<OSMIFeatureTracker>();
-		osmiBugInfo = new LinkedHashMap<BugInfo, Long>();
-		selectGeomType = new ArrayList<GeomType>();
+		arrFeatures = new ArrayList<>();
+		osmiBugInfo = new LinkedHashMap<>();
+		selectGeomType = new ArrayList<>();
 
 		// Step 3 - discovery; enhance to iterate over all types with bounds
@@ -360,5 +360,5 @@
 		for (int idx = 1; idx < typeNames.length; ++idx) {
 			String typeName = typeNames[idx];
-			Set<FeatureId> selectedFeatures = new HashSet<FeatureId>();
+			Set<FeatureId> selectedFeatures = new HashSet<>();
 
 			FeatureCollection<SimpleFeatureType, SimpleFeature> features = wfsClient
@@ -417,5 +417,5 @@
 		for (int idx = 1; idx < typeNames.length; ++idx) {
 			String typeName = typeNames[idx];
-			Set<FeatureId> selectedFeatures = new HashSet<FeatureId>();
+			Set<FeatureId> selectedFeatures = new HashSet<>();
 
 			monitor.setProgress(100 / typeNames.length * idx);
@@ -621,5 +621,5 @@
 				FeatureIterator<SimpleFeature> iter = selectedFeatures
 						.features();
-				Set<FeatureId> IDs = new HashSet<FeatureId>();
+				Set<FeatureId> IDs = new HashSet<>();
 
 				System.out.println("Selected features "