Changeset 11647 in josm for trunk

Timestamp:

2017-03-02T00:32:19+01:00 (8 years ago)

Author:

Don-vip

Message:

see #14175 - refactor HistoryBrowserModel

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/history/TagInfoTransferHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/history/TagTableModel.java (added)
• test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserModelTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import javax.swing.JTable;
-import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableModel;
 
@@ -96 +92 @@
     public HistoryBrowserModel() {
         versionTableModel = new VersionTableModel(this);
-        currentTagTableModel = new TagTableModel(PointInTimeType.CURRENT_POINT_IN_TIME);
-        referenceTagTableModel = new TagTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME);
+        currentTagTableModel = new TagTableModel(this, PointInTimeType.CURRENT_POINT_IN_TIME);
+        referenceTagTableModel = new TagTableModel(this, PointInTimeType.REFERENCE_POINT_IN_TIME);
         referenceNodeListTableModel = new DiffTableModel();
         currentNodeListTableModel = new DiffTableModel();
@@ -482 +478 @@
      * Returns the latest {@code HistoryOsmPrimitive}.
      * @return the latest {@code HistoryOsmPrimitive}
+     * @since 11646
      */
     public HistoryOsmPrimitive getLatest() {
@@ -488 +485 @@
 
     /**
-     * The table model for the tags of the version at {@link PointInTimeType#REFERENCE_POINT_IN_TIME}
-     * or {@link PointInTimeType#CURRENT_POINT_IN_TIME}
-     *
-     */
-    public final class TagTableModel extends AbstractTableModel {
-
-        private List<String> keys;
-        private final PointInTimeType pointInTimeType;
-
-        private TagTableModel(PointInTimeType type) {
-            pointInTimeType = type;
-            initKeyList();
-        }
-
-        private void initKeyList() {
-            Set<String> keySet = new HashSet<>();
-            if (current != null) {
-                keySet.addAll(current.getTags().keySet());
-            }
-            if (reference != null) {
-                keySet.addAll(reference.getTags().keySet());
-            }
-            keys = new ArrayList<>(keySet);
-            Collections.sort(keys);
-            fireTableDataChanged();
-        }
-
-        @Override
-        public int getRowCount() {
-            if (keys == null)
-                return 0;
-            return keys.size();
-        }
-
-        @Override
-        public Object getValueAt(int row, int column) {
-            return getKeyAt(row);
-        }
-
-        /**
-         * Get the key for the given row.
-         * @param row The row
-         * @return The key in that row.
-         * @since 10637
-         */
-        public String getKeyAt(int row) {
-            return keys.get(row);
-        }
-
-        /**
-         * Determines if a tag exists for the given key.
-         * @param key tag key
-         * @return {@code true} if a tag exists for the given key
-         */
-        public boolean hasTag(String key) {
-            HistoryOsmPrimitive primitive = getPointInTime(pointInTimeType);
-            return primitive != null && primitive.hasKey(key);
-        }
-
-        /**
-         * Returns the tag value for the given key.
-         * @param key tag key
-         * @return tag value, or null
-         */
-        public String getValue(String key) {
-            HistoryOsmPrimitive primitive = getPointInTime(pointInTimeType);
-            if (primitive == null)
-                return null;
-            return primitive.get(key);
-        }
-
-        /**
-         * Determines if a tag exists in the opposite point in time for the given key.
-         * @param key tag key
-         * @return {@code true} if a tag exists for the given key
-         */
-        public boolean oppositeHasTag(String key) {
-            PointInTimeType opposite = pointInTimeType.opposite();
-            HistoryOsmPrimitive primitive = getPointInTime(opposite);
-            return primitive != null && primitive.hasKey(key);
-        }
-
-        /**
-         * Returns the tag value in the opposite point in time for the given key.
-         * @param key tag key
-         * @return tag value, or null
-         */
-        public String getOppositeValue(String key) {
-            PointInTimeType opposite = pointInTimeType.opposite();
-            HistoryOsmPrimitive primitive = getPointInTime(opposite);
-            if (primitive == null)
-                return null;
-            return primitive.get(key);
-        }
-
-        /**
-         * Determines if the tag value is the same in the opposite point in time for the given key.
-         * @param key tag key
-         * @return {@code true} if the tag value is the same in the opposite point in time for the given key
-         */
-        public boolean hasSameValueAsOpposite(String key) {
-            String value = getValue(key);
-            String oppositeValue = getOppositeValue(key);
-            return value != null && value.equals(oppositeValue);
-        }
-
-        /**
-         * Returns the type of point in time.
-         * @return the type of point in time
-         */
-        public PointInTimeType getPointInTimeType() {
-            return pointInTimeType;
-        }
-
-        /**
-         * Determines if this is the current point in time.
-         * @return {@code true} if this is the current point in time
-         */
-        public boolean isCurrentPointInTime() {
-            return pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME);
-        }
-
-        /**
-         * Determines if this is the reference point in time.
-         * @return {@code true} if this is the reference point in time
-         */
-        public boolean isReferencePointInTime() {
-            return pointInTimeType.equals(PointInTimeType.REFERENCE_POINT_IN_TIME);
-        }
-
-        @Override
-        public int getColumnCount() {
-            return 2;
-        }
+     * Returns the key set (union of current and reference point in type key sets).
+     * @return the key set (union of current and reference point in type key sets)
+     * @since 11647
+     */
+    public Set<String> getKeySet() {
+        Set<String> keySet = new HashSet<>();
+        if (current != null) {
+            keySet.addAll(current.getTags().keySet());
+        }
+        if (reference != null) {
+            keySet.addAll(reference.getTags().keySet());
+        }
+        return keySet;
     }
 

trunk/src/org/openstreetmap/josm/gui/history/TagInfoTransferHandler.java

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.datatransfer.TagTransferable;
 import org.openstreetmap.josm.gui.datatransfer.data.TagTransferData;
-import org.openstreetmap.josm.gui.history.HistoryBrowserModel.TagTableModel;
 
 /**

trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java

@@ -33 +33 @@
     }
 
-    protected void setBackgroundReadable(String key, HistoryBrowserModel.TagTableModel model, boolean isSelected, boolean hasFocus,
-            boolean isValue) {
+    protected void setBackgroundReadable(String key, TagTableModel model, boolean isSelected, boolean hasFocus, boolean isValue) {
         Color bgColor = UIManager.getColor("Table.background");
         if ((!model.hasTag(key) && model.isCurrentPointInTime())
@@ -64 +63 @@
 
         String key = (String) value;
-        HistoryBrowserModel.TagTableModel model = getTagTableModel(table);
+        TagTableModel model = getTagTableModel(table);
 
         String text = "";
@@ -87 +86 @@
     }
 
-    protected HistoryBrowserModel.TagTableModel getTagTableModel(JTable table) {
-        return (HistoryBrowserModel.TagTableModel) table.getModel();
+    protected TagTableModel getTagTableModel(JTable table) {
+        return (TagTableModel) table.getModel();
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserModelTest.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 import org.openstreetmap.josm.data.osm.history.HistoryNode;
-import org.openstreetmap.josm.gui.history.HistoryBrowserModel.TagTableModel;
 import org.openstreetmap.josm.testutils.JOSMTestRules;