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

Timestamp:

2016-01-23T18:20:46+01:00 (9 years ago)

Author:

Don-vip

Message:

see #12412 - improve support of multipolygon presets type

File:

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

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

@@ -9 +9 @@
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
-import java.util.EnumSet;
 
 import javax.swing.AbstractAction;
@@ -19 +18 @@
 import javax.swing.event.TableModelListener;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -24 +24 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -32 +31 @@
  * and tag values. Two action buttons are placed on the left, one for adding
  * a new tag and one for deleting the currently selected tags.
- *
+ * @since 2040
  */
 public class TagEditorPanel extends JPanel {
@@ -140 +139 @@
 
         addFocusListener(new FocusAdapter() {
-            @Override public void focusGained(FocusEvent e) {
+            @Override
+            public void focusGained(FocusEvent e) {
                 tagTable.requestFocusInCell(0, 0);
             }
@@ -149 +149 @@
      * Creates a new tag editor panel. The editor model is created
      * internally and can be retrieved with {@link #getModel()}.
+     * @param primitive primitive to consider
      * @param presetHandler tagging preset handler
      */
-    public TagEditorPanel(TaggingPresetHandler presetHandler) {
-        this(null, presetHandler, 0);
+    public TagEditorPanel(OsmPrimitive primitive, TaggingPresetHandler presetHandler) {
+        this(new TagEditorModel().forPrimitive(primitive), presetHandler, 0);
     }
 
@@ -198 +199 @@
         editor.setAutoCompletionManager(autocomplete);
         editor.setAutoCompletionList(acList);
-        editor = ((TagCellEditor) tagTable.getColumnModel().getColumn(1).getCellEditor());
+        editor = (TagCellEditor) tagTable.getColumnModel().getColumn(1).getCellEditor();
         editor.setAutoCompletionManager(autocomplete);
         editor.setAutoCompletionList(acList);
@@ -211 +212 @@
     private void updatePresets() {
         presetListPanel.updatePresets(
-                EnumSet.of(TaggingPresetType.RELATION),
+                model.getTaggingPresetTypes(),
                 model.getTags(), presetHandler);
         validate();