use instanceof pattern

cpesch · Jan 21, 2024 · d26c788 · d26c788
1 parent 034cb42
commit d26c788
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/mapsforge-mapview/src/main/java/slash/navigation/mapview/mapsforge/MapsforgeMapView.java b/mapsforge-mapview/src/main/java/slash/navigation/mapview/mapsforge/MapsforgeMapView.java
@@ -548,9 +548,8 @@ private void handleMapAndThemeUpdate(boolean centerAndZoom, boolean alwaysRecent
             layers.remove(remove);
             remove.onDestroy();
 
-            if (remove instanceof TileLayer)
-                //noinspection rawtypes
-                ((TileLayer) remove).getTileCache().destroy();
+            if (remove instanceof TileLayer tileLayer)
+                tileLayer.getTileCache().destroy();
         }
         mapsToLayers.clear();
 
@@ -562,8 +561,8 @@ private void handleMapAndThemeUpdate(boolean centerAndZoom, boolean alwaysRecent
         handleOverlays();
 
         // then start download layer threads
-        if (layer instanceof TileDownloadLayer)
-           ((TileDownloadLayer) layer).start();
+        if (layer instanceof TileDownloadLayer tileDownloadLayer)
+           tileDownloadLayer.start();
 
         // center and zoom: if map is initialized, doesn't contain route or there is no route
         BoundingBox mapBoundingBox = getMapBoundingBox();

diff --git a/.../src/main/java/slash/navigation/mapview/mapsforge/helpers/MapViewCoordinateDisplayer.java b/.../src/main/java/slash/navigation/mapview/mapsforge/helpers/MapViewCoordinateDisplayer.java
@@ -70,9 +70,10 @@ public void setShowCoordinates(boolean showCoordinates) {
 
     private JFrame getFrame() {
         Application application = Application.getInstance();
-        if (!(application instanceof SingleFrameApplication))
+        if (application instanceof SingleFrameApplication singleFrameApplication)
+            return singleFrameApplication.getFrame();
+        else
             return null;
-        return ((SingleFrameApplication) application).getFrame();
     }
 
     private void display(Point locationOnScreen, int mouseX, int mouseY) {

diff --git a/...pview/src/main/java/slash/navigation/mapview/mapsforge/helpers/MapViewMoverAndZoomer.java b/...pview/src/main/java/slash/navigation/mapview/mapsforge/helpers/MapViewMoverAndZoomer.java
@@ -121,8 +121,8 @@ private MarkerAndDelta getMarkerFor(MouseEvent e) {
                     continue;
 
                 org.mapsforge.core.model.Point layerXY = projection.toPixels(layer.getPosition());
-                if (layer.onTap(tapLatLong, layerXY, tapXY)) {
-                    return new MarkerAndDelta((DraggableMarker) layer, layerXY.x - tapXY.x, layerXY.y - tapXY.y);
+                if (layer.onTap(tapLatLong, layerXY, tapXY) && layer instanceof DraggableMarker draggableMarker) {
+                    return new MarkerAndDelta(draggableMarker, layerXY.x - tapXY.x, layerXY.y - tapXY.y);
                 }
             }
         }