Changeset 14632 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

Timestamp:

2019-01-03T20:46:14+01:00 (5 years ago)

Author:

simon04

Message:

fix #15817 - Imagery Preferences: collect all cache settings in the same tab

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (modified) (4 diffs)

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

@@ -90 +90 @@
     private final WMSSettingsPanel wmsSettings = new WMSSettingsPanel();
     private final TMSSettingsPanel tmsSettings = new TMSSettingsPanel();
+    private final CacheSettingsPanel cacheSettingsPanel = new CacheSettingsPanel();
 
     /**
@@ -143 +144 @@
         pane.addTab(tr("Settings"), buildSettingsPanel());
         pane.addTab(tr("Offset bookmarks"), new OffsetBookmarksPanel(gui));
-        pane.addTab(tr("Cache contents"), new CacheContentsPanel());
+        pane.addTab(tr("Cache"), cacheSettingsPanel);
         loadSettings();
         p.add(pane, GBC.std().fill(GBC.BOTH));
@@ -160 +161 @@
         wmsSettings.loadSettings();
         tmsSettings.loadSettings();
+        cacheSettingsPanel.loadSettings();
     }
 
@@ -177 +179 @@
         boolean wmsRestartRequired = wmsSettings.saveSettings();
         boolean tmsRestartRequired = tmsSettings.saveSettings();
-
-        return commonRestartRequired || wmsRestartRequired || tmsRestartRequired;
+        boolean cacheRestartRequired = cacheSettingsPanel.saveSettings();
+
+        return commonRestartRequired || wmsRestartRequired || tmsRestartRequired || cacheRestartRequired;
     }