Changeset 12199 in josm for trunk

Timestamp:

2017-05-17T02:57:03+02:00 (8 years ago)

Author:

Don-vip

Message:

checkstyle/PMD/findbugs

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/preferences/AbstractProperty.java (modified) (3 diffs)
• tools/pmd/josm-ruleset.xml (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -80 +80 @@
     private double east = Double.NaN;
     private double north = Double.NaN;
-    private Object eastNorthCacheKey = null;
+    private Object eastNorthCacheKey;
 
     /**

trunk/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java

@@ -267 +267 @@
     private class WeakPreferenceAdapter extends ListenableWeakReference<ValueChangeListener<? super T>>
             implements ValueChangeListener<T> {
-        public WeakPreferenceAdapter(ValueChangeListener<? super T> referent) {
+        WeakPreferenceAdapter(ValueChangeListener<? super T> referent) {
             super(referent);
         }
@@ -273 +273 @@
         @Override
         public void valueChanged(ValueChangeEvent<? extends T> e) {
-            ValueChangeListener<? super T> r = this.get();
-            r.valueChanged(e);
+            ValueChangeListener<? super T> r = super.get();
+            if (r != null) {
+                r.valueChanged(e);
+            }
         }
 
@@ -281 +283 @@
             removeListenerImpl(new PreferenceChangedListenerAdapter(this));
         }
-
     }
 

trunk/tools/pmd/josm-ruleset.xml

@@ -29 +29 @@
   <rule ref="rulesets/java/strictexception.xml">
         <exclude name="ExceptionAsFlowControl"/>
+        <exclude name="AvoidCatchingGenericException"/>
         <exclude name="AvoidRethrowingException"/>
   </rule>