Changeset 33028 in osm

Timestamp:

2016-10-05T23:02:54+02:00 (8 years ago)

Author:

donvip

Message:

checkstyle

Location:

applications/editors/josm/plugins/ImportImagePlugin

Files:

• .checkstyle (added)
• .project (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (modified) (9 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (modified) (12 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java (modified) (15 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java (modified) (20 diffs)
• test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/GeoTiffReaderTest.java (modified) (1 diff)

applications/editors/josm/plugins/ImportImagePlugin/.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/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
@@ -66 +67 @@
     /**
      * Constructor
-     *
-     * @param file
-     * @throws IOException
      */
     public ImageLayer(File file) throws IOException {
@@ -80 +78 @@
     /**
      * create spatial referenced image.
-     *
-     * @return
-     * @throws IOException
      */
     private Image createImage() throws IOException {
@@ -97 +92 @@
 
         } catch (FactoryException e) {
-            logger.error("Error while creating GridCoverage:",e);
+            logger.error("Error while creating GridCoverage:", e);
             throw new IOException(e.getMessage());
         } catch (Exception e) {
-            if(e.getMessage().contains("No projection file found"))
-            {
-                ExtendedDialog ex = new ExtendedDialog(Main.parent, tr("Warning"), new String[] {tr("Default image projection"), tr("JOSM''s current projection"), tr("Cancel")});
+            if (e.getMessage().contains("No projection file found")) {
+                ExtendedDialog ex = new ExtendedDialog(Main.parent, tr("Warning"), 
+                    new String[] {tr("Default image projection"), tr("JOSM''s current projection"), tr("Cancel")});
+                // CHECKSTYLE.OFF: LineLength
                 ex.setContent(tr("No projection file (.prj) found.<br>"
-                        + "You can choose the default image projection ({0}) or JOSM''s current editor projection ({1}) as original image projection.<br>"
-                        + "(It can be changed later from the right click menu of the image layer.)", 
-                        ImportImagePlugin.pluginProps.getProperty("default_crs_srid"), Main.getProjection().toCode()));
+                    + "You can choose the default image projection ({0}) or JOSM''s current editor projection ({1}) as original image projection.<br>"
+                    + "(It can be changed later from the right click menu of the image layer.)", 
+                    ImportImagePlugin.pluginProps.getProperty("default_crs_srid"), Main.getProjection().toCode()));
+                // CHECKSTYLE.ON: LineLength
                 ex.showDialog();
                 int val = ex.getValue();
@@ -128 +125 @@
                     }
                 } catch (Exception e1) {
-                    logger.error("Error while creating GridCoverage:",e1);
+                    logger.error("Error while creating GridCoverage:", e1);
                     throw new IOException(e1);
                 }
-            }
-            else
-            {
-                logger.error("Error while creating GridCoverage:",e);
+            } else {
+                logger.error("Error while creating GridCoverage:", e);
                 throw new IOException(e);
             }
@@ -267 +262 @@
     @Override
     public String getToolTipText() {
-        // TODO Auto-generated method stub
         return this.getName();
     }
-
 
     public File getImageFile() {
@@ -283 +276 @@
      * loads the image and reprojects it using a transformation
      * calculated by the new reference system.
-     *
-     * @param newRefSys
-     * @throws IOException
-     * @throws FactoryException
-     * @throws NoSuchAuthorityCodeException
-     */
-    void resample(CoordinateReferenceSystem refSys) throws IOException, NoSuchAuthorityCodeException, FactoryException
-    {
+     */
+    void resample(CoordinateReferenceSystem refSys) throws IOException, NoSuchAuthorityCodeException, FactoryException {
         logger.debug("resample");
-        GridCoverage2D coverage =  PluginOperations.createGridFromFile(this.imageFile, refSys, true);
+        GridCoverage2D coverage = PluginOperations.createGridFromFile(this.imageFile, refSys, true);
         coverage = PluginOperations.reprojectCoverage(coverage, CRS.decode(Main.getProjection().toCode()));
         this.bbox = coverage.getEnvelope2D();
-        this.image = ((PlanarImage)coverage.getRenderedImage()).getAsBufferedImage();
+        this.image = ((PlanarImage) coverage.getRenderedImage()).getAsBufferedImage();
 
         upperLeft = new EastNorth(coverage.getEnvelope2D().x, coverage
@@ -312 +299 @@
      *
      */
-    public class LayerPropertiesAction extends AbstractAction
-    {
+    public class LayerPropertiesAction extends AbstractAction {
         public ImageLayer imageLayer;
 
-        public LayerPropertiesAction(ImageLayer imageLayer){
+        public LayerPropertiesAction(ImageLayer imageLayer) {
             super(tr("Layer Properties"));
             this.imageLayer = imageLayer;
@@ -322 +308 @@
 
         public void actionPerformed(ActionEvent arg0) {
-
             LayerPropertiesDialog layerProps = new LayerPropertiesDialog(imageLayer, PluginOperations.crsDescriptions);
-            layerProps.setLocation(Main.parent.getWidth() / 4 , Main.parent.getHeight() / 4);
+            layerProps.setLocation(Main.parent.getWidth() / 4, Main.parent.getHeight() / 4);
             layerProps.setVisible(true);
         }

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
@@ -40 +41 @@
     @Override
     public void importData(List<File> files, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
-        if (null == files || files.isEmpty())  return;
+        if (null == files || files.isEmpty()) return;
 
         for (File file: files) {

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
@@ -29 +30 @@
  *
  */
-public class ImportImagePlugin extends Plugin{
+public class ImportImagePlugin extends Plugin {
 
     private static Logger logger;
@@ -43 +44 @@
 
     // path constants
-    static final String PLUGIN_DIR = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/";
-    static final String PLUGINPROPERTIES_PATH = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/pluginProperties.properties";
-    static final String PLUGINLIBRARIES_DIR = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/lib/";
+    static final String PLUGIN_DIR = 
+            Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/";
+    static final String PLUGINPROPERTIES_PATH = 
+            Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/pluginProperties.properties";
+    static final String PLUGINLIBRARIES_DIR = 
+            Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/lib/";
     static final String PLUGINPROPERTIES_FILENAME = "pluginProperties.properties";
-    static final String LOGGING_PROPERTIES_FILEPATH = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/log4j.properties/";
+    static final String LOGGING_PROPERTIES_FILEPATH = 
+            Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/log4j.properties/";
 
     public Properties getPluginProps() {
@@ -56 +61 @@
      * constructor
      *
-     * @param info
      * @throws IOException if any I/O error occurs
      */
-    public ImportImagePlugin(PluginInformation info) throws IOException{
+    public ImportImagePlugin(PluginInformation info) throws IOException {
         super(info);
 
@@ -73 +77 @@
 
             // If resources are available load properties from plugin directory
-            if(pluginProps == null || pluginProps.isEmpty())
-            {
+            if (pluginProps == null || pluginProps.isEmpty()) {
                 pluginProps = new Properties();
                 pluginProps.load(new File(PLUGINPROPERTIES_PATH).toURI().toURL().openStream());
@@ -103 +106 @@
      * Checks whether plugin resources are available.
      * If not, start install procedure.
-     *
-     * @throws IOException
-     */
-    private void checkInstallation() throws IOException
-    {
+     */
+    private void checkInstallation() throws IOException {
         // check plugin resource state
         boolean isInstalled = true;
-        if(!new File(PLUGINPROPERTIES_PATH).exists()
+        if (!new File(PLUGINPROPERTIES_PATH).exists()
                 || !new File(PLUGIN_DIR).exists()
                 || !new File(PLUGINLIBRARIES_DIR).exists())
@@ -123 +123 @@
             // check if plugin directory exist
             File pluginDir = new File(PLUGIN_DIR);
-            if(!pluginDir.exists()){
+            if (!pluginDir.exists()) {
                 Utils.mkDirs(pluginDir);
             }
@@ -129 +129 @@
             // check if "lib" directory exist
             File libDir = new File(PLUGINLIBRARIES_DIR);
-            if(!libDir.exists()){
+            if (!libDir.exists()) {
                 Utils.mkDirs(libDir);
             }
@@ -136 +136 @@
             if (pluginProps == null || pluginProps.isEmpty()) {
                 try (FileWriter fw = new FileWriter(new File(PLUGINPROPERTIES_PATH))) {
-                        URL propertiesURL = pluginClassLoader.getResource("resources/" + PLUGINPROPERTIES_FILENAME);
-                        pluginProps = new Properties();
-                        pluginProps.load(propertiesURL.openStream());
-                        pluginProps.store(fw, null);
+                    URL propertiesURL = pluginClassLoader.getResource("resources/" + PLUGINPROPERTIES_FILENAME);
+                    pluginProps = new Properties();
+                    pluginProps.load(propertiesURL.openStream());
+                    pluginProps.store(fw, null);
                 }
                 logger.debug("Plugin properties loaded");
@@ -146 +146 @@
             if (!new File(LOGGING_PROPERTIES_FILEPATH).exists()) {
                 try (FileWriter fw = new FileWriter(new File(LOGGING_PROPERTIES_FILEPATH))) {
-                        URL propertiesURL = pluginClassLoader.getResource("resources/log4j.properties");
-                        Properties loggingProps = new Properties();
-                        loggingProps.load(propertiesURL.openStream());
-                        loggingProps.store(fw, null);
+                    URL propertiesURL = pluginClassLoader.getResource("resources/log4j.properties");
+                    Properties loggingProps = new Properties();
+                    loggingProps.load(propertiesURL.openStream());
+                    loggingProps.store(fw, null);
                 }
                 logger.debug("Logging properties created");
@@ -160 +160 @@
     /**
      * Initialize logger using plugin classloader.
-     *
-     * @param cl
      */
     private void initializeLogger(ClassLoader cl) {
@@ -207 +205 @@
     /**
      * get a plugin-specific classloader.
-     *
-     * @return
-     * @throws MalformedURLException
-     */
-    private ClassLoader createPluginClassLoader() throws MalformedURLException
-    {
+     */
+    private ClassLoader createPluginClassLoader() throws MalformedURLException {
         ClassLoader loader = null;
         loader = URLClassLoader.newInstance(
-                new URL[] { new File(Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin.jar").toURI().toURL()},
+                new URL[] {new File(Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin.jar").toURI().toURL()},
                 ImportImagePlugin.class.getClassLoader()
                 );

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.ImportImagePlugin;
+
 import java.awt.Cursor;
 import java.awt.Dimension;
@@ -42 +44 @@
  *
  */
-public class LayerPropertiesDialog extends JFrame{
+public class LayerPropertiesDialog extends JFrame {
 
     private Vector<String> supportedCRS;
@@ -194 +196 @@
             lowerRightValueLabel.setBounds(new Rectangle(210, 315, 134, 16));
             lowerRightValueLabel.setHorizontalAlignment(SwingConstants.RIGHT);
-            lowerRightValueLabel.setText((float)imageLayer.getBbox().getMinX() + ", " + (float)imageLayer.getBbox().getMaxY());
+            lowerRightValueLabel.setText((float) imageLayer.getBbox().getMinX() + ", " + (float) imageLayer.getBbox().getMaxY());
             lowerLeftValueLabel = new JLabel();
             lowerLeftValueLabel.setBounds(new Rectangle(30, 315, 133, 16));
             lowerLeftValueLabel.setHorizontalAlignment(SwingConstants.LEFT);
-            lowerLeftValueLabel.setText((float)imageLayer.getBbox().getMinX() + ", " + (float)imageLayer.getBbox().getMinY());
+            lowerLeftValueLabel.setText((float) imageLayer.getBbox().getMinX() + ", " + (float) imageLayer.getBbox().getMinY());
             upperRightValueLabel = new JLabel();
             upperRightValueLabel.setBounds(new Rectangle(210, 255, 138, 16));
             upperRightValueLabel.setHorizontalAlignment(SwingConstants.RIGHT);
-            upperRightValueLabel.setText((float)imageLayer.getBbox().getMaxX() + ", " + (float)imageLayer.getBbox().getMaxY());
+            upperRightValueLabel.setText((float) imageLayer.getBbox().getMaxX() + ", " + (float) imageLayer.getBbox().getMaxY());
             upperLeftValueLabel = new JLabel();
             upperLeftValueLabel.setBounds(new Rectangle(30, 255, 133, 16));
             upperLeftValueLabel.setHorizontalAlignment(SwingConstants.LEFT);
-            upperLeftValueLabel.setText((float)imageLayer.getBbox().getMaxX() + ", " + (float)imageLayer.getBbox().getMinY());
+            upperLeftValueLabel.setText((float) imageLayer.getBbox().getMaxX() + ", " + (float) imageLayer.getBbox().getMinY());
             lowerRightLabel = new JLabel();
             lowerRightLabel.setBounds(new Rectangle(287, 344, 74, 16));
@@ -232 +234 @@
                 crsDescription = imageLayer.getBbox().getCoordinateReferenceSystem().getIdentifiers().iterator().next().toString();
             } catch (Exception e) {
+                Main.debug(e);
             }
             crsValueLabel.setText(crsDescription + "(" + imageLayer.getBbox().getCoordinateReferenceSystem().getName().toString() + ")");
@@ -294 +297 @@
                 crsDescription = imageLayer.getSourceRefSys().getIdentifiers().iterator().next().toString();
             } catch (Exception e) {
+                Main.debug(e);
             }
             currentCRSValueLabel.setText(crsDescription);
@@ -351 +355 @@
             okButton.addActionListener(new java.awt.event.ActionListener() {
                 @Override
-                                public void actionPerformed(java.awt.event.ActionEvent e) {
-
+        public void actionPerformed(java.awt.event.ActionEvent e) {
                     setVisible(false);
                     dispose();
@@ -373 +376 @@
             searchField.addKeyListener(new java.awt.event.KeyAdapter() {
                 @Override
-                                public void keyTyped(java.awt.event.KeyEvent e) {
+                public void keyTyped(java.awt.event.KeyEvent e) {
 
                     for (Iterator<String> iterator = supportedCRS.iterator(); iterator.hasNext();) {
@@ -429 +432 @@
             useDefaultCRSButton.addActionListener(new java.awt.event.ActionListener() {
                 @Override
-                                public void actionPerformed(java.awt.event.ActionEvent e) {
-
+        public void actionPerformed(java.awt.event.ActionEvent e) {
                     try {
 
                         setCursor(new Cursor(Cursor.WAIT_CURSOR));
-                        if(PluginOperations.defaultSourceCRS != null){
+                        if (PluginOperations.defaultSourceCRS != null) {
                             imageLayer.resample(PluginOperations.defaultSourceCRS);
-                        }else
-                        {
-                            JOptionPane.showMessageDialog(getContentPane(), "<html>No default reference system available.<br>Please select one from the list</html>");
+                        } else {
+                            JOptionPane.showMessageDialog(getContentPane(), 
+                                    "<html>No default reference system available.<br>Please select one from the list</html>");
                         }
 
@@ -450 +452 @@
                         // TODO Auto-generated catch block
                         e2.printStackTrace();
-                    }
-                    finally{
+                    } finally {
                         setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
                     }
@@ -474 +475 @@
             applySelectedCRSButton.addActionListener(new java.awt.event.ActionListener() {
                 @Override
-                                public void actionPerformed(java.awt.event.ActionEvent e) {
+        public void actionPerformed(java.awt.event.ActionEvent e) {
 
                     String selection = crsJList.getSelectedValue();
@@ -496 +497 @@
                         // TODO Auto-generated catch block
                         e2.printStackTrace();
-                    }
-                    finally{
+                    } finally {
                         setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
                     }
-
-
                 }
             });
@@ -521 +519 @@
                     .addActionListener(new java.awt.event.ActionListener() {
                         @Override
-                                                public void actionPerformed(java.awt.event.ActionEvent e) {
-
-                            if(crsJList.getSelectedValue() != null){
+                        public void actionPerformed(java.awt.event.ActionEvent e) {
+
+                            if (crsJList.getSelectedValue() != null) {
                                 String selection = crsJList.getSelectedValue();
                                 String code = selection.substring(selection.indexOf("[-") + 2, selection.indexOf("-]"));
@@ -531 +529 @@
                                     PluginOperations.defaultSourceCRSDescription = selection;
 
-                                    ImportImagePlugin.pluginProps.setProperty("default_crs_eastingfirst", "" + eastingFirstCheckBox.isSelected());
+                                    ImportImagePlugin.pluginProps.setProperty("default_crs_eastingfirst", 
+                                            "" + eastingFirstCheckBox.isSelected());
                                     ImportImagePlugin.pluginProps.setProperty("default_crs_srid", code);
                                     try (FileWriter fileWriter = new FileWriter(new File(ImportImagePlugin.PLUGINPROPERTIES_PATH))) {
-                                        ImportImagePlugin.pluginProps.store(fileWriter, null);
+                                        ImportImagePlugin.pluginProps.store(fileWriter, null);
                                     }
 
@@ -565 +564 @@
     }
 
-
-
     /**
      * Listener setting text in the search field if selection has changed.
@@ -573 +570 @@
     class ListSelectionHandler implements ListSelectionListener {
         @Override
-                public void valueChanged(ListSelectionEvent e) {
-            if(e.getValueIsAdjusting())
-            {
+        public void valueChanged(ListSelectionEvent e) {
+            if (e.getValueIsAdjusting()) {
                 searchField.setText(supportedCRS.get(e.getLastIndex()));
                 searchField.setEditable(true);

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
@@ -29 +30 @@
      */
     public LoadImageAction() {
-        super(tr("Import image"), (String)null, tr("Import georeferenced image"), null, true, "importimage/loadimage", true);
+        super(tr("Import image"), (String) null, tr("Import georeferenced image"), null, true, "importimage/loadimage", true);
     }
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
@@ -39 +40 @@
  *
  */
-public class PluginOperations {
+public final class PluginOperations {
 
     private static final Logger logger = Logger.getLogger(PluginOperations.class);
@@ -51 +52 @@
     static String defaultSourceCRSDescription;
 
-
-
-    public static enum SUPPORTEDIMAGETYPES {
+    public enum SUPPORTEDIMAGETYPES {
         tiff, tif, jpg, jpeg, bmp, png
     }
 
-    public static enum POSTFIXES_WORLDFILE {
+    public enum POSTFIXES_WORLDFILE {
         wld, jgw, jpgw, pgw, pngw, tfw, tifw, bpw, bmpw,
-    };
+    }
+    
+    private PluginOperations() {
+        // Hide default constructor for utilities classes
+    }
 
     /**
      * Reprojects a GridCoverage to a given CRS.
-     *
-     * @param coverage
-     * @param targetCrs
-     * @return destination
-     * @throws FactoryException
-     * @throws NoSuchAuthorityCodeException
      */
     public static GridCoverage2D reprojectCoverage(GridCoverage2D coverage,
@@ -92 +89 @@
     /**
      * Creates a org.geotools.coverage.grid.GridCoverage2D from a given file.
-     *
-     * @param file
-     * @return
-     * @throws IOException
-     * @throws Exception
      */
     public static GridCoverage2D createGridFromFile(File file, CoordinateReferenceSystem refSys, boolean failIfNoPrjFile) throws IOException {
@@ -111 +103 @@
 
         /*------- switch for file type -----------*/
-        if (extension.equalsIgnoreCase(".tif") || extension.equalsIgnoreCase(".tiff"))
-        {
+        if (extension.equalsIgnoreCase(".tif") || extension.equalsIgnoreCase(".tiff")) {
 
             // try to read GeoTIFF:
@@ -119 +110 @@
                 return coverage;
             } catch (DataSourceException dse) {
-                if (!dse.getMessage().contains("Coordinate Reference System is not available")){
+                if (!dse.getMessage().contains("Coordinate Reference System is not available")) {
                     dse.printStackTrace();
                 }
@@ -133 +124 @@
             for (int i = 0; i < postfixes.length; i++) {
                 File prjFile = new File(fileNameWithoutExt + "." + postfixes[i]);
-                if (prjFile.exists()){
+                if (prjFile.exists()) {
                     tfwReader = new WorldFileReader(prjFile);
                 }
@@ -162 +153 @@
             double lowerLeft_y = tfwReader.getYULC() - height;
             Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
-
             coverage = createGridCoverage(img, bbox, refSys);
-        }
-        //
-        else if (extension.equalsIgnoreCase(".jpg")
-                || extension.equalsIgnoreCase(".jpeg"))
-        {
+
+        } else if (extension.equalsIgnoreCase(".jpg")
+                || extension.equalsIgnoreCase(".jpeg")) {
             String[] postfixes = {"wld", "jgw", "jpgw"};
             // try to read Worldfile:
@@ -174 +162 @@
             for (int i = 0; i < postfixes.length; i++) {
                 File prjFile = new File(fileNameWithoutExt + "." + postfixes[i]);
-                if (prjFile.exists()){
+                if (prjFile.exists()) {
                     tfwReader = new WorldFileReader(prjFile);
                 }
@@ -197 +185 @@
             double lowerLeft_y = tfwReader.getYULC() - height;
             Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
-
             coverage = createGridCoverage(img, bbox, refSys);
-        }
-        else if(extension.equalsIgnoreCase(".bmp"))
-        {
+
+        } else if (extension.equalsIgnoreCase(".bmp")) {
             String[] postfixes = {"wld", "bmpw", "bpw"};
             // try to read Worldfile:
@@ -207 +193 @@
             for (int i = 0; i < postfixes.length; i++) {
                 File prjFile = new File(fileNameWithoutExt + "." + postfixes[i]);
-                if (prjFile.exists()){
+                if (prjFile.exists()) {
                     tfwReader = new WorldFileReader(prjFile);
                 }
@@ -230 +216 @@
             double lowerLeft_y = tfwReader.getYULC() - height;
             Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
-
             coverage = createGridCoverage(img, bbox, refSys);
-        }
-        else if(extension.equalsIgnoreCase(".png"))
-        {
+
+        } else if (extension.equalsIgnoreCase(".png")) {
 
             String[] postfixes = {"wld", "pgw", "pngw"};
@@ -241 +225 @@
             for (int i = 0; i < postfixes.length; i++) {
                 File prjFile = new File(fileNameWithoutExt + "." + postfixes[i]);
-                if (prjFile.exists()){
+                if (prjFile.exists()) {
                     tfwReader = new WorldFileReader(prjFile);
                 }
             }
-            if(tfwReader == null) throw new IOException("No Worldfile found.");
+            if (tfwReader == null) throw new IOException("No Worldfile found.");
 
             if (refSys == null) {
@@ -264 +248 @@
             double lowerLeft_y = tfwReader.getYULC() - height;
             Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
-
             coverage = createGridCoverage(img, bbox, refSys);
-        }
-        else{
+
+        } else {
             throw new IOException("Image type not supported. Supported formats are: \n" +
                     Arrays.toString(SUPPORTEDIMAGETYPES.values()));
@@ -279 +262 @@
      * tries to parse it.
      *
-     *
      * @param file image file, not the real world file (will be searched)
-     * @return
-     * @throws IOException
-     */
-    public static CoordinateReferenceSystem readPrjFile(File file) throws IOException
-    {
-
+     */
+    public static CoordinateReferenceSystem readPrjFile(File file) throws IOException {
         CoordinateReferenceSystem refSys = null;
 
@@ -300 +278 @@
             StringBuilder sb = new StringBuilder();
             String content = null;
-            while((content = br.readLine()) != null) {
+            while ((content = br.readLine()) != null) {
                 sb.append(content);
             }
@@ -313 +291 @@
     /**
      * Method for external use.
-     *
-     * @param img
-     * @param bbox
-     * @param crs
-     * @return
-     */
-    public static GridCoverage2D createGridCoverage(BufferedImage img, Envelope2D bbox, CoordinateReferenceSystem crs)
-    {
+     */
+    public static GridCoverage2D createGridCoverage(BufferedImage img, Envelope2D bbox, CoordinateReferenceSystem crs) {
         bbox.setCoordinateReferenceSystem(crs);
         return new GridCoverageFactory().create("", img, bbox);
@@ -328 +300 @@
      * Method for reading a GeoTIFF file.
      *
-     * @param file
      * @param refSys if delivered, the coverage will be forced to use this crs
-     * @return
-     * @throws IOException
-     * @throws FactoryException
-     */
-    public static GridCoverage2D readGeoTiff(File file, CoordinateReferenceSystem refSys) throws IOException, FactoryException
-    {
+     */
+    public static GridCoverage2D readGeoTiff(File file, CoordinateReferenceSystem refSys) throws IOException, FactoryException {
         GridCoverage2D coverage = null;
         Hints hints = new Hints(Hints.FORCE_LONGITUDE_FIRST_AXIS_ORDER, true);
-        if(refSys != null)
-        {
+        if (refSys != null) {
             hints.put(Hints.DEFAULT_COORDINATE_REFERENCE_SYSTEM, refSys);
         }
@@ -354 +320 @@
     /**
      * Loads CRS data from an EPSG database and creates descriptions for each one.
-     *
-     * @param pluginProps
-     * @throws Exception
-     */
-    public static void loadCRSData(Properties pluginProps)
-    {
+     */
+    public static void loadCRSData(Properties pluginProps) {
         String defaultcrsString = pluginProps.getProperty("default_crs_srid");
 
@@ -375 +337 @@
                 String description = desc.toString() + " [-EPSG:" + string + "-]";
                 crsDescriptions.add(description);
-                if(defaultcrsString != null && defaultcrsString.equalsIgnoreCase("EPSG:" + string)){
+                if (defaultcrsString != null && defaultcrsString.equalsIgnoreCase("EPSG:" + string)) {
                     boolean isEastingFirst = Boolean.valueOf(pluginProps.getProperty("default_crs_eastingfirst"));
                     defaultSourceCRS = CRS.decode("EPSG:" + string, isEastingFirst);

applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/GeoTiffReaderTest.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.ImportImagePlugin;