Package | Description |
---|---|
oracle.javatools.compare |
Contains classes and interfaces for compare / merge components, including diff algorithms,
model classes and some view implementations.
|
oracle.javatools.patch | |
oracle.jdeveloper.merge |
Contains classes for merge editor abstractions, including an editor addin, commands, a
controller, and utilities.
|
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 |
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 |
---|---|
PatchModel |
PatchEngine.createModel(PatchContributor fromFileContributor,
PatchCreateOptions createOptions)
Creates a
PatchModel based on differences between the given contributor
and the engine's to-file contributor, according to options. |
PatchModel |
PatchEngine.createModel(PatchStreamContributor fromStream,
PatchCreateOptions createOptions)
Creates a
PatchModel based on differences between the given inputstream
and the engine's to input stream, according to options. |
Modifier and Type | Method and Description |
---|---|
CompareModel |
MergeEngine.executeMerge()
Executes a three-way merge.
|