Changeset 30737 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/imagery_offset_db/src/iodb

Files:

• IODBReader.java (modified) (2 diffs)
• ImageryIdGenerator.java (modified) (1 diff)
• ImageryOffsetPlugin.java (modified) (1 diff)
• ImageryOffsetWatcher.java (modified) (2 diffs)
• OffsetDialog.java (modified) (1 diff)
• StoreImageryOffsetAction.java (modified) (1 diff)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/IODBReader.java

@@ -36 +36 @@
     public IODBReader( InputStream source ) throws IOException {
         this.source = new InputSource(UTFInputStreamReader.create(source, "UTF-8"));
-        this.offsets = new ArrayList<ImageryOffsetBase>();
+        this.offsets = new ArrayList<>();
     }
 
@@ -212 +212 @@
             maxZoom = -1;
             flagged = false;
-            geometry = new ArrayList<LatLon>();
+            geometry = new ArrayList<>();
         }
 

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryIdGenerator.java

@@ -43 +43 @@
 
         // Parse query parameters into a sorted map
-        final Set<String> removeWMSParams = new TreeSet<String>(Arrays.asList(new String[] {
+        final Set<String> removeWMSParams = new TreeSet<>(Arrays.asList(new String[] {
                     "srs", "width", "height", "bbox", "service", "request", "version", "format", "styles", "transparent"
                 }));
-        Map<String, String> qparams = new TreeMap<String, String>();
+        Map<String, String> qparams = new TreeMap<>();
         String[] qparamsStr = query.length() > 1 ? query.substring(1).split("&") : new String[0];
         for( String param : qparamsStr ) {

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetPlugin.java

@@ -43 +43 @@
         // an ugly hack to add this plugin to the toolbar
         if( Main.pref.getBoolean("iodb.modify.toolbar", true) ) {
-            Collection<String> toolbar = new LinkedList<String>(Main.toolbar.getToolString());
+            Collection<String> toolbar = new LinkedList<>(Main.toolbar.getToolString());
             if( !toolbar.contains("getoffset") ) {
                 toolbar.add("getoffset");

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetWatcher.java

@@ -19 +19 @@
     private static final double THRESHOLD = 1e-8;
     private static ImageryOffsetWatcher instance;
-    private Map<Integer, ImageryLayerData> layers = new TreeMap<Integer, ImageryLayerData>();
-    private List<OffsetStateListener> listeners = new ArrayList<OffsetStateListener>();
+    private Map<Integer, ImageryLayerData> layers = new TreeMap<>();
+    private List<OffsetStateListener> listeners = new ArrayList<>();
     private Timer time;
     private double maxDistance;
@@ -192 +192 @@
         if( !Main.pref.getBoolean("iodb.remember.offsets", true) || id == null )
             return;
-        Collection<String> offsets = new LinkedList<String>(Main.pref.getCollection("iodb.stored.offsets"));
+        Collection<String> offsets = new LinkedList<>(Main.pref.getCollection("iodb.stored.offsets"));
         for( Iterator<String> iter = offsets.iterator(); iter.hasNext(); ) {
             String[] offset = iter.next().split(":");

applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java

@@ -137 +137 @@
         boolean showCalibration = Main.pref.getBoolean(PREF_CALIBRATION, true);
         boolean showDeprecated = Main.pref.getBoolean(PREF_DEPRECATED, false);
-        List<ImageryOffsetBase> filteredOffsets = new ArrayList<ImageryOffsetBase>();
+        List<ImageryOffsetBase> filteredOffsets = new ArrayList<>();
         for( ImageryOffsetBase offset : offsets ) {
             if( offset.isDeprecated() && !showDeprecated )

applications/editors/josm/plugins/imagery_offset_db/src/iodb/StoreImageryOffsetAction.java

@@ -106 +106 @@
         // upload object info to server
         try {
-            Map<String, String> params = new HashMap<String, String>();
+            Map<String, String> params = new HashMap<>();
             offsetObj.putServerParams(params);
             StringBuilder query = null;