stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8039752: Regression: Clipboard couldn't be used on linux

Browse Source 
Reviewed-by: anthony, serb, azvegint
This commit is contained in:
Petr Pchelko 2014-04-09 18:20:55 +04:00
parent 22166928a5
commit c3a9369016
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jdk/src/share/classes/java/awt/datatransfer/Clipboard.java
View File

@ -67,7 +67,7 @@ public class Clipboard {
*
* @since 1.5
*/
private final Set<FlavorListener> flavorListeners = new HashSet<>();
private Set<FlavorListener> flavorListeners;
/**
* A set of <code>DataFlavor</code>s that is available on
@ -85,7 +85,6 @@ public class Clipboard {
*/
public Clipboard(String name) {
this.name = name;
currentDataFlavors = getAvailableDataFlavorSet();
}
/**
@ -257,6 +256,12 @@ public class Clipboard {
if (listener == null) {
return;
}
if (flavorListeners == null) {
flavorListeners = new HashSet<>();
currentDataFlavors = getAvailableDataFlavorSet();
}
flavorListeners.add(listener);
}
@ -278,7 +283,7 @@ public class Clipboard {
* @since 1.5
*/
public synchronized void removeFlavorListener(FlavorListener listener) {
if (listener == null) {
if (listener == null || flavorListeners == null) {
return;
}
flavorListeners.remove(listener);
@ -297,7 +302,8 @@ public class Clipboard {
* @since 1.5
*/
public synchronized FlavorListener[] getFlavorListeners() {
return flavorListeners.toArray(new FlavorListener[flavorListeners.size()]);
return flavorListeners == null ? new FlavorListener[0] :
flavorListeners.toArray(new FlavorListener[flavorListeners.size()]);
}
/**
@ -308,6 +314,10 @@ public class Clipboard {
* @since 1.5
*/
private void fireFlavorsChanged() {
if (flavorListeners == null) {
return;
}
Set<DataFlavor> prevDataFlavors = currentDataFlavors;
currentDataFlavors = getAvailableDataFlavorSet();
if (Objects.equals(prevDataFlavors, currentDataFlavors)) {