Changeset 5340 in josm

Timestamp:

Jul 14, 2012 5:32:32 PM (10 months ago)

Author:

Don-vip

Message:

see #7505 - Hide redacted version in history browser when loading an .osm file containg primitives that have been redacted meanwhile

Location:

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

Files:

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

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

@@ -161 +161 @@
         if (history.getByVersion(primitive.getVersion()) != null)
             return primitive.isModified();
+
+        // if latest version from history is higher than a non existing primitive version,
+        // that means this version has been redacted and the primitive cannot be used.
+        if (history.getLatest().getVersion() > primitive.getVersion())
+            return false;
 
         // latest has a higher version than one of the primitives

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

@@ -6 +6 @@
 import javax.swing.SwingConstants;
 import javax.swing.table.DefaultTableColumnModel;
-import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 
@@ -25 +24 @@
         col.setResizable(false);
         addColumn(col);
-        // column 1 - Reverence
+        // column 1 - Reference
         col = new TableColumn(1);
         col.setHeaderValue(tr("A"));