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

Timestamp:

2014-10-18T23:07:52+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector

Files:

• GeoFabrikWFSClient.java (modified) (1 diff)
• OSMIFeatureTracker.java (modified) (1 diff)
• OsmInspectorLayer.java (modified) (7 diffs)

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

@@ -95 +95 @@
                 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);

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

@@ -16 +16 @@
         public OSMIFeatureTracker(
                         FeatureCollection<SimpleFeatureType, SimpleFeature> featuresIn) {
-                hashFeatures = new HashMap<Long, SimpleFeature>();
+                hashFeatures = new HashMap<>();
                 features = new MemoryFeatureCollection(featuresIn.getSchema());
 

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

@@ -200 +200 @@
 
                         bugId = idx;
-                        attributes = new HashMap<String, String>();
+                        attributes = new HashMap<>();
                         Collection<Property> properties = next.getProperties();
                         Iterator<Property> it = properties.iterator();
@@ -261 +261 @@
 
                 public BugIndex(Map<BugInfo, Long> bugs) {
-                        osmBugs = new ArrayList<BugInfo>(bugs.keySet());
+                        osmBugs = new ArrayList<>(bugs.keySet());
                         nextIndex = 0;
                         previousIndex = -1;
@@ -267 +267 @@
 
                 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 +345 @@
                 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 +360 @@
                 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 +417 @@
                 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 +621 @@
                                 FeatureIterator<SimpleFeature> iter = selectedFeatures
                                                 .features();
-                                Set<FeatureId> IDs = new HashSet<FeatureId>();
+                                Set<FeatureId> IDs = new HashSet<>();
 
                                 System.out.println("Selected features "