| 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 | Field and Description | 
|---|---|
static ContributorKind | 
ContributorKind.ANCESTOR
The ANCESTOR contributor. 
 | 
static ContributorKind | 
ContributorKind.FIRST
The FIRST contributor. 
 | 
static ContributorKind | 
ContributorKind.SECOND
The SECOND contributor. 
 | 
| Modifier and Type | Method and Description | 
|---|---|
protected static ContributorKind | 
ContributorKind.valueOf(ContributorKind[] enums,
       java.lang.String name)  | 
static ContributorKind | 
ContributorKind.valueOf(java.lang.String name)  | 
static ContributorKind[] | 
ContributorKind.values()  | 
| Modifier and Type | Method and Description | 
|---|---|
CompareContributor | 
CompareModel.getContributor(ContributorKind contributor)
Get the specified contributor to this compare. 
 | 
protected static ContributorKind | 
ContributorKind.valueOf(ContributorKind[] enums,
       java.lang.String name)  | 
| Modifier and Type | Field and Description | 
|---|---|
protected ContributorKind | 
SequenceCompareView.OverviewComponent._firstContributorKind  | 
protected ContributorKind | 
DiffGutter._leftContributorKind  | 
protected ContributorKind | 
DiffGutter._rightContributorKind  | 
protected ContributorKind | 
SequenceCompareView.OverviewComponent._secondContributorKind  | 
| Modifier and Type | Method and Description | 
|---|---|
protected ContributorKind | 
BaseCompareView.getAdjacentContributorKind(ContributorKind contributorKind)  | 
protected ContributorKind | 
BaseCompareView.getAdjacentContributorKind(ContributorKind contributorKind,
                          BaseCompareView.ContributorBias bias)  | 
protected abstract ContributorKind | 
DiffGutter.getContributorAtPoint(java.awt.Point p)  | 
ContributorKind | 
ViewEditEvent.getContributorKind()  | 
protected abstract ContributorKind | 
BaseCompareView.getCurrentContributorKind()  | 
ContributorKind | 
DiffGutter.getOtherContributorKind(ContributorKind whichContributor)
Get the contributor adjacent to the specified contributor. 
 | 
| 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.createDeleteBlockAction(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
                       ContributorKind contributor,
                       ContributorKind adjacentContributor)  | 
protected javax.swing.Action | 
BaseCompareView.createInsertBlockAction(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
                       ContributorKind contributor,
                       ContributorKind adjacentContributor)  | 
protected javax.swing.Action | 
BaseCompareView.createReplaceBlockAction(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
                        ContributorKind contributor,
                        ContributorKind adjacentContributor)  | 
protected abstract void | 
BaseCompareView.deleteBlock(oracle.javatools.compare.algorithm.BaseCompareDifference block,
           ContributorKind contributor)
Remove the specified difference block from the specified contributor. 
 | 
static boolean | 
CompareViewUtil.equal(CompareModel model,
     oracle.javatools.compare.algorithm.sequence.SequenceCompareDifference block,
     ContributorKind contributor1,
     ContributorKind contributor2)  | 
protected ContributorKind | 
BaseCompareView.getAdjacentContributorKind(ContributorKind contributorKind)  | 
protected ContributorKind | 
BaseCompareView.getAdjacentContributorKind(ContributorKind contributorKind,
                          BaseCompareView.ContributorBias bias)  | 
protected CompareContributor | 
BaseCompareView.getContributor(ContributorKind contributorKind)  | 
protected javax.swing.Action | 
BaseCompareView.getDefaultEditAction(CompareDifference difference,
                    ContributorKind contributor,
                    ContributorKind adjacentContributor)
Get the default edit action for the specified difference. 
 | 
javax.swing.Icon | 
BaseCompareView.getDefaultEditActionIcon(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
                        ContributorKind contributor,
                        ContributorKind adjacentContributor,
                        boolean isAncestor)  | 
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)  | 
ContributorKind | 
DiffGutter.getOtherContributorKind(ContributorKind whichContributor)
Get the contributor adjacent to the specified contributor. 
 | 
protected abstract java.awt.Color | 
SequenceCompareView.getOverviewDifferenceColor(oracle.javatools.compare.algorithm.sequence.SequenceCompareDifference differenceBlock,
                          boolean isLeft,
                          ContributorKind firstContributorKind,
                          ContributorKind secondContributorKind)  | 
java.awt.Rectangle | 
BaseCompareView.getPanelBounds(ContributorKind kind)
Get the screen location of the panel of the contributor (first / ancester / second ) and the size. 
 | 
java.lang.String | 
CompareToolTipProvider.getToolTipText(ContributorKind contributorKind,
              CompareDifference difference)  | 
protected int | 
SequenceCompareView.getVirtualHeightLines(ContributorKind contributor)
Get the virtual height of the compare view in lines. 
 | 
protected int | 
SequenceCompareView.getVirtualLineForReal(int line,
                     ContributorKind contributor)
Given a line number for one contributor, get the line number in virtual
 space. 
 | 
protected boolean | 
BaseCompareView.hasDefaultEditAction(CompareDifference difference,
                    ContributorKind contributor,
                    ContributorKind adjacentContributor)
Return whether there is a default edit action 
 | 
protected abstract void | 
BaseCompareView.insertBlockCopy(oracle.javatools.compare.algorithm.BaseCompareDifference block,
               ContributorKind fromContributor,
               ContributorKind toContributor)
Take a copy of the block from the specified contributor and insert
 it into the other contributor after the change. 
 | 
protected boolean | 
BaseCompareView.isAddition(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
          ContributorKind firstContributor,
          ContributorKind secondContributor)  | 
static boolean | 
CompareViewUtil.isAddition(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
          ContributorKind firstContributor,
          ContributorKind secondContributor,
          CompareViewBias bias)
Utility that determines whether this difference block represents a logical
 addition between the specified two contributors. 
 | 
protected boolean | 
BaseCompareView.isEditable(ContributorKind contributor)  | 
protected boolean | 
BaseCompareView.isRemoval(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
         ContributorKind firstContributor,
         ContributorKind secondContributor)  | 
static boolean | 
CompareViewUtil.isRemoval(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
         ContributorKind firstContributor,
         ContributorKind secondContributor,
         CompareViewBias bias)
Utility that determines whether this difference block represents a logical
 removal between the specified two contributors. 
 | 
void | 
BaseCompareView.moveTo(ContributorKind kind,
      int startPos,
      int endPos)  | 
void | 
BaseCompareView.moveToLine(ContributorKind kind,
          int line,
          boolean highLight)  | 
protected abstract void | 
BaseCompareView.replaceBlock(oracle.javatools.compare.algorithm.BaseCompareDifference block,
            ContributorKind fromContributor,
            ContributorKind toContributor)
Take a copy of the block from the specified contributor and replace the
 text of the adjacent contributor with the text. 
 | 
| Constructor and Description | 
|---|
DiffGutter(BaseCompareView baseCompareView,
          ContributorKind leftContributor,
          ContributorKind rightContributor)  | 
OverviewComponent(SequenceCompareView view,
                 ContributorKind firstContributorKind,
                 ContributorKind secondContributorKind)  | 
ViewEditEvent(java.lang.Object source,
             int id,
             ContributorKind contributor,
             ViewEdit viewEdit)  | 
| Modifier and Type | Method and Description | 
|---|---|
protected ContributorKind | 
ListCompareView.getCurrentContributorKind()  | 
| Modifier and Type | Method and Description | 
|---|---|
protected boolean | 
ListCompareView.canReadElement(CompareDifference difference,
              ContributorKind contributorKind)  | 
protected boolean | 
ListCompareView.canWriteElement(CompareDifference difference,
               ContributorKind contributorKind)  | 
protected javax.swing.Action | 
ListCompareView.createInsertBlockAction(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
                       ContributorKind contributor,
                       ContributorKind adjacentContributor)  | 
protected void | 
ListCompareView.deleteBlock(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
           ContributorKind contributorKind)  | 
protected java.awt.Color | 
ListCompareView.getOverviewDifferenceColor(oracle.javatools.compare.algorithm.sequence.SequenceCompareDifference differenceBlock,
                          boolean isLeft,
                          ContributorKind firstContributorKind,
                          ContributorKind secondContributorKind)  | 
protected int | 
ListCompareView.getVirtualHeightLines(ContributorKind contributor)  | 
protected void | 
ListCompareView.insertBlockCopy(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
               ContributorKind fromContributorKind,
               ContributorKind toContributorKind)  | 
protected void | 
ListCompareView.replaceBlock(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
            ContributorKind fromContributorKind,
            ContributorKind toContributorKind)  | 
| Modifier and Type | Method and Description | 
|---|---|
protected ContributorKind | 
WedgeCompareView.getCurrentContributorKind()  | 
| Modifier and Type | Method and Description | 
|---|---|
protected void | 
WedgeCompareView.deleteBlock(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
           ContributorKind contributor)
Remove the specified difference block from the specified contributor. 
 | 
protected oracle.javatools.compare.algorithm.sequence.SequenceCompareDifference | 
WedgeCompareView.getBlockAtRealLine(ContributorKind contributor,
                  int line)  | 
javax.swing.text.Document | 
WedgeCompareView.getDocument(ContributorKind contrib)  | 
protected javax.swing.Action[] | 
WedgeCompareView.getEditActions(CompareDifference difference,
              ContributorKind contributor,
              ContributorKind adjacentContributor)
Get edit actions for the specified difference. 
 | 
protected BasicEditorPane | 
WedgeCompareView.getEditorPane(ContributorKind contributor)  | 
protected java.awt.Color | 
WedgeCompareView.getOverviewDifferenceColor(oracle.javatools.compare.algorithm.sequence.SequenceCompareDifference differenceBlock,
                          boolean isLeft,
                          ContributorKind firstContributorKind,
                          ContributorKind secondContributorKind)  | 
protected void | 
WedgeCompareView.insertBlockCopy(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
               ContributorKind fromContributor,
               ContributorKind toContributor)
Take a copy of the block from the specified contributor and insert
 it into the other contributor after the change. 
 | 
void | 
WedgeCompareView.moveTo(ContributorKind kind,
      int startPos,
      int endPos)  | 
void | 
WedgeCompareView.moveToLine(ContributorKind kind,
          int line,
          boolean highLite)  | 
protected void | 
WedgeCompareView.replaceBlock(oracle.javatools.compare.algorithm.BaseCompareDifference difference,
            ContributorKind fromContributor,
            ContributorKind toContributor)
Take a copy of the block from the specified contributor and replace the
 text of the adjacent contributor with the text. 
 | 
| Modifier and Type | Method and Description | 
|---|---|
java.lang.String | 
BaseTextMergeEditor.getToolTipText(ContributorKind contributorKind,
              CompareDifference difference)  |