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

IDEA-163057 2016.3 crashes

Browse Source
This commit is contained in:
Vassiliy.Kudryashov
2016-10-26 21:26:52 +03:00
parent f05bbb6e84
commit ab36b91b26
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
+28 -4
View File
@@ -123,6 +123,17 @@ public class ClipboardSynchronizer implements ApplicationComponent {
myClipboardHandler.resetContent();
}
@Nullable
private static Clipboard getClipboard() {
try {
//sun.awt.windows.WClipboard may throw an IllegalStateException
return Toolkit.getDefaultToolkit().getSystemClipboard();
}
catch (Exception e) {
LOG.warn(e);
return null;
}
}
private static class ClipboardHandler {
public void init() { }
@@ -130,7 +141,8 @@ public class ClipboardSynchronizer implements ApplicationComponent {
public void dispose() { }
public boolean areDataFlavorsAvailable(@NotNull DataFlavor... flavors) {
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
Clipboard clipboard = getClipboard();
if (clipboard == null) return false;
for (DataFlavor flavor : flavors) {
if (clipboard.isDataFlavorAvailable(flavor)) {
return true;
@@ -139,12 +151,18 @@ public class ClipboardSynchronizer implements ApplicationComponent {
return false;
}
@Nullable
public Transferable getContents() throws IllegalStateException {
IllegalStateException last = null;
for (int i = 0; i < 3; i++) {
try {
return Toolkit.getDefaultToolkit().getSystemClipboard().getContents(this);
Clipboard clipboard = getClipboard();
if (clipboard == null){
TimeoutUtil.sleep(50);
continue;
}
return clipboard.getContents(this);
}
catch (IllegalStateException e) {
TimeoutUtil.sleep(50);
@@ -157,7 +175,12 @@ public class ClipboardSynchronizer implements ApplicationComponent {
public void setContent(@NotNull final Transferable content, @NotNull final ClipboardOwner owner) {
for (int i = 0; i < 3; i++) {
try {
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(content, owner);
Clipboard clipboard = getClipboard();
if (clipboard == null) {
TimeoutUtil.sleep(50);
continue;
}
clipboard.setContents(content, owner);
}
catch (IllegalStateException e) {
TimeoutUtil.sleep(50);
@@ -389,7 +412,8 @@ public class ClipboardSynchronizer implements ApplicationComponent {
*/
@Nullable
private static Collection<DataFlavor> checkContentsQuick() {
final Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
final Clipboard clipboard = getClipboard();
if (clipboard == null) return null;
final Class<? extends Clipboard> aClass = clipboard.getClass();
if (!"sun.awt.X11.XClipboard".equals(aClass.getName())) return null;