Changeset 32060 in osm for applications/editors/josm


Ignore:
Timestamp:
2016-02-09T23:50:50+01:00 (9 years ago)
Author:
donvip
Message:

remove tabs

Location:
applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java

    r31443 r32060  
    6464
    6565public class Address extends MapMode implements MouseListener, MouseMotionListener, ActionListener {
    66     private static final long serialVersionUID = 1L;
    6766
    6867    // perhaps make all these tags configurable in the future
     
    114113        }
    115114//        dialog.setVisible(false);
    116         // kill the window completely to fix an issue on some linux distro and
    117         // full screen mode.
     115        // kill the window completely to fix an issue on some linux distro and full screen mode.
    118116        if(dialog != null)
    119117        {
     
    251249                revertInputNumberChange();
    252250            } catch (NumberFormatException en) {
    253                 Main.warn("Unable to parse house number \"" + inputNumber.getText() + "\"");
    254             }
    255 
     251                Main.warn("Unable to parse house number \"" + inputNumber.getText() + "\"");
     252            }
    256253        }
    257254        cmds.add(new ChangePropertyCommand(osm, tagHouseNumber, inputNumber.getText()));
     
    263260            setNewSelection(osm);
    264261        } catch (NumberFormatException en) {
    265                 Main.warn("Unable to parse house number \"" + inputNumber.getText() + "\"");
     262            Main.warn("Unable to parse house number \"" + inputNumber.getText() + "\"");
    266263        }
    267264    }
     
    467464        clearButton.addActionListener(new ActionListener() {
    468465            @Override
    469                         public void actionPerformed(ActionEvent e) {
     466            public void actionPerformed(ActionEvent e) {
    470467                inputNumber.setText("");
    471468                inputStreet.setText("");
     
    518515            }
    519516            @Override
    520                         public void windowClosed(WindowEvent e) {}
    521             @Override
    522                         public void windowActivated(WindowEvent arg0) {}
    523             @Override
    524                         public void windowDeactivated(WindowEvent arg0) {}
    525             @Override
    526                         public void windowDeiconified(WindowEvent arg0) {}
    527             @Override
    528                         public void windowIconified(WindowEvent arg0) {}
    529             @Override
    530                         public void windowOpened(WindowEvent arg0) {}
     517            public void windowClosed(WindowEvent e) {}
     518            @Override
     519            public void windowActivated(WindowEvent arg0) {}
     520            @Override
     521            public void windowDeactivated(WindowEvent arg0) {}
     522            @Override
     523            public void windowDeiconified(WindowEvent arg0) {}
     524            @Override
     525            public void windowIconified(WindowEvent arg0) {}
     526            @Override
     527            public void windowOpened(WindowEvent arg0) {}
    531528        });
    532529        String bounds = Main.pref.get("cadastrewms.addr.bounds",null);
     
    536533                    Integer.parseInt(b[0]),Integer.parseInt(b[1]),Integer.parseInt(b[2]),Integer.parseInt(b[3])));
    537534        }
    538 }
     535    }
    539536
    540537    private void setSelectedWay(Way w) {
     
    553550        getCurrentDataSet().setSelected(osm);
    554551    }
    555 
    556552}
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java

    r30859 r32060  
    9292            }
    9393            if (size > (long)cacheSize*1024*1024) {
    94                 Main.info("Delete oldest file  \""+ files[oldestFile].getName()
     94                Main.info("Delete oldest file  \""+ files[oldestFile].getName()
    9595                        + "\" in cache dir to stay under the limit of " + cacheSize + " MB.");
    9696                files[oldestFile].delete();
     
    135135            delete(new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension()));
    136136        } catch (Exception e) {
    137                 Main.error(e);
     137            Main.error(e);
    138138        }
    139139    }
     
    224224        return ext;
    225225    }
    226 
    227226}
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java

    r31993 r32060  
    350350                    String lov = new String(input.substring(i+c0ptionListStart.length()-1, j));
    351351                    if (lov.indexOf(">") != -1) {
    352                         Main.info("parse "+lov);
     352                        Main.info("parse "+lov);
    353353                        listOfCommunes.add(lov);
    354354                    } else
     
    547547            for (Layer l : Main.map.mapView.getAllLayers()) {
    548548                if (l instanceof WMSLayer && l.getName().equals(wmsLayer.getName()) && (l != wmsLayer)) {
    549                         Main.info("Try to grab into a new layer when "+wmsLayer.getName()+" is already opened.");
     549                    Main.info("Try to grab into a new layer when "+wmsLayer.getName()+" is already opened.");
    550550                    // remove the duplicated layer
    551551                    Main.main.removeLayer(wmsLayer);
     
    565565        lastWMSLayerName = null;
    566566    }
    567 
    568567}
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java

    r31665 r32060  
    232232            menuSource.addActionListener(new ActionListener() {
    233233                @Override
    234                                 public void actionPerformed(ActionEvent ev) {
     234                public void actionPerformed(ActionEvent ev) {
    235235                    Main.pref.put("cadastrewms.autosourcing", menuSource.isSelected());
    236236                    autoSourcing = menuSource.isSelected();
     
    367367
    368368    @Override
    369         public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
     369    public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
    370370        if (cadastreJMenu != null) {
    371371            if (oldFrame == null && newFrame != null) {
     
    439439                dialog.setAlwaysOnTop(true);
    440440            } catch(SecurityException e) {
    441                 Main.warn(tr("Warning: failed to put option pane dialog always on top. Exception was: {0}", e.toString()));
     441                Main.warn(tr("Warning: failed to put option pane dialog always on top. Exception was: {0}", e.toString()));
    442442            }
    443443        }
     
    478478        } catch (NumberFormatException e) {}
    479479        if (srcYear.equals("AAAA") || (year != null && year < currentYear)) {
    480                 Main.info("Replace source year "+srcYear+" by current year "+currentYear);
     480            Main.info("Replace source year "+srcYear+" by current year "+currentYear);
    481481            src = src.substring(0, src.lastIndexOf(" ")+1)+currentYear;
    482482            Main.pref.put("cadastrewms.source", src);
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java

    r30859 r32060  
    6868            }
    6969        } catch (DuplicateLayerException e) {
    70                 Main.warn("removed a duplicated layer");
     70            Main.warn("removed a duplicated layer");
    7171        } catch (WMSException e) {
    7272            errorMessage = e.getMessage();
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java

    r30859 r32060  
    7474            }
    7575        } catch (DuplicateLayerException e) {
    76                 Main.warn("removed a duplicated layer");
     76            Main.warn("removed a duplicated layer");
    7777        } catch (WMSException e) {
    7878            errorMessage = e.getMessage();
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java

    r30859 r32060  
    8585            } catch (DuplicateLayerException e) {
    8686                // we tried to grab onto a duplicated layer (removed)
    87                 Main.warn("removed a duplicated layer");
     87                Main.warn("removed a duplicated layer");
    8888            } catch (WMSException e) {
    8989                errorMessage = e.getMessage();
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java

    r30859 r32060  
    5959        } catch (DuplicateLayerException e) {
    6060            // we tried to grab onto a duplicated layer (removed)
    61                 Main.warn("removed a duplicated layer");
     61            Main.warn("removed a duplicated layer");
    6262        } catch (WMSException e) {
    6363            errorMessage = e.getMessage();
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java

    r30859 r32060  
    9292                        newImage = grabber.grab(wmsLayer, currentGrabImage.min, currentGrabImage.max);
    9393                    } catch (IOException e) {
    94                         Main.warn("Download action canceled by user or server did not respond");
     94                        Main.warn("Download action canceled by user or server did not respond");
    9595                        setCanceled(true);
    9696                        break;
     
    106106                    }
    107107                    try {
    108                             if (CadastrePlugin.backgroundTransparent) {
    109                                 wmsLayer.imagesLock.lock();
    110                                 for (GeorefImage img : wmsLayer.getImages()) {
    111                                     if (img.overlap(newImage))
    112                                         // mask overlapping zone in already grabbed image
    113                                         img.withdraw(newImage);
    114                                     else
    115                                         // mask overlapping zone in new image only when new image covers completely the
    116                                         // existing image
    117                                         newImage.withdraw(img);
    118                                 }
    119                                 wmsLayer.imagesLock.unlock();
    120                             }
    121                             wmsLayer.addImage(newImage);
    122                             Main.map.mapView.repaint();
    123                             saveToCache(newImage);
     108                        if (CadastrePlugin.backgroundTransparent) {
     109                            wmsLayer.imagesLock.lock();
     110                            for (GeorefImage img : wmsLayer.getImages()) {
     111                                if (img.overlap(newImage))
     112                                    // mask overlapping zone in already grabbed image
     113                                    img.withdraw(newImage);
     114                                else
     115                                    // mask overlapping zone in new image only when new image covers completely the
     116                                    // existing image
     117                                    newImage.withdraw(img);
     118                            }
     119                            wmsLayer.imagesLock.unlock();
     120                        }
     121                        wmsLayer.addImage(newImage);
     122                        Main.map.mapView.repaint();
     123                        saveToCache(newImage);
    124124                    } catch (NullPointerException e) {
    125125                        Main.info("Layer destroyed. Cancel grab thread");
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java

    r30859 r32060  
    2525
    2626    @Override
    27         public void actionPerformed(ActionEvent e) {
     27    public void actionPerformed(ActionEvent e) {
    2828        JFileChooser fc = createAndOpenFileChooser();
    2929        if (fc == null)
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java

    r30859 r32060  
    5353
    5454    @Override
    55         public void actionPerformed(ActionEvent e) {
     55    public void actionPerformed(ActionEvent e) {
    5656        WMSLayer wmsLayer = addNewLayer(new ArrayList<WMSLayer>());
    5757        if (wmsLayer != null)
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java

    r30859 r32060  
    7272
    7373    @Override
    74         public void actionPerformed(ActionEvent arg0) {
     74    public void actionPerformed(ActionEvent arg0) {
    7575        File file;
    7676        JFileChooser fc = new JFileChooser();
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/RasterImageGeoreferencer.java

    r30859 r32060  
    6868
    6969   /**
    70    *
    71    * @return false if all operations are canceled
    72    */
     70    *
     71    * @return false if all operations are canceled
     72    */
    7373  public boolean startGeoreferencing(WMSLayer wmsLayer) {
    7474      this.wmsLayer = wmsLayer;
     
    9191  }
    9292
    93 
    9493  public boolean isRunning()
    9594  {
     
    9897
    9998  @Override
    100 public void mouseClicked(MouseEvent e) {
     99  public void mouseClicked(MouseEvent e) {
    101100      if (System.currentTimeMillis() - mouseClickedTime < initialClickDelay) {
    102101          Main.info("mouse click bounce detected");
     
    147146
    148147  /**
    149   *
    150   * @return false if all operations are canceled
    151   */
     148   *
     149   * @return false if all operations are canceled
     150   */
    152151 private boolean canceledOrRestartCurrAction(String action) {
    153152     Object[] options = { "Cancel", "Retry" };
     
    251250     pane.addPropertyChangeListener(new PropertyChangeListener() {
    252251         @Override
    253                 public void propertyChange(PropertyChangeEvent evt) {
     252         public void propertyChange(PropertyChangeEvent evt) {
    254253             if (JOptionPane.VALUE_PROPERTY.equals(evt.getPropertyName())) {
    255254                 ignoreMouseClick = false;
     
    355354
    356355 @Override
    357 public void mouseEntered(MouseEvent arg0) {
     356 public void mouseEntered(MouseEvent arg0) {
    358357 }
    359358
    360359 @Override
    361 public void mouseExited(MouseEvent arg0) {
     360 public void mouseExited(MouseEvent arg0) {
    362361 }
    363362
    364363 @Override
    365 public void mousePressed(MouseEvent arg0) {
     364 public void mousePressed(MouseEvent arg0) {
    366365 }
    367366
    368367 @Override
    369 public void mouseReleased(MouseEvent arg0) {
    370  }
    371 
     368 public void mouseReleased(MouseEvent arg0) {
     369 }
    372370}
  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java

    r30859 r32060  
    620620     */
    621621    @Override
    622         public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
     622    public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
    623623        return false;
    624624    }
Note: See TracChangeset for help on using the changeset viewer.