Changeset 8071 in josm for trunk/src/org

Timestamp:

2015-02-15T21:10:53+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #10960 - Add note API search dialog (modified patch by ToeBee). Enable notes by default

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SearchNotesDownloadAction.java (added)
• data/Preferences.java (modified) (1 diff)
• gui/MainMenu.java (modified) (3 diffs)
• gui/MapFrame.java (modified) (1 diff)
• gui/download/DownloadDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1684 +1684 @@
 
         String[] obsolete = {
+                "osm.notes.enableDownload" // was used prior to r8071 when notes was an hidden feature. To remove end of 2015
         };
         for (String key : obsolete) {

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

@@ -78 +78 @@
 import org.openstreetmap.josm.actions.SaveAction;
 import org.openstreetmap.josm.actions.SaveAsAction;
+import org.openstreetmap.josm.actions.SearchNotesDownloadAction;
 import org.openstreetmap.josm.actions.SelectAllAction;
 import org.openstreetmap.josm.actions.SelectNonBranchingWaySequencesAction;
@@ -152 +153 @@
     /** File / Download object... **/
     public final DownloadPrimitiveAction downloadPrimitive = new DownloadPrimitiveAction();
+    /** File / Search Notes... **/
+    public final SearchNotesDownloadAction searchNotes = new SearchNotesDownloadAction();
     /** File / Download parent ways/relations... **/
     public final DownloadReferrersAction downloadReferrers = new DownloadReferrersAction();
@@ -615 +618 @@
         add(fileMenu, download);
         add(fileMenu, downloadPrimitive);
+        add(fileMenu, searchNotes);
         add(fileMenu, downloadReferrers);
         add(fileMenu, update);

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

@@ -243 +243 @@
         addToggleDialog(new ChangesetDialog(), true);
         addToggleDialog(new MapPaintDialog());
-        //TODO: remove this if statement once note support is complete
-        if(Main.pref.getBoolean("osm.notes.enableDownload", false)) {
-            addToggleDialog(noteDialog = new NotesDialog());
-        }
+        addToggleDialog(noteDialog = new NotesDialog());
         toolBarToggle.setFloatable(false);
 

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

@@ -99 +99 @@
         cbDownloadGpxData = new JCheckBox(tr("Raw GPS data"));
         cbDownloadGpxData.setToolTipText(tr("Select to download GPS traces in the selected download area."));
-        //TODO: uncomment this and remove logic below once notes are enabled
-        //pnl.add(cbDownloadGpxData,  GBC.std().insets(5,5,1,5));
+        pnl.add(cbDownloadGpxData,  GBC.std().insets(5,5,1,5));
         cbDownloadNotes = new JCheckBox(tr("Notes"));
         cbDownloadNotes.setToolTipText(tr("Select to download notes in the selected download area."));
-        if (Main.pref.getBoolean("osm.notes.enableDownload", false)) {
-            pnl.add(cbDownloadGpxData,  GBC.std().insets(5,5,1,5));
-            pnl.add(cbDownloadNotes, GBC.eol().insets(50, 5, 1, 5));
-        } else {
-            pnl.add(cbDownloadGpxData,  GBC.eol().insets(5,5,1,5));
-        }
+        pnl.add(cbDownloadNotes, GBC.eol().insets(50, 5, 1, 5));
 
         // hook for subclasses
@@ -205 +199 @@
     }
 
+    /**
+     * Constructs a new {@code DownloadDialog}.
+     * @param parent the parent component
+     */
     public DownloadDialog(Component parent) {
         super(JOptionPane.getFrameForComponent(parent),tr("Download"), ModalityType.DOCUMENT_MODAL);
@@ -247 +245 @@
     /**
      * Distributes a "bounding box changed" from one DownloadSelection
-     * object to the others, so they may update or clear their input
-     * fields.
+     * object to the others, so they may update or clear their input fields.
      *
      * @param eventSource - the DownloadSelection object that fired this notification.
@@ -347 +344 @@
         cbDownloadOsmData.setSelected(Main.pref.getBoolean("download.osm", true));
         cbDownloadGpxData.setSelected(Main.pref.getBoolean("download.gps", false));
-        //TODO: This is to make sure notes are not downloaded if the Notes checkbox isn't being displayed.
-        //      Make it look like the ones above when notes are enabled
-        boolean downloadNotes = Main.pref.getBoolean("download.notes", false)
-                && Main.pref.getBoolean("osm.notes.enableDownload", false);
-        cbDownloadNotes.setSelected(downloadNotes);
+        cbDownloadNotes.setSelected(Main.pref.getBoolean("download.notes", false));
         cbNewLayer.setSelected(Main.pref.getBoolean("download.newlayer", false));
         cbStartup.setSelected( isAutorunEnabled() );
@@ -485 +478 @@
             }
             if (!isDownloadOsmData() && !isDownloadGpxData() && !isDownloadNotes()) {
-                //TODO: When notes are enabled, change this message to include downloading notes
                 JOptionPane.showMessageDialog(
                         DownloadDialog.this,
-                        tr("<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled.<br>"
-                                + "Please choose to either download OSM data, or GPX data, or both.</html>",
+                        tr("<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> nor <strong>{2}</strong> is enabled.<br>"
+                                + "Please choose to either download OSM data, or GPX data, or Notes, or all.</html>",
                                 cbDownloadOsmData.getText(),
-                                cbDownloadGpxData.getText()
+                                cbDownloadGpxData.getText(),
+                                cbDownloadNotes.getText()
                         ),
                         tr("Error"),