Changeset 10670 in josm for trunk/src/org/openstreetmap/josm/gui/history
- Timestamp:
- 2016-07-29T00:02:17+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/history
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java
r10637 r10670 36 36 boolean isValue) { 37 37 Color bgColor = UIManager.getColor("Table.background"); 38 if ( !model.hasTag(key) && model.isCurrentPointInTime()39 || !model.oppositeHasTag(key) && model.isReferencePointInTime()) {38 if ((!model.hasTag(key) && model.isCurrentPointInTime()) 39 || (!model.oppositeHasTag(key) && model.isReferencePointInTime())) { 40 40 bgColor = TwoColumnDiff.Item.DiffItemType.DELETED.getColor(); 41 } else if ( !model.oppositeHasTag(key) && model.isCurrentPointInTime()42 || !model.hasTag(key) && model.isReferencePointInTime()) {41 } else if ((!model.oppositeHasTag(key) && model.isCurrentPointInTime()) 42 || (!model.hasTag(key) && model.isReferencePointInTime())) { 43 43 bgColor = TwoColumnDiff.Item.DiffItemType.INSERTED.getColor(); 44 44 } else if (isValue && model.hasTag(key) && model.oppositeHasTag(key) && !model.hasSameValueAsOpposite(key)) { -
trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
r9246 r10670 79 79 Diff.Change scriptReversed = new Diff(referenceReversed, current).diff_2(false); 80 80 if (scriptReversed == null /* reference and current are identical */ 81 || script != null && scriptReversed.getTotalNumberOfChanges() < script.getTotalNumberOfChanges()) {81 || (script != null && scriptReversed.getTotalNumberOfChanges() < script.getTotalNumberOfChanges())) { 82 82 this.referenceReversed = true; 83 83 twoColumnDiffFromScript(scriptReversed, referenceReversed, current, true);
Note:
See TracChangeset
for help on using the changeset viewer.