Changeset 12537 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2017-07-30T00:22:46+02:00 (7 years ago)

Author:

Don-vip

Message:

PMD - VariableNamingConventions

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• ChangesetCache.java (modified) (2 diffs)
• DataSet.java (modified) (4 diffs)
• QuadBuckets.java (modified) (2 diffs)
• User.java (modified) (2 diffs)
• event/DatasetEventManager.java (modified) (2 diffs)
• event/SelectionEventManager.java (modified) (2 diffs)
• visitor/paint/PaintColors.java (modified) (2 diffs)

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

@@ -37 +37 @@
 public final class ChangesetCache implements PreferenceChangedListener {
     /** the unique instance */
-    private static final ChangesetCache instance = new ChangesetCache();
+    private static final ChangesetCache INSTANCE = new ChangesetCache();
 
     /** the cached changesets */
@@ -56 +56 @@
      */
     public static ChangesetCache getInstance() {
-        return instance;
+        return INSTANCE;
     }
 

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

@@ -638 +638 @@
      * dataset. (However, the selection does only change in the active layer)
      */
-    private static final Collection<SelectionChangedListener> selListeners = new CopyOnWriteArrayList<>();
+    private static final Collection<SelectionChangedListener> SEL_LISTENERS = new CopyOnWriteArrayList<>();
 
     /**
@@ -647 +647 @@
      */
     public static void addSelectionListener(SelectionChangedListener listener) {
-        ((CopyOnWriteArrayList<SelectionChangedListener>) selListeners).addIfAbsent(listener);
+        ((CopyOnWriteArrayList<SelectionChangedListener>) SEL_LISTENERS).addIfAbsent(listener);
     }
 
@@ -657 +657 @@
      */
     public static void removeSelectionListener(SelectionChangedListener listener) {
-        selListeners.remove(listener);
+        SEL_LISTENERS.remove(listener);
     }
 
@@ -671 +671 @@
 
     private static void fireDreprecatedSelectionChange(Collection<? extends OsmPrimitive> currentSelection) {
-        for (SelectionChangedListener l : selListeners) {
+        for (SelectionChangedListener l : SEL_LISTENERS) {
             l.selectionChanged(currentSelection);
         }

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

@@ -23 +23 @@
  */
 public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
-    private static final boolean consistency_testing = false;
+    private static final boolean CONSISTENCY_TESTING = false;
     private static final byte NW_INDEX = 1;
     private static final byte NE_INDEX = 3;
@@ -271 +271 @@
 
         void doAdd(T o) {
-            if (consistency_testing) {
+            if (CONSISTENCY_TESTING) {
                 if (o instanceof Node && !matches(o, this)) {
                     o.getBBox().getIndex(level);

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

@@ -34 +34 @@
      * @see #getAnonymous()
      */
-    private static final User anonymous = createLocalUser(tr("<anonymous>"));
+    private static final User ANONYMOUS = createLocalUser(tr("<anonymous>"));
 
     private static long getNextLocalUid() {
@@ -131 +131 @@
      */
     public static User getAnonymous() {
-        return anonymous;
+        return ANONYMOUS;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

@@ -29 +29 @@
 public class DatasetEventManager implements ActiveLayerChangeListener, Listener {
 
-    private static final DatasetEventManager instance = new DatasetEventManager();
+    private static final DatasetEventManager INSTANCE = new DatasetEventManager();
 
     private final class EdtRunnable implements Runnable {
@@ -139 +139 @@
      */
     public static DatasetEventManager getInstance() {
-        return instance;
+        return INSTANCE;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java

@@ -32 +32 @@
 public class SelectionEventManager implements DataSelectionListener, ActiveLayerChangeListener {
 
-    private static final SelectionEventManager instance = new SelectionEventManager();
+    private static final SelectionEventManager INSTANCE = new SelectionEventManager();
 
     /**
@@ -39 +39 @@
      */
     public static SelectionEventManager getInstance() {
-        return instance;
+        return INSTANCE;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java

@@ -93 +93 @@
     private static volatile Color backgroundColorCache;
 
-    private static final MapPaintSylesUpdateListener styleOverrideListener = new MapPaintSylesUpdateListener() {
+    private static final MapPaintSylesUpdateListener STYLE_OVERRIDE_LISTENER = new MapPaintSylesUpdateListener() {
         //TODO: Listen to wireframe map mode changes.
         @Override
@@ -107 +107 @@
 
     static {
-        MapPaintStyles.addMapPaintSylesUpdateListener(styleOverrideListener);
+        MapPaintStyles.addMapPaintSylesUpdateListener(STYLE_OVERRIDE_LISTENER);
     }