Changeset 10784 in josm for trunk/src/org

Timestamp:

2016-08-11T17:17:36+02:00 (8 years ago)

Author:

simon04

Message:

see #11823 - Delay minimap initialization until first use

This does no longer cause the JCSCacheManager to be initialized when creating the MapFrame.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java

@@ -12 +12 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.bbox.BBoxChooser;
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
@@ -21 +20 @@
 public class MinimapDialog extends ToggleDialog implements NavigatableComponent.ZoomChangeListener, PropertyChangeListener {
 
-    protected final SlippyMapBBoxChooser slippyMap = new SlippyMapBBoxChooser();
-    protected boolean skipEvents;
+    private SlippyMapBBoxChooser slippyMap;
+    private boolean skipEvents;
 
     /**
@@ -29 +28 @@
     public MinimapDialog() {
         super(tr("Mini map"), "minimap", tr("Displays a small map of the current edit location"), null, 150);
-        createLayout(slippyMap, false, Collections.<SideButton>emptyList());
+    }
+
+    private synchronized void initialize() {
+        if (slippyMap != null) {
+            return;
+        }
+        slippyMap = new SlippyMapBBoxChooser();
+        createLayout(slippyMap, false, Collections.emptyList());
         slippyMap.setSizeButtonVisible(false);
         slippyMap.addPropertyChangeListener(BBoxChooser.BBOX_PROP, this);
@@ -36 +42 @@
     @Override
     public void showDialog() {
+        initialize();
         NavigatableComponent.addZoomChangeListener(this);
         super.showDialog();