Changeset 14327 in josm for trunk

Timestamp:

2018-10-14T14:15:06+02:00 (6 years ago)

Author:

Don-vip

Message:

checkstyle/unit test fixes

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java

@@ -89 +89 @@
 
         boolean restartRequired = false;
-        restartRequired |= removeCacheFiles(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get(), 1024L * 1024L * ((Integer) this.maxElementsOnDisk.getValue()));
+        restartRequired |= removeCacheFiles(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get(),
+                1024L * 1024L * ((Integer) this.maxElementsOnDisk.getValue()));
 
         if (!AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.get().equals(this.maxElementsOnDisk.getValue())) {

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -8 +8 @@
 import java.awt.Component;
 import java.awt.Font;
-import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -1208 +1207 @@
     }
 
+    /**
+     * Called in the download dialog to give the plugins a chance to modify the list
+     * of bounding box selectors.
+     * @param downloadSelections list of bounding box selectors
+     */
     public static void addDownloadSelection(List<DownloadSelection> downloadSelections) {
         for (PluginProxy p : pluginList) {
@@ -1214 +1218 @@
     }
 
+    /**
+     * Returns the list of plugin preference settings.
+     * @return the list of plugin preference settings
+     */
     public static Collection<PreferenceSettingFactory> getPreferenceSetting() {
         Collection<PreferenceSettingFactory> settings = new ArrayList<>();

trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java

@@ -73 +73 @@
         final String query = getExpandedQuery("amenity=drinking_water");
         assertEquals("" +
-                "[out:xml][timeout:25][bbox:2.0,1.0,4.0,3.0];\n" +
+                "[out:xml][timeout:90][bbox:2.0,1.0,4.0,3.0];\n" +
                 "(\n" +
                 "  node[\"amenity\"=\"drinking_water\"];\n" +
@@ -135 +135 @@
         final String query = getExpandedQuery("amenity=drinking_water in London");
         assertEquals("" +
-                "[out:xml][timeout:25];\n" +
+                "[out:xml][timeout:90];\n" +
                 "area(3600065606)->.searchArea;\n" +
                 "(\n" +
@@ -168 +168 @@
 
         assertTrue(OverpassDownloadReader.OUTPUT_FORMAT_STATEMENT.matcher(
-                "[out:pbf][timeout:25][bbox:{{bbox}}];\n" +
+                "[out:pbf][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
                 "  node[\"amenity\"=\"pharmacy\"];\n" +
@@ -205 +205 @@
                 "  )]"));
 
-        assertEquals("[out:json][timeout:25];\n" +
+        assertEquals("[out:json][timeout:90];\n" +
                 "(\n" +
                 "  node[\"historic\"=\"ringfort\"];\n" +
@@ -211 +211 @@
                 ");\n" +
                 "out meta;",
-            OverpassDownloadReader.fixQuery("[out:json][timeout:25];\n" +
+            OverpassDownloadReader.fixQuery("[out:json][timeout:90];\n" +
                 "(\n" +
                 "  node[\"historic\"=\"ringfort\"];\n" +

trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java

@@ -28 +28 @@
         final String query = OverpassTurboQueryWizard.getInstance().constructQuery("amenity=drinking_water");
         assertEquals("" +
-                "[out:xml][timeout:25][bbox:{{bbox}}];\n" +
+                "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
                 "(\n" +
                 "  node[\"amenity\"=\"drinking_water\"];\n" +