Changeset 17887 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2021-05-12T23:31:56+02:00 (3 years ago)

Author:

simon04

Message:

fix #20879 - History browser: which version changed a tag (git blame)?

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/history/History.java (modified) (2 diffs)
• gui/history/TagTableCellRenderer.java (modified) (4 diffs)
• gui/history/TagTableColumnModel.java (modified) (2 diffs)
• gui/history/TagTableModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/history/History.java

@@ -7 +7 @@
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -190 +191 @@
 
     /**
+     * Replies the history primitive which changed the given key.
+     * @param version the version
+     * @param key the OSM key
+     * @return the history primitive which changed the given key
+     */
+    public HistoryOsmPrimitive getWhichChangedTag(long version, String key) {
+        HistoryOsmPrimitive primitive = getByVersion(version);
+        if (primitive == null) {
+            return null;
+        }
+        for (int i = versions.indexOf(primitive); i > 0; i--) {
+            if (!Objects.equals(versions.get(i).get(key), versions.get(i - 1).get(key))) {
+                return versions.get(i);
+            }
+        }
+        return versions.get(0);
+    }
+
+    /**
      * Replies the history primitive at given <code>date</code>. null,
      * if no such primitive exists.

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

@@ -7 +7 @@
 import javax.swing.JLabel;
 import javax.swing.JTable;
+import javax.swing.SwingConstants;
 import javax.swing.table.TableCellRenderer;
 
+import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -43 +47 @@
 
         String text = "";
+        String tooltip = null;
         if (model.hasTag(key)) {
             switch(column) {
@@ -53 +58 @@
                 text = model.getValue(key);
                 break;
+            case TagTableColumnModel.COLUMN_VERSION:
+                HistoryOsmPrimitive primitive = model.getWhichChangedTag(key);
+                if (primitive != null) {
+                    text = "v" + primitive.getVersion();
+                    tooltip = tr("Key ''{0}'' was changed in version {1}", key, primitive.getVersion());
+                }
             default: // Do nothing
             }
@@ -58 +69 @@
 
         setText(text);
-        setToolTipText(text);
+        setToolTipText(tooltip != null ? tooltip : text);
+        setHorizontalAlignment(column == TagTableColumnModel.COLUMN_VERSION ? SwingConstants.TRAILING : SwingConstants.LEADING);
         TwoColumnDiff.Item.DiffItemType diffItemType = model.getDiffItemType(key, column == TagTableColumnModel.COLUMN_VALUE);
         GuiHelper.setBackgroundReadable(this, diffItemType.getColor(isSelected, table.hasFocus()));

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

@@ -14 +14 @@
     protected static final int COLUMN_KEY = 0;
     protected static final int COLUMN_VALUE = 1;
+    protected static final int COLUMN_VERSION = 2;
 
     /**
@@ -25 +26 @@
         TagTableCellRenderer renderer = new TagTableCellRenderer();
 
-        // column 0 - Key
-        TableColumn col = new TableColumn(0);
+        TableColumn col = new TableColumn(COLUMN_KEY);
         col.setHeaderValue(tr("Key"));
         col.setCellRenderer(renderer);
+        col.setPreferredWidth(100);
         addColumn(col);
 
-        // column 1 - Value
-        col = new TableColumn(1);
+        col = new TableColumn(COLUMN_VALUE);
         col.setHeaderValue(tr("Value"));
         col.setCellRenderer(renderer);
+        col.setPreferredWidth(100);
+        addColumn(col);
+
+        col = new TableColumn(COLUMN_VERSION);
+        col.setHeaderValue(tr("Since"));
+        col.setCellRenderer(renderer);
+        col.setPreferredWidth(10);
         addColumn(col);
     }

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

@@ -84 +84 @@
 
     /**
+     * Returns the history primitive which changed the given key.
+     * @param key the OSM key
+     * @return the history primitive which changed the given key
+     */
+    public HistoryOsmPrimitive getWhichChangedTag(String key) {
+        HistoryOsmPrimitive primitive = model.getPointInTime(pointInTimeType);
+        if (primitive == null)
+            return null;
+        return model.getHistory().getWhichChangedTag(primitive.getVersion(), key);
+    }
+
+    /**
      * Determines if a tag exists in the opposite point in time for the given key.
      * @param key tag key
@@ -142 +154 @@
     @Override
     public int getColumnCount() {
-        return 2;
+        return 3;
     }