Package | Description |
---|---|
oracle.javatools.compare |
Contains classes and interfaces for compare / merge components, including diff algorithms,
model classes and some view implementations.
|
oracle.javatools.compare.view | |
oracle.javatools.compare.view.list | |
oracle.javatools.compare.view.wedge | |
oracle.javatools.patch | |
oracle.jdeveloper.merge |
Contains classes for merge editor abstractions, including an editor addin, commands, a
controller, and utilities.
|
oracle.jdeveloper.vcs.versionhistory |
Modifier and Type | Method and Description |
---|---|
CompareModel |
CompareAlgorithm.compare(CompareContributor first,
CompareContributor second)
Compare two contributors, returning a model of the differences between
the two.
|
static CompareModel |
CompareModelFactory.createCompareModel(CompareContributor first,
CompareContributor second)
Compare the first contributor to the second contributor and return
a model describing the differences.
|
static CompareModel |
CompareModelFactory.createCompareModel(CompareContributor first,
CompareContributor second,
CompareType type)
Compare the first contributor to the second contributor and return
a model describing the differences.
|
static CompareModel |
CompareModelFactory.createCompareModel(CompareContributor first,
CompareContributor second,
CompareType type,
CompareAlgorithm compareAlgorithm) |
static CompareModel |
CompareModelFactory.createMergeModel(CompareContributor first,
CompareContributor second,
CompareContributor ancestor)
Merge the first contributor and the second contributor based on a third and
return a model of conflicting differences.
|
static CompareModel |
CompareModelFactory.createMergeModel(CompareContributor first,
CompareContributor second,
CompareContributor ancestor,
CompareType type)
Merge the first contributor and the second contributor based on a third and
return a model of conflicting differences.
|
CompareModel |
CompareView.getModel()
Get the model for this view.
|
CompareModel |
CompareMergeAlgorithm.merge(CompareContributor first,
CompareContributor second,
CompareContributor ancestor)
Merge two contributors based on a third, returning a model of the
conflicting differences between the two.
|
Modifier and Type | Method and Description |
---|---|
static CompareView |
CompareViewFactory.createCompareView(CompareModel model)
Create a compare view suitable for displaying the specified model.
|
static CompareView |
CompareViewFactory.createCompareView(CompareModel model,
CompareViewBias bias)
Create a compare view suitable for displaying the specified model.
|
static CompareView |
CompareViewFactory.createMergeView(CompareModel model)
Create a merge view suitable for displaying the specified model.
|
static CompareView |
CompareViewFactory.createView(CompareModel model,
CompareMode mode,
java.lang.Class<? extends CompareView> viewClass)
Create a view suitable for displaying the specified model.
|
static CompareView |
CompareViewFactory.createView(CompareModel model,
CompareMode mode,
Thunk<java.lang.Class<? extends CompareView>> viewClass) |
void |
CompareView.setModel(CompareModel model)
Set the model for this view.
|
Modifier and Type | Method and Description |
---|---|
protected CompareModel |
BaseCompareView.createModel(CompareDifference[] differences) |
protected CompareModel |
SequenceCompareView.createModel(CompareModel compareModel,
CompareDifference[] differences) |
protected abstract CompareModel |
BaseCompareView.createModel(CompareModel compareModel,
CompareDifference[] differences) |
protected CompareModel |
BaseCompareView.createMutableModel(CompareModel compareModel) |
CompareModel |
BaseCompareView.getCompareModel() |
CompareModel |
BaseCompareView.getModel() |
Modifier and Type | Method and Description |
---|---|
protected javax.swing.Action |
BaseCompareView.createMarkAllResolvedAction(CompareModel compareModel) |
protected CompareModel |
SequenceCompareView.createModel(CompareModel compareModel,
CompareDifference[] differences) |
protected abstract CompareModel |
BaseCompareView.createModel(CompareModel compareModel,
CompareDifference[] differences) |
protected CompareModel |
BaseCompareView.createMutableModel(CompareModel compareModel) |
static boolean |
CompareViewUtil.equal(CompareModel model,
oracle.javatools.compare.algorithm.sequence.SequenceCompareDifference block,
ContributorKind contributor1,
ContributorKind contributor2) |
protected void |
BaseCompareView.initializeView(CompareModel compareModel) |
protected void |
BaseCompareView.markAllResolved(CompareModel compareModel)
Mark all differences in the given model as resolved.
|
protected void |
BaseCompareView.setCompareModel(CompareModel compareModel) |
void |
BaseCompareView.setModel(CompareModel compareModel) |
protected void |
BaseCompareView.updateModel(CompareModel model) |
Modifier and Type | Method and Description |
---|---|
protected void |
ListCompareView.initializeView(CompareModel compareModel) |
Modifier and Type | Method and Description |
---|---|
protected CompareModel |
WedgeCompareView.createModel(CompareModel compareModel,
CompareDifference[] differences) |
protected CompareModel |
WedgeCompareView.createMutableModel(CompareModel compareModel) |
Modifier and Type | Method and Description |
---|---|
protected CompareModel |
WedgeCompareView.createModel(CompareModel compareModel,
CompareDifference[] differences) |
protected CompareModel |
WedgeCompareView.createMutableModel(CompareModel compareModel) |
protected void |
WedgeCompareView.initializeView(CompareModel model) |
Modifier and Type | Method and Description |
---|---|
CompareModel |
PatchCompareView.getModel() |
Modifier and Type | Method and Description |
---|---|
void |
PatchCompareView.setModel(CompareModel compareModel) |
Modifier and Type | Method and Description |
---|---|
protected CompareModel |
BaseMergeEditor.createMergeModel(Context context)
Creates a merge compare model, based on the current editor context.
|
protected CompareModel |
BaseTextMergeEditor.createMergeModelImpl(Context context)
Creates a merge compare model, based on the current editor context (implementor).
|
protected abstract CompareModel |
BaseMergeEditor.createMergeModelImpl(Context context)
Creates a merge compare model, based on the current editor context (implementor).
|
protected CompareModel |
BaseTextMergeEditor.createMergeModelSS(Context context) |
CompareModel |
MergeEngine.executeMerge()
Executes a three-way merge.
|
static CompareModel |
MergeContext.getModel(Context context) |
Modifier and Type | Method and Description |
---|---|
protected void |
BaseMergeEditor.initializeMergeModel(CompareModel mergeModel) |
protected boolean |
BaseTextMergeEditor.saveMergeImpl(Context context,
CompareModel compareModel)
Deprecated.
only required for dynamic editor behaviors; merge editors
should now be statically registered against a derivative type of
BaseMergeNode . |
protected boolean |
BaseMergeEditor.saveMergeImpl(Context context,
CompareModel compareModel)
Deprecated.
only required for dynamic editor behaviors; merge editors
should now be statically registered against a derivative type of
BaseMergeNode . |
static void |
MergeContext.setModel(Context context,
CompareModel model) |
protected boolean |
BaseTextMergeEditor.validateContent(CompareModel model) |
protected abstract boolean |
BaseMergeEditor.validateContent(CompareModel compareModel)
Validate the content of the merged result.
|
Modifier and Type | Method and Description |
---|---|
protected CompareView |
VersionHistoryViewer.createCompareView(CompareModel model) |