Changeset 8897 in josm

Timestamp:

2015-10-18T18:31:16+02:00 (9 years ago)

Author:

simon04

Message:

fix #10730 - Way splitting: improve dialog layout and hide id of new ways

File:

• trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (4 diffs)

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

@@ -7 +7 @@
 
 import java.awt.Component;
-import java.awt.GridLayout;
+import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -46 +46 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
@@ -231 +232 @@
 
             setButtonIcons(new String[]{"ok", "cancel"});
-            final JPanel pane = new JPanel(new GridLayout(2, 1));
-            pane.add(new JLabel(getTitle()));
-            pane.add(list);
+            final JPanel pane = new JPanel(new GridBagLayout());
+            pane.add(new JLabel(getTitle()), GBC.eol().fill(GBC.HORIZONTAL));
+            pane.add(list, GBC.eop().fill(GBC.HORIZONTAL));
             setContent(pane);
         }
@@ -258 +259 @@
                 public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
                     final Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-                    ((JLabel) c).setText(tr("Segment {0}: {1}", index + 1, DefaultNameFormatter.getInstance().format((Way) value)));
+                    final String name = DefaultNameFormatter.getInstance().format((Way) value);
+                    // get rid of id from DefaultNameFormatter.decorateNameWithId()
+                    final String nameWithoutId = name.replaceAll(" \\[id: -?\\d+\\]$", "");
+                    ((JLabel) c).setText(tr("Segment {0}: {1}", index + 1, nameWithoutId));
                     return c;
                 }