Changeset 6806 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-02-03T19:26:05+01:00 (12 years ago)

Author:

Don-vip

Message:

fix some Sonar issues introduced recently

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (2 diffs)
• conflict/tags/TagConflictResolverModel.java (modified) (1 diff)
• history/VersionTable.java (modified) (1 diff)
• mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)
• preferences/validator/ValidatorTagCheckerRulesPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -524 +524 @@
 
         private boolean handleNetworkErrors() {
-            boolean condition = !networkErrors.isEmpty();
+            boolean condition = !NETWORK_ERRORS.isEmpty();
             if (condition) {
                 Set<String> errors = new TreeSet<String>();
-                for (Throwable t : networkErrors.values()) {
+                for (Throwable t : NETWORK_ERRORS.values()) {
                     errors.add(t.toString());
                 }
@@ -537 +537 @@
                                 "It may result of a missing proxy configuration.<br>" +
                                 "Would you like to change your proxy settings now?",
-                                Utils.joinAsHtmlUnorderedList(networkErrors.keySet()),
+                                Utils.joinAsHtmlUnorderedList(NETWORK_ERRORS.keySet()),
                                 Utils.joinAsHtmlUnorderedList(errors)
                         ));

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

@@ -266 +266 @@
             } else {
                 // Do not suggest to keep all values in order to reduce the wrong usage of semicolon values, see #9104!
-                //decision.keepAll();
             }
         }

trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java

@@ -185 +185 @@
         @Override
         protected String createInfoUrl(Object infoObject) {
-            HistoryOsmPrimitive primitive = (HistoryOsmPrimitive) infoObject;
-            return primitive.getUser() == null ? null : getBaseBrowseUrl() + "/user/" + primitive.getUser().getName();
+            HistoryOsmPrimitive hp = (HistoryOsmPrimitive) infoObject;
+            return hp.getUser() == null ? null : getBaseBrowseUrl() + "/user/" + hp.getUser().getName();
         }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -538 +538 @@
                 return s == null ? null : URLEncoder.encode(s, "UTF-8");
             } catch (UnsupportedEncodingException ex) {
-                throw new RuntimeException();
+                throw new RuntimeException(ex);
             }
         }

trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java

@@ -124 +124 @@
          * The unique instance.
          */
-        public final static RulePrefHelper INSTANCE = new RulePrefHelper();
+        public static final RulePrefHelper INSTANCE = new RulePrefHelper();
 
         /**