Changeset 14327 in josm


Ignore:
Timestamp:
2018-10-14T14:15:06+02:00 (7 months ago)
Author:
Don-vip
Message:

checkstyle/unit test fixes

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java

    r14295 r14327  
    8989
    9090        boolean restartRequired = false;
    91         restartRequired |= removeCacheFiles(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get(), 1024L * 1024L * ((Integer) this.maxElementsOnDisk.getValue()));
     91        restartRequired |= removeCacheFiles(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get(),
     92                1024L * 1024L * ((Integer) this.maxElementsOnDisk.getValue()));
    9293
    9394        if (!AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.get().equals(this.maxElementsOnDisk.getValue())) {
  • trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

    r14317 r14327  
    88import java.awt.Component;
    99import java.awt.Font;
    10 import java.awt.GraphicsEnvironment;
    1110import java.awt.GridBagConstraints;
    1211import java.awt.GridBagLayout;
     
    12081207    }
    12091208
     1209    /**
     1210     * Called in the download dialog to give the plugins a chance to modify the list
     1211     * of bounding box selectors.
     1212     * @param downloadSelections list of bounding box selectors
     1213     */
    12101214    public static void addDownloadSelection(List<DownloadSelection> downloadSelections) {
    12111215        for (PluginProxy p : pluginList) {
     
    12141218    }
    12151219
     1220    /**
     1221     * Returns the list of plugin preference settings.
     1222     * @return the list of plugin preference settings
     1223     */
    12161224    public static Collection<PreferenceSettingFactory> getPreferenceSetting() {
    12171225        Collection<PreferenceSettingFactory> settings = new ArrayList<>();
  • trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java

    r14090 r14327  
    7373        final String query = getExpandedQuery("amenity=drinking_water");
    7474        assertEquals("" +
    75                 "[out:xml][timeout:25][bbox:2.0,1.0,4.0,3.0];\n" +
     75                "[out:xml][timeout:90][bbox:2.0,1.0,4.0,3.0];\n" +
    7676                "(\n" +
    7777                "  node[\"amenity\"=\"drinking_water\"];\n" +
     
    135135        final String query = getExpandedQuery("amenity=drinking_water in London");
    136136        assertEquals("" +
    137                 "[out:xml][timeout:25];\n" +
     137                "[out:xml][timeout:90];\n" +
    138138                "area(3600065606)->.searchArea;\n" +
    139139                "(\n" +
     
    168168
    169169        assertTrue(OverpassDownloadReader.OUTPUT_FORMAT_STATEMENT.matcher(
    170                 "[out:pbf][timeout:25][bbox:{{bbox}}];\n" +
     170                "[out:pbf][timeout:90][bbox:{{bbox}}];\n" +
    171171                "(\n" +
    172172                "  node[\"amenity\"=\"pharmacy\"];\n" +
     
    205205                "  )]"));
    206206
    207         assertEquals("[out:json][timeout:25];\n" +
     207        assertEquals("[out:json][timeout:90];\n" +
    208208                "(\n" +
    209209                "  node[\"historic\"=\"ringfort\"];\n" +
     
    211211                ");\n" +
    212212                "out meta;",
    213             OverpassDownloadReader.fixQuery("[out:json][timeout:25];\n" +
     213            OverpassDownloadReader.fixQuery("[out:json][timeout:90];\n" +
    214214                "(\n" +
    215215                "  node[\"historic\"=\"ringfort\"];\n" +
  • trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java

    r11003 r14327  
    2828        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("amenity=drinking_water");
    2929        assertEquals("" +
    30                 "[out:xml][timeout:25][bbox:{{bbox}}];\n" +
     30                "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
    3131                "(\n" +
    3232                "  node[\"amenity\"=\"drinking_water\"];\n" +
Note: See TracChangeset for help on using the changeset viewer.