Changeset 6364 in josm

Timestamp:

2013-11-03T03:01:01+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #3744 - Refresh list of TMS layers of download dialog when imagery preferences are changed

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (2 diffs)
• gui/bbox/SlippyMapBBoxChooser.java (modified) (7 diffs)
• gui/bbox/SourceButton.java (modified) (3 diffs)
• gui/download/DownloadDialog.java (modified) (3 diffs)
• gui/download/SlippyMapChooser.java (modified) (2 diffs)
• gui/preferences/imagery/ImageryPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -147 +147 @@
         @pref String icon;
 
+        /**
+         * Constructs a new {@code ImageryPreferenceEntry}.
+         */
         public ImageryPreferenceEntry() {
         }
@@ -191 +194 @@
             }
         }
-    }
-
+
+        @Override
+        public String toString() {
+            return "ImageryPreferenceEntry [name=" + name + "]";
+        }
+    }
+
+    /**
+     * Constructs a new {@code ImageryInfo}.
+     */
     public ImageryInfo() {
     }

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

@@ -42 +42 @@
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 
-public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
+public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
 
     public interface TileSourceProvider {
@@ -139 +139 @@
     }
 
-
     /**
      * Plugins that wish to add custom tile sources to slippy map choose should call this method
@@ -175 +174 @@
     private Bounds bbox;
 
-    // upper left and lower right corners of the selection rectangle (x/y on
-    // ZOOM_MAX)
+    // upper left and lower right corners of the selection rectangle (x/y on ZOOM_MAX)
     Point iSelectionRectStart;
     Point iSelectionRectEnd;
 
+    /**
+     * Constructs a new {@code SlippyMapBBoxChooser}.
+     */
     public SlippyMapBBoxChooser() {
-        super();
         TMSLayer.setMaxWorkers();
         cachedLoader = TMSLayer.loaderFactory.makeTileLoader(this);
@@ -191 +191 @@
         setMinimumSize(new Dimension(350, 350 / 2));
         // We need to set an initial size - this prevents a wrong zoom selection
-        // for
-        // the area before the component has been displayed the first time
+        // for the area before the component has been displayed the first time
         setBounds(new Rectangle(getMinimumSize()));
         if (cachedLoader == null) {
@@ -201 +200 @@
         setMaxTilesInMemory(Main.pref.getInteger("slippy_map_chooser.max_tiles", 1000));
 
-        List<TileSource> tileSources = new ArrayList<TileSource>();
-        for (TileSourceProvider provider: providers) {
-            tileSources.addAll(provider.getTileSources());
-        }
+        List<TileSource> tileSources = getTileSources();
 
         iSourceButton = new SourceButton(tileSources);
@@ -224 +220 @@
 
         new SlippyMapControler(this, this, iSizeButton, iSourceButton);
+    }
+    
+    private List<TileSource> getTileSources() {
+        List<TileSource> tileSources = new ArrayList<TileSource>();
+        for (TileSourceProvider provider: providers) {
+            tileSources.addAll(provider.getTileSources());
+        }
+        return tileSources;
     }
 
@@ -390 +394 @@
         repaint();
     }
+    
+    /**
+     * Refreshes the tile sources
+     * @since 6364
+     */
+    public final void refreshTileSources() {
+        iSourceButton.setSources(getTileSources());
+    }
 }

trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java

@@ -8 +8 @@
 import java.awt.Point;
 import java.awt.RenderingHints;
-import java.util.List;
+import java.util.Collection;
 
 import javax.swing.ImageIcon;
 
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -23 +24 @@
     private int layerHeight;
 
-    private final TileSource[] sources;
+    private TileSource[] sources;
 
     private ImageIcon enlargeImage;
@@ -34 +35 @@
     public static final int HIDE_OR_SHOW = 1;
 
-    public SourceButton(List<TileSource> sources) {
-        this.sources = sources.toArray(new TileSource[sources.size()]);
+    public SourceButton(Collection<TileSource> sources) {
+        setSources(sources);
         this.currentMap = 2;
         enlargeImage = ImageProvider.get("layer-switcher-maximize.png");
         shrinkImage = ImageProvider.get("layer-switcher-minimize.png");
+    }
+    
+    /**
+     * Set the tile sources.
+     * @param sources The tile sources to display
+     * @since 6364
+     */
+    public final void setSources(Collection<TileSource> sources) {
+        CheckParameterUtil.ensureParameterNotNull(sources, "sources");
+        this.sources = sources.toArray(new TileSource[sources.size()]);
     }
 

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -66 +66 @@
     }
 
+    protected SlippyMapChooser slippyMapChooser;
     protected final List<DownloadSelection> downloadSelections = new ArrayList<DownloadSelection>();
     protected final JTabbedPane tpDownloadAreaSelectors = new JTabbedPane();
@@ -102 +103 @@
 
         // predefined download selections
-        downloadSelections.add(new SlippyMapChooser());
+        downloadSelections.add(slippyMapChooser = new SlippyMapChooser());
         downloadSelections.add(new BookmarkSelection());
         downloadSelections.add(new BoundingBoxSelection());
@@ -293 +294 @@
     }
 
+    /**
+     * Refreshes the tile sources
+     * @since 6364
+     */
+    public final void refreshTileSources() {
+        if (slippyMapChooser != null) {
+            slippyMapChooser.refreshTileSources();
+        }
+    }
+    
     /**
      * Remembers the current settings in the download dialog

trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java

@@ -22 +22 @@
  *
  */
-public class SlippyMapChooser extends JPanel implements DownloadSelection, PropertyChangeListener{
+public class SlippyMapChooser extends JPanel implements DownloadSelection, PropertyChangeListener {
 
     private DownloadDialog iGui;
@@ -81 +81 @@
         }
     }
+    
+    /**
+     * Refreshes the tile sources
+     * @since 6364
+     */
+    public final void refreshTileSources() {
+        if (pnlSlippyMapBBoxChooser != null) {
+            pnlSlippyMapBBoxChooser.refreshTileSources();
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -57 +57 @@
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.imagery.Shape;
+import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -141 +142 @@
         Main.main.menu.imageryMenu.refreshOffsetMenu();
         OffsetBookmark.saveBookmarks();
+        
+        DownloadDialog.getInstance().refreshTileSources();
 
         boolean commonRestartRequired = commonSettings.saveSettings();