List of usage examples for com.intellij.openapi.diff SimpleDiffRequest setContents
public void setContents(@NotNull DiffContent content1, @NotNull DiffContent content2)
From source file:com.intellij.diff.actions.impl.ShowOldDiffAction.java
License:Apache License
@RequiredDispatchThread @Override/*from w ww . j a v a 2 s . co m*/ public void actionPerformed(AnActionEvent e) { ContentDiffRequest request = (ContentDiffRequest) e.getRequiredData(DiffDataKeys.DIFF_REQUEST); List<DiffContent> contents = request.getContents(); List<String> titles = request.getContentTitles(); SimpleDiffRequest newRequest = new SimpleDiffRequest(e.getProject(), request.getTitle()); newRequest.setContentTitles(titles.get(0), titles.get(1)); newRequest.setContents(convert(e.getProject(), contents.get(0)), convert(e.getProject(), contents.get(1))); newRequest.addHint(DO_NOT_TRY_MIGRATE); DiffManager.getInstance().getDiffTool().show(newRequest); }
From source file:com.intellij.execution.testframework.stacktrace.DiffHyperlink.java
License:Apache License
public void openDiff(final Project project) { String expectedTitle = ExecutionBundle.message("diff.content.expected.title"); final DiffContent expectedContent; final VirtualFile vFile; if (myFilePath != null && (vFile = LocalFileSystem.getInstance().findFileByPath(myFilePath)) != null) { expectedContent = DiffContent.fromFile(project, vFile); expectedTitle += " (" + vFile.getPresentableUrl() + ")"; } else// w w w . j a v a 2 s .c o m expectedContent = new SimpleContent(myExpected); final SimpleDiffRequest diffData = new SimpleDiffRequest(project, getTitle()); diffData.setContents(expectedContent, new SimpleContent(myActual)); diffData.setContentTitles(expectedTitle, ExecutionBundle.message("diff.content.actual.title")); diffData.addHint(DiffTool.HINT_SHOW_FRAME); diffData.addHint(DiffTool.HINT_DO_NOT_IGNORE_WHITESPACES); diffData.setGroupKey("#com.intellij.execution.junit2.states.ComparisonFailureState$DiffDialog"); DiffManager.getInstance().getIdeaDiffTool().show(diffData); }
From source file:com.intellij.history.integration.ui.views.HistoryDialog.java
License:Apache License
protected SimpleDiffRequest createDifference(final FileDifferenceModel m) { final SimpleDiffRequest r = new SimpleDiffRequest(myProject, m.getTitle()); new Task.Modal(myProject, message("message.processing.revisions"), false) { public void run(@NotNull final ProgressIndicator i) { ApplicationManager.getApplication().runReadAction(new Runnable() { @Override//from w w w . java 2 s .c om public void run() { RevisionProcessingProgressAdapter p = new RevisionProcessingProgressAdapter(i); p.processingLeftRevision(); DiffContent left = m.getLeftDiffContent(p); p.processingRightRevision(); DiffContent right = m.getRightDiffContent(p); r.setContents(left, right); r.setContentTitles(m.getLeftTitle(p), m.getRightTitle(p)); } }); } }.queue(); return r; }
From source file:com.intellij.ide.diff.DiffElement.java
License:Apache License
@Nullable protected DiffRequest createRequest(Project project, DiffElement element) throws IOException { final T src = getValue(); final Object trg = element.getValue(); if (src instanceof VirtualFile && trg instanceof VirtualFile && ((VirtualFile) src).getFileType().isBinary() && ((VirtualFile) trg).getFileType().isBinary()) { return createRequestForBinaries(project, ((VirtualFile) src), ((VirtualFile) trg)); }/* ww w. j a v a2 s .co m*/ if (src instanceof VirtualFile) { if (((VirtualFile) src).getFileType().isBinary()) return null; if (trg instanceof VirtualFile) { if (((VirtualFile) trg).getFileType().isBinary()) return null; final FileDocumentManager mgr = FileDocumentManager.getInstance(); if (mgr.getDocument((VirtualFile) src) != null && mgr.getDocument((VirtualFile) trg) != null) { return SimpleDiffRequest.compareFiles((VirtualFile) src, (VirtualFile) trg, project == null ? ProjectManager.getInstance().getDefaultProject() : project); } } } final DiffContent srcContent = createDiffContent(); final DiffContent trgContent = element.createDiffContent(); if (srcContent != null && trgContent != null) { final SimpleDiffRequest request = new SimpleDiffRequest(project, ""); request.setContents(srcContent, trgContent); return request; } return null; }
From source file:jetbrains.communicator.idea.DiffWindowOpener.java
License:Apache License
public void showDiff() { DiffTool diffTool = DiffManager.getInstance().getIdeaDiffTool(); SimpleDiffRequest diffRequest = new SimpleDiffRequest(myProject, "Diff for " + myVFile.getDisplayName()); diffRequest.addHint(DiffTool.HINT_SHOW_NOT_MODAL_DIALOG); Document localDocument = FileDocumentManager.getInstance().getDocument(myVirtualFile); diffRequest.setContentTitles("My Version", myRemoteUser.getDisplayName() + "'s Version"); diffRequest.setContents(new DocumentContent(localDocument), new SimpleContent(myRemoteText)); diffTool.show(diffRequest);//from w w w . j av a 2 s. c o m }
From source file:org.jetbrains.idea.svn.diff.FileWithBranchComparer.java
License:Apache License
@Override protected void showResult() { if (!success.isNull()) { SimpleDiffRequest req = new SimpleDiffRequest(myProject, SvnBundle.message("compare.with.branch.diff.title")); req.setContents( new SimpleContent(CharsetToolkit.bytesToString(content.get(), myVirtualFile.getCharset())), new FileContent(myProject, myVirtualFile)); req.setContentTitles(remoteTitleBuilder.toString(), myVirtualFile.getPresentableUrl()); DiffManager.getInstance().getDiffTool().show(req); }/*from w ww . j av a 2s .co m*/ }