Skip to content

Commit f2c0306

Browse files
risiclerisicle
committed
remove use of deprecated Main.pref
1 parent 6cf6c7a commit f2c0306

5 files changed

Lines changed: 21 additions & 24 deletions

File tree

‎src/org/openstreetmap/josm/plugins/markseen/MarkSeenDialog.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.Hashtable;
2222

2323
import static org.openstreetmap.josm.tools.I18n.tr;
24-
import org.openstreetmap.josm.Main;
2524
import org.openstreetmap.josm.actions.JosmAction;
2625
import org.openstreetmap.josm.actions.ToggleAction;
2726
import org.openstreetmap.josm.data.Bounds;
@@ -30,6 +29,7 @@
3029
import org.openstreetmap.josm.gui.NavigatableComponent;
3130
import org.openstreetmap.josm.gui.bbox.BBoxChooser;
3231
import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
32+
import org.openstreetmap.josm.spi.preferences.Config;
3333
import org.openstreetmap.josm.tools.ImageProvider;
3434

3535
/**
@@ -71,7 +71,7 @@ public MarkSeenDialog(
7171
this.toolBar = new JToolBar();
7272
this.innerPanel = new JPanel(new BorderLayout());
7373

74-
final boolean showToolBarInitially = Main.pref.getBoolean("markseen.dialog.showToolBar", true);
74+
final boolean showToolBarInitially = Config.getPref().getBoolean("markseen.dialog.showToolBar", true);
7575
this.showToolBarToggleButton = new JToggleButton(ImageProvider.get("misc", "buttonshow"), showToolBarInitially);
7676
this.showToolBarToggleButton.setToolTipText(tr("Toggle toolbar visbility"));
7777
this.showToolBarToggleButton.setBorder(BorderFactory.createEmptyBorder());
@@ -165,7 +165,7 @@ private void updateShowToolBarToggleButton() {
165165
public void stateChanged(ChangeEvent e) {
166166
if (e.getSource() == this.showToolBarToggleButton.getModel()) {
167167
this.updateShowToolBarToggleButton();
168-
Main.pref.putBoolean("markseen.dialog.showToolBar", this.showToolBarToggleButton.getModel().isSelected());
168+
Config.getPref().putBoolean("markseen.dialog.showToolBar", this.showToolBarToggleButton.getModel().isSelected());
169169
} else {
170170
throw new RuntimeException("Unknown/unexpected ChangeEvent source");
171171
}

‎src/org/openstreetmap/josm/plugins/markseen/MarkSeenRoot.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import static org.openstreetmap.josm.tools.I18n.tr;
1818

19-
import org.openstreetmap.josm.Main;
2019
import org.openstreetmap.josm.actions.JosmAction;
2120
import org.openstreetmap.josm.actions.ToggleAction;
2221
import org.openstreetmap.josm.data.Bounds;
@@ -25,6 +24,7 @@
2524
import org.openstreetmap.josm.gui.MapFrame;
2625
import org.openstreetmap.josm.gui.MapView;
2726
import org.openstreetmap.josm.gui.NavigatableComponent;
27+
import org.openstreetmap.josm.spi.preferences.Config;
2828
import org.openstreetmap.josm.tools.ColorHelper;
2929
import org.openstreetmap.josm.tools.ImageProvider;
3030
import org.openstreetmap.josm.tools.Shortcut;
@@ -48,7 +48,7 @@ public MarkSeenToggleRecordAction() {
4848
"MarkSeen/record",
4949
false
5050
);
51-
this.setSelected(Main.pref.getBoolean("markseen.recordActive", false));
51+
this.setSelected(Config.getPref().getBoolean("markseen.recordActive", false));
5252
this.addPropertyChangeListener(this);
5353
}
5454

@@ -69,7 +69,7 @@ public void actionPerformed(ActionEvent e) {
6969
toggleSelectedState(e);
7070
notifySelectedState();
7171
MarkSeenRoot.this.zoomChanged();
72-
Main.pref.putBoolean("markseen.recordActive", this.isSelected());
72+
Config.getPref().putBoolean("markseen.recordActive", this.isSelected());
7373
}
7474
}
7575

@@ -143,15 +143,15 @@ public void actionPerformed(ActionEvent e) {
143143

144144
public MarkSeenRoot() {
145145
this.quadTreeMeta = new QuadTreeMeta(
146-
Main.pref.getInt("markseen.quadTreeTileSize", 256),
147-
ColorHelper.html2color(Main.pref.get("color.markseen.seenarea", "#ff00ff")),
148-
Main.pref.getDouble("markseen.maskOpacity", 0.5)
146+
Config.getPref().getInt("markseen.quadTreeTileSize", 256),
147+
ColorHelper.html2color(Config.getPref().get("color.markseen.seenarea", "#ff00ff")),
148+
Config.getPref().getDouble("markseen.maskOpacity", 0.5)
149149
);
150150
this.clearAction = new MarkSeenClearAction();
151151
this.recordAction = new MarkSeenToggleRecordAction();
152152
this.setMaxViewportAction = new MarkSeenSetMaxViewportAction();
153153
this.recordMinZoom = new DefaultBoundedRangeModel(
154-
Math.max(recordMinZoomMin, Math.min(Main.pref.getInt("markseen.recordMinZoom", 11), recordMinZoomMax)),
154+
Math.max(recordMinZoomMin, Math.min(Config.getPref().getInt("markseen.recordMinZoom", 11), recordMinZoomMax)),
155155
0,
156156
recordMinZoomMin,
157157
recordMinZoomMax
@@ -190,7 +190,7 @@ public void zoomChanged() {
190190
this.updateRecordActionEnabled(currentBounds);
191191

192192
if (this.recordAction.isEnabled() && this.recordAction.isSelected()) {
193-
this.quadTreeMeta.requestSeenBoundsMark(currentBounds, Main.pref.getDouble("markseen.minTilesAcross", 3.5));
193+
this.quadTreeMeta.requestSeenBoundsMark(currentBounds, Config.getPref().getDouble("markseen.minTilesAcross", 3.5));
194194
}
195195
}
196196
}
@@ -223,7 +223,7 @@ public void stateChanged(ChangeEvent e) {
223223
if (MainApplication.isDisplayingMapView()) {
224224
this.updateRecordActionEnabled(getCurrentBounds());
225225
}
226-
Main.pref.putInt("markseen.recordMinZoom", this.recordMinZoom.getValue());
226+
Config.getPref().putInt("markseen.recordMinZoom", this.recordMinZoom.getValue());
227227
} else {
228228
throw new RuntimeException("Unknown/unexpected ChangeEvent source");
229229
}

‎src/org/openstreetmap/josm/plugins/markseen/QuadTreeMeta.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.awt.image.IndexColorModel;
1919
import java.awt.image.WritableRaster;
2020

21-
import org.openstreetmap.josm.Main;
2221
import org.openstreetmap.josm.data.Bounds;
2322
import org.openstreetmap.josm.tools.Logging;
2423

‎src/org/openstreetmap/josm/plugins/markseen/QuadTreeNode.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
import java.awt.image.BufferedImage;
88
import java.awt.image.IndexColorModel;
99

10-
import java.lang.Math;
1110
import java.lang.ref.SoftReference;
1211
import java.util.Arrays;
1312

1413
import org.openstreetmap.gui.jmapviewer.JMapViewer;
1514
import org.openstreetmap.gui.jmapviewer.OsmMercator;
16-
import org.openstreetmap.josm.Main;
1715
import org.openstreetmap.josm.data.Bounds;
1816
import org.openstreetmap.josm.tools.Logging;
1917

‎test/unit/org/openstreetmap/josm/plugins/markseen/MarkSeenRootTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.openstreetmap.gui.jmapviewer.tilesources.TMSTileSource;
2323
import org.openstreetmap.gui.jmapviewer.tilesources.TileSourceInfo;
2424

25-
import org.openstreetmap.josm.Main;
2625
import org.openstreetmap.josm.actions.ToggleAction;
2726
import org.openstreetmap.josm.data.Bounds;
2827
import org.openstreetmap.josm.gui.MainApplication;
@@ -31,6 +30,7 @@
3130
import org.openstreetmap.josm.gui.MapViewState;
3231
import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
3332
import org.openstreetmap.josm.gui.util.GuiHelper;
33+
import org.openstreetmap.josm.spi.preferences.Config;
3434

3535
import org.openstreetmap.josm.TestUtils;
3636
import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer;
@@ -258,8 +258,8 @@ public void assertControlStates(int recordMinZoomValue, boolean recordActionSele
258258
@Test
259259
public void testInitPrefRecordActiveDisabled() throws Exception {
260260
MapFrame mainMap = MainApplication.getMap();
261-
Main.pref.putInt("markseen.recordMinZoom", 2); // deliberately out of range
262-
Main.pref.putBoolean("markseen.recordActive", true);
261+
Config.getPref().putInt("markseen.recordMinZoom", 2); // deliberately out of range
262+
Config.getPref().putBoolean("markseen.recordActive", true);
263263
mainMap.mapView.zoomTo(new Bounds(26.27, -18.23, 26.29, -18.16));
264264

265265
this.setUpMarkSeenRoot();
@@ -331,10 +331,10 @@ public void testInitPrefRecordActiveDisabled() throws Exception {
331331
@Test
332332
public void testInitPrefRecordActiveEnabled() throws Exception {
333333
MapFrame mainMap = MainApplication.getMap();
334-
Main.pref.putInt("markseen.recordMinZoom", 10);
335-
Main.pref.putBoolean("markseen.recordActive", true);
336-
Main.pref.put("color.markseen.seenarea", "#00ffff");
337-
Main.pref.putDouble("markseen.maskOpacity", 1.0);
334+
Config.getPref().putInt("markseen.recordMinZoom", 10);
335+
Config.getPref().putBoolean("markseen.recordActive", true);
336+
Config.getPref().put("color.markseen.seenarea", "#00ffff");
337+
Config.getPref().putDouble("markseen.maskOpacity", 1.0);
338338
mainMap.mapView.zoomTo(new Bounds(-0.001, -0.001, 0.001, 0.001));
339339

340340
this.setUpMarkSeenRoot();
@@ -374,8 +374,8 @@ public void testInitPrefRecordActiveEnabled() throws Exception {
374374
@Test
375375
public void testSetMaxViewportFromCurrent() throws Exception {
376376
MapFrame mainMap = MainApplication.getMap();
377-
Main.pref.putInt("markseen.recordMinZoom", 4);
378-
Main.pref.putBoolean("markseen.recordActive", false);
377+
Config.getPref().putInt("markseen.recordMinZoom", 4);
378+
Config.getPref().putBoolean("markseen.recordActive", false);
379379
mainMap.mapView.zoomTo(new Bounds(-20.0, 0, -19.998, 0.002));
380380

381381
this.setUpMarkSeenRoot();

0 commit comments

Comments
 (0)