Package com.intellij.diff.merge

Class MergeUtil

java.lang.Object

com.intellij.diff.merge.MergeUtil

public class MergeUtil
extends java.lang.Object

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	MergeUtil.ProxyDiffContext

Constructor Summary

Constructors

Constructor and Description
MergeUtil()

Method Summary

Modifier and Type	Method and Description
static javax.swing.Action	createSimpleResolveAction(MergeResult result, MergeRequest request, MergeContext context, MergeTool.MergeViewer viewer, boolean contentWasModified)
static java.lang.String	getResolveActionTitle(MergeResult result, MergeRequest request, MergeContext context)
static java.util.List<java.lang.String>	notNullizeContentTitles(java.util.List<java.lang.String> mergeContentTitles)
static void	putRevisionInfos(DiffRequest request, MergeData data)
static void	putRevisionInfos(MergeRequest request, MergeData data)
static void	reportProjectFileChangeIfNeeded(Project project, VirtualFile file)
static boolean	shouldRestoreOriginalContentOnCancel(MergeRequest request)
static boolean	showConfirmDiscardChangesDialog(javax.swing.JComponent parent, java.lang.String actionName, boolean contentWasModified)
static boolean	showExitWithoutApplyingChangesDialog(javax.swing.JComponent component, MergeRequest request, MergeContext context)
static boolean	showExitWithoutApplyingChangesDialog(MergeTool.MergeViewer viewer, MergeRequest request, MergeContext context, boolean contentWasModified)

Methods inherited from class java.lang.Object

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

Constructor Detail

MergeUtil

public MergeUtil()

Method Detail

createSimpleResolveAction

public static javax.swing.Action createSimpleResolveAction(MergeResult result,
                                                           MergeRequest request,
                                                           MergeContext context,
                                                           MergeTool.MergeViewer viewer,
                                                           boolean contentWasModified)

getResolveActionTitle

public static java.lang.String getResolveActionTitle(MergeResult result,
                                                     MergeRequest request,
                                                     MergeContext context)

notNullizeContentTitles

public static java.util.List<java.lang.String> notNullizeContentTitles(java.util.List<java.lang.String> mergeContentTitles)

showExitWithoutApplyingChangesDialog

public static boolean showExitWithoutApplyingChangesDialog(MergeTool.MergeViewer viewer,
                                                           MergeRequest request,
                                                           MergeContext context,
                                                           boolean contentWasModified)

showExitWithoutApplyingChangesDialog

public static boolean showExitWithoutApplyingChangesDialog(javax.swing.JComponent component,
                                                           MergeRequest request,
                                                           MergeContext context)

showConfirmDiscardChangesDialog

public static boolean showConfirmDiscardChangesDialog(javax.swing.JComponent parent,
                                                      java.lang.String actionName,
                                                      boolean contentWasModified)

shouldRestoreOriginalContentOnCancel

public static boolean shouldRestoreOriginalContentOnCancel(MergeRequest request)

putRevisionInfos

public static void putRevisionInfos(MergeRequest request,
                                    MergeData data)

putRevisionInfos

public static void putRevisionInfos(DiffRequest request,
                                    MergeData data)

reportProjectFileChangeIfNeeded

public static void reportProjectFileChangeIfNeeded(Project project,
                                                   VirtualFile file)