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

EA-30535 (no more NPEs around CopyPasteManager.getContents())

Browse Source
This commit is contained in:
Roman Shevchenko
2011-10-17 16:43:04 +02:00
parent d76f44e7c6
commit 2e2a29c48b
8 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java
+9 -8
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import com.intellij.openapi.diff.*;
import com.intellij.openapi.ide.CopyPasteManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.SystemInfo;
import org.jetbrains.annotations.Nullable;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
@@ -72,16 +73,16 @@ public class CompareValueWithClipboardAction extends BaseValueAction {
return DebuggerBundle.message("diff.clipboard.vs.value.dialog.title");
}
@Nullable
private static DiffContent createClipboardContent() {
Transferable content = CopyPasteManager.getInstance().getContents();
String text = "";
try {
text = (String) (content.getTransferData(DataFlavor.stringFlavor));
if (content != null) {
try {
String text = (String) (content.getTransferData(DataFlavor.stringFlavor));
return text != null ? new SimpleContent(text) : null;
} catch (Exception ignored) { }
}
catch (Exception e) {
LOG.info(e);
}
return new SimpleContent(text);
return null;
}
}
}