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

EA-35645 (JRE bug - just catch and log)

Browse Source
This commit is contained in:
Roman Shevchenko
2012-04-18 17:51:10 +02:00
parent 1f941fff99
commit d0decb505b
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
+25 -18
View File
@@ -328,12 +328,18 @@ public class ClipboardSynchronizer implements ApplicationComponent {
return currentContent.isDataFlavorSupported(dataFlavor);
}
final Collection<DataFlavor> flavors = checkContentsQuick();
if (flavors != null) {
return flavors.contains(dataFlavor);
}
try {
final Collection<DataFlavor> flavors = checkContentsQuick();
if (flavors != null) {
return flavors.contains(dataFlavor);
}
return super.isDataFlavorAvailable(dataFlavor);
return super.isDataFlavorAvailable(dataFlavor);
}
catch (NullPointerException e) {
LOG.warn("Sun bug #6322854", e);
return false;
}
}
@Override
@@ -343,12 +349,18 @@ public class ClipboardSynchronizer implements ApplicationComponent {
return currentContent;
}
final Collection<DataFlavor> flavors = checkContentsQuick();
if (flavors != null && flavors.isEmpty()) {
try {
final Collection<DataFlavor> flavors = checkContentsQuick();
if (flavors != null && flavors.isEmpty()) {
return null;
}
return super.getContents();
}
catch (NullPointerException e) {
LOG.warn("Sun bug #6322854", e);
return null;
}
return super.getContents();
}
@Override
@@ -369,7 +381,7 @@ public class ClipboardSynchronizer implements ApplicationComponent {
* collection of available data flavors otherwise.
*/
@Nullable
public static Collection<DataFlavor> checkContentsQuick() {
private static Collection<DataFlavor> checkContentsQuick() {
final Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
final Class<? extends Clipboard> aClass = clipboard.getClass();
if (!"sun.awt.X11.XClipboard".equals(aClass.getName())) return null;
@@ -391,14 +403,9 @@ public class ClipboardSynchronizer implements ApplicationComponent {
if (formats == null || formats.length == 0) {
return Collections.emptySet();
}
try {
@SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
final Set<DataFlavor> set = DataTransferer.getInstance().getFlavorsForFormats(formats, FLAVOR_MAP).keySet();
return set;
}
catch (NullPointerException e) {
LOG.warn("Sun bug #6322854", e);
}
@SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
final Set<DataFlavor> set = DataTransferer.getInstance().getFlavorsForFormats(formats, FLAVOR_MAP).keySet();
return set;
}
catch (IllegalAccessException ignore) { }
catch (IllegalArgumentException ignore) { }