Changeset 4016 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java
- Timestamp:
- 2011-04-06T14:57:45+02:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java
r3978 r4016 71 71 } 72 72 ImageryProvidersPanel imageryProviders; 73 ImageryLayerInfo layerInfo; 73 74 74 75 static ImagerySettingsMigration settingsMigration; … … 269 270 JPanel p = gui.createPreferenceTab("imagery", tr("Imagery Preferences"), tr("Modify list of imagery layers displayed in the Imagery menu")); 270 271 JTabbedPane pane = new JTabbedPane(); 271 imageryProviders = new ImageryProvidersPanel(gui, ImageryLayerInfo.instance); 272 layerInfo = new ImageryLayerInfo(ImageryLayerInfo.instance); 273 imageryProviders = new ImageryProvidersPanel(gui, layerInfo); 272 274 pane.add(imageryProviders); 273 275 pane.add(buildSettingsPanel(gui)); … … 308 310 public boolean ok() { 309 311 boolean restartRequired = false; 310 ImageryLayerInfo.instance.save(); 312 layerInfo.save(); 313 ImageryLayerInfo.instance.load(); 311 314 Main.main.menu.imageryMenu.refreshImageryMenu(); 312 315 Main.main.menu.imageryMenu.refreshOffsetMenu(); … … 567 570 568 571 public void actionPerformed(ActionEvent evt) { 569 layerInfo.load (true);572 layerInfo.loadDefaults(true); 570 573 modeldef.fireTableDataChanged(); 571 574 } … … 857 860 settingsMigration = null; 858 861 } 859 ImageryLayerInfo.instance.load(false); 862 ImageryLayerInfo.instance.load(); 863 ImageryLayerInfo.instance.loadDefaults(false); 860 864 OffsetBookmark.loadBookmarks(); 861 865 Main.main.menu.imageryMenu.refreshImageryMenu();
Note:
See TracChangeset
for help on using the changeset viewer.