Changeset 34655 in osm

Timestamp:

2018-09-15T14:19:12+02:00 (6 years ago)

Author:

donvip

Message:

fix UnnecessaryParentheses warnings

Location:

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer

Files:

• actions/SavePictureCalibrationToWorldAction.java (modified) (4 diffs)
• command/TransformCommand.java (modified) (1 diff)
• layer/PicLayerAbstract.java (modified) (2 diffs)
• layer/kml/KMLReader.java (modified) (2 diffs)
• transform/Matrix3D.java (modified) (1 diff)

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationToWorldAction.java

@@ -7 +7 @@
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 
 import javax.swing.JFileChooser;
@@ -16 +17 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -73 +75 @@
                 file = new File(path + "." + wext);
             }
-            try (BufferedWriter bw = new BufferedWriter(new FileWriter(file))) {
+            try (BufferedWriter bw = Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8)) {
                 for (int i = 0; i < 6; i++) {
                     bw.write(Double.toString(values[i]));
@@ -81 +83 @@
                 }
             } catch (IOException e) {
-                // Error
-                e.printStackTrace();
+                Logging.error(e);
                 JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("Saving file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/command/TransformCommand.java

@@ -77 +77 @@
         afterTransform = extractTransform();
 
-        boolean changed = !(beforeTransform.getTransform().equals(afterTransform.getTransform())) ||
-            !(beforeTransform.getOriginPoints().equals(afterTransform.getOriginPoints())) ||
-            !(beforeTransform.getImagePosition().equals(afterTransform.getImagePosition()));
+        boolean changed = !beforeTransform.getTransform().equals(afterTransform.getTransform()) ||
+            !beforeTransform.getOriginPoints().equals(afterTransform.getOriginPoints()) ||
+            !beforeTransform.getImagePosition().equals(afterTransform.getImagePosition());
         if (changed && !alreadyAdded) {
             UndoRedoHandler.getInstance().add(this);

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java

@@ -146 +146 @@
             EastNorth center = MainApplication.getMap().mapView.getCenter();
 
-//            imagePosition = new EastNorth(center.east(), center.north());
             transformer.setImagePosition(new EastNorth(center.east(), center.north()));
-//            initialImagePosition = new EastNorth(imagePosition.east(), imagePosition.north());
             // Initial scale at which the image was loaded
             initialImageScale = MainApplication.getMap().mapView.getDist100Pixel();
@@ -161 +159 @@
         }
         // Load image completely
-        (new ImageIcon(image)).getImage();
+        new ImageIcon(image).getImage();
 
         lookForCalibration();

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/kml/KMLReader.java

@@ -3 +3 @@
 
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.List;
 
@@ -27 +28 @@
             XMLReader xr = XMLReaderFactory.createXMLReader();
             xr.setContentHandler(handler);
-            xr.parse(new InputSource(new FileReader(file)));
+            xr.parse(new InputSource(Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)));
         } catch (SAXException | IOException e) {
             Logging.error(e);

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/transform/Matrix3D.java

@@ -59 +59 @@
         double s = 1/det;
 
-        invert.a[0][0] = (s) * (a[1][1] * a[2][2] - a[1][2] * a[2][1]);
-        invert.a[1][0] = (s) * (a[1][2] * a[2][0] - a[1][0] * a[2][2]);
-        invert.a[2][0] = (s) * (a[1][0] * a[2][1] - a[1][1] * a[2][0]);
-        invert.a[0][1] = (s) * (a[0][2] * a[2][1] - a[0][1] * a[2][2]);
-        invert.a[1][1] = (s) * (a[0][0] * a[2][2] - a[0][2] * a[2][0]);
-        invert.a[2][1] = (s) * (a[0][1] * a[2][0] - a[0][0] * a[2][1]);
-        invert.a[0][2] = (s) * (a[0][1] * a[1][2] - a[0][2] * a[1][1]);
-        invert.a[1][2] = (s) * (a[0][2] * a[1][0] - a[0][0] * a[1][2]);
-        invert.a[2][2] = (s) * (a[0][0] * a[1][1] - a[0][1] * a[1][0]);
+        invert.a[0][0] = s * (a[1][1] * a[2][2] - a[1][2] * a[2][1]);
+        invert.a[1][0] = s * (a[1][2] * a[2][0] - a[1][0] * a[2][2]);
+        invert.a[2][0] = s * (a[1][0] * a[2][1] - a[1][1] * a[2][0]);
+        invert.a[0][1] = s * (a[0][2] * a[2][1] - a[0][1] * a[2][2]);
+        invert.a[1][1] = s * (a[0][0] * a[2][2] - a[0][2] * a[2][0]);
+        invert.a[2][1] = s * (a[0][1] * a[2][0] - a[0][0] * a[2][1]);
+        invert.a[0][2] = s * (a[0][1] * a[1][2] - a[0][2] * a[1][1]);
+        invert.a[1][2] = s * (a[0][2] * a[1][0] - a[0][0] * a[1][2]);
+        invert.a[2][2] = s * (a[0][0] * a[1][1] - a[0][1] * a[1][0]);
 
         return invert;