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.jdeveloper.merge |
Contains classes for merge editor abstractions, including an editor addin, commands, a
controller, and utilities.
|
Modifier and Type | Method and Description |
---|---|
static CompareDifference[] |
CompareDifference.cloneDifferences(CompareDifference[] differences) |
CompareDifference[] |
CompareModel.getDifferences()
Gets the differences represented by this compare model.
|
Modifier and Type | Method and Description |
---|---|
static CompareDifference[] |
CompareDifference.cloneDifferences(CompareDifference[] differences) |
Constructor and Description |
---|
CompareDifference(CompareDifference compareDifference) |
Modifier and Type | Method and Description |
---|---|
protected abstract CompareDifference |
DiffGutter.getBlockAtPoint(java.awt.Point p) |
protected abstract CompareDifference |
BaseCompareView.getCurrentDifference() |
CompareDifference[] |
ViewMemento.getDifferences() |
protected abstract CompareDifference |
BaseCompareView.getNextConflict() |
protected abstract CompareDifference |
BaseCompareView.getNextDifference() |
protected abstract CompareDifference |
BaseCompareView.getPreviousConflict() |
protected abstract CompareDifference |
BaseCompareView.getPreviousDifference() |
Modifier and Type | Method and Description |
---|---|
protected boolean |
BaseCompareView.canReadElement(CompareDifference difference,
ContributorKind contributorKind) |
protected boolean |
BaseCompareView.canWriteElement(CompareDifference difference,
ContributorKind contributorKind) |
protected javax.swing.Action |
BaseCompareView.createMarkResolvedAction(CompareDifference difference) |
protected CompareModel |
BaseCompareView.createModel(CompareDifference[] differences) |
protected CompareModel |
SequenceCompareView.createModel(CompareModel compareModel,
CompareDifference[] differences) |
protected abstract CompareModel |
BaseCompareView.createModel(CompareModel compareModel,
CompareDifference[] differences) |
protected javax.swing.Action |
BaseCompareView.getDefaultEditAction(CompareDifference difference,
ContributorKind contributor,
ContributorKind adjacentContributor)
Get the default edit action for the specified difference.
|
protected javax.swing.Action[] |
BaseCompareView.getEditActions(CompareDifference difference,
ContributorKind contributor,
ContributorKind adjacentContributor)
Get edit actions for the specified difference.
|
protected javax.swing.Action[] |
BaseCompareView.getLowPriorityEditActions(CompareDifference difference,
ContributorKind contributor,
ContributorKind adjacentContributor) |
java.lang.String |
CompareToolTipProvider.getToolTipText(ContributorKind contributorKind,
CompareDifference difference) |
protected void |
BaseCompareView.goToDifference(CompareDifference block) |
protected abstract void |
BaseCompareView.goToDifference(CompareDifference differenceBlock,
boolean requestFocus) |
protected boolean |
BaseCompareView.hasDefaultEditAction(CompareDifference difference,
ContributorKind contributor,
ContributorKind adjacentContributor)
Return whether there is a default edit action
|
protected void |
BaseCompareView.markResolved(CompareDifference difference)
Mark the given difference block as resolved.
|
void |
ViewMemento.setDifferences(CompareDifference[] differences) |
Modifier and Type | Method and Description |
---|---|
protected CompareDifference |
ListCompareView.getCurrentDifference() |
protected CompareDifference |
ListCompareView.getNextConflict() |
protected CompareDifference |
ListCompareView.getNextDifference() |
protected CompareDifference |
ListCompareView.getPreviousConflict() |
protected CompareDifference |
ListCompareView.getPreviousDifference() |
Modifier and Type | Method and Description |
---|---|
protected boolean |
ListCompareView.canReadElement(CompareDifference difference,
ContributorKind contributorKind) |
protected boolean |
ListCompareView.canWriteElement(CompareDifference difference,
ContributorKind contributorKind) |
protected void |
ListCompareView.goToDifference(CompareDifference difference,
boolean requestFocus) |
Modifier and Type | Method and Description |
---|---|
protected CompareDifference |
WedgeCompareView.getCurrentDifference() |
protected CompareDifference |
WedgeCompareView.getNextConflict() |
protected CompareDifference |
WedgeCompareView.getNextDifference() |
protected CompareDifference |
WedgeCompareView.getPreviousConflict() |
protected CompareDifference |
WedgeCompareView.getPreviousDifference() |
Modifier and Type | Method and Description |
---|---|
protected CompareModel |
WedgeCompareView.createModel(CompareModel compareModel,
CompareDifference[] differences) |
protected javax.swing.Action[] |
WedgeCompareView.getEditActions(CompareDifference difference,
ContributorKind contributor,
ContributorKind adjacentContributor)
Get edit actions for the specified difference.
|
protected void |
WedgeCompareView.goToDifference(CompareDifference difference,
boolean requestFocus) |
Modifier and Type | Method and Description |
---|---|
java.lang.String |
BaseTextMergeEditor.getToolTipText(ContributorKind contributorKind,
CompareDifference difference) |