Changeset 459 in josm for trunk/src/org

Timestamp:

2007-11-09T23:13:20+01:00 (17 years ago)

Author:

(none)

Message:

fix bug #426: tick the checkbox in the download dialog for "OpenStreetMap data" by default

• set the default in DownloadOsmTask
• don't overwrite this in DownloadDialog.java

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• gui/download/DownloadDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -55 +55 @@
                 }
         }
-        private JCheckBox checkBox = new JCheckBox(tr("OpenStreetMap data"));
+        private JCheckBox checkBox = new JCheckBox(tr("OpenStreetMap data"), true);
 
         public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) {

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

@@ -80 +80 @@
                 for (DownloadTask task : downloadTasks) {
                         add(task.getCheckBox(), GBC.eol().insets(20,0,0,0));
-                        task.getCheckBox().setSelected(Main.pref.getBoolean("download."+task.getPreferencesSuffix()));
+                        // don't override defaults, if we (initially) don't have any preferences
+                        if(Main.pref.hasKey("download."+task.getPreferencesSuffix())) {
+                                task.getCheckBox().setSelected(Main.pref.getBoolean("download."+task.getPreferencesSuffix()));
+                        }
                 }