Package com.intellij.diff.merge

Class TextMergeViewer.MyThreesideViewer

java.lang.Object

com.intellij.diff.tools.util.base.DiffViewerBase

com.intellij.diff.tools.util.base.ListenerDiffViewerBase

com.intellij.diff.tools.util.side.ThreesideDiffViewer<TextEditorHolder>

com.intellij.diff.tools.util.side.ThreesideTextDiffViewer

com.intellij.diff.tools.simple.ThreesideTextDiffViewerEx

com.intellij.diff.merge.TextMergeViewer.MyThreesideViewer

All Implemented Interfaces:

FrameDiffTool.DiffViewer, DataProvider, Disposable

Enclosing class:

TextMergeViewer

public class TextMergeViewer.MyThreesideViewer
extends ThreesideTextDiffViewerEx

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
class	TextMergeViewer.MyThreesideViewer.ApplyNonConflictsAction
class	TextMergeViewer.MyThreesideViewer.MagicResolvedConflictsAction
class	TextMergeViewer.MyThreesideViewer.ModifierProvider

Nested classes/interfaces inherited from class com.intellij.diff.tools.simple.ThreesideTextDiffViewerEx

ThreesideTextDiffViewerEx.MyDividerPainter, ThreesideTextDiffViewerEx.MyFoldingModel, ThreesideTextDiffViewerEx.MyInitialScrollHelper, ThreesideTextDiffViewerEx.MyPrevNextDifferenceIterable, ThreesideTextDiffViewerEx.MyStatusPanel, ThreesideTextDiffViewerEx.MySyncScrollable, ThreesideTextDiffViewerEx.MyToggleExpandByDefaultAction

Nested classes/interfaces inherited from class com.intellij.diff.tools.util.side.ThreesideTextDiffViewer

ThreesideTextDiffViewer.MyInitialScrollPositionHelper, ThreesideTextDiffViewer.MyToggleAutoScrollAction, ThreesideTextDiffViewer.TextShowPartialDiffAction

Nested classes/interfaces inherited from class com.intellij.diff.tools.util.side.ThreesideDiffViewer

ThreesideDiffViewer.PartialDiffMode, ThreesideDiffViewer.ShowPartialDiffAction

Nested classes/interfaces inherited from interface com.intellij.openapi.Disposable

Disposable.Parent

Field Summary

Fields inherited from class com.intellij.diff.tools.simple.ThreesideTextDiffViewerEx

myFoldingModel, myInitialScrollHelper, myStatusPanel

Fields inherited from class com.intellij.diff.tools.util.side.ThreesideTextDiffViewer

myEditorSettingsAction, mySyncScrollSupport

Fields inherited from class com.intellij.diff.tools.util.side.ThreesideDiffViewer

myContentPanel, myLoadingPanel, myPanel

Fields inherited from class com.intellij.diff.tools.util.base.DiffViewerBase

LOG, myContext, myProject, myRequest

Constructor Summary

Constructors

Constructor and Description
MyThreesideViewer(DiffContext context, ContentDiffRequest request)

Method Summary

Modifier and Type	Method and Description
boolean	canResolveChangeAutomatically(TextMergeChange change, ThreeSide side)
protected java.util.List<AnAction>	createEditorPopupActions()
protected java.util.List<AnAction>	createPopupActions()
protected java.util.List<AnAction>	createToolbarActions()
protected void	destroyChangedBlocks()
protected java.lang.Runnable	doPerformRediff(ProgressIndicator indicator)
boolean	executeMergeCommand(java.lang.String commandName, boolean underBulkUpdate, java.util.List<? extends TextMergeChange> affected, java.lang.Runnable task)
boolean	executeMergeCommand(java.lang.String commandName, java.util.List<? extends TextMergeChange> affected, java.lang.Runnable task)
java.util.List<TextMergeChange>	getAllChanges()
java.util.List<TextMergeChange>	getChanges()
protected DiffDividerDrawUtil.DividerPaintable	getDividerPaintable(Side side)
EditorEx	getEditor()
MergeModelBase	getModel()
KeyboardModifierListener	getModifierProvider()
javax.swing.Action	getResolveAction(MergeResult result)
void	ignoreChange(TextMergeChange change, Side side, boolean resolveChange)
void	markChangeResolved(TextMergeChange change)
void	markChangeResolved(TextMergeChange change, Side side)
protected void	onBeforeDocumentChange(DocumentEvent e)
protected void	onDispose()
protected void	onInit()
protected java.lang.Runnable	performRediff(ProgressIndicator indicator)
void	rediff(boolean trySync)
void	repaintDividers()
void	replaceChange(TextMergeChange change, Side side, boolean resolveChange)
void	resolveChangeAutomatically(TextMergeChange change, ThreeSide side)

Methods inherited from class com.intellij.diff.tools.simple.ThreesideTextDiffViewerEx

applyNotification, clearDiffPresentation, doScrollToChange, doScrollToChange, getChangesCount, getConflictsCount, getData, getFoldingModelSettings, getSelectedChange, getStatusPanel, getSyncScrollable, getSyncScrollSupport, isChangeSelected, onChangeAdded, onChangeRemoved, processContextHints, resetChangeCounters, updateContextHints

Methods inherited from class com.intellij.diff.tools.util.side.ThreesideTextDiffViewer

canShowRequest, createEditorHolders, createTitles, destroyEditorListeners, disableSyncScrollSupport, getContent, getContents, getCurrentContent, getCurrentEditor, getEditableEditors, getEditor, getEditors, getEditorSide, getNavigatable, getTextSettings, installEditorListeners, onDocumentChange, scrollToLine, transferPosition

Methods inherited from class com.intellij.diff.tools.util.side.ThreesideDiffViewer

canShowRequest, getComponent, getCurrentEditorHolder, getCurrentSide, getEditorHolders, getPreferredFocusedComponent, setCurrentSide

Methods inherited from class com.intellij.diff.tools.util.base.ListenerDiffViewerBase

createDocumentListener, createFileListener, onFileChange, onFileChange

Methods inherited from class com.intellij.diff.tools.util.base.DiffViewerBase

abortRediff, addListener, dispose, forceRediffSynchronously, getContext, getListeners, getProject, getRequest, init, isDisposed, onAfterRediff, onBeforeRediff, onSlowRediff, rediff, removeListener, scheduleRediff, tryRediffSynchronously

Methods inherited from class java.lang.Object

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

Constructor Detail

MyThreesideViewer

public MyThreesideViewer(DiffContext context,
                         ContentDiffRequest request)

Method Detail

onInit

protected void onInit()

Overrides:

onInit in class ThreesideTextDiffViewerEx

onDispose

protected void onDispose()

Overrides:

onDispose in class ThreesideTextDiffViewerEx

createToolbarActions

protected java.util.List<AnAction> createToolbarActions()

Overrides:

createToolbarActions in class DiffViewerBase

createEditorPopupActions

protected java.util.List<AnAction> createEditorPopupActions()

Overrides:

createEditorPopupActions in class ThreesideTextDiffViewer

createPopupActions

protected java.util.List<AnAction> createPopupActions()

Overrides:

createPopupActions in class DiffViewerBase

getResolveAction

public javax.swing.Action getResolveAction(MergeResult result)

rediff

public void rediff(boolean trySync)

Overrides:

rediff in class DiffViewerBase

performRediff

protected java.lang.Runnable performRediff(ProgressIndicator indicator)

Specified by:

performRediff in class DiffViewerBase

doPerformRediff

protected java.lang.Runnable doPerformRediff(ProgressIndicator indicator)

destroyChangedBlocks

protected void destroyChangedBlocks()

Overrides:

destroyChangedBlocks in class ThreesideTextDiffViewerEx

onBeforeDocumentChange

protected void onBeforeDocumentChange(DocumentEvent e)

Overrides:

onBeforeDocumentChange in class ListenerDiffViewerBase

repaintDividers

public void repaintDividers()

getModel

public MergeModelBase getModel()

getAllChanges

public java.util.List<TextMergeChange> getAllChanges()

Overrides:

getAllChanges in class ThreesideTextDiffViewerEx

getChanges

public java.util.List<TextMergeChange> getChanges()

Specified by:

getChanges in class ThreesideTextDiffViewerEx

getDividerPaintable

protected DiffDividerDrawUtil.DividerPaintable getDividerPaintable(Side side)

Specified by:

getDividerPaintable in class ThreesideTextDiffViewerEx

getModifierProvider

public KeyboardModifierListener getModifierProvider()

getEditor

public EditorEx getEditor()

executeMergeCommand

public boolean executeMergeCommand(java.lang.String commandName,
                                   boolean underBulkUpdate,
                                   java.util.List<? extends TextMergeChange> affected,
                                   java.lang.Runnable task)

executeMergeCommand

public boolean executeMergeCommand(java.lang.String commandName,
                                   java.util.List<? extends TextMergeChange> affected,
                                   java.lang.Runnable task)

markChangeResolved

public void markChangeResolved(TextMergeChange change)

markChangeResolved

public void markChangeResolved(TextMergeChange change,
                               Side side)

ignoreChange

public void ignoreChange(TextMergeChange change,
                         Side side,
                         boolean resolveChange)

replaceChange

public void replaceChange(TextMergeChange change,
                          Side side,
                          boolean resolveChange)

canResolveChangeAutomatically

public boolean canResolveChangeAutomatically(TextMergeChange change,
                                             ThreeSide side)

resolveChangeAutomatically

public void resolveChangeAutomatically(TextMergeChange change,
                                       ThreeSide side)