Changeset 13743 in josm for trunk/src


Ignore:
Timestamp:
2018-05-13T09:16:14+02:00 (16 months ago)
Author:
wiktorn
Message:

Fix bugs spotted by findbugs

Location:
trunk/src/org/openstreetmap/josm
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/imagery/LayerDetails.java

    r13742 r13743  
    5353        }
    5454        ret.addAll(crs);
    55         return crs;
     55        return ret;
    5656    }
    5757
  • trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

    r13733 r13743  
    3737import org.openstreetmap.josm.tools.Utils;
    3838
     39import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     40
    3941/**
    4042 * Class bridging TMS requests to JCS cache requests
     
    6567     * @param downloadExecutor that will be executing the jobs
    6668     */
     69    @SuppressFBWarnings(value = "JLM_JSR166_UTILCONCURRENT_MONITORENTER")
    6770    public TMSCachedTileLoaderJob(TileLoaderListener listener, Tile tile,
    6871            ICacheAccess<String, BufferedImageCacheEntry> cache,
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java

    r13742 r13743  
    7676                layerPanel.add(scrollPane, GBC.eol().fill());
    7777                layerPanel.revalidate();
    78             } catch (Exception ex) {
     78            } catch (IOException | WMTSGetCapabilitiesException ex) {
    7979                JOptionPane.showMessageDialog(
    8080                        getParent(),
  • trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

    r13742 r13743  
    354354                    switch(qName) {
    355355                    case "type":
    356                         ImageryType.values();
    357356                        boolean found = false;
    358357                        for (ImageryType type : ImageryType.values()) {
     
    524523                    break;
    525524                case "minimum-tile-expire":
    526                     entry.setMinimumTileExpire(Integer.valueOf(accumulator.toString()));
     525                    entry.setMinimumTileExpire(Integer.parseInt(accumulator.toString()));
    527526                    break;
    528527                default: // Do nothing
  • trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

    r13742 r13743  
    574574        }
    575575        if (conv != null) {
    576             new Bounds(
     576            return new Bounds(
    577577                    conv.eastNorth2latlon(new EastNorth(getDecimalDegree(minx), getDecimalDegree(miny))),
    578578                    conv.eastNorth2latlon(new EastNorth(getDecimalDegree(maxx), getDecimalDegree(maxy)))
Note: See TracChangeset for help on using the changeset viewer.