Class Differencer
The engine is used by calling one of the findDifferences
methods and passing
in the objects to compare.
The engine calls the following methods on the input objects to perform the compare:
getChildren
: for enumerating the children of an object (if any),contentsEqual
: for comparing the content of leaf objects, that is, objects without children,visit
: for every pair of compared object the compare result is passed in.
getChildren
: tries to apply theIStructureComparator
interface to enumerate the children,contentsEqual
: tries to apply theIStreamContentAccessor
interface to perform a byte-wise content comparison,visit
: creates aDiffNode
for any detected difference between the compared objects and links it under a parent node effectively creating a tree of differences.
-
Field Summary
Modifier and TypeFieldDescriptionstatic final int
Difference constant (value 1) indicating one side was added.static final int
Difference constant (value 3) indicating side changed.static final int
Bit mask (value 3) for extracting the kind of difference.static final int
Three-way change constant (value 12) indicating a change on left and right sides.static final int
Difference constant (value 2) indicating one side was removed.static final int
Bit mask (value 12) for extracting the direction of a three-way change.static final int
Three-way change constant (value 4) indicating a change on left side.static final int
Difference constant (value 0) indicating no difference.static final int
Constant (value 16) indicating a change on left and right side (with respect to ancestor) but left and right are identical.static final int
Three-way change constant (value 8) indicating a change on right side. -
Constructor Summary
-
Method Summary
Modifier and TypeMethodDescriptionprotected boolean
contentsEqual
(Object input1, char contributor1, Object input2, char contributor2) Performs a content compare on the two given inputs.protected boolean
contentsEqual
(Object input1, Object input2) Performs a content compare on the two given inputs.findDifferences
(boolean threeWay, IProgressMonitor pm, Object data, Object ancestor, Object left, Object right) Starts the differencing engine on the three input objects.protected Object[]
getChildren
(Object input) Returns the children of the given input ornull
if there are no children.protected void
updateProgress
(IProgressMonitor progressMonitor, Object node) Called for every leaf or node compare to update progress information.protected Object
Called for every node or leaf comparison.
-
Field Details
-
NO_CHANGE
public static final int NO_CHANGEDifference constant (value 0) indicating no difference.- See Also:
-
ADDITION
public static final int ADDITIONDifference constant (value 1) indicating one side was added.- See Also:
-
DELETION
public static final int DELETIONDifference constant (value 2) indicating one side was removed.- See Also:
-
CHANGE
public static final int CHANGEDifference constant (value 3) indicating side changed.- See Also:
-
CHANGE_TYPE_MASK
public static final int CHANGE_TYPE_MASKBit mask (value 3) for extracting the kind of difference.- See Also:
-
LEFT
public static final int LEFTThree-way change constant (value 4) indicating a change on left side.- See Also:
-
RIGHT
public static final int RIGHTThree-way change constant (value 8) indicating a change on right side.- See Also:
-
CONFLICTING
public static final int CONFLICTINGThree-way change constant (value 12) indicating a change on left and right sides.- See Also:
-
DIRECTION_MASK
public static final int DIRECTION_MASKBit mask (value 12) for extracting the direction of a three-way change.- See Also:
-
PSEUDO_CONFLICT
public static final int PSEUDO_CONFLICTConstant (value 16) indicating a change on left and right side (with respect to ancestor) but left and right are identical.- See Also:
-
-
Constructor Details
-
Differencer
public Differencer()Creates a new differencing engine.
-
-
Method Details
-
findDifferences
public Object findDifferences(boolean threeWay, IProgressMonitor pm, Object data, Object ancestor, Object left, Object right) Starts the differencing engine on the three input objects. If threeWay istrue
a three-way comparison is performed, otherwise a two-way compare (in the latter case the ancestor argument is ignored). The progress monitor is passed to the methodupdateProgress
which is called for every node or leaf compare. The method returns the object that was returned from the top-most call to methodvisit
. At most two of the ancestor, left, and right parameters are allowed to benull
.- Parameters:
threeWay
- iftrue
a three-way comparison is performed, otherwise a two-way comparepm
- a progress monitor which is passed to methodupdateProgress
data
- a client data that is passed to the top-level call tovisit
ancestor
- the ancestor object of the compare (may benull
)left
- the left object of the compareright
- the right object of the compare- Returns:
- the object returned from the top most call to method
visit
, possiblynull
-
visit
Called for every node or leaf comparison. The differencing engine passes in the input objects of the compare and the result of the compare. The data object is the value returned from a call to thevisit
method on the parent input. It can be considered the "parent" reference and is useful when building a tree.The
Differencer
implementation returns a newDiffNode
which is initialized with the corresponding values. Subclasses may override.- Parameters:
data
- object returned from parent call tovisit
, possiblynull
result
- the result of the compare operation performed on the three inputsancestor
- the compare ancestor of the left and right inputsleft
- the left input to the compareright
- the right input to the compare- Returns:
- the result, possibly
null
-
contentsEqual
Performs a content compare on the two given inputs.The
Differencer
implementation returnscontentsEqual(Object input1, Object input2)
. Subclasses may override to implement a different content compare on the given inputs.- Parameters:
input1
- first input to contents comparecontributor1
- the contributor of input1input2
- second input to contents comparecontributor2
- the contributor of input2- Returns:
true
if content is equal- Since:
- 3.6
- Restriction:
- This method is not intended to be referenced by clients.
-
contentsEqual
Performs a content compare on the two given inputs.The
Differencer
implementation returnstrue
if both inputs implementIStreamContentAccessor
and their byte contents is identical. Subclasses may override to implement a different content compare on the given inputs.- Parameters:
input1
- first input to contents compareinput2
- second input to contents compare- Returns:
true
if content is equal
-
getChildren
Returns the children of the given input ornull
if there are no children.The
Differencer
implementation checks whether the input implements theIStructureComparator
interface. If yes it is used to return an array containing all children. Otherwisenull
is returned. Subclasses may override to implement a different strategy to enumerate children.- Parameters:
input
- the object for which to return children- Returns:
- the children of the given input or
null
if there are no children.
-
updateProgress
Called for every leaf or node compare to update progress information.The
Differencer
implementation shows the name of the input object as a subtask. Subclasses may override.- Parameters:
progressMonitor
- the progress monitor for reporting progressnode
- the currently processed non-null
node
-