dorkbox/SystemTray
2
1
Fork 1
Code Issues Pull Requests Releases 5 Wiki Activity

Fixed race condition between bind() and add(), where they could both add

Browse Source 
an entry. Now entries will only be added if they have not already been
 added.
This commit is contained in:
nathan 2017-07-04 19:09:21 +02:00
parent 44c5b11816
commit 133cb9f8f8
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dorkbox/systemTray/Entry.java
View File

@ -56,6 +56,14 @@ class Entry {
// END methods for hooking into the system tray, menu's, and entries. // END methods for hooking into the system tray, menu's, and entries.
/**
* @return true if this entry has a peer assigned to it.
*/
public final
boolean hasPeer() {
return peer != null;
}
/** /**
* @return the parent menu (of this entry or menu) or null if we are the root menu * @return the parent menu (of this entry or menu) or null if we are the root menu
*/ */

12
src/dorkbox/systemTray/Menu.java
View File

@ -124,7 +124,6 @@ class Menu extends MenuItem {
copy = new ArrayList<Entry>(menuEntries); copy = new ArrayList<Entry>(menuEntries);
} }
for (int i = 0, menuEntriesSize = copy.size(); i < menuEntriesSize; i++) { for (int i = 0, menuEntriesSize = copy.size(); i < menuEntriesSize; i++) {
final Entry menuEntry = copy.get(i); final Entry menuEntry = copy.get(i);
peer.add(this, menuEntry, i); peer.add(this, menuEntry, i);
@ -145,7 +144,6 @@ class Menu extends MenuItem {
@SuppressWarnings("Duplicates") @SuppressWarnings("Duplicates")
public final public final
Menu add(final JMenu entry) { Menu add(final JMenu entry) {
Menu menu = new Menu(); Menu menu = new Menu();
menu.setEnabled(entry.isEnabled()); menu.setEnabled(entry.isEnabled());
@ -267,7 +265,7 @@ class Menu extends MenuItem {
* Adds a menu entry, separator, or sub-menu to this menu. * Adds a menu entry, separator, or sub-menu to this menu.
*/ */
public public
<T extends Entry> T add(final T entry, int index) { <T extends Entry> T add(final T entry, int index) {
synchronized (menuEntries) { synchronized (menuEntries) {
// access on this object must be synchronized for object visibility // access on this object must be synchronized for object visibility
if (index == -1) { if (index == -1) {
@ -279,10 +277,10 @@ class Menu extends MenuItem {
} }
menuEntries.add(index, entry); menuEntries.add(index, entry);
} }
}
if (peer != null) { if (peer != null) {
((MenuPeer) peer).add(this, entry, index); ((MenuPeer) peer).add(this, entry, index);
}
} }
return entry; return entry;
@ -351,7 +349,7 @@ class Menu extends MenuItem {
} }
/** /**
* This removes a menu entry from the dropdown menu. * This removes a menu entry from the menu.
* *
* @param entry This is the menu entry to remove * @param entry This is the menu entry to remove
*/ */

6
src/dorkbox/systemTray/swingUI/SwingMenu.java
View File

@ -73,6 +73,12 @@ class SwingMenu implements MenuPeer {
@Override @Override
public public
void run() { void run() {
// don't add this entry if it's already been added via another method. Because of threading via swing/gtk, entries can
// POSSIBLY get added twice. Once via add() and once via bind().
if (entry.hasPeer()) {
return;
}
if (entry instanceof Menu) { if (entry instanceof Menu) {
SwingMenu swingMenu = new SwingMenu(SwingMenu.this, (Menu) entry); SwingMenu swingMenu = new SwingMenu(SwingMenu.this, (Menu) entry);
((Menu) entry).bind(swingMenu, parentMenu, parentMenu.getSystemTray()); ((Menu) entry).bind(swingMenu, parentMenu, parentMenu.getSystemTray());