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.algorithm.sequence | |
oracle.javatools.compare.algorithm.text | |
oracle.javatools.compare.view | |
oracle.javatools.history |
Provides a model and UI components for displaying the history of a resource.
|
oracle.jdeveloper.compare |
contains classes nbsp;that can be used to invoke and control the integrated compare (diff) viewer in JDeveloper and hook into the Compare With menu.
|
oracle.jdeveloper.history | |
oracle.jdeveloper.merge |
Contains classes for merge editor abstractions, including an editor addin, commands, a
controller, and utilities.
|
oracle.jdeveloper.vcs.generic | |
oracle.jdeveloper.vcs.versiontree |
Modifier and Type | Class and Description |
---|---|
static class |
CompareMain.FileCompareContributor
Deprecated.
|
Modifier and Type | Method and Description |
---|---|
CompareContributor |
CompareModel.getContributor(ContributorKind contributor)
Get the specified contributor to this compare.
|
Modifier and Type | Method and Description |
---|---|
boolean |
CompareAlgorithm.canCompare(CompareContributor first,
CompareContributor second)
Deprecated.
not replaced.
|
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.
|
oracle.javatools.compare.algorithm.list.ListCompareContributor |
ContributorCache.getValue(CompareContributor key) |
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.
|
void |
ContributorCache.putContributorInfo(CompareContributor key,
oracle.javatools.compare.algorithm.list.ListCompareContributor value) |
void |
ContributorCache.remove(CompareContributor contrib) |
Modifier and Type | Class and Description |
---|---|
class |
oracle.javatools.compare.algorithm.sequence.SequenceCompareContributor
A CompareContributor that is used with the SequenceCompareAlgorithm
must implement this interface.
|
Modifier and Type | Class and Description |
---|---|
class |
oracle.javatools.compare.algorithm.text.TextCompareContributor
Base class for a text contributor.
|
Modifier and Type | Method and Description |
---|---|
protected CompareContributor |
BaseCompareView.getContributor(ContributorKind contributorKind) |
CompareContributor |
BaseCompareView.getFocusContributor() |
Modifier and Type | Method and Description |
---|---|
CompareContributor |
HistoryEntry.getCompareContributor()
Get the compare contributor for this entry in the history.
|
Modifier and Type | Method and Description |
---|---|
static CompareContributor[] |
CompareContext.getContributors(Context context) |
Modifier and Type | Method and Description |
---|---|
static void |
CompareContext.setContributors(Context context,
CompareContributor[] contributors) |
void |
CompareViewer.show(CompareContributor left,
CompareContributor right)
Deprecated.
replaced by
#show(CompareContributor,CompareContributor,Node) . |
abstract void |
CompareViewer.show(CompareContributor left,
CompareContributor right,
Element contextNode)
Display the compare viewer for the specified two contributors.
|
Modifier and Type | Method and Description |
---|---|
abstract void |
RestoreFromRevisionHelper.restore(Node node,
CompareContributor contributor)
Subclasses to implement algorithm to restore a revision of the given node using
the given CompareContributor.
|
Modifier and Type | Class and Description |
---|---|
class |
TextMergeContributor
Textual merge compare contributor class, based around a
TextBuffer . |
Modifier and Type | Method and Description |
---|---|
static CompareContributor |
MergeContext.getAncestorContributor(Context context) |
static CompareContributor |
MergeContext.getFirstContributor(Context context) |
static CompareContributor |
MergeContext.getSecondContributor(Context context) |
Modifier and Type | Method and Description |
---|---|
static java.net.URL |
MergeURLFileSystemHelper.newMergeURL(CompareContributor source,
CompareContributor target,
CompareContributor ancestor) |
void |
MergeEngine.prepareMerge(CompareContributor contributor1,
CompareContributor contributor2,
CompareContributor contributorA)
Deprecated.
use
#prepareMerge(CompareContributor, CompareContributor, CompareContributor, Node) |
void |
MergeEngine.prepareMerge(CompareContributor contributor1,
CompareContributor contributor2,
CompareContributor contributorA,
Element contextNode)
Prepares a three-way merge.
|
static void |
MergeContext.setAncestorContributor(Context context,
CompareContributor ancestorContributor) |
static void |
MergeContext.setFirstContributor(Context context,
CompareContributor firstContributor) |
static void |
MergeContext.setSecondContributor(Context context,
CompareContributor secondContributor) |
Modifier and Type | Method and Description |
---|---|
protected CompareContributor |
VCSHistoryEntry.createCompareContributor(java.net.URL sourceUrl,
RevisionIdentifier revision) |
protected CompareContributor |
VCSHistoryEntry.createCompareContributor(java.net.URL sourceUrl,
RevisionIdentifier revision,
oracle.jdeveloper.compare.PatchCompareDescriptor patchDescriptor) |
CompareContributor |
VCSHistoryEntry.getCompareContributor() |
Modifier and Type | Method and Description |
---|---|
protected void |
VCSHistoryEntry.configureCompareContributor(CompareContributor contributor,
java.net.URL url,
RevisionIdentifier rev) |
Modifier and Type | Method and Description |
---|---|
protected abstract CompareContributor |
VersionTreeCompareCommand.createContributor(java.net.URL url,
oracle.ide.vhv.VHVInContextResource resource) |
protected CompareContributor |
VersionTreeCompareCommand.createURLContributor(java.net.URL url) |