Changeset 15441 in josm for trunk/src

Timestamp:

2019-10-07T22:39:42+02:00 (5 years ago)

Author:

Don-vip

Message:

see #10564 - add missing geojson download task
see #13015 - fix presets checkgroup layout for checks without icon

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenLocationAction.java (modified) (2 diffs)
• gui/tagging/presets/items/Check.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -23 +23 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.josm.actions.downloadtasks.DownloadGeoJsonTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesTask;
@@ -101 +102 @@
         addDownloadTaskClass(DownloadNotesUrlBoundsTask.class);
         addDownloadTaskClass(DownloadNotesUrlIdTask.class);
+        addDownloadTaskClass(DownloadGeoJsonTask.class);
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java

@@ -96 +96 @@
         check.setState(check.getState()); // to update the tooltip text
 
-        JPanel checkPanel = new JPanel(new GridBagLayout());
-        checkPanel.add(check, GBC.std());
         if (icon != null) {
+            JPanel checkPanel = new JPanel(new GridBagLayout());
+            checkPanel.add(check, GBC.std());
             JLabel label = new JLabel(locale_text, getIcon(), SwingConstants.LEFT);
             label.addMouseListener(new MouseAdapter() {
@@ -108 +108 @@
             checkPanel.add(label);
             checkPanel.add(new JLabel(), GBC.eol().fill());
+            p.add(checkPanel, GBC.eol()); // Do not fill, see #15104
+        } else {
+            p.add(check, GBC.eol()); // Do not fill, see #15104
         }
-        p.add(checkPanel, GBC.eol()); // Do not fill, see #15104
         return true;
     }