Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java (revision 32060) @@ -64,5 +64,4 @@ public class Address extends MapMode implements MouseListener, MouseMotionListener, ActionListener { - private static final long serialVersionUID = 1L; // perhaps make all these tags configurable in the future @@ -114,6 +113,5 @@ } // dialog.setVisible(false); - // kill the window completely to fix an issue on some linux distro and - // full screen mode. + // kill the window completely to fix an issue on some linux distro and full screen mode. if(dialog != null) { @@ -251,7 +249,6 @@ revertInputNumberChange(); } catch (NumberFormatException en) { - Main.warn("Unable to parse house number \"" + inputNumber.getText() + "\""); - } - + Main.warn("Unable to parse house number \"" + inputNumber.getText() + "\""); + } } cmds.add(new ChangePropertyCommand(osm, tagHouseNumber, inputNumber.getText())); @@ -263,5 +260,5 @@ setNewSelection(osm); } catch (NumberFormatException en) { - Main.warn("Unable to parse house number \"" + inputNumber.getText() + "\""); + Main.warn("Unable to parse house number \"" + inputNumber.getText() + "\""); } } @@ -467,5 +464,5 @@ clearButton.addActionListener(new ActionListener() { @Override - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent e) { inputNumber.setText(""); inputStreet.setText(""); @@ -518,15 +515,15 @@ } @Override - public void windowClosed(WindowEvent e) {} - @Override - public void windowActivated(WindowEvent arg0) {} - @Override - public void windowDeactivated(WindowEvent arg0) {} - @Override - public void windowDeiconified(WindowEvent arg0) {} - @Override - public void windowIconified(WindowEvent arg0) {} - @Override - public void windowOpened(WindowEvent arg0) {} + public void windowClosed(WindowEvent e) {} + @Override + public void windowActivated(WindowEvent arg0) {} + @Override + public void windowDeactivated(WindowEvent arg0) {} + @Override + public void windowDeiconified(WindowEvent arg0) {} + @Override + public void windowIconified(WindowEvent arg0) {} + @Override + public void windowOpened(WindowEvent arg0) {} }); String bounds = Main.pref.get("cadastrewms.addr.bounds",null); @@ -536,5 +533,5 @@ Integer.parseInt(b[0]),Integer.parseInt(b[1]),Integer.parseInt(b[2]),Integer.parseInt(b[3]))); } -} + } private void setSelectedWay(Way w) { @@ -553,4 +550,3 @@ getCurrentDataSet().setSelected(osm); } - } Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java (revision 32060) @@ -92,5 +92,5 @@ } if (size > (long)cacheSize*1024*1024) { - Main.info("Delete oldest file \""+ files[oldestFile].getName() + Main.info("Delete oldest file \""+ files[oldestFile].getName() + "\" in cache dir to stay under the limit of " + cacheSize + " MB."); files[oldestFile].delete(); @@ -135,5 +135,5 @@ delete(new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension())); } catch (Exception e) { - Main.error(e); + Main.error(e); } } @@ -224,4 +224,3 @@ return ext; } - } Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java (revision 32060) @@ -350,5 +350,5 @@ String lov = new String(input.substring(i+c0ptionListStart.length()-1, j)); if (lov.indexOf(">") != -1) { - Main.info("parse "+lov); + Main.info("parse "+lov); listOfCommunes.add(lov); } else @@ -547,5 +547,5 @@ for (Layer l : Main.map.mapView.getAllLayers()) { if (l instanceof WMSLayer && l.getName().equals(wmsLayer.getName()) && (l != wmsLayer)) { - Main.info("Try to grab into a new layer when "+wmsLayer.getName()+" is already opened."); + Main.info("Try to grab into a new layer when "+wmsLayer.getName()+" is already opened."); // remove the duplicated layer Main.main.removeLayer(wmsLayer); @@ -565,4 +565,3 @@ lastWMSLayerName = null; } - } Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java (revision 32060) @@ -232,5 +232,5 @@ menuSource.addActionListener(new ActionListener() { @Override - public void actionPerformed(ActionEvent ev) { + public void actionPerformed(ActionEvent ev) { Main.pref.put("cadastrewms.autosourcing", menuSource.isSelected()); autoSourcing = menuSource.isSelected(); @@ -367,5 +367,5 @@ @Override - public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { + public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { if (cadastreJMenu != null) { if (oldFrame == null && newFrame != null) { @@ -439,5 +439,5 @@ dialog.setAlwaysOnTop(true); } catch(SecurityException e) { - Main.warn(tr("Warning: failed to put option pane dialog always on top. Exception was: {0}", e.toString())); + Main.warn(tr("Warning: failed to put option pane dialog always on top. Exception was: {0}", e.toString())); } } @@ -478,5 +478,5 @@ } catch (NumberFormatException e) {} if (srcYear.equals("AAAA") || (year != null && year < currentYear)) { - Main.info("Replace source year "+srcYear+" by current year "+currentYear); + Main.info("Replace source year "+srcYear+" by current year "+currentYear); src = src.substring(0, src.lastIndexOf(" ")+1)+currentYear; Main.pref.put("cadastrewms.source", src); Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java (revision 32060) @@ -68,5 +68,5 @@ } } catch (DuplicateLayerException e) { - Main.warn("removed a duplicated layer"); + Main.warn("removed a duplicated layer"); } catch (WMSException e) { errorMessage = e.getMessage(); Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java (revision 32060) @@ -74,5 +74,5 @@ } } catch (DuplicateLayerException e) { - Main.warn("removed a duplicated layer"); + Main.warn("removed a duplicated layer"); } catch (WMSException e) { errorMessage = e.getMessage(); Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java (revision 32060) @@ -85,5 +85,5 @@ } catch (DuplicateLayerException e) { // we tried to grab onto a duplicated layer (removed) - Main.warn("removed a duplicated layer"); + Main.warn("removed a duplicated layer"); } catch (WMSException e) { errorMessage = e.getMessage(); Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java (revision 32060) @@ -59,5 +59,5 @@ } catch (DuplicateLayerException e) { // we tried to grab onto a duplicated layer (removed) - Main.warn("removed a duplicated layer"); + Main.warn("removed a duplicated layer"); } catch (WMSException e) { errorMessage = e.getMessage(); Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java (revision 32060) @@ -92,5 +92,5 @@ newImage = grabber.grab(wmsLayer, currentGrabImage.min, currentGrabImage.max); } catch (IOException e) { - Main.warn("Download action canceled by user or server did not respond"); + Main.warn("Download action canceled by user or server did not respond"); setCanceled(true); break; @@ -106,20 +106,20 @@ } try { - if (CadastrePlugin.backgroundTransparent) { - wmsLayer.imagesLock.lock(); - for (GeorefImage img : wmsLayer.getImages()) { - if (img.overlap(newImage)) - // mask overlapping zone in already grabbed image - img.withdraw(newImage); - else - // mask overlapping zone in new image only when new image covers completely the - // existing image - newImage.withdraw(img); - } - wmsLayer.imagesLock.unlock(); - } - wmsLayer.addImage(newImage); - Main.map.mapView.repaint(); - saveToCache(newImage); + if (CadastrePlugin.backgroundTransparent) { + wmsLayer.imagesLock.lock(); + for (GeorefImage img : wmsLayer.getImages()) { + if (img.overlap(newImage)) + // mask overlapping zone in already grabbed image + img.withdraw(newImage); + else + // mask overlapping zone in new image only when new image covers completely the + // existing image + newImage.withdraw(img); + } + wmsLayer.imagesLock.unlock(); + } + wmsLayer.addImage(newImage); + Main.map.mapView.repaint(); + saveToCache(newImage); } catch (NullPointerException e) { Main.info("Layer destroyed. Cancel grab thread"); Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java (revision 32060) @@ -25,5 +25,5 @@ @Override - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent e) { JFileChooser fc = createAndOpenFileChooser(); if (fc == null) Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java (revision 32060) @@ -53,5 +53,5 @@ @Override - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent e) { WMSLayer wmsLayer = addNewLayer(new ArrayList()); if (wmsLayer != null) Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java (revision 32060) @@ -72,5 +72,5 @@ @Override - public void actionPerformed(ActionEvent arg0) { + public void actionPerformed(ActionEvent arg0) { File file; JFileChooser fc = new JFileChooser(); Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/RasterImageGeoreferencer.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/RasterImageGeoreferencer.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/RasterImageGeoreferencer.java (revision 32060) @@ -68,7 +68,7 @@ /** - * - * @return false if all operations are canceled - */ + * + * @return false if all operations are canceled + */ public boolean startGeoreferencing(WMSLayer wmsLayer) { this.wmsLayer = wmsLayer; @@ -91,5 +91,4 @@ } - public boolean isRunning() { @@ -98,5 +97,5 @@ @Override -public void mouseClicked(MouseEvent e) { + public void mouseClicked(MouseEvent e) { if (System.currentTimeMillis() - mouseClickedTime < initialClickDelay) { Main.info("mouse click bounce detected"); @@ -147,7 +146,7 @@ /** - * - * @return false if all operations are canceled - */ + * + * @return false if all operations are canceled + */ private boolean canceledOrRestartCurrAction(String action) { Object[] options = { "Cancel", "Retry" }; @@ -251,5 +250,5 @@ pane.addPropertyChangeListener(new PropertyChangeListener() { @Override - public void propertyChange(PropertyChangeEvent evt) { + public void propertyChange(PropertyChangeEvent evt) { if (JOptionPane.VALUE_PROPERTY.equals(evt.getPropertyName())) { ignoreMouseClick = false; @@ -355,18 +354,17 @@ @Override -public void mouseEntered(MouseEvent arg0) { + public void mouseEntered(MouseEvent arg0) { } @Override -public void mouseExited(MouseEvent arg0) { + public void mouseExited(MouseEvent arg0) { } @Override -public void mousePressed(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { } @Override -public void mouseReleased(MouseEvent arg0) { - } - + public void mouseReleased(MouseEvent arg0) { + } } Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java (revision 32059) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java (revision 32060) @@ -620,5 +620,5 @@ */ @Override - public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) { + public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) { return false; }