Changeset 33016 in osm for applications/editors

Timestamp:

2016-09-28T02:01:20+02:00 (8 years ago)

Author:

donvip

Message:

don't reinvent the wheel: replace KeyValuePair by Tag class

Location:

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor

Files:

• TagEditorDialog.java (modified) (3 diffs)
• editor/TagEditorModel.java (modified) (2 diffs)
• tagspec/KeyValuePair.java (deleted)
• tagspec/TagSpecifications.java (modified) (2 diffs)
• tagspec/ui/ITagSelectorListener.java (modified) (1 diff)
• tagspec/ui/TabularTagSelector.java (modified) (5 diffs)
• tagspec/ui/TagsTableModel.java (modified) (8 diffs)

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
@@ -38 +39 @@
 import org.openstreetmap.josm.plugins.tageditor.preset.ui.IPresetSelectorListener;
 import org.openstreetmap.josm.plugins.tageditor.preset.ui.TabularPresetSelector;
-import org.openstreetmap.josm.plugins.tageditor.tagspec.KeyValuePair;
 import org.openstreetmap.josm.plugins.tageditor.tagspec.ui.ITagSelectorListener;
 import org.openstreetmap.josm.plugins.tageditor.tagspec.ui.TabularTagSelector;
@@ -176 +176 @@
                 new ITagSelectorListener() {
                     @Override
-                    public void itemSelected(KeyValuePair pair) {
+                    public void itemSelected(Tag pair) {
                         tagEditor.stopEditing();
                         tagEditor.getModel().applyKeyValuePair(pair);

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java

@@ -14 +14 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.tagging.TagModel;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.plugins.tageditor.preset.AdvancedTag;
-import org.openstreetmap.josm.plugins.tageditor.tagspec.KeyValuePair;
 
 @SuppressWarnings("serial")
@@ -84 +84 @@
 
     /**
-     * applies a tag given by a {@see KeyValuePair} to the model
+     * applies a tag given by a {@see Tag} to the model
      *
      * @param pair the key value pair
      */
-    public void applyKeyValuePair(KeyValuePair pair) {
+    public void applyKeyValuePair(Tag pair) {
         TagModel tagModel = get(pair.getKey());
         if (tagModel == null) {

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java

@@ -12 +12 @@
 import java.util.logging.Logger;
 
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
@@ -163 +164 @@
      * @return the list
      */
-    public ArrayList<KeyValuePair> asList() {
-        ArrayList<KeyValuePair> entries = new ArrayList<>();
+    public ArrayList<Tag> asList() {
+        ArrayList<Tag> entries = new ArrayList<>();
 
         for (TagSpecification s : tagSpecifications) {
             for (LabelSpecification l : s.getLables()) {
-                entries.add(new KeyValuePair(s.getKey(), l.getValue()));
+                entries.add(new Tag(s.getKey(), l.getValue()));
             }
         }

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/ITagSelectorListener.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.tageditor.tagspec.ui;
 
-import org.openstreetmap.josm.plugins.tageditor.tagspec.KeyValuePair;
+import org.openstreetmap.josm.data.osm.Tag;
 
 public interface ITagSelectorListener {
-    void itemSelected(KeyValuePair pair);
+    void itemSelected(Tag pair);
 }

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java

@@ -30 +30 @@
 import javax.swing.event.ListSelectionListener;
 
-import org.openstreetmap.josm.plugins.tageditor.tagspec.KeyValuePair;
+import org.openstreetmap.josm.data.osm.Tag;
 
 public class TabularTagSelector extends JPanel {
@@ -97 +97 @@
                 int rowNum = tagsTable.getSelectedRow();
                 if (rowNum >= 0) {
-                    KeyValuePair item = getModel().getVisibleItem(rowNum);
+                    Tag item = getModel().getVisibleItem(rowNum);
                     fireItemSelected(item);
                 }
@@ -124 +124 @@
                         int row = tagsTable.getSelectedRow();
                         if (row >= 0) {
-                            KeyValuePair item = getModel().getVisibleItem(row);
+                            Tag item = getModel().getVisibleItem(row);
                             fireItemSelected(item);
                         }
@@ -236 +236 @@
     }
 
-    protected void fireItemSelected(KeyValuePair pair) {
+    protected void fireItemSelected(Tag pair) {
         synchronized (this.listeners) {
             for (ITagSelectorListener listener: listeners) {
@@ -249 +249 @@
             if (e.getClickCount() == 2) {
                 int rowNum = tagsTable.rowAtPoint(e.getPoint());
-                KeyValuePair pair = getModel().getVisibleItem(rowNum);
+                Tag pair = getModel().getVisibleItem(rowNum);
                 fireItemSelected(pair);
             }

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java

@@ -12 +12 @@
 import javax.swing.table.AbstractTableModel;
 
-import org.openstreetmap.josm.plugins.tageditor.tagspec.KeyValuePair;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.plugins.tageditor.tagspec.TagSpecifications;
 
@@ -19 +19 @@
     private static Logger logger = Logger.getLogger(TagsTableModel.class.getName());
 
-    private ArrayList<KeyValuePair> items = null;
-    private ArrayList<KeyValuePair> visibleItems = null;
+    private ArrayList<Tag> items = null;
+    private ArrayList<Tag> visibleItems = null;
 
     public TagsTableModel() {
@@ -30 +30 @@
         Collections.sort(
                 items,
-                new Comparator<KeyValuePair>() {
+                new Comparator<Tag>() {
                     @Override
-                    public int compare(KeyValuePair self,
-                            KeyValuePair other) {
+                    public int compare(Tag self, Tag other) {
                         int ret = self.getKey().compareToIgnoreCase(other.getKey());
 
@@ -63 +62 @@
         items = spec.asList();
         sort();
-        for (KeyValuePair item : items) {
+        for (Tag item : items) {
             visibleItems.add(item);
         }
@@ -80 +79 @@
     @Override
     public Object getValueAt(int row, int col) {
-        KeyValuePair pair = visibleItems.get(row);
+        Tag pair = visibleItems.get(row);
         switch(col) {
         case 0: return pair.getKey();
@@ -94 +93 @@
             if (filter == null || filter.trim().equals("")) {
                 visibleItems.clear();
-                for (KeyValuePair pair: items) {
+                for (Tag pair: items) {
                     visibleItems.add(pair);
                 }
@@ -100 +99 @@
                 visibleItems.clear();
                 filter = filter.toLowerCase();
-                for (KeyValuePair pair: items) {
+                for (Tag pair: items) {
                     if (pair.getKey().toLowerCase().trim().startsWith(filter)
                             || pair.getValue().toLowerCase().trim().startsWith(filter)) {
@@ -117 +116 @@
     }
 
-    public KeyValuePair getVisibleItem(int row) {
+    public Tag getVisibleItem(int row) {
         if (row < 0 || row >= visibleItems.size())
             throw new IndexOutOfBoundsException("row is out of bound: row=" + row);