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

Added proper logging for exceptions. Code polish

Browse Source
This commit is contained in:
nathan 2016-09-27 00:51:28 +02:00
parent 34588de6b7
commit 9d46adf3f1
1 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/dorkbox/systemTray/SystemTray.java
View File

@ -115,7 +115,7 @@ class SystemTray {
* <p> * <p>
* This is an advanced feature, and it is recommended to leave at 0. * This is an advanced feature, and it is recommended to leave at 0.
*/ */
public static int FORCE_TRAY_TYPE = 3; public static int FORCE_TRAY_TYPE = 0;
@Property @Property
/** /**
@ -880,7 +880,7 @@ class SystemTray {
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); logger.error("Error updating menu entry: {}, with text {}", origMenuText, newMenuText);
} }
if (!hasValue.get()) { if (!hasValue.get()) {
@ -925,7 +925,7 @@ class SystemTray {
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); logger.error("Error updating menu entry: {}, with image {}", origMenuText, imagePath);
} }
if (!hasValue.get()) { if (!hasValue.get()) {
@ -943,7 +943,7 @@ class SystemTray {
void updateMenuEntry(final String origMenuText, final URL imageUrl) { void updateMenuEntry(final String origMenuText, final URL imageUrl) {
// have to wait for the value // have to wait for the value
final CountDownLatch countDownLatch = new CountDownLatch(1); final CountDownLatch countDownLatch = new CountDownLatch(1);
final AtomicBoolean hasValue = new AtomicBoolean(true); final AtomicBoolean hasValue = new AtomicBoolean(true);
dispatch(new Runnable() { dispatch(new Runnable() {
@Override @Override
@ -971,7 +971,7 @@ class SystemTray {
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); logger.error("Error updating menu entry: {}, with image URL {}", origMenuText, imageUrl.getPath());
} }
if (!hasValue.get()) { if (!hasValue.get()) {
@ -989,7 +989,7 @@ class SystemTray {
void updateMenuEntry(final String origMenuText, final String cacheName, final InputStream imageStream) { void updateMenuEntry(final String origMenuText, final String cacheName, final InputStream imageStream) {
// have to wait for the value // have to wait for the value
final CountDownLatch countDownLatch = new CountDownLatch(1); final CountDownLatch countDownLatch = new CountDownLatch(1);
final AtomicBoolean hasValue = new AtomicBoolean(true); final AtomicBoolean hasValue = new AtomicBoolean(true);
dispatch(new Runnable() { dispatch(new Runnable() {
@Override @Override
@ -1016,7 +1016,7 @@ class SystemTray {
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); logger.error("Error updating menu entry: {}, with image stream (named) {}", origMenuText, cacheName);
} }
if (!hasValue.get()) { if (!hasValue.get()) {
@ -1034,7 +1034,7 @@ class SystemTray {
void updateMenuEntry(final String origMenuText, final InputStream imageStream) { void updateMenuEntry(final String origMenuText, final InputStream imageStream) {
// have to wait for the value // have to wait for the value
final CountDownLatch countDownLatch = new CountDownLatch(1); final CountDownLatch countDownLatch = new CountDownLatch(1);
final AtomicBoolean hasValue = new AtomicBoolean(true); final AtomicBoolean hasValue = new AtomicBoolean(true);
dispatch(new Runnable() { dispatch(new Runnable() {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@ -1062,7 +1062,7 @@ class SystemTray {
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); logger.error("Error updating menu entry: {}, with iamgeStream {}", origMenuText);
} }
if (!hasValue.get()) { if (!hasValue.get()) {
@ -1080,7 +1080,7 @@ class SystemTray {
void updateMenuEntry(final String origMenuText, final SystemTrayMenuAction newCallback) { void updateMenuEntry(final String origMenuText, final SystemTrayMenuAction newCallback) {
// have to wait for the value // have to wait for the value
final CountDownLatch countDownLatch = new CountDownLatch(1); final CountDownLatch countDownLatch = new CountDownLatch(1);
final AtomicBoolean hasValue = new AtomicBoolean(true); final AtomicBoolean hasValue = new AtomicBoolean(true);
dispatch(new Runnable() { dispatch(new Runnable() {
@Override @Override
@ -1107,7 +1107,7 @@ class SystemTray {
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); logger.error("Error updating menu entry: {}, with new callback", origMenuText);
} }
if (!hasValue.get()) { if (!hasValue.get()) {
@ -1127,7 +1127,7 @@ class SystemTray {
void updateMenuEntry(final String origMenuText, final String newMenuText, final SystemTrayMenuAction newCallback) { void updateMenuEntry(final String origMenuText, final String newMenuText, final SystemTrayMenuAction newCallback) {
// have to wait for the value // have to wait for the value
final CountDownLatch countDownLatch = new CountDownLatch(1); final CountDownLatch countDownLatch = new CountDownLatch(1);
final AtomicBoolean hasValue = new AtomicBoolean(true); final AtomicBoolean hasValue = new AtomicBoolean(true);
dispatch(new Runnable() { dispatch(new Runnable() {
@Override @Override
@ -1155,7 +1155,7 @@ class SystemTray {
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); logger.error("Error updating menu entry: {}, with text and callback {}", origMenuText, newMenuText);
} }
if (!hasValue.get()) { if (!hasValue.get()) {
@ -1179,7 +1179,7 @@ class SystemTray {
// have to wait for the value // have to wait for the value
final CountDownLatch countDownLatch = new CountDownLatch(1); final CountDownLatch countDownLatch = new CountDownLatch(1);
final AtomicBoolean hasValue = new AtomicBoolean(false); final AtomicBoolean hasValue = new AtomicBoolean(false);
dispatch(new Runnable() { dispatch(new Runnable() {
@Override @Override
@ -1215,7 +1215,7 @@ class SystemTray {
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); logger.error("Error removing menu entry: {}", label);
} }
if (!hasValue.get()) { if (!hasValue.get()) {
@ -1233,29 +1233,23 @@ class SystemTray {
void removeMenuEntry(final String menuText) { void removeMenuEntry(final String menuText) {
// have to wait for the value // have to wait for the value
final CountDownLatch countDownLatch = new CountDownLatch(1); final CountDownLatch countDownLatch = new CountDownLatch(1);
final AtomicBoolean hasValue = new AtomicBoolean(true); final AtomicBoolean hasValue = new AtomicBoolean(true);
dispatch(new Runnable() { dispatch(new Runnable() {
@Override @Override
public public
void run() { void run() {
dispatch(new Runnable() { synchronized (menuEntries) {
@Override MenuEntry menuEntry = getMenuEntry(menuText);
public
void run() {
synchronized (menuEntries) {
MenuEntry menuEntry = getMenuEntry(menuText);
if (menuEntry == null) { if (menuEntry == null) {
hasValue.set(false); hasValue.set(false);
}
else {
removeMenuEntry(menuEntry);
}
}
countDownLatch.countDown();
} }
}); else {
removeMenuEntry(menuEntry);
}
}
countDownLatch.countDown();
} }
}); });
@ -1266,7 +1260,7 @@ class SystemTray {
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); logger.error("Error removing menu entry: {}", menuText);
} }
if (!hasValue.get()) { if (!hasValue.get()) {