Index: /applications/editors/josm/plugins/ImportImagePlugin/.checkstyle =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/.checkstyle (revision 33028) +++ /applications/editors/josm/plugins/ImportImagePlugin/.checkstyle (revision 33028) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/ImportImagePlugin/.project =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/.project (revision 33027) +++ /applications/editors/josm/plugins/ImportImagePlugin/.project (revision 33028) @@ -16,7 +16,13 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (revision 33027) +++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (revision 33028) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.ImportImagePlugin; @@ -66,7 +67,4 @@ /** * Constructor - * - * @param file - * @throws IOException */ public ImageLayer(File file) throws IOException { @@ -80,7 +78,4 @@ /** * create spatial referenced image. - * - * @return - * @throws IOException */ private Image createImage() throws IOException { @@ -97,14 +92,16 @@ } 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.
" - + "You can choose the default image projection ({0}) or JOSM''s current editor projection ({1}) as original image projection.
" - + "(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.
" + + "(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,11 +125,9 @@ } } 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,8 +262,6 @@ @Override public String getToolTipText() { - // TODO Auto-generated method stub return this.getName(); } - public File getImageFile() { @@ -283,17 +276,11 @@ * 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,9 +299,8 @@ * */ - 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,7 +308,6 @@ 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); } Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java (revision 33027) +++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java (revision 33028) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.ImportImagePlugin; @@ -40,5 +41,5 @@ @Override public void importData(List files, ProgressMonitor progressMonitor) throws IOException, IllegalDataException { - if (null == files || files.isEmpty()) return; + if (null == files || files.isEmpty()) return; for (File file: files) { Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (revision 33027) +++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (revision 33028) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.ImportImagePlugin; @@ -29,5 +30,5 @@ * */ -public class ImportImagePlugin extends Plugin{ +public class ImportImagePlugin extends Plugin { private static Logger logger; @@ -43,9 +44,13 @@ // 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,8 +61,7 @@ * 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,6 +77,5 @@ // 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,12 +106,9 @@ * 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,5 +123,5 @@ // check if plugin directory exist File pluginDir = new File(PLUGIN_DIR); - if(!pluginDir.exists()){ + if (!pluginDir.exists()) { Utils.mkDirs(pluginDir); } @@ -129,5 +129,5 @@ // check if "lib" directory exist File libDir = new File(PLUGINLIBRARIES_DIR); - if(!libDir.exists()){ + if (!libDir.exists()) { Utils.mkDirs(libDir); } @@ -136,8 +136,8 @@ 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,8 +146,8 @@ 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,6 +160,4 @@ /** * Initialize logger using plugin classloader. - * - * @param cl */ private void initializeLogger(ClassLoader cl) { @@ -207,13 +205,9 @@ /** * 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() ); Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java (revision 33027) +++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java (revision 33028) @@ -1,3 +1,5 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.ImportImagePlugin; + import java.awt.Cursor; import java.awt.Dimension; @@ -42,5 +44,5 @@ * */ -public class LayerPropertiesDialog extends JFrame{ +public class LayerPropertiesDialog extends JFrame { private Vector supportedCRS; @@ -194,17 +196,17 @@ 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,4 +234,5 @@ crsDescription = imageLayer.getBbox().getCoordinateReferenceSystem().getIdentifiers().iterator().next().toString(); } catch (Exception e) { + Main.debug(e); } crsValueLabel.setText(crsDescription + "(" + imageLayer.getBbox().getCoordinateReferenceSystem().getName().toString() + ")"); @@ -294,4 +297,5 @@ crsDescription = imageLayer.getSourceRefSys().getIdentifiers().iterator().next().toString(); } catch (Exception e) { + Main.debug(e); } currentCRSValueLabel.setText(crsDescription); @@ -351,6 +355,5 @@ 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,5 +376,5 @@ 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 iterator = supportedCRS.iterator(); iterator.hasNext();) { @@ -429,14 +432,13 @@ 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(), "No default reference system available.
Please select one from the list"); + } else { + JOptionPane.showMessageDialog(getContentPane(), + "No default reference system available.
Please select one from the list"); } @@ -450,6 +452,5 @@ // TODO Auto-generated catch block e2.printStackTrace(); - } - finally{ + } finally { setCursor(new Cursor(Cursor.DEFAULT_CURSOR)); } @@ -474,5 +475,5 @@ 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,10 +497,7 @@ // TODO Auto-generated catch block e2.printStackTrace(); - } - finally{ + } finally { setCursor(new Cursor(Cursor.DEFAULT_CURSOR)); } - - } }); @@ -521,7 +519,7 @@ .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,8 +529,9 @@ 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,6 +564,4 @@ } - - /** * Listener setting text in the search field if selection has changed. @@ -573,7 +570,6 @@ 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); Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java (revision 33027) +++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java (revision 33028) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.ImportImagePlugin; @@ -29,5 +30,5 @@ */ 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); } Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java (revision 33027) +++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java (revision 33028) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.ImportImagePlugin; @@ -39,5 +40,5 @@ * */ -public class PluginOperations { +public final class PluginOperations { private static final Logger logger = Logger.getLogger(PluginOperations.class); @@ -51,22 +52,18 @@ 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,9 +89,4 @@ /** * 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,6 +103,5 @@ /*------- switch for file type -----------*/ - if (extension.equalsIgnoreCase(".tif") || extension.equalsIgnoreCase(".tiff")) - { + if (extension.equalsIgnoreCase(".tif") || extension.equalsIgnoreCase(".tiff")) { // try to read GeoTIFF: @@ -119,5 +110,5 @@ 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,5 +124,5 @@ 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,11 +153,8 @@ 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,5 +162,5 @@ 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,9 +185,7 @@ 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,5 +193,5 @@ 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,9 +216,7 @@ 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,9 +225,9 @@ 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,8 +248,7 @@ 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,12 +262,7 @@ * 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,5 +278,5 @@ StringBuilder sb = new StringBuilder(); String content = null; - while((content = br.readLine()) != null) { + while ((content = br.readLine()) != null) { sb.append(content); } @@ -313,12 +291,6 @@ /** * 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,16 +300,10 @@ * 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,10 +320,6 @@ /** * 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,5 +337,5 @@ 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); Index: /applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/GeoTiffReaderTest.java =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/GeoTiffReaderTest.java (revision 33027) +++ /applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/GeoTiffReaderTest.java (revision 33028) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.ImportImagePlugin;