MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: show diff from debugger - use new api

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-02-03 20:14:12 +03:00
parent c2ae14646a
commit b895f4f472
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/debugger-impl.iml
+2 -2
View File
@@ -20,11 +20,11 @@
<orderEntry type="module" module-name="java-impl" />
<orderEntry type="module" module-name="platform-impl" />
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="diff-api" />
</component>
<component name="copyright">
<Base>
<setting name="state" value="1" />
</Base>
</component>
</module>
</module>
java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java
+6 -3
View File
@@ -17,15 +17,18 @@ package com.intellij.debugger.actions;
import com.intellij.debugger.impl.DebuggerContextImpl;
import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl;
import com.intellij.openapi.diff.DiffManager;
import com.intellij.openapi.diff.actions.ClipboardVsValueContents;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.diff.DiffDialogHints;
import com.intellij.openapi.util.diff.DiffManager;
import com.intellij.openapi.util.diff.impl.DiffRequestFactory;
import com.intellij.openapi.util.diff.requests.DiffRequest;
/**
* @author Jeka
*/
public class CompareValueWithClipboardAction extends BaseValueAction {
protected void processText(final Project project, final String text, DebuggerTreeNodeImpl node, DebuggerContextImpl debuggerContext) {
DiffManager.getInstance().getDiffTool().show(new ClipboardVsValueContents(text, project));
DiffRequest request = DiffRequestFactory.createClipboardVsValue(text);
DiffManager.getInstance().showDiff(project, request, DiffDialogHints.DEFAULT);
}
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java
+6 -4
View File
@@ -15,9 +15,11 @@
*/
package com.intellij.xdebugger.impl.ui.tree.actions;
import com.intellij.openapi.diff.DiffManager;
import com.intellij.openapi.diff.actions.ClipboardVsValueContents;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.diff.DiffDialogHints;
import com.intellij.openapi.util.diff.DiffManager;
import com.intellij.openapi.util.diff.impl.DiffRequestFactory;
import com.intellij.openapi.util.diff.requests.DiffRequest;
import com.intellij.util.ui.UIUtil;
import com.intellij.xdebugger.impl.ui.tree.XDebuggerTree;
@@ -31,9 +33,9 @@ public class XCompareWithClipboardAction extends XFetchValueActionBase {
UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
public void run() {
DiffManager.getInstance().getDiffTool().show(new ClipboardVsValueContents(value, project));
DiffRequest request = DiffRequestFactory.createClipboardVsValue(value);
DiffManager.getInstance().showDiff(project, request, DiffDialogHints.DEFAULT);
}
});
}
}
platform/xdebugger-impl/xdebugger-impl.iml
+2 -2
View File
@@ -14,6 +14,6 @@
<orderEntry type="module" module-name="platform-resources" />
<orderEntry type="module" module-name="dom-impl" scope="TEST" />
<orderEntry type="module" module-name="xml" scope="TEST" />
<orderEntry type="module" module-name="diff-api" />
</component>
</module>
</module>