Changeset 3518 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java

Timestamp:

10.09.2010 07:45:16 (21 months ago)

Author:

jttt

Message:

• add New relation button to Preset dialog
• add required attribute to tagging preset (allows to specify what tags has to filled for osm primitive to qualify as having preset)
• show list of preset also in relation dialog

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java

@@ -6 +6 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 
@@ -12 +15 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
 
+import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel;
+import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel.PresetHandler;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
@@ -33 +40 @@
     private TagTable tagTable;
 
+    private PresetListPanel presetListPanel;
+    private final PresetHandler presetHandler;
+
     private AutoCompletionManager autocomplete;
     private AutoCompletionList acList;
@@ -46 +56 @@
         pnl.setLayout(new BorderLayout());
         pnl.add(new JScrollPane(tagTable), BorderLayout.CENTER);
+        if (presetHandler != null) {
+            presetListPanel = new PresetListPanel();
+            pnl.add(presetListPanel, BorderLayout.NORTH);
+        }
         return pnl;
     }
@@ -98 +112 @@
         gc.anchor = GridBagConstraints.CENTER;
         add(tablePanel,gc);
+
+        if (presetHandler != null) {
+            model.addTableModelListener(new TableModelListener() {
+                @Override
+                public void tableChanged(TableModelEvent e) {
+                    updatePresets();
+                }
+            });
+        }
     }
 
@@ -104 +127 @@
      * internally and can be retrieved with {@see #getModel()}.
      */
-    public TagEditorPanel() {
-        this(null);
+    public TagEditorPanel(PresetHandler presetHandler) {
+        this(null, presetHandler);
     }
 
@@ -111 +134 @@
      * Creates a new tag editor panel with a supplied model. If
      * {@code model} is null, a new model is created.
-     * 
+     *
      * @param model the tag editor model
      */
-    public TagEditorPanel(TagEditorModel model) {
+    public TagEditorPanel(TagEditorModel model, PresetHandler presetHandler) {
         this.model = model;
+        this.presetHandler = presetHandler;
         if (this.model == null) {
             this.model = new TagEditorModel();
@@ -135 +159 @@
      * tag editor panel. {@code layer} is the data layer from whose data set
      * tag values are proposed as auto completion items.
-     * 
+     *
      * @param layer the data layer. Must not be null.
      * @throws IllegalArgumentException thrown if {@code layer} is null
@@ -158 +182 @@
         super.setEnabled(enabled);
     }
+
+    private void updatePresets() {
+        Map<String, Map<String, Integer>> valuesCount = new HashMap<String, Map<String,Integer>>();
+        for (Entry<String, String> entry: model.getTags().entrySet()) {
+            Map<String, Integer> values = new HashMap<String, Integer>();
+            values.put(entry.getValue(), 1);
+            valuesCount.put(entry.getKey(), values);
+        }
+        presetListPanel.updatePresets(0, 0, 1, 0, valuesCount, presetHandler);
+        validate();
+    }
 }