Ticket #15414: v1-0003-SlippyMapBBoxChooser-maintain-state-of-showDownloadA.patch

File v1-0003-SlippyMapBBoxChooser-maintain-state-of-showDownloadA.patch, 3.0 KB (added by ris, 8 years ago)

  • src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java 

    From 07ef277140afc0e52e0051482ac1e5d2b4c8e36b Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 8 Oct 2017 10:17:07 +0100
Subject: [PATCH 3/3] SlippyMapBBoxChooser: maintain state of
 showDownloadAreaButtonModel in property

---
 src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
index 93d4358..0bdc219 100644
    a b import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;  
    4747import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
    4848import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
    4949import org.openstreetmap.josm.data.osm.BBox;
     50import org.openstreetmap.josm.data.preferences.BooleanProperty;
    5051import org.openstreetmap.josm.data.preferences.StringProperty;
    5152import org.openstreetmap.josm.gui.MainApplication;
    5253import org.openstreetmap.josm.gui.layer.AbstractCachedTileSourceLayer;
    … … public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, Cha  
    124125    }
    125126
    126127    private static final StringProperty PROP_MAPSTYLE = new StringProperty("slippy_map_chooser.mapstyle", "Mapnik");
     128    private static final BooleanProperty PROP_SHOWDLAREA = new BooleanProperty("slippy_map_chooser.show_downloaded_area", true);
    127129    /**
    128130     * The property name used for the resize button.
    129131     * @see #addPropertyChangeListener(java.beans.PropertyChangeListener)
    … … public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, Cha  
    134136    private final transient OsmTileLoader uncachedLoader;
    135137
    136138    private final SizeButton iSizeButton;
    137     private final ButtonModel showDownloadAreaButtonModel = new JToggleButton.ToggleButtonModel();
     139    private final ButtonModel showDownloadAreaButtonModel;
    138140    private final SourceButton iSourceButton;
    139141    private transient Bounds bbox;
    140142
    … … public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, Cha  
    177179
    178180        List<TileSource> tileSources = getAllTileSources();
    179181
     182        this.showDownloadAreaButtonModel = new JToggleButton.ToggleButtonModel();
     183        this.showDownloadAreaButtonModel.setSelected(PROP_SHOWDLAREA.get());
    180184        this.showDownloadAreaButtonModel.addChangeListener(this);
    181185        iSourceButton = new SourceButton(this, tileSources, this.showDownloadAreaButtonModel);
    182186        add(iSourceButton);
    … … public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, Cha  
    281285
    282286    @Override
    283287    public void stateChanged(ChangeEvent e) {
     288        // fired for the stateChanged event of this.showDownloadAreaButtonModel
     289        PROP_SHOWDLAREA.put(this.showDownloadAreaButtonModel.isSelected());
    284290        this.repaint();
    285291    }
    286292