Changeset 30609 in osm for applications/editors/josm/plugins

Timestamp:

2014-08-30T13:42:09+02:00 (10 years ago)

Author:

donvip

Message:

[josm_openinghours] fix #josm10402 - change key text field by a combo box with known values, defaulting to opening_hours

File:

• applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java (modified) (5 diffs)

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java

@@ -22 +22 @@
 import javax.swing.ButtonGroup;
 import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -29 +30 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
-import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
 import javax.swing.table.DefaultTableCellRenderer;
@@ -195 +195 @@
             sp.setViewportView(propertyTable);
 
-            final JTextField newTagField = new JTextField();
+            final JComboBox<String> newTagField = new JComboBox<>(new String[]{
+                    "opening_hours", "collection_times", "collection_times:local", "service_times", "lit"});
 
             JRadioButton editButton = new JRadioButton(new AbstractAction(tr("edit existing tag")) {
@@ -250 +251 @@
                 propertyTable.setEnabled(false);
                 newTagField.setEnabled(true);
-                newTagField.setText(preSelectedKey);
+                newTagField.setSelectedItem(preSelectedKey);
                 newButton.setSelected(true);
             }
@@ -284 +285 @@
                     valuesToEdit = propertyData.getValueAt(propertyTable.getSelectedRow(), 1);
                 } else if (newButton.isSelected()) {
-                    keyToEdit = newTagField.getText();
+                    keyToEdit = newTagField.getSelectedItem().toString();
                 }
             if (keyToEdit == null)