Changeset 14648 in josm for trunk

Timestamp:

2019-01-05T22:03:23+01:00 (5 years ago)

Author:

simon04

Message:

fix #17067 - Duplicate settings for display of hatching area

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DrawBoundariesOfDownloadedDataAction.java (added)
• actions/HatchAreaOutsideDownloadAction.java (deleted)
• gui/MainMenu.java (modified) (3 diffs)
• gui/layer/OsmDataLayer.java (modified) (4 diffs)
• gui/preferences/display/DrawingPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -53 +53 @@
 import org.openstreetmap.josm.actions.FullscreenToggleAction;
 import org.openstreetmap.josm.actions.GpxExportAction;
-import org.openstreetmap.josm.actions.HatchAreaOutsideDownloadAction;
+import org.openstreetmap.josm.actions.DrawBoundariesOfDownloadedDataAction;
 import org.openstreetmap.josm.actions.HelpAction;
 import org.openstreetmap.josm.actions.HistoryInfoAction;
@@ -223 +223 @@
     public final WireframeToggleAction wireFrameToggleAction = new WireframeToggleAction();
     /** View / Hatch area outside download */
-    public final HatchAreaOutsideDownloadAction hatchAreaOutsideDownloadAction = new HatchAreaOutsideDownloadAction();
+    public final DrawBoundariesOfDownloadedDataAction drawBoundariesOfDownloadedDataAction = new DrawBoundariesOfDownloadedDataAction();
     /** View / Advanced info */
     public final InfoAction info = new InfoAction();
@@ -719 +719 @@
         wireframe.setAccelerator(wireFrameToggleAction.getShortcut().getKeyStroke());
         wireFrameToggleAction.addButtonModel(wireframe.getModel());
-        final JCheckBoxMenuItem hatchAreaOutsideDownloadMenuItem = hatchAreaOutsideDownloadAction.getCheckbox();
+        final JCheckBoxMenuItem hatchAreaOutsideDownloadMenuItem = drawBoundariesOfDownloadedDataAction.getCheckbox();
         viewMenu.add(hatchAreaOutsideDownloadMenuItem);
         ExpertToggleAction.addVisibilitySwitcher(hatchAreaOutsideDownloadMenuItem);

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -47 +47 @@
 
 import org.openstreetmap.josm.actions.ExpertToggleAction;
-import org.openstreetmap.josm.actions.HatchAreaOutsideDownloadAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.ToggleUploadDiscouragedLayerAction;
@@ -108 +107 @@
 import org.openstreetmap.josm.gui.io.importexport.OsmImporter;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.gui.preferences.display.DrawingPreference;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
@@ -481 +481 @@
         // draw the hatched area for non-downloaded region. only draw if we're the active
         // and bounds are defined; don't draw for inactive layers or loaded GPX files etc
-        if (active && Config.getPref().getBoolean("draw.data.downloaded_area", true) && !data.getDataSources().isEmpty()) {
+        if (active && DrawingPreference.SOURCE_BOUNDS_PROP.get() && !data.getDataSources().isEmpty()) {
             // initialize area with current viewport
             Rectangle b = mv.getBounds();
@@ -508 +508 @@
             }
             try {
-                if (HatchAreaOutsideDownloadAction.isHatchEnabled()) {
-                    g.fill(a);
-                }
+                g.fill(a);
             } catch (ArrayIndexOutOfBoundsException e) {
                 // #16686 - AIOOBE in java.awt.TexturePaintContext$Int.setRaster

trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java

@@ -14 +14 @@
 
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.autofilter.AutoFilterManager;
 import org.openstreetmap.josm.gui.autofilter.AutoFilterRule;
@@ -41 +42 @@
         }
     }
+
+    /**
+     * Property controlling whether to draw boundaries of downloaded data
+     * @since 14648
+     */
+    public static final BooleanProperty SOURCE_BOUNDS_PROP = new BooleanProperty("draw.data.downloaded_area", true);
 
     private GPXSettingsPanel gpxPanel;
@@ -107 +114 @@
         // downloaded area
         sourceBounds.setToolTipText(tr("Draw the boundaries of data loaded from the server."));
-        sourceBounds.setSelected(Config.getPref().getBoolean("draw.data.downloaded_area", true));
+        sourceBounds.setSelected(SOURCE_BOUNDS_PROP.get());
 
         // virtual nodes
@@ -210 +217 @@
         Config.getPref().putBoolean("draw.segment.order_number", segmentOrderNumber.isSelected());
         Config.getPref().putBoolean("draw.segment.order_number.on_selected", segmentOrderNumberOnSelectedWay.isSelected());
-        Config.getPref().putBoolean("draw.data.downloaded_area", sourceBounds.isSelected());
+        SOURCE_BOUNDS_PROP.put(sourceBounds.isSelected());
         Config.getPref().putBoolean("draw.data.inactive_color", inactive.isSelected());
         Config.getPref().putBoolean("mappaint.use-antialiasing", useAntialiasing.isSelected());