Changeset 9914 in josm for trunk/src/org

Timestamp:

2016-03-02T21:29:52+01:00 (9 years ago)

Author:

Don-vip

Message:

see #12350 - fix coverity 1352420, 1352421, 1352422, 1352423, 1352424 (potential NPEs)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• NavigatableComponent.java (modified) (1 diff)
• layer/NativeScaleLayer.java (modified) (4 diffs)
• layer/WMTSLayer.java (modified) (1 diff)

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

@@ -206 +206 @@
                 scaleList = scaleList.withIntermediateSteps(PROP_ZOOM_RATIO.get());
             }
-            Scale scale = scaleList.scaleZoomTimes(getScale(), PROP_ZOOM_RATIO.get(), times);
-            return scale.getScale();
+            Scale s = scaleList.scaleZoomTimes(getScale(), PROP_ZOOM_RATIO.get(), times);
+            return s != null ? s.getScale() : 0;
         } else {
             return getScale() * Math.pow(PROP_ZOOM_RATIO.get(), times);

trunk/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java

@@ -222 +222 @@
         public Scale scaleZoomIn(double scale, double ratio) {
             Scale snap = getSnapScale(scale, ratio, false);
-            Scale next = getNextIn(snap, ratio);
-            return next;
+            return getNextIn(snap, ratio);
         }
 
@@ -234 +233 @@
         public Scale scaleZoomOut(double scale, double ratio) {
             Scale snap = getSnapScale(scale, ratio, false);
-            Scale next = getNextOut(snap, ratio);
-            return next;
+            return getNextOut(snap, ratio);
         }
 
@@ -248 +246 @@
 
         private Scale getNextIn(Scale scale, double ratio) {
+            if (scale == null)
+                return null;
             int nextIndex = scale.getIndex() + 1;
             if (nextIndex <= 0 || nextIndex > this.scales.size()-1) {
@@ -258 +258 @@
 
         private Scale getNextOut(Scale scale, double ratio) {
+            if (scale == null)
+                return null;
             int nextIndex = scale.getIndex() - 1;
             if (nextIndex < 0 || nextIndex >= this.scales.size()-1) {

trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java

@@ -60 +60 @@
     @Override
     protected int getBestZoom() {
-        if (!Main.isDisplayingMapView()) return 0;
+        if (!Main.isDisplayingMapView())
+            return 0;
+        Scale snap = getNativeScales().getSnapScale(Main.map.mapView.getScale(), false);
         return Math.max(
                 getMinZoomLvl(),
                 Math.min(
-                        getNativeScales().getSnapScale(Main.map.mapView.getScale(), false).getIndex(),
+                        snap != null ? snap.getIndex() : getMaxZoomLvl(),
                         getMaxZoomLvl()
                         )