Changeset 11322 in josm for trunk/src/org

Timestamp:

2016-11-27T02:36:59+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14032 - include editor (retrieved from created_by changeset tag) in history dialog

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowserModel.java (modified) (3 diffs)
• VersionTable.java (modified) (1 diff)
• VersionTableColumnModel.java (modified) (2 diffs)

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

@@ -16 +16 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -423 +424 @@
         public Object getValueAt(int row, int column) {
             switch (column) {
-            case 0:
+            case VersionTableColumnModel.COL_VERSION:
                 return Long.toString(getPrimitive(row).getVersion());
-            case 1:
+            case VersionTableColumnModel.COL_REFERENCE:
                 return isReferencePointInTime(row);
-            case 2:
+            case VersionTableColumnModel.COL_CURRENT:
                 return isCurrentPointInTime(row);
-            case 3:
+            case VersionTableColumnModel.COL_DATE:
                 HistoryOsmPrimitive p3 = getPrimitive(row);
                 if (p3 != null && p3.getTimestamp() != null)
                     return DateUtils.formatDateTime(p3.getTimestamp(), DateFormat.SHORT, DateFormat.SHORT);
                 return null;
-            case 4:
+            case VersionTableColumnModel.COL_USER:
                 HistoryOsmPrimitive p4 = getPrimitive(row);
                 if (p4 != null) {
@@ -440 +441 @@
                     if (user != null)
                         return user.getName();
+                }
+                return null;
+            case VersionTableColumnModel.COL_EDITOR:
+                HistoryOsmPrimitive p5 = getPrimitive(row);
+                if (p5 != null) {
+                    Changeset cs = p5.getChangeset();
+                    if (cs != null) {
+                        return cs.get("created_by");
+                    }
                 }
                 return null;

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

@@ -97 +97 @@
             adjustColumnWidth(this, 3, 0);
             adjustColumnWidth(this, 4, 0);
+            adjustColumnWidth(this, 5, 0);
         });
     }

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

@@ -25 +25 @@
     /** Column index for user */
     public static final int COL_USER = 4;
+    /** Column index for editor */
+    public static final int COL_EDITOR = 5;
 
     /**
@@ -67 +69 @@
         col.setResizable(false);
         addColumn(col);
+        // column 5 - Editor
+        col = new TableColumn(COL_EDITOR);
+        col.setHeaderValue(tr("Editor"));
+        col.setResizable(false);
+        addColumn(col);
     }
 }