public class

MergeVisitor

extends Object
implements RevisionVisitor
java.lang.Object
   ↳ org.apache.commons.jrcs.diff.MergeVisitor

Class Overview

.. makes changes to the revisions it visits, so if a conflict is detected, the revisions should be discarded.

TODO: Support ignoring whitespace.

Summary

Fields
public static final Category log
Public Constructors
MergeVisitor()
Public Methods
void init(Object[] orig)
Initialise this visitor instance with a copy of the original object array being diffed.
void visit(ChangeDelta delta)
Implementation of the Revision Visitor interface.
void visit(Revision revision)
Implementation of the Revision Visitor interface.
void visit(DeleteDelta delta)
Implementation of the Revision Visitor interface.
void visit(AddDelta delta)
Implementation of the Revision Visitor interface.
boolean wasConflictDetected()
Returns true if a conflict was detected.
[Expand]
Inherited Methods
From class java.lang.Object
From interface org.apache.commons.jrcs.diff.RevisionVisitor

Fields

public static final Category log

Public Constructors

public MergeVisitor ()

Public Methods

public void init (Object[] orig)

Initialise this visitor instance with a copy of the original object array being diffed.

public void visit (ChangeDelta delta)

Implementation of the Revision Visitor interface.

public void visit (Revision revision)

Implementation of the Revision Visitor interface.

public void visit (DeleteDelta delta)

Implementation of the Revision Visitor interface.

public void visit (AddDelta delta)

Implementation of the Revision Visitor interface.

public boolean wasConflictDetected ()

Returns true if a conflict was detected.

Returns
  • true if a conflict has been detected, false otherwise.