Changeset 5340 in josm


Ignore:
Timestamp:
2012-07-14T17:32:32+02:00 (7 years 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

    r5319 r5340  
    161161        if (history.getByVersion(primitive.getVersion()) != null)
    162162            return primitive.isModified();
     163
     164        // if latest version from history is higher than a non existing primitive version,
     165        // that means this version has been redacted and the primitive cannot be used.
     166        if (history.getLatest().getVersion() > primitive.getVersion())
     167            return false;
    163168
    164169        // latest has a higher version than one of the primitives
  • trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java

    r5266 r5340  
    66import javax.swing.SwingConstants;
    77import javax.swing.table.DefaultTableColumnModel;
    8 import javax.swing.table.TableCellRenderer;
    98import javax.swing.table.TableColumn;
    109
     
    2524        col.setResizable(false);
    2625        addColumn(col);
    27         // column 1 - Reverence
     26        // column 1 - Reference
    2827        col = new TableColumn(1);
    2928        col.setHeaderValue(tr("A"));
Note: See TracChangeset for help on using the changeset viewer.