Search in sources :

Example 16 with DiffRequest

use of com.intellij.diff.requests.DiffRequest in project intellij-community by JetBrains.

the class MemoryDiskConflictResolver method askReloadFromDisk.

boolean askReloadFromDisk(VirtualFile file, Document document) {
    String message = UIBundle.message("file.cache.conflict.message.text", file.getPresentableUrl());
    final DialogBuilder builder = new DialogBuilder();
    builder.setCenterPanel(new JLabel(message, Messages.getQuestionIcon(), SwingConstants.CENTER));
    builder.addOkAction().setText(UIBundle.message("file.cache.conflict.load.fs.changes.button"));
    builder.addCancelAction().setText(UIBundle.message("file.cache.conflict.keep.memory.changes.button"));
    builder.addAction(new AbstractAction(UIBundle.message("file.cache.conflict.show.difference.button")) {

        @Override
        public void actionPerformed(ActionEvent e) {
            final ProjectEx project = (ProjectEx) ProjectLocator.getInstance().guessProjectForFile(file);
            FileType fileType = file.getFileType();
            String fsContent = LoadTextUtil.loadText(file).toString();
            DocumentContent content1 = DiffContentFactory.getInstance().create(project, fsContent, fileType);
            DocumentContent content2 = DiffContentFactory.getInstance().create(project, document, file);
            String title = UIBundle.message("file.cache.conflict.for.file.dialog.title", file.getPresentableUrl());
            String title1 = UIBundle.message("file.cache.conflict.diff.content.file.system.content");
            String title2 = UIBundle.message("file.cache.conflict.diff.content.memory.content");
            DiffRequest request = new SimpleDiffRequest(title, content1, content2, title1, title2);
            request.putUserData(DiffUserDataKeys.GO_TO_SOURCE_DISABLE, true);
            DialogBuilder diffBuilder = new DialogBuilder(project);
            DiffRequestPanel diffPanel = DiffManager.getInstance().createRequestPanel(project, diffBuilder, diffBuilder.getWindow());
            diffPanel.setRequest(request);
            diffBuilder.setCenterPanel(diffPanel.getComponent());
            diffBuilder.setDimensionServiceKey("FileDocumentManager.FileCacheConflict");
            diffBuilder.addOkAction().setText(UIBundle.message("file.cache.conflict.save.changes.button"));
            diffBuilder.addCancelAction();
            diffBuilder.setTitle(title);
            if (diffBuilder.show() == DialogWrapper.OK_EXIT_CODE) {
                builder.getDialogWrapper().close(DialogWrapper.CANCEL_EXIT_CODE);
            }
        }
    });
    builder.setTitle(UIBundle.message("file.cache.conflict.dialog.title"));
    builder.setButtonsAlignment(SwingConstants.CENTER);
    builder.setHelpId("reference.dialogs.fileCacheConflict");
    return builder.show() == 0;
}
Also used : ProjectEx(com.intellij.openapi.project.ex.ProjectEx) SimpleDiffRequest(com.intellij.diff.requests.SimpleDiffRequest) DiffRequestPanel(com.intellij.diff.DiffRequestPanel) FileType(com.intellij.openapi.fileTypes.FileType) ActionEvent(java.awt.event.ActionEvent) DocumentContent(com.intellij.diff.contents.DocumentContent) DiffRequest(com.intellij.diff.requests.DiffRequest) SimpleDiffRequest(com.intellij.diff.requests.SimpleDiffRequest) DialogBuilder(com.intellij.openapi.ui.DialogBuilder)

Example 17 with DiffRequest

use of com.intellij.diff.requests.DiffRequest in project intellij-community by JetBrains.

the class XCompareWithClipboardAction method handle.

@Override
protected void handle(final Project project, final String value, XDebuggerTree tree) {
    UIUtil.invokeLaterIfNeeded(() -> {
        DiffRequest request = DiffRequestFactory.getInstance().createClipboardVsValue(value);
        DiffManager.getInstance().showDiff(project, request);
    });
}
Also used : DiffRequest(com.intellij.diff.requests.DiffRequest)

Aggregations

DiffRequest (com.intellij.diff.requests.DiffRequest)17 SimpleDiffRequest (com.intellij.diff.requests.SimpleDiffRequest)7 DiffContent (com.intellij.diff.contents.DiffContent)5 VirtualFile (com.intellij.openapi.vfs.VirtualFile)5 NotNull (org.jetbrains.annotations.NotNull)5 DiffRequestProducerException (com.intellij.diff.chains.DiffRequestProducerException)4 ProcessCanceledException (com.intellij.openapi.progress.ProcessCanceledException)4 ProgressIndicator (com.intellij.openapi.progress.ProgressIndicator)4 ContentDiffRequest (com.intellij.diff.requests.ContentDiffRequest)3 Project (com.intellij.openapi.project.Project)3 FilePath (com.intellij.openapi.vcs.FilePath)3 IOException (java.io.IOException)3 DocumentContent (com.intellij.diff.contents.DocumentContent)2 UnknownFileTypeDiffRequest (com.intellij.diff.requests.UnknownFileTypeDiffRequest)2 FileType (com.intellij.openapi.fileTypes.FileType)2 Task (com.intellij.openapi.progress.Task)2 Ref (com.intellij.openapi.util.Ref)2 UserDataHolder (com.intellij.openapi.util.UserDataHolder)2 Change (com.intellij.openapi.vcs.changes.Change)2 File (java.io.File)2