Changeset 30737 in osm for applications/editors/josm/plugins/ImportImagePlugin/src

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

File:

• applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java (modified) (6 diffs)

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java

@@ -156 +156 @@
 
             // create Envelope
-            double width = (double) (img.getWidth() * tfwReader.getXPixelSize());
-            double height = (double) (img.getHeight() * (-tfwReader.getYPixelSize()));
-            double lowerLeft_x = (double) tfwReader.getXULC();
-            double lowerLeft_y = (double) tfwReader.getYULC() - height;
+            double width = img.getWidth() * tfwReader.getXPixelSize();
+            double height = img.getHeight() * (-tfwReader.getYPixelSize());
+            double lowerLeft_x = tfwReader.getXULC();
+            double lowerLeft_y = tfwReader.getYULC() - height;
             Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
 
@@ -191 +191 @@
 
             // create Envelope
-            double width = (double) (img.getWidth() * tfwReader.getXPixelSize());
-            double height = (double) (img.getHeight() * (-tfwReader.getYPixelSize()));
-            double lowerLeft_x = (double) tfwReader.getXULC();
-            double lowerLeft_y = (double) tfwReader.getYULC() - height;
+            double width = img.getWidth() * tfwReader.getXPixelSize();
+            double height = img.getHeight() * (-tfwReader.getYPixelSize());
+            double lowerLeft_x = tfwReader.getXULC();
+            double lowerLeft_y = tfwReader.getYULC() - height;
             Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
 
@@ -224 +224 @@
 
             // create Envelope
-            double width = (double) (img.getWidth() * tfwReader.getXPixelSize());
-            double height = (double) (img.getHeight() * (-tfwReader.getYPixelSize()));
-            double lowerLeft_x = (double) tfwReader.getXULC();
-            double lowerLeft_y = (double) tfwReader.getYULC() - height;
+            double width = img.getWidth() * tfwReader.getXPixelSize();
+            double height = img.getHeight() * (-tfwReader.getYPixelSize());
+            double lowerLeft_x = tfwReader.getXULC();
+            double lowerLeft_y = tfwReader.getYULC() - height;
             Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
 
@@ -258 +258 @@
 
             // create Envelope
-            double width = (double) (img.getWidth() * tfwReader.getXPixelSize());
-            double height = (double) (img.getHeight() * (-tfwReader.getYPixelSize()));
-            double lowerLeft_x = (double) tfwReader.getXULC();
-            double lowerLeft_y = (double) tfwReader.getYULC() - height;
+            double width = img.getWidth() * tfwReader.getXPixelSize();
+            double height = img.getHeight() * (-tfwReader.getYPixelSize());
+            double lowerLeft_x = tfwReader.getXULC();
+            double lowerLeft_y = tfwReader.getYULC() - height;
             Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
 
@@ -350 +350 @@
         GeoTiffReader reader = new GeoTiffReader(file, hints);
 
-        coverage = (GridCoverage2D) reader.read(null);
+        coverage = reader.read(null);
 
         return coverage;
@@ -366 +366 @@
         String defaultcrsString = pluginProps.getProperty("default_crs_srid");
 
-        crsDescriptions = new Vector<String>();
+        crsDescriptions = new Vector<>();
         Set<String> supportedCodes = CRS.getSupportedCodes("EPSG");
         CRSAuthorityFactory fac = CRS.getAuthorityFactory(false);
 
         for (Iterator<String> iterator = supportedCodes.iterator(); iterator.hasNext();) {
-            String string = (String) iterator.next();
+            String string = iterator.next();
             try {
                 if ("WGS84(DD)".equals(string)) {