org.openstreetmap.josm.gui.history

Class TwoColumnDiff

java.lang.Object

org.openstreetmap.josm.gui.history.TwoColumnDiff

class TwoColumnDiff
extends Object

Produces a "two column diff" of two lists. (same as diff -y) Each list is annotated with the changes relative to the other, and "empty" cells are inserted so the lists are comparable item by item. diff on [1 2 3 4] [1 a 4 5] yields: item(SAME, 1) item(SAME, 1) item(CHANGED, 2) item(CHANGED, 2) item(DELETED, 3) item(EMPTY) item(SAME, 4) item(SAME, 4) item(EMPTY) item(INSERTED, 5)

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	TwoColumnDiff.Item

Field Summary

Fields

Modifier and Type	Field and Description
private Object[]	current
List<TwoColumnDiff.Item>	currentDiff
private Object[]	reference
List<TwoColumnDiff.Item>	referenceDiff
(package private) boolean	referenceReversed

Constructor Summary

Constructors

Constructor and Description
TwoColumnDiff(Object[] reference, Object[] current)

Method Summary

Modifier and Type	Method and Description
private void	diff()
private void	twoColumnDiffFromScript(Diff.Change script, Object[] a, Object[] b, boolean reversed) The result from the diff algorithm is a "script" (a compressed description of the changes) This method expands this script into a full two column description.

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

referenceDiff

public List<TwoColumnDiff.Item> referenceDiff

currentDiff

public List<TwoColumnDiff.Item> currentDiff

reference

private final Object[] reference

current

private final Object[] current

referenceReversed

boolean referenceReversed

Constructor Detail

TwoColumnDiff

TwoColumnDiff(Object[] reference,
              Object[] current)

Method Detail

diff

private void diff()

twoColumnDiffFromScript

private void twoColumnDiffFromScript(Diff.Change script,
                                     Object[] a,
                                     Object[] b,
                                     boolean reversed)

The result from the diff algorithm is a "script" (a compressed description of the changes) This method expands this script into a full two column description.

Parameters:

script - diff script

a - reference version

b - current version

reversed - if true use TwoColumnDiff.Item.DiffItemType.REVERSED instead of TwoColumnDiff.Item.DiffItemType.SAME