Skip navigation links

oracle.jdeveloper.merge
Class TextMergeEditor

java.lang.Object
oracle.ide.view.View
oracle.ide.editor.Editor
oracle.jdevimpl.compare.BaseCompareEditor
oracle.jdeveloper.merge.AbstractMergeEditor
oracle.jdeveloper.merge.TextMergeEditor

All Implemented Interfaces:

java.util.EventListener, oracle.ide.ceditor.find.FindableEditor, ControllerProvider, Helpable, LayoutSelector, Observer, DynamicStatusProvider, StatusProvider, ComparePopupManager, CompareToolTipProvider, ViewEditListener, oracle.jdevimpl.compare.CompareViewOwner

public class TextMergeEditor

extends AbstractMergeEditor

implements CompareToolTipProvider

Textual merge editor specialization class.

Since:

10.1.3.0.3

Field Summary

Fields inherited from class oracle.ide.editor.Editor

_addin, ATTRIBUTE_BACKGROUND_COLOR, ATTRIBUTE_CUSTOM_HORIZONTAL_SCROLLBAR, ATTRIBUTE_CUSTOM_VERTICAL_SCROLLBAR, ATTRIBUTE_DELAY_PALETTE_LOAD, ATTRIBUTE_HORIZONTAL_BLOCK_INCREMENT, ATTRIBUTE_HORIZONTAL_SCROLLBAR_POLICY, ATTRIBUTE_HORIZONTAL_UNIT_INCREMENT, ATTRIBUTE_MENU_ID, ATTRIBUTE_OLD_EDITOR, ATTRIBUTE_SCROLLABLE, ATTRIBUTE_VERTICAL_BLOCK_INCREMENT, ATTRIBUTE_VERTICAL_SCROLLBAR_POLICY, ATTRIBUTE_VERTICAL_UNIT_INCREMENT, CUSTOM_BORDER, PROPERTY_FIXED_BOTTOM_MARGIN, PROPERTY_FIXED_LEFT_MARGIN, PROPERTY_FIXED_RIGHT_MARGIN, PROPERTY_FIXED_TOP_MARGIN, PROPERTY_SCROLLABLE_LEFT_MARGIN, PROPERTY_SCROLLABLE_TOP_MARGIN

Fields inherited from class oracle.ide.view.View

EMPTY_SELECTION, PROJECT_PROP, VISIBLE_PROP, WORKSPACE_PROP

Constructor Summary

TextMergeEditor()

Method Summary

void	close()
protected Command	createEditCommand(ViewEdit viewEdit)
protected java.lang.String	createFirstContributorLabelSS()
protected CompareModel	createMergeModelImpl(Context context) Creates a merge compare model, based on the current editor context (implementor).
protected CompareModel	createMergeModelSS(Context context)
protected oracle.javatools.compare.algorithm.sequence.SequenceCompareModel	createTextMergeModel(Context context) Deprecated. override createMergeModelSS(oracle.ide.Context) or createMergeModelCS(oracle.ide.Context) instead.
protected void	deinstallUndoableEditListener() De-installs view-specific undoable edit listeners.
protected java.lang.Class	getAnnotationClassSS()
protected boolean	getClientSideMergeSetting()
protected oracle.ide.diffmerge.diff3.Diff3Model	getDiff3Model()
protected TextMergeNode	getTextMergeNode() Gets the text merge node representing ancestor / result data.
java.lang.String	getToolTipText(ContributorKind contributorKind, CompareDifference difference)
protected void	initializeMergeView(CompareView mergeView) Intializes the merge compare view.
protected void	installUndoableEditListener() Installs view-specific undoable edit listeners.
protected boolean	restartMergeImpl(Context context) Restarts the merge task, without user confirmation (implementor).
protected boolean	saveMergeImpl(Context context, CompareModel compareModel) Saves the merge results, without user confirmation (implementor).
protected boolean	saveTextMerge(Context context, oracle.javatools.compare.algorithm.sequence.SequenceCompareModel textMergeModel) Deprecated. override AbstractMergeEditor.saveMergeImpl() instead.
protected void	setTextMergeNode(TextMergeNode textMergeNode) Sets the text merge node representing ancestor / result data.
protected boolean	validateContent(CompareModel model) Validate the content of the merged result.

Methods inherited from class oracle.jdeveloper.merge.AbstractMergeEditor

addChangeListener, createLocalAction, createMergeModel, createReader, getBottomComponent, getCompareView, getController, getCustomCells, getEditorAttribute, getFocusedEditorPane, getGUI, getHelpInfo, getSaveURL, getSuffixAsType, getToolbar, hidePopup, initializeMergeContextCS, initializeToolbar, initializeToolbarImpl, isCompleteState, isExpandable, isMergeModelBasedOnFile, isNodeDirty, layoutNorthComponent, moveToCompleteState, open, removeChangeListener, reopen, restartMerge, restartMergeImpl, saveMerge, saveMergeImpl, setContext, setProgressCancelable, showPopup, update, updateMergeAttributes, updateStatusLabel, viewEditHappened

Methods inherited from class oracle.jdevimpl.compare.BaseCompareEditor

augmentToolbarComponents

Methods inherited from class oracle.ide.editor.Editor

addPreferredLayoutListener, addPropertyChangeListener, editorHidden, editorShown, firePropertyChangeEvent, getContext, getContextMenu, getDefaultFocusComponent, getDependentNodes, getDisplayName, getEditorAddin, getFixedBottomMargin, getFixedLeftMargin, getFixedRightMargin, getFixedTopMargin, getMiniToolbar, getPreferredLayoutBaseName, getPreferredLayoutURL, getScrollableLeftMargin, getScrollableTopMargin, getTabDescription, getTabIcon, getTabLabel, getTitleLabel, getType, initializeActiveLayout, initializeLayout, isReady, loadSettings, newId, prepareForSaving, removePreferredLayoutListener, removePropertyChangeListener, saveSettings, setEditorAddin, setEditorAttribute, setPreferredLayoutBaseName, setPreferredLayoutURL, setType

Methods inherited from class oracle.ide.view.View

activate, addViewListener, addViewSelectionListener, addViewStateListener, deactivate, fireViewCollapsed, fireViewExpanded, fireViewSelectionChanged, getContext, getId, getSelection, getSelectionFromUI, getTabName, getViewWithoutDecoration, isVisible, loadLayout, loadManifestToolbar, loadManifestToolbar, owner, removeViewListener, removeViewSelectionListener, removeViewStateListener, saveLayout, scheduleUpdateSelection, setId, setOwner, setToolbarVisible, show, toString, updateSelection, updateSelectionImpl, updateTitle, updateToolbarActions, updateVisibleActions, updateVisibleActions

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait

Constructor Detail

TextMergeEditor

public TextMergeEditor()

Method Detail

getDiff3Model

protected oracle.ide.diffmerge.diff3.Diff3Model getDiff3Model()

initializeMergeView

protected void initializeMergeView(CompareView mergeView)

Description copied from class: AbstractMergeEditor

Intializes the merge compare view. By default, does nothing.

Overrides:

initializeMergeView in class AbstractMergeEditor

Parameters:

mergeView - the merge compare view.

getAnnotationClassSS

protected java.lang.Class getAnnotationClassSS()

createFirstContributorLabelSS

protected java.lang.String createFirstContributorLabelSS()

getToolTipText

public java.lang.String getToolTipText(ContributorKind contributorKind,
                                       CompareDifference difference)

Specified by:

getToolTipText in interface CompareToolTipProvider

close

public void close()

Description copied from class: AbstractMergeEditor

Overrides:

close in class AbstractMergeEditor

validateContent

protected boolean validateContent(CompareModel model)
                           throws java.io.IOException

Description copied from class: AbstractMergeEditor

Validate the content of the merged result.

Specified by:

validateContent in class AbstractMergeEditor

Returns:

true content valid or user wants to continue and save. false content not valid.

Throws:

java.io.IOException

installUndoableEditListener

protected void installUndoableEditListener()

Installs view-specific undoable edit listeners. By default, adds a ViewEditListener to the view.

Overrides:

installUndoableEditListener in class AbstractMergeEditor

deinstallUndoableEditListener

protected void deinstallUndoableEditListener()

De-installs view-specific undoable edit listeners. By default, removes a ViewEditListener from the view.

Overrides:

deinstallUndoableEditListener in class AbstractMergeEditor

createMergeModelImpl

protected CompareModel createMergeModelImpl(Context context)

Creates a merge compare model, based on the current editor context (implementor).

Specified by:

createMergeModelImpl in class AbstractMergeEditor

Parameters:

context - the current context.

Returns:

the create merge model, a CompareModel.

restartMergeImpl

protected boolean restartMergeImpl(Context context)
                            throws java.io.IOException

Restarts the merge task, without user confirmation (implementor).

Specified by:

restartMergeImpl in class AbstractMergeEditor

Parameters:

context - the current context.

Returns:

true if the restart succeeded.

Throws:

java.io.IOException - if an I/O exception occurred restarting the merge task.

saveMergeImpl

protected boolean saveMergeImpl(Context context,
                                CompareModel compareModel)
                         throws java.io.IOException

Saves the merge results, without user confirmation (implementor).

Specified by:

saveMergeImpl in class AbstractMergeEditor

Parameters:

context - the current context.

compareModel - the merge compare model of the view.

Returns:

true if the save succeeded.

Throws:

java.io.IOException - if an I/O exception occurred saving merge results.

saveTextMerge

protected boolean saveTextMerge(Context context,
                                oracle.javatools.compare.algorithm.sequence.SequenceCompareModel textMergeModel)
                         throws java.io.IOException

Deprecated. override AbstractMergeEditor.saveMergeImpl() instead.

Saves the results of the merge (stored by the ancestor contributor) to the node's URL. By default, the results are written to the and no confirmations or errors are displayed.

Parameters:

context - the current context.

textMergeModel - the text merge compare model of the view.

Returns:

true if the save succeeded.

Throws:

java.io.IOException - if an I/O exception occurred saving merge results.

createEditCommand

protected Command createEditCommand(ViewEdit viewEdit)

Overrides:

createEditCommand in class AbstractMergeEditor

getClientSideMergeSetting

protected boolean getClientSideMergeSetting()

Overrides:

getClientSideMergeSetting in class AbstractMergeEditor

createTextMergeModel

protected oracle.javatools.compare.algorithm.sequence.SequenceCompareModel createTextMergeModel(Context context)
                                                                                         throws java.io.IOException

Deprecated. override createMergeModelSS(oracle.ide.Context) or createMergeModelCS(oracle.ide.Context) instead.

Creates a textual merge compare model, based on the current editor context (implementor). Note that the merge node must be initialized via the setTextMergeNode(oracle.jdeveloper.merge.TextMergeNode) method during the execution of this method.

Parameters:

context - the current context.

Returns:

the create merge model, a CompareModel.

Throws:

java.io.IOException

createMergeModelSS

protected CompareModel createMergeModelSS(Context context)
                                   throws java.io.IOException

Throws:

java.io.IOException

setTextMergeNode

protected void setTextMergeNode(TextMergeNode textMergeNode)

Sets the text merge node representing ancestor / result data.

Parameters:

textMergeNode - the TextMergeNode.

getTextMergeNode

protected TextMergeNode getTextMergeNode()

Gets the text merge node representing ancestor / result data. By default, returns the value initialized during the execution of the createTextMergeModel(oracle.ide.Context) method.

Returns:

the TextMergeNode.

Skip navigation links