Changeset 11489 in josm for trunk

Timestamp:

2017-01-25T02:15:11+01:00 (8 years ago)

Author:

Don-vip

Message:

error-prone - enums should be immutable, and cannot have non-final fields

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/coor/CoordinateFormat.java (modified) (2 diffs)
• gui/conflict/pair/ComparePairType.java (modified) (1 diff)
• gui/io/UploadStrategy.java (modified) (1 diff)
• gui/mappaint/mapcss/MapCSSParser.jj (modified) (1 diff)
• gui/preferences/plugin/PluginUpdatePolicyPanel.java (modified) (1 diff)
• gui/preferences/server/ProxyPreferencesPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java

@@ -6 +6 @@
 /**
  * An enumeration  of coordinate formats
- *
+ * @since 1990
  */
 public enum CoordinateFormat {
@@ -30 +30 @@
     EAST_NORTH(tr("Projected Coordinates"));
 
-    private String displayName;
+    private final String displayName;
+
     CoordinateFormat(String displayName) {
         this.displayName = displayName;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java

@@ -31 +31 @@
     /** the localized display name */
     private final String displayName;
-    private ListRole[] participatingRoles;
+    private final ListRole[] participatingRoles;
 
     ComparePairType(String displayName, ListRole ... participatingRoles) {

trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java

@@ -22 +22 @@
     SINGLE_REQUEST_STRATEGY("singlerequest");
 
-    private String preferenceValue;
+    private final String preferenceValue;
 
     UploadStrategy(String preferenceValue) {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -72 +72 @@
         DEFAULT(2);
 
-        int idx; // the integer, which javacc assigns to this state
+        final int idx; // the integer, which javacc assigns to this state
 
         LexicalState(int idx) {

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java

@@ -36 +36 @@
         NEVER("never");
 
-        private String preferenceValue;
+        private final String preferenceValue;
+
         Policy(String preferenceValue) {
             this.preferenceValue = preferenceValue;

trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java

@@ -66 +66 @@
         USE_SOCKS_PROXY("use-socks-proxy");
 
-        private String policyName;
+        private final String policyName;
+
         ProxyPolicy(String policyName) {
             this.policyName = policyName;