Changeset 16280 in josm for trunk

Timestamp:

2020-04-12T22:31:32+02:00 (4 years ago)

Author:

simon04

Message:

fix #19022 - PresetLink: allow to customize label text and UI position

Location:

trunk

Files:

• resources/data/tagging-preset.xsd (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java (modified) (4 diffs)

trunk/resources/data/tagging-preset.xsd

@@ -155 +155 @@
     <complexType name="preset_link">
         <attribute name="preset_name" type="string" use="required" />
+        <attribute name="text" type="string" />
+        <attribute name="text_context" type="string" />
         <attribute name="name" use="prohibited" />
     </complexType>

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -20 +20 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
@@ -307 +308 @@
         PresetPanel p = new PresetPanel();
         List<Link> l = new LinkedList<>();
-        List<PresetLink> presetLink = new LinkedList<>();
 
         final JPanel pp = new JPanel();
@@ -336 +336 @@
         boolean presetInitiallyMatches = !selected.isEmpty() && selected.stream().allMatch(this);
         JPanel items = new JPanel(new GridBagLayout());
+        TaggingPresetItem previous = null;
         for (TaggingPresetItem i : data) {
             if (i instanceof Link) {
                 l.add((Link) i);
                 p.hasElements = true;
-            } else if (i instanceof PresetLink) {
-                presetLink.add((PresetLink) i);
             } else {
+                if (i instanceof PresetLink) {
+                    PresetLink link = (PresetLink) i;
+                    if (!(previous instanceof PresetLink && Objects.equals(((PresetLink) previous).text, link.text))) {
+                        items.add(link.createLabel(), GBC.eol().insets(0, 8, 0, 0));
+                    }
+                }
                 if (i.addToPanel(items, selected, presetInitiallyMatches)) {
                     p.hasElements = true;
                 }
             }
+            previous = i;
         }
         p.add(items, GBC.eol().fill());
         if (selected.isEmpty() && !supportsRelation()) {
             GuiHelper.setEnabledRec(items, false);
-        }
-
-        // add PresetLink
-        if (!presetLink.isEmpty()) {
-            p.add(new JLabel(tr("Edit also …")), GBC.eol().insets(0, 8, 0, 0));
-            for (PresetLink link : presetLink) {
-                link.addToPanel(p, selected, presetInitiallyMatches);
-            }
         }
 

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.tagging.presets.items;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.MouseAdapter;
@@ -14 +16 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetLabel;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
@@ -23 +24 @@
  * @since 8863
  */
-public class PresetLink extends TaggingPresetItem {
+public class PresetLink extends TextItem {
 
     static final class TaggingPresetMouseAdapter extends MouseAdapter {
@@ -40 +41 @@
     /** The exact name of the preset to link to. Required. */
     public String preset_name = ""; // NOSONAR
+
+    /**
+     * Creates a label to be inserted aboive this link
+     * @return a label
+     */
+    public JLabel createLabel() {
+        initializeLocaleText(tr("Edit also …"));
+        return new JLabel(locale_text);
+    }
 
     @Override