Changeset 32675 in osm

Timestamp:

2016-07-18T23:45:04+02:00 (8 years ago)

Author:

donvip

Message:

checkstyle

Location:

applications/editors/josm/plugins/piclayer

Files:

• .checkstyle (added)
• .project (modified) (1 diff)
• .settings/org.eclipse.jdt.ui.prefs (added)
• src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/GenericPicTransformAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationFromWorldAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromClipboardAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromFileAction.java (modified) (9 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/MovePictureAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/RotatePictureAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScalePictureActionAbstract.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXPictureAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXYPictureAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleYPictureAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ShearPictureAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/RemovePointAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/TransformPointAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/command/TransformCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/layer/CalibrationFileFilter.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java (modified) (20 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromClipboard.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromFile.java (modified) (7 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromKML.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/layer/kml/KMLGroundOverlay.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/layer/kml/KMLReader.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/transform/Matrix3D.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/transform/NoSolutionException.java (modified) (1 diff)

applications/editors/josm/plugins/piclayer/.project

@@ -16 +16 @@
                         </arguments>
                 </buildCommand>
+                <buildCommand>
+                        <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>
                 <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
         </natures>
 </projectDescription>

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java

@@ -74 +74 @@
 
         // Create menu entry
-        
+
         // Add menu items
         MainMenu.add(Main.main.menu.imagerySubMenu, newLayerFromFileAction);
@@ -89 +89 @@
     @Override
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
-        if(newFrame != null) {
+        if (newFrame != null) {
             // Create plugin map modes
             MovePictureAction movePictureAction = new MovePictureAction(newFrame);
@@ -114 +114 @@
             buttonList.add(picLayerActionButtonFactory(shearPictureAction));
 
-            for(IconToggleButton btn : buttonList) {
+            for (IconToggleButton btn : buttonList) {
                 newFrame.addMapMode(btn);
             }

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

@@ -57 +57 @@
     public void mousePressed(MouseEvent e) {
         // Start action
-        if ( Main.getLayerManager().getActiveLayer() instanceof PicLayerAbstract ) {
-            currentLayer = (PicLayerAbstract)Main.getLayerManager().getActiveLayer();
+        if (Main.getLayerManager().getActiveLayer() instanceof PicLayerAbstract) {
+            currentLayer = (PicLayerAbstract) Main.getLayerManager().getActiveLayer();
 
-            if ( currentLayer != null && e.getButton() == MouseEvent.BUTTON1 ) {
+            if (currentLayer != null && e.getButton() == MouseEvent.BUTTON1) {
                 requestFocusInMapView();
                 isDragging = true;
                 prevMousePoint = new Point(e.getPoint());
-                prevEastNorth = Main.map.mapView.getEastNorth(e.getX(),e.getY());
+                prevEastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY());
                 // try to find and fill selected point if possible
                 selectedPoint = currentLayer.findSelectedPoint(e.getPoint());
@@ -75 +75 @@
     public void mouseDragged(MouseEvent e) {
         // Call action performing
-        if(isDragging && currentLayer != null) {
+        if (isDragging && currentLayer != null) {
             doAction(e);
             prevMousePoint = new Point(e.getPoint());
-            prevEastNorth = Main.map.mapView.getEastNorth(e.getX(),e.getY());
+            prevEastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY());
             Main.map.mapView.repaint();
         }
@@ -101 +101 @@
         Layer active = Main.getLayerManager().getActiveLayer();
         if (active instanceof PicLayerAbstract) {
-            ((PicLayerAbstract)active).setDrawPoints(value);
+            ((PicLayerAbstract) active).setDrawPoints(value);
         }
         Main.map.mapView.repaint();
     }
-
 }

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

@@ -51 +51 @@
      * Constructor
      */
-    public LoadPictureCalibrationAction( PicLayerAbstract owner ) {
+    public LoadPictureCalibrationAction(PicLayerAbstract owner) {
         super(tr("Load Picture Calibration..."), null, tr("Loads calibration data from a file"), null, false);
         // Remember the owner...
@@ -64 +64 @@
         // Save dialog
         JFileChooser fc = new JFileChooser();
-        fc.setAcceptAllFileFilterUsed( true );
-        fc.setFileFilter( new CalibrationFileFilter() );
-        fc.setSelectedFile( new File(m_owner.getPicLayerName() + CalibrationFileFilter.EXTENSION));
-        int result = fc.showOpenDialog(Main.parent );
+        fc.setAcceptAllFileFilterUsed(true);
+        fc.setFileFilter(new CalibrationFileFilter());
+        fc.setSelectedFile(new File(m_owner.getPicLayerName() + CalibrationFileFilter.EXTENSION));
+        int result = fc.showOpenDialog(Main.parent);
 
-        if ( result == JFileChooser.APPROVE_OPTION ) {
+        if (result == JFileChooser.APPROVE_OPTION) {
 
             // Load
@@ -77 +77 @@
                 // Error
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent , tr("Loading file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
+                JOptionPane.showMessageDialog(Main.parent,
+                        tr("Loading file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             }
         }

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

@@ -28 +28 @@
 
         JFileChooser fc = new JFileChooser();
-        fc.setAcceptAllFileFilterUsed( true );
-        int result = fc.showOpenDialog(Main.parent );
+        fc.setAcceptAllFileFilterUsed(true);
+        int result = fc.showOpenDialog(Main.parent);
 
-        if ( result == JFileChooser.APPROVE_OPTION ) {
+        if (result == JFileChooser.APPROVE_OPTION) {
 
             // Load
@@ -39 +39 @@
                 // Error
                 ex.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent , tr("Loading file failed: {0}", ex.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
+                JOptionPane.showMessageDialog(Main.parent,
+                        tr("Loading file failed: {0}", ex.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             }
         }

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

@@ -50 +50 @@
      * Constructor
      */
-    public SavePictureCalibrationAction( PicLayerAbstract owner ) {
+    public SavePictureCalibrationAction(PicLayerAbstract owner) {
         super(tr("Save Picture Calibration..."), null, tr("Saves calibration data to a file"), null, false);
         // Remember the owner...
@@ -63 +63 @@
         // Save dialog
         final JFileChooser fc = new JFileChooser();
-        fc.setAcceptAllFileFilterUsed( true );
-        fc.setFileFilter( new CalibrationFileFilter() );
-        fc.setSelectedFile( new File(m_owner.getPicLayerName() + CalibrationFileFilter.EXTENSION));
-        int result = fc.showSaveDialog( Main.parent );
+        fc.setAcceptAllFileFilterUsed(true);
+        fc.setFileFilter(new CalibrationFileFilter());
+        fc.setSelectedFile(new File(m_owner.getPicLayerName() + CalibrationFileFilter.EXTENSION));
+        int result = fc.showSaveDialog(Main.parent);
 
-        if ( result == JFileChooser.APPROVE_OPTION ) {
+        if (result == JFileChooser.APPROVE_OPTION) {
             // Check file extension and force it to be valid
             File file = fc.getSelectedFile();
             String path = file.getAbsolutePath();
-            if ( path.length() < CalibrationFileFilter.EXTENSION.length()
-                || !path.substring( path.length() - 4 ).equals(CalibrationFileFilter.EXTENSION)) {
-                file = new File( path + CalibrationFileFilter.EXTENSION );
+            if (path.length() < CalibrationFileFilter.EXTENSION.length()
+                || !path.substring(path.length() - 4).equals(CalibrationFileFilter.EXTENSION)) {
+                file = new File(path + CalibrationFileFilter.EXTENSION);
             }
 
@@ -85 +85 @@
                 // Error
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent , tr("Saving file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
+                JOptionPane.showMessageDialog(Main.parent,
+                        tr("Saving file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             }
         }

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

@@ -56 +56 @@
         try {
             layer.initialize();
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             // Failed
-            System.out.println( "NewLayerFromClipboardAction::actionPerformed - " + e.getMessage() );
+            System.out.println("NewLayerFromClipboardAction::actionPerformed - " + e.getMessage());
             JOptionPane.showMessageDialog(null, e.getMessage(), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
             return;
         }
         // Add layer
-        Main.getLayerManager().addLayer( layer );
+        Main.getLayerManager().addLayer(layer);
     }
 }

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

@@ -59 +59 @@
         private String[] supportedExtensions;
 
-        public ImageFileFilter() {
+        ImageFileFilter() {
             List<String> extensions = new ArrayList<>();
             extensions.add("zip");
             extensions.add("kml");
-            for (String ext : ImageIO.getReaderFormatNames())
+            for (String ext : ImageIO.getReaderFormatNames()) {
                 extensions.add(ext);
+            }
             supportedExtensions = extensions.toArray(new String[0]);
         }
@@ -70 +71 @@
         @Override
         public boolean accept(File f) {
-            if ( f.isDirectory() )
+            if (f.isDirectory())
                 return true;
 
@@ -77 +78 @@
             // Unfortunately, getReaderFormatNames does not always return ALL extensions in
             // both lower and upper case, so we can not do a search in the array
-            for (String e: supportedExtensions)
-                if ( e.equalsIgnoreCase(fileExtension) ) {
+            for (String e: supportedExtensions) {
+                if (e.equalsIgnoreCase(fileExtension)) {
                     return true;
                 }
+            }
 
             return false;
         }
-
 
         @Override
@@ -90 +91 @@
             return tr("Supported image files, *.zip, *.kml");
         }
-
     }
 
@@ -108 +108 @@
         // Choose a file
         JFileChooser fc = new JFileChooser(Main.pref.get(m_lastdirprefname));
-        fc.setAcceptAllFileFilterUsed( true );
-        fc.setFileFilter( new ImageFileFilter() );
+        fc.setAcceptAllFileFilterUsed(true);
+        fc.setFileFilter(new ImageFileFilter());
 
         fc.setMultiSelectionEnabled(true);
-        int result = fc.showOpenDialog( Main.parent );
+        int result = fc.showOpenDialog(Main.parent);
 
         // Create a layer?
-        if ( result == JFileChooser.APPROVE_OPTION ) {
+        if (result == JFileChooser.APPROVE_OPTION) {
             // The first loaded layer will be placed at the top of any other layer of the same class,
             // or at the bottom of the stack if there is no such layer yet
             // The next layers we load will be placed one after the other after this first layer
             int newLayerPos = Main.getLayerManager().getLayers().size();
-            for(Layer l : Main.getLayerManager().getLayersOfType(PicLayerAbstract.class)) {
+            for (Layer l : Main.getLayerManager().getLayersOfType(PicLayerAbstract.class)) {
                 int pos = Main.getLayerManager().getLayers().indexOf(l);
                 if (pos < newLayerPos) newLayerPos = pos;
             }
 
-            for(File file : fc.getSelectedFiles() ) {
+            for (File file : fc.getSelectedFiles()) {
                 // TODO: we need a progress bar here, it can take quite some time
 
@@ -150 +150 @@
     private void addNewLayerFromFile(File file, int newLayerPos, boolean isZoomToLayer) {
         try {
-            PicLayerFromFile layer = new PicLayerFromFile( file );
+            PicLayerFromFile layer = new PicLayerFromFile(file);
             layer.initialize();
 
             placeLayer(layer, newLayerPos, isZoomToLayer);
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             // Failed
-            System.out.println( "NewLayerFromFileAction::actionPerformed - " + e.getMessage() );
+            System.out.println("NewLayerFromFileAction::actionPerformed - " + e.getMessage());
             JOptionPane.showMessageDialog(null, e.getMessage(), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
         }
@@ -168 +167 @@
         Main.map.mapView.moveLayer(layer, newLayerPos++);
 
-        if ( isZoomToLayer && Main.pref.getInteger("piclayer.zoom-on-load", 1) != 0 ) {
+        if (isZoomToLayer && Main.pref.getInteger("piclayer.zoom-on-load", 1) != 0) {
             // if we are loading a single picture file, zoom on it, so that the user can see something
             BoundingXYVisitor v = new BoundingXYVisitor();
@@ -175 +174 @@
         }
     }
+
     private void addNewLayerFromKML(File root, KMLGroundOverlay overlay, int newLayerPos) {
         try {
@@ -183 +183 @@
         } catch (IOException e) {
             // Failed
-            System.out.println( "NewLayerFromFileAction::actionPerformed - " + e.getMessage() );
+            System.out.println("NewLayerFromFileAction::actionPerformed - " + e.getMessage());
             JOptionPane.showMessageDialog(null, e.getMessage(), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE);
         }

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

@@ -46 +46 @@
     @Override
     protected void doAction(MouseEvent e) {
-        EastNorth eastNorth = Main.map.mapView.getEastNorth(e.getX(),e.getY());
+        EastNorth eastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY());
         currentLayer.movePictureBy(
             eastNorth.east() - prevEastNorth.east(),

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

@@ -41 +41 @@
      */
     public RotatePictureAction(MapFrame frame) {
-        super(tr("PicLayer rotate"), tr("Rotated"), "rotate", tr("Drag to rotate the picture"), frame, ImageProvider.getCursor("crosshair", null));
+        super(tr("PicLayer rotate"), tr("Rotated"), "rotate", tr("Drag to rotate the picture"),
+                frame, ImageProvider.getCursor("crosshair", null));
     }
 
@@ -47 +48 @@
     protected void doAction(MouseEvent e) {
         double factor;
-        if ( ( e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK ) != 0 ) {
+        if ((e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0) {
             factor = Main.pref.getDouble("piclayer.rotatefactors.high_precision", 100.0);
+        } else {
+            factor = Main.pref.getDouble("piclayer.rotatefactors.low_precision", 10.0);
         }
-        else {
-            factor = Main.pref.getDouble("piclayer.rotatefactors.low_precision", 10.0 );
-        }
-        currentLayer.rotatePictureBy( ( e.getY() - prevMousePoint.getY() ) / factor );
+        currentLayer.rotatePictureBy((e.getY() - prevMousePoint.getY()) / factor);
     }
 }

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

@@ -38 +38 @@
      * Constructor
      */
-    public ScalePictureActionAbstract (String name, String actionName, String icon, String tooltip, MapFrame frame) {
+    public ScalePictureActionAbstract(String name, String actionName, String icon, String tooltip, MapFrame frame) {
         super(name, actionName, icon, tooltip, frame, ImageProvider.getCursor("crosshair", null));
     }
@@ -45 +45 @@
     protected void doAction(MouseEvent e) {
         double factor;
-        if ( ( e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK ) != 0 ) {
+        if ((e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0) {
             factor = Main.pref.getDouble("piclayer.scalefactors.high_precision", 1.0005);
-        }
-        else {
+        } else {
             factor = Main.pref.getDouble("piclayer.scalefactors.low_precision", 1.015);
         }
-        doTheScale( Math.pow(factor, prevMousePoint.getY() - e.getY() ) );
+        doTheScale(Math.pow(factor, prevMousePoint.getY() - e.getY()));
     }
 
@@ -57 +56 @@
      * Does the actual scaling in the inherited class.
      */
-     protected abstract void doTheScale( double scale );
+     protected abstract void doTheScale(double scale);
 
 }

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

@@ -29 +29 @@
  */
 @SuppressWarnings("serial")
-public class ScaleXPictureAction extends ScalePictureActionAbstract
-{
-    /*
+public class ScaleXPictureAction extends ScalePictureActionAbstract {
+
+    /**
      * Constructor
      */
@@ -39 +39 @@
 
     @Override
-    public void doTheScale( double scale ) {
-            currentLayer.scalePictureBy( scale, 1.0 );
-        }
+    public void doTheScale(double scale) {
+        currentLayer.scalePictureBy(scale, 1.0);
+    }
 }

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

@@ -29 +29 @@
  */
 @SuppressWarnings("serial")
-public class ScaleXYPictureAction extends ScalePictureActionAbstract
-{
-    /*
+public class ScaleXYPictureAction extends ScalePictureActionAbstract {
+
+    /**
      * Constructor
      */
@@ -39 +39 @@
 
     @Override
-    public void doTheScale( double scale ) {
-            currentLayer.scalePictureBy( scale, scale );
-        }
+    public void doTheScale(double scale) {
+        currentLayer.scalePictureBy(scale, scale);
+    }
 }

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

@@ -29 +29 @@
  */
 @SuppressWarnings("serial")
-public class ScaleYPictureAction extends ScalePictureActionAbstract
-{
-    /*
+public class ScaleYPictureAction extends ScalePictureActionAbstract {
+
+    /**
      * Constructor
      */
@@ -39 +39 @@
 
     @Override
-    public void doTheScale( double scale ) {
-        currentLayer.scalePictureBy( 1.0, scale );
+    public void doTheScale(double scale) {
+        currentLayer.scalePictureBy(1.0, scale);
     }
 }

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

@@ -48 +48 @@
     @Override
     protected void doAction(MouseEvent e) {
-        EastNorth eastNorth = Main.map.mapView.getEastNorth(e.getX(),e.getY());
+        EastNorth eastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY());
         currentLayer.shearPictureBy(
             1000* (eastNorth.east() - prevEastNorth.east()),
@@ -54 +54 @@
         );
     }
-
 }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/RemovePointAction.java

@@ -44 +44 @@
         updateDrawPoints(false);
     }
-
-
 }

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/TransformPointAction.java

@@ -26 +26 @@
                     JOptionPane.showMessageDialog(null, tr("You should have 3 checkpoints to transform the image!"), tr("PicLayer"), JOptionPane.ERROR_MESSAGE, null);
                 else*/
-                {
+                //{
                     currentLayer.getTransformer().updatePair(selectedPoint, pressed);
-                }
+                //}
             }
 
@@ -36 +36 @@
         }
     }
+
     @Override
     public void enterMode() {

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

@@ -27 +27 @@
         beforeTransform = extractTransform();
     }
-
 
     @Override

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

@@ -36 +36 @@
     @Override
     public boolean accept(File f) {
-        String ext3 = ( f.getName().length() > 4 ) ?  f.getName().substring( f.getName().length() - 4 ).toLowerCase() : "";
+        String ext3 = (f.getName().length() > 4) ? f.getName().substring(f.getName().length() - 4).toLowerCase() : "";
 
         // TODO: check what is supported by Java :)
-        return ( f.isDirectory()
-            ||  ext3.equals( EXTENSION )
-            );
+        return (f.isDirectory() || ext3.equals(EXTENSION));
     }
 

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

@@ -27 +27 @@
 import java.awt.Image;
 import java.awt.Point;
+import java.awt.RenderingHints;
 import java.awt.Toolkit;
-import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.NoninvertibleTransformException;
@@ -155 +155 @@
 
         // If the map does not exist - we're screwed. We should not get into this situation in the first place!
-        if ( Main.map != null && Main.map.mapView != null ) {
+        if (Main.map != null && Main.map.mapView != null) {
 
             EastNorth center = Main.map.mapView.getCenter();
@@ -170 +170 @@
         // Create image
         image = createImage();
-        if ( image == null ) {
+        if (image == null) {
             throw new IOException(tr("PicLayer failed to load or import the image."));
         }
@@ -188 +188 @@
 
     protected abstract void lookForCalibration() throws IOException;
+
     /**
      * To be overridden by subclasses. Returns the user readable name of the layer.
@@ -194 +195 @@
 
     @Override
-    public Icon getIcon() { return layerIcon; }
-
-    @Override
-    public Object getInfoComponent() { return null; }
+    public Icon getIcon() {
+        return layerIcon;
+    }
+
+    @Override
+    public Object getInfoComponent() {
+        return null;
+    }
 
     @Override
@@ -209 +214 @@
                 new LoadPictureCalibrationFromWorldAction(this),
                 SeparatorLayerAction.INSTANCE,
-                new RenameLayerAction(null,this),
+                new RenameLayerAction(null, this),
         };
     }
@@ -229 +234 @@
     public void paint(Graphics2D g2, MapView mv, Bounds bounds) {
 
-        if ( image != null) {
+        if (image != null) {
 
             // Position image at the right graphical place
             EastNorth center = mv.getCenter();
-            EastNorth leftop = mv.getEastNorth( 0, 0 );
+            EastNorth leftop = mv.getEastNorth(0, 0);
             // Number of pixels for one unit in east north space.
             // This is the same in x- and y- direction.
-            double pixel_per_en = ( mv.getWidth() / 2.0 ) / ( center.east() - leftop.east() );
+            double pixel_per_en = (mv.getWidth() / 2.0) / (center.east() - leftop.east());
 
             //     This is now the offset in screen pixels
             EastNorth imagePosition = transformer.getImagePosition();
-            double pic_offset_x = (( imagePosition.east() - leftop.east() ) * pixel_per_en);
-            double pic_offset_y = (( leftop.north() - imagePosition.north() ) * pixel_per_en);
-
-            Graphics2D g = (Graphics2D)g2.create();
+            double pic_offset_x = ((imagePosition.east() - leftop.east()) * pixel_per_en);
+            double pic_offset_y = ((leftop.north() - imagePosition.north()) * pixel_per_en);
+
+            Graphics2D g = (Graphics2D) g2.create();
             // Move
-            g.translate( pic_offset_x, pic_offset_y );
+            g.translate(pic_offset_x, pic_offset_y);
 
             // Scale
             double scalex = initialImageScale * pixel_per_en / getMetersPerEasting(imagePosition) / 100;
             double scaley = initialImageScale * pixel_per_en / getMetersPerNorthing(imagePosition) / 100;
-            g.scale( scalex, scaley );
+            g.scale(scalex, scaley);
 
             g.transform(transformer.getTransform());
@@ -257 +262 @@
 
             // Draw picture
-            g.drawImage( image, -image.getWidth(null) / 2, -image.getHeight(null) / 2, null );
+            g.drawImage(image, -image.getWidth(null) / 2, -image.getHeight(null) / 2, null);
 
             // Draw additional rectangle for the active pic layer
             if (mv.getLayerManager().getActiveLayer() == this) {
-                g.setColor( new Color( 0xFF0000 ) );
+                g.setColor(new Color(0xFF0000));
                 g.drawRect(
                     -image.getWidth(null) / 2,
@@ -269 +274 @@
                 );
             }
-            if (drawMarkers ) {
+            if (drawMarkers) {
                 // draw markers for selection
-                Graphics2D gPoints = (Graphics2D)g2.create();
+                Graphics2D gPoints = (Graphics2D) g2.create();
 
                 gPoints.translate(pic_offset_x, pic_offset_y);
@@ -282 +287 @@
                 for (int i = 0; i < transformer.getOriginPoints().size(); i++) {
                    Point2D trP = tr.transform(transformer.getOriginPoints().get(i), null);
-                   int x = (int)trP.getX(), y = (int)trP.getY();
+                   int x = (int) trP.getX(), y = (int) trP.getY();
 
                    int dstx = x-pinAnchorX;
                    int dsty = y-pinAnchorY;
-                   gPoints.drawImage(pinTiledImage, dstx, dsty, dstx+pinWidth, dsty+pinHeight, pinTileOffsetX[i], pinTileOffsetY[i], pinTileOffsetX[i]+pinWidth, pinTileOffsetY[i]+pinHeight, null);
+                   gPoints.drawImage(pinTiledImage, dstx, dsty, dstx+pinWidth, dsty+pinHeight,
+                           pinTileOffsetX[i], pinTileOffsetY[i], pinTileOffsetX[i]+pinWidth, pinTileOffsetY[i]+pinHeight, null);
                 }
             }
         } else {
             // TODO: proper logging
-            System.out.println( "PicLayerAbstract::paint - general drawing error (image is null or Graphics not 2D" );
+            System.out.println("PicLayerAbstract::paint - general drawing error (image is null or Graphics not 2D");
         }
     }
@@ -344 +350 @@
      */
     public void visitBoundingBox(BoundingXYVisitor arg0) {
-        if ( image == null )
+        if (image == null)
             return;
         String projcode = projection.toCode();
@@ -354 +360 @@
         // initial scale is in m/100pix
         // So for now, we support the bounding box only when everything is in meters
-        if (projcode.equals("EPSG:4326") )
+        if (projcode.equals("EPSG:4326"))
             return;
 
@@ -380 +386 @@
      * @param props Properties to save to
      */
-    public void saveCalibration( Properties props ) {
+    public void saveCalibration(Properties props) {
         // Save
         double[] matrix = new double[6];
@@ -401 +407 @@
      * Loads calibration data from file
      * @param file The file to read from
-     * @return
      */
     public void loadCalibration(InputStream is) throws IOException {
@@ -412 +417 @@
      * Loads calibration data from properties structure
      * @param props Properties to load from
-     * @return
-     */
-    public void loadCalibration( Properties props ) {
+     */
+    public void loadCalibration(Properties props) {
         // Load
 
@@ -426 +430 @@
 
         initialImageScale = Double.valueOf(props.getProperty(INITIAL_SCALE, "1")); //in_scale
-        if (props.containsKey(SCALEX)) {// old format
+        if (props.containsKey(SCALEX)) { // old format
             //double in_pos_x = Double.valueOf(props.getProperty(INITIAL_POS_X, "0"));
             //double in_pos_y = Double.valueOf(props.getProperty(INITIAL_POS_Y, "0"));
@@ -459 +463 @@
 
     public void loadWorldfile(InputStream is) throws IOException {
-        
+
         try (
             Reader reader = new InputStreamReader(is);
             BufferedReader br = new BufferedReader(reader)
         ) {
-            double e[] = new double[6];
-            for (int i=0; i<6; ++i) {
+            double[] e = new double[6];
+            for (int i = 0; i < 6; ++i) {
                 String line = br.readLine();
                 e[i] = Double.parseDouble(line);
             }
-            double sx=e[0], ry=e[1], rx=e[2], sy=e[3], dx=e[4], dy=e[5];
+            double sx = e[0], ry = e[1], rx = e[2], sy = e[3], dx = e[4], dy = e[5];
             int w = image.getWidth(null);
             int h = image.getHeight(null);
@@ -498 +502 @@
 
         EastNorth center = Main.map.mapView.getCenter();
-        EastNorth leftop = Main.map.mapView.getEastNorth( 0, 0 );
+        EastNorth leftop = Main.map.mapView.getEastNorth(0, 0);
         // Number of pixels for one unit in east north space.
         // This is the same in x- and y- direction.
-        double pixel_per_en = ( Main.map.mapView.getWidth() / 2.0 ) / ( center.east() - leftop.east() );
+        double pixel_per_en = (Main.map.mapView.getWidth() / 2.0) / (center.east() - leftop.east());
 
         EastNorth imageCenter = transformer.getImagePosition();
         //     This is now the offset in screen pixels
-        double pic_offset_x = (( imageCenter.east() - leftop.east() ) * pixel_per_en);
-        double pic_offset_y = (( leftop.north() - imageCenter.north() ) * pixel_per_en); // something bad...
+        double pic_offset_x = ((imageCenter.east() - leftop.east()) * pixel_per_en);
+        double pic_offset_y = ((leftop.north() - imageCenter.north()) * pixel_per_en); // something bad...
 
         AffineTransform pointTrans = AffineTransform.getTranslateInstance(pic_offset_x, pic_offset_y);
@@ -527 +531 @@
         transformer.setImagePosition(transformer.getImagePosition().add(x, y));
     }
-
 
     public void rotatePictureBy(double angle) {
@@ -572 +575 @@
             Point2D pressed = transformPoint(point);
             double mindist = 10;
-            for (Point2D p : transformer.getOriginPoints())
+            for (Point2D p : transformer.getOriginPoints()) {
                 if (p.distance(pressed) < mindist) { // if user clicked to select some of origin point
                     selected = p;
                     mindist = p.distance(pressed);
                 }
+            }
             return selected;
         } catch (NoninvertibleTransformException e) {

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

@@ -42 +42 @@
         Transferable t = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null);
         // Check result
-        if ( t == null ) {
+        if (t == null) {
             throw new IOException(tr("Nothing in clipboard"));
         }
@@ -50 +50 @@
         try {
             if (t.isDataFlavorSupported(DataFlavor.imageFlavor)) {
-                image = (Image)t.getTransferData(DataFlavor.imageFlavor);
+                image = (Image) t.getTransferData(DataFlavor.imageFlavor);
             } else {
                 throw new IOException(tr("The clipboard data is not an image"));
             }
         } catch (UnsupportedFlavorException e) {
-            throw new IOException( e.getMessage() );
+            throw new IOException(e.getMessage());
         }
 

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

@@ -53 +53 @@
     private String m_tooltiptext;
 
-    public PicLayerFromFile( File file ) {
+    public PicLayerFromFile(File file) {
         // Remember the file
         m_file = file;
@@ -102 +102 @@
             }
         } else {
-            image = ImageIO.read( m_file );
+            image = ImageIO.read(m_file);
             return image;
         }
@@ -126 +126 @@
 
         String[][] imgExtensions = new String[][] {
-            { ".jpg", ".jpeg" },
-            { ".png" },
-            { ".tif", ".tiff" },
-            { ".bmp" },
+            {".jpg", ".jpeg"},
+            {".png"},
+            {".tif", ".tiff"},
+            {".bmp"},
         };
         String[][] wldExtensions = new String[][] {
-            { ".wld", ".jgw", ".jpgw" },
-            { ".wld", ".pgw", ".pngw" },
-            { ".wld", ".tfw", ".tifw" },
-            { ".wld", ".bmpw", ".bpw"},
+            {".wld", ".jgw", ".jpgw"},
+            {".wld", ".pgw", ".pngw"},
+            {".wld", ".tfw", ".tifw"},
+            {".wld", ".bmpw", ".bpw"},
         };
 
@@ -153 +153 @@
                     String extension = imgNameInZip.substring(dotIdx);
                     String namepart = imgNameInZip.substring(0, dotIdx);
-                    for (int i=0; i<imgExtensions.length; ++i) {
+                    for (int i = 0; i < imgExtensions.length; ++i) {
                         if (Arrays.asList(imgExtensions[i]).contains(extension.toLowerCase())) {
                             for (String wldExtension : wldExtensions[i]) {
@@ -184 +184 @@
                 String extension = m_file.getName().substring(dotIdx);
                 String namepart = m_file.getName().substring(0, dotIdx);
-                for (int i=0; i<imgExtensions.length; ++i) {
+                for (int i = 0; i < imgExtensions.length; ++i) {
                     if (Arrays.asList(imgExtensions[i]).contains(extension.toLowerCase())) {
                         for (String wldExtension : wldExtensions[i]) {
@@ -206 +206 @@
 
         String msg = tr("A calibration file associated to the picture file was found: {0}\n", fileName);
-        if ( policy.equals("yes") ) {
+        if (policy.equals("yes")) {
             loadcal = true;
-        }
-        else if ( policy.equals("no") ) {
+        } else if (policy.equals("no")) {
             loadcal = false;
-        }
-        else if ( policy.equals("ask") ) {
+        } else if (policy.equals("ask")) {
             msg += "\n" + tr("Set \"{0}\" to yes/no/ask in the preferences\n"+
                             "to control the autoloading of calibration files.", prefkey);
@@ -220 +218 @@
                 loadcal = true;
             }
-        }
-        else {
+        } else {
             msg += "\n" + tr("It will be applied automatically.");
             msg += "\n" + tr("Also, from now on, calibration files will always be loaded automatically.");

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

@@ -28 +28 @@
         setName(picture.getName());
     }
+
     @Override
     protected Image createImage() throws IOException {

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.piclayer.layer.kml;
-
 
 public class KMLGroundOverlay {
@@ -15 +14 @@
         return filename;
     }
+
     public void setFileName(String file) {
         this.filename = file;
     }
+
     public double getNorth() {
         return north;
     }
+
     public void setNorth(double north) {
         this.north = north;
     }
+
     public double getSouth() {
         return south;
     }
+
     public void setSouth(double south) {
         this.south = south;
     }
+
     public double getEast() {
         return east;
     }
+
     public void setEast(double east) {
         this.east = east;
     }
+
     public double getWest() {
         return west;
     }
+
     public void setWest(double west) {
         this.west = west;
     }
+
     public double getRotate() {
         return rotate;
     }
+
     public void setRotate(double rotate) {
         this.rotate = rotate;
     }
+
     public String getName() {
         return name;
     }
+
     public void setName(String name) {
         this.name = name;

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

@@ -51 +51 @@
     private KMLGroundOverlay overlay;
 
-    public KMLHandler() {
+    KMLHandler() {
         result = new ArrayList<>();
     }

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

@@ -5 +5 @@
 import java.util.List;
 
-
 class Matrix3D {
     double[][] a;
-    
-    public Matrix3D() {
+
+    Matrix3D() {
         a = new double[3][]; a[0] = new double[3]; a[1] = new double[3]; a[2] = new double[3];
     }
-    
-    public Matrix3D(PictureTransform pictureTransform, double b11, double b12, double b13, double b21, double b22, double b23, double b31, double b32, double b33) {
+
+    Matrix3D(PictureTransform pictureTransform, double b11, double b12, double b13, double b21, double b22, double b23, double b31, double b32, double b33) {
         this();
-        
+
         a[0][0] = b11; a[0][1] = b12; a[0][2] = b13;
         a[1][0] = b21; a[1][1] = b22; a[1][2] = b23;
         a[2][0] = b31; a[2][1] = b32; a[2][2] = b33;
     }
-    
-    public Matrix3D(List<? extends Point2D> list) {
+
+    Matrix3D(List<? extends Point2D> list) {
         this();
-        
-        for(int i=0; i<3; i++) {
+
+        for (int i = 0; i < 3; i++) {
             Point2D p = list.get(i);
             a[0][i] = p.getX();
@@ -34 +33 @@
     public Matrix3D multiply(Matrix3D m) {
         Matrix3D result = new Matrix3D();
-        for(int i=0; i<3; i++) 
-            for (int j=0; j<3; j++) {
+        for (int i = 0; i < 3; i++) {
+            for (int j = 0; j < 3; j++) {
                 double sum = 0;
-                for (int k=0; k<3; k++)
+                for (int k = 0; k < 3; k++) {
                     sum += a[i][k]*m.a[k][j];
+                }
                 result.a[i][j] = sum;
-            }                
+            }
+        }
         return result;
     }
-    
+
     private double determinant() {
         return a[0][0]*(a[1][1]*a[2][2]-a[1][2]*a[2][1])-a[0][1]*(a[1][0]*a[2][2]-a[1][2]*a[2][0])
                +a[0][2]*(a[1][0]*a[2][1]-a[1][1]*a[2][0]);
     }
-    
+
     public Matrix3D inverse() throws NoSolutionException {
         Matrix3D invert = new Matrix3D();
@@ -54 +55 @@
         if (Math.abs(det) <= Double.MIN_VALUE)
             throw new NoSolutionException("Determinant = 0");
-        
+
         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]);
@@ -66 +67 @@
         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;
     }
-    
+
     public AffineTransform toAffineTransform() throws NoSolutionException {
         if (!(Math.abs(a[2][0]) <= 1e-2 && Math.abs(a[2][1]) <= 1e-2 && Math.abs(a[2][2]-1) <= 1e-2))

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

@@ -2 +2 @@
 
 class NoSolutionException extends Exception {
-    
-    public NoSolutionException(String message) {
+
+    NoSolutionException(String message) {
         super(message);
     }