Changeset 9975 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-03-13T00:27:11+01:00 (9 years ago)

Author:

Don-vip

Message:

sonar - make some final fields static too, use Collection.isEmpty(), remove useless cast

Location:

trunk/src/org/openstreetmap/josm

Files:

• corrector/TagCorrector.java (modified) (2 diffs)
• data/osm/Storage.java (modified) (3 diffs)
• gui/dialogs/FilterDialog.java (modified) (2 diffs)
• gui/dialogs/LayerListDialog.java (modified) (1 diff)
• gui/mappaint/StyleCache.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java

@@ -46 +46 @@
     public abstract Collection<Command> execute(P oldprimitive, P primitive) throws UserCancelException;
 
-    private final String[] applicationOptions = new String[] {
+    private static final String[] APPLICATION_OPTIONS = new String[] {
             tr("Apply selected changes"),
             tr("Do not apply changes"),
@@ -133 +133 @@
                     JOptionPane.PLAIN_MESSAGE,
                     null,
-                    applicationOptions,
-                    applicationOptions[0]
+                    APPLICATION_OPTIONS,
+                    APPLICATION_OPTIONS[0]
             );
 

trunk/src/org/openstreetmap/josm/data/osm/Storage.java

@@ -91 +91 @@
     private int size;
     private volatile int modCount;
-    private final double loadFactor = 0.6d;
+    private static final double LOAD_FACTOR = 0.6d;
     private static final int DEFAULT_CAPACITY = 16;
     private final boolean safeIterator;
@@ -143 +143 @@
     public Storage(Hash<? super T, ? super T> ha, int capacity, boolean safeIterator) {
         this.hash = ha;
-        int cap = 1 << (int) (Math.ceil(Math.log(capacity/loadFactor) / Math.log(2)));
+        int cap = 1 << (int) (Math.ceil(Math.log(capacity/LOAD_FACTOR) / Math.log(2)));
         @SuppressWarnings("unchecked") T[] newData = (T[]) new Object[cap];
         data = newData;
@@ -328 +328 @@
 
     private void ensureSpace() {
-        if (size > data.length*loadFactor) { // rehash
+        if (size > data.length*LOAD_FACTOR) { // rehash
             @SuppressWarnings("unchecked") T[] big = (T[]) new Object[data.length * 2];
             int nMask = big.length - 1;

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

@@ -98 +98 @@
             KeyEvent.VK_H, Shortcut.ALT_CTRL);
 
-    protected final String[] columnToolTips = {
+    protected static final String[] COLUMN_TOOLTIPS = {
             Main.platform.makeTooltip(tr("Enable filter"), ENABLE_FILTER_SHORTCUT),
             Main.platform.makeTooltip(tr("Hiding filter"), HIDING_FILTER_SHORTCUT),
@@ -116 +116 @@
                         int index = columnModel.getColumnIndexAtX(p.x);
                         int realIndex = columnModel.getColumn(index).getModelIndex();
-                        return columnToolTips[realIndex];
+                        return COLUMN_TOOLTIPS[realIndex];
                     }
                 };

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

@@ -888 +888 @@
         @Override
         public boolean supportLayers(List<Layer> layers) {
-            if (layers.size() < 1) {
+            if (layers.isEmpty()) {
                 return false;
             } else {

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

@@ -21 +21 @@
 
     @SuppressWarnings("unchecked")
-    private final DividedScale<StyleElementList>[] states = (DividedScale<StyleElementList>[]) new DividedScale[2];
+    private final DividedScale<StyleElementList>[] states = new DividedScale[2];
 
     private StyleCache(StyleCache sc) {