Changeset 14327 in josm
- Timestamp:
- 2018-10-14T14:15:06+02:00 (5 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java
r14295 r14327 89 89 90 90 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())); 92 93 93 94 if (!AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.get().equals(this.maxElementsOnDisk.getValue())) { -
trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
r14317 r14327 8 8 import java.awt.Component; 9 9 import java.awt.Font; 10 import java.awt.GraphicsEnvironment;11 10 import java.awt.GridBagConstraints; 12 11 import java.awt.GridBagLayout; … … 1208 1207 } 1209 1208 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 */ 1210 1214 public static void addDownloadSelection(List<DownloadSelection> downloadSelections) { 1211 1215 for (PluginProxy p : pluginList) { … … 1214 1218 } 1215 1219 1220 /** 1221 * Returns the list of plugin preference settings. 1222 * @return the list of plugin preference settings 1223 */ 1216 1224 public static Collection<PreferenceSettingFactory> getPreferenceSetting() { 1217 1225 Collection<PreferenceSettingFactory> settings = new ArrayList<>(); -
trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
r14090 r14327 73 73 final String query = getExpandedQuery("amenity=drinking_water"); 74 74 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" + 76 76 "(\n" + 77 77 " node[\"amenity\"=\"drinking_water\"];\n" + … … 135 135 final String query = getExpandedQuery("amenity=drinking_water in London"); 136 136 assertEquals("" + 137 "[out:xml][timeout: 25];\n" +137 "[out:xml][timeout:90];\n" + 138 138 "area(3600065606)->.searchArea;\n" + 139 139 "(\n" + … … 168 168 169 169 assertTrue(OverpassDownloadReader.OUTPUT_FORMAT_STATEMENT.matcher( 170 "[out:pbf][timeout: 25][bbox:{{bbox}}];\n" +170 "[out:pbf][timeout:90][bbox:{{bbox}}];\n" + 171 171 "(\n" + 172 172 " node[\"amenity\"=\"pharmacy\"];\n" + … … 205 205 " )]")); 206 206 207 assertEquals("[out:json][timeout: 25];\n" +207 assertEquals("[out:json][timeout:90];\n" + 208 208 "(\n" + 209 209 " node[\"historic\"=\"ringfort\"];\n" + … … 211 211 ");\n" + 212 212 "out meta;", 213 OverpassDownloadReader.fixQuery("[out:json][timeout: 25];\n" +213 OverpassDownloadReader.fixQuery("[out:json][timeout:90];\n" + 214 214 "(\n" + 215 215 " node[\"historic\"=\"ringfort\"];\n" + -
trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java
r11003 r14327 28 28 final String query = OverpassTurboQueryWizard.getInstance().constructQuery("amenity=drinking_water"); 29 29 assertEquals("" + 30 "[out:xml][timeout: 25][bbox:{{bbox}}];\n" +30 "[out:xml][timeout:90][bbox:{{bbox}}];\n" + 31 31 "(\n" + 32 32 " node[\"amenity\"=\"drinking_water\"];\n" +
Note:
See TracChangeset
for help on using the changeset viewer.