Changeset 8764 in josm for trunk/src

Timestamp:

2015-09-18T00:57:22+02:00 (9 years ago)

Author:

Don-vip

Message:

fix Checkstyle issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/WMTSTileSource.java (modified) (3 diffs)
• gui/dialogs/LayerListDialog.java (modified) (2 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• gui/layer/geoimage/ThumbsLoader.java (modified) (3 diffs)
• gui/preferences/imagery/CacheContentsPanel.java (modified) (1 diff)
• io/OverpassDownloadReader.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -162 +162 @@
                             return 3;
                         }
+
                         @Override
                         public String getColumnName(int column) {
@@ -172 +173 @@
                             }
                         }
+
                         @Override
-                        public boolean isCellEditable(int row, int column) { return false; }
+                        public boolean isCellEditable(int row, int column) {
+                            return false;
+                        }
                     });
             this.list.setPreferredSize(new Dimension(400, 400));
@@ -679 +683 @@
         Set<String> ret = new HashSet<>();
         if (currentLayer == null) {
-            for(Layer layer: this.layers) {
+            for (Layer layer: this.layers) {
                 ret.add(layer.tileMatrixSet.crs);
             }
         } else {
-            for(Layer layer: this.layers) {
+            for (Layer layer: this.layers) {
                 if (currentLayer.name.equals(layer.name)) {
                     ret.add(layer.tileMatrixSet.crs);

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -524 +524 @@
      * Abstract action which allows to adjust a double value using a slider
      */
-    public static abstract class AbstractLayerPropertySliderAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
+    public abstract static class AbstractLayerPropertySliderAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
         protected final JPopupMenu popup;
         protected final JSlider slider;
@@ -539 +539 @@
                 @Override
                 public void stateChanged(ChangeEvent e) {
-                    setValue((double) slider.getValue() / factor);
+                    setValue(slider.getValue() / factor);
                 }
             });

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -143 +143 @@
      * use fairly small memory cache, as cached objects are quite big, as they contain BufferedImages
      */
-    public static final IntegerProperty MEMORY_CACHE_SIZE = new IntegerProperty(PREFERENCE_PREFIX + ".cache.max_objects_ram", (int)Math.max(200,  200 * Math.pow(4, ZOOM_OFFSET.get())));
+    public static final IntegerProperty MEMORY_CACHE_SIZE = new IntegerProperty(PREFERENCE_PREFIX + ".cache.max_objects_ram",
+            (int) Math.max(200,  200 * Math.pow(4, ZOOM_OFFSET.get())));
 
     /*

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -38 +38 @@
         if (!cacheOff) {
             try {
-                cache = JCSCacheManager.getCache("geoimage-thumbnails", 0, 120, Main.pref.getCacheDirectory().getPath() + File.separator + "geoimage-thumbnails");
+                cache = JCSCacheManager.getCache("geoimage-thumbnails", 0, 120,
+                        Main.pref.getCacheDirectory().getPath() + File.separator + "geoimage-thumbnails");
             } catch (IOException e) {
                 Main.warn("Failed to initialize cache for geoimage-thumbnails");
@@ -134 +135 @@
         if (!cacheOff && cache != null) {
             try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
-                ImageIO.write(scaledBI,"png", output);
+                ImageIO.write(scaledBI, "png", output);
                 cache.put(cacheIdent, new BufferedImageCacheEntry(output.toByteArray()));
             } catch (IOException e) {
@@ -144 +145 @@
         return scaledBI;
     }
-
 }

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

@@ -217 +217 @@
         String[][] ret = new String[sortedStats.size()][3];
         int index = 0;
-        for(Pair<String, Integer> e: sortedStats) {
+        for (Pair<String, Integer> e: sortedStats) {
             ret[index] = new String[]{e.a, e.b.toString(), tr("Clear")};
             index++;

trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1303 +1303 @@
      */
     public static ThreadFactory newThreadFactory(final String nameFormat, final int threadPriority) {
-        final String ignore = String.format(Locale.ENGLISH, nameFormat, 0);// fail fast
+        final String ignore = String.format(Locale.ENGLISH, nameFormat, 0); // fail fast
         return new ThreadFactory() {
             final AtomicLong count = new AtomicLong(0);