Skip to content

Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance

reduced danger that Tray does not initialize

Michael Peter Christen6042dd99c609
diff --git a/source/net/yacy/gui/Tray.java b/source/net/yacy/gui/Tray.java
index b585639d5..6ac7e84ce 100644
--- a/source/net/yacy/gui/Tray.java
+++ b/source/net/yacy/gui/Tray.java
@@ -51,18 +51,18 @@ import net.yacy.search.SwitchboardConstants;
public final class Tray {
- private final Switchboard sb;
+ private final Switchboard sb;
- private TrayIcon ti = null;
- private final String trayLabel;
+ private TrayIcon ti = null;
+ private final String trayLabel;
- final private static boolean deutsch = System.getProperty("user.language","").equals("de");
- final private static boolean french = System.getProperty("user.language","").equals("fr");
+ final private static boolean deutsch = System.getProperty("user.language","").equals("de");
+ final private static boolean french = System.getProperty("user.language","").equals("fr");
- // states
- private boolean isShown = false;
- private boolean appIsReady = false;
- private boolean menuEnabled = true;
+ // states
+ private boolean isShown = false;
+ private boolean appIsReady = false;
+ private boolean menuEnabled = true;
private BufferedImage[] progressIcons = null;
private final String iconPath;
@@ -71,23 +71,23 @@ public final class Tray {
private MenuItem menuItemAdministration = null;
private MenuItem menuItemTerminate = null;
- public Tray(final Switchboard sb_par) {
- this.sb = sb_par;
- this.menuEnabled = this.sb.getConfigBool(SwitchboardConstants.TRAY_MENU_ENABLED, true);
- this.trayLabel = this.sb.getConfig(SwitchboardConstants.TRAY_ICON_LABEL, "YaCy");
- this.iconPath = this.sb.getAppPath().toString() + "/addon/YaCy_TrayIcon.png".replace("/", File.separator);
- if (this.useTray()) {
- try {
- System.setProperty("java.awt.headless", "false"); // we have to switch off headless mode, else all will fail
- if (SystemTray.isSupported()) {
+ public Tray(final Switchboard sb_par) {
+ this.sb = sb_par;
+ this.menuEnabled = this.sb.getConfigBool(SwitchboardConstants.TRAY_MENU_ENABLED, true);
+ this.trayLabel = this.sb.getConfig(SwitchboardConstants.TRAY_ICON_LABEL, "YaCy");
+ this.iconPath = this.sb.getAppPath().toString() + "/addon/YaCy_TrayIcon.png".replace("/", File.separator);
+ if (this.useTray()) {
+ try {
+ System.setProperty("java.awt.headless", "false"); // we have to switch off headless mode, else all will fail
+ if (SystemTray.isSupported()) {
final ActionListener al = e -> Tray.this.doubleClickAction();
- ImageIO.setUseCache(false); // do not write a cache to disc; keep in RAM
- final Image trayIcon = ImageIO.read(new File(this.iconPath)); // 128x128
+ ImageIO.setUseCache(false); // do not write a cache to disc; keep in RAM
+ final Image trayIcon = ImageIO.read(new File(this.iconPath)); // 128x128
final Image progressBooting = ImageIO.read(new File(this.sb.getAppPath().toString() + "/addon/progress_booting.png".replace("/", File.separator))); // 128x28
final BufferedImage progress = this.getProgressImage();
this.progressIcons = new BufferedImage[4];
for (int i = 0; i < 4; i++) {
- this.progressIcons[i] = new BufferedImage(128, 128, BufferedImage.TYPE_INT_ARGB);
+ this.progressIcons[i] = new BufferedImage(128, 128, BufferedImage.TYPE_INT_ARGB);
final Graphics2D h = this.progressIcons[i].createGraphics();
h.setBackground(Color.BLACK);
h.clearRect(0, 0, 128, 128);
@@ -95,46 +95,46 @@ public final class Tray {
h.drawImage(progress.getSubimage(i * 7, 0, 128, progress.getHeight() / 2), 0, 128 - progress.getHeight() / 2, null);
h.drawImage(progressBooting, 0, 128 - progress.getHeight(), null);
h.dispose();
- }
+ }
final PopupMenu menu = (this.menuEnabled) ? this.getPopupMenu() : null;
- this.ti = new TrayIcon(trayIcon, this.trayLabel, menu);
+ this.ti = new TrayIcon(trayIcon, this.trayLabel, menu);
if (OS.isMacArchitecture) setDockIcon(trayIcon);
- this.ti.setImageAutoSize(true);
- this.ti.addActionListener(al);
- SystemTray.getSystemTray().add(this.ti);
- this.isShown = true;
- this.ti.setToolTip(this.startupMessage());
- new TrayAnimation().start();
- } else {
- System.setProperty("java.awt.headless", "true");
- }
- } catch (final Exception e) {
- System.setProperty("java.awt.headless", "true");
- }
- }
- }
-
- private boolean useTray() {
- final boolean trayIconEnabled = this.sb.getConfigBool(SwitchboardConstants.TRAY_ICON_ENABLED, false);
+ this.ti.setImageAutoSize(true);
+ this.ti.addActionListener(al);
+ SystemTray.getSystemTray().add(this.ti);
+ this.isShown = true;
+ this.ti.setToolTip(this.startupMessage());
+ new TrayAnimation().start();
+ } else {
+ System.setProperty("java.awt.headless", "true");
+ }
+ } catch (final Throwable e) {
+ System.setProperty("java.awt.headless", "true");
+ }
+ }
+ }
+
+ private boolean useTray() {
+ final boolean trayIconEnabled = this.sb.getConfigBool(SwitchboardConstants.TRAY_ICON_ENABLED, false);
final boolean trayIconForced = this.sb.getConfigBool(SwitchboardConstants.TRAY_ICON_FORCED, false);
return trayIconEnabled && (OS.isWindows || OS.isMacArchitecture || trayIconForced);
- }
+ }
- private class TrayAnimation extends Thread {
+ private class TrayAnimation extends Thread {
- public TrayAnimation() {
- super(TrayAnimation.class.getSimpleName());
- }
+ public TrayAnimation() {
+ super(TrayAnimation.class.getSimpleName());
+ }
- int ic = 0;
- @Override
+ int ic = 0;
+ @Override
public void run() {
- while (!Tray.this.appIsReady) {
- Tray.this.ti.setImage(Tray.this.progressIcons[this.ic]);
+ while (!Tray.this.appIsReady) {
+ Tray.this.ti.setImage(Tray.this.progressIcons[this.ic]);
if (OS.isMacArchitecture) setDockIcon(Tray.this.progressIcons[this.ic]);
- this.ic++; if (this.ic >= 4) this.ic = 0;
- try {Thread.sleep(80);} catch (final InterruptedException e) {break;}
- }
+ this.ic++; if (this.ic >= 4) this.ic = 0;
+ try {Thread.sleep(80);} catch (final InterruptedException e) {break;}
+ }
try {
ImageIO.setUseCache(false); // do not write a cache to disc; keep in RAM
final Image trayIcon = ImageIO.read(new File(Tray.this.iconPath));
@@ -145,10 +145,10 @@ public final class Tray {
ConcurrentLog.logException(e);
}
Tray.this.progressIcons = null;
- }
- }
-
- private static Object applicationInstance;
+ }
+ }
+
+ private static Object applicationInstance;
private static Method setDockIconImage;
static {
@@ -167,28 +167,28 @@ public final class Tray {
}
}
- private static void setDockIcon(Image icon) {
- if (!OS.isMacArchitecture || setDockIconImage == null || applicationInstance == null) return;
- try {
- setDockIconImage.invoke(applicationInstance, icon);
+ private static void setDockIcon(final Image icon) {
+ if (!OS.isMacArchitecture || setDockIconImage == null || applicationInstance == null) return;
+ try {
+ setDockIconImage.invoke(applicationInstance, icon);
} catch (final Throwable e) {}
// same as: Application.getApplication().setDockIconImage(i);
- }
-
- /**
- * set all functions available
- */
- public void setReady() {
- this.appIsReady = true;
- if (this.useTray()) {
- try {
- ImageIO.setUseCache(false); // do not write a cache to disc; keep in RAM
- final Image trayIcon = ImageIO.read(new File(this.iconPath));
- if (this.ti != null) {
- this.ti.setImage(trayIcon);
- this.ti.setToolTip(this.readyMessage());
- }
- setDockIcon(trayIcon);
+ }
+
+ /**
+ * set all functions available
+ */
+ public void setReady() {
+ this.appIsReady = true;
+ if (this.useTray()) {
+ try {
+ ImageIO.setUseCache(false); // do not write a cache to disc; keep in RAM
+ final Image trayIcon = ImageIO.read(new File(this.iconPath));
+ if (this.ti != null) {
+ this.ti.setImage(trayIcon);
+ this.ti.setToolTip(this.readyMessage());
+ }
+ setDockIcon(trayIcon);
} catch (final IOException e) {
ConcurrentLog.logException(e);
}
@@ -196,8 +196,8 @@ public final class Tray {
if (this.menuItemSearch != null) this.menuItemSearch.setEnabled(true);
if (this.menuItemAdministration != null) this.menuItemAdministration.setEnabled(true);
if (this.menuItemTerminate != null) this.menuItemTerminate.setEnabled(true);
- }
- }
+ }
+ }
public void setShutdown() {
if (this.useTray()) {
@@ -241,13 +241,13 @@ public final class Tray {
return progress;
}
- public void remove() {
- if (this.isShown){
- SystemTray.getSystemTray().remove(this.ti);
- this.ti = null;
- this.isShown = false;
- }
- }
+ public void remove() {
+ if (this.isShown){
+ SystemTray.getSystemTray().remove(this.ti);
+ this.ti = null;
+ this.isShown = false;
+ }
+ }
private String startupMessage() {
if (deutsch)
@@ -261,14 +261,14 @@ public final class Tray {
private String readyMessage() {
if (deutsch) return "YaCy laeuft unter http://localhost:" + this.sb.getLocalPort();
else if(french)
- return "YaCy est en cours d'exécution à l'adresse http://localhost:" + this.sb.getLocalPort();
+ return "YaCy est en cours d'exécution à l'adresse http://localhost:" + this.sb.getLocalPort();
return "YaCy is running at http://localhost:" + this.sb.getLocalPort();
}
private String shutdownMessage() {
if (deutsch) return "YaCy wird beendet, bitte warten...";
else if(french)
- return "YaCy est en cours d'arrêt, veuillez patienter...";
+ return "YaCy est en cours d'arrêt, veuillez patienter...";
return "YaCy will shut down, please wait...";
}
@@ -281,20 +281,20 @@ public final class Tray {
}
}
- /**
- *
- * @param browserPopUpPage relative path to the webserver root
- */
- private void openBrowserPage(final String browserPopUpPage) {
- if(!this.menuEnabled) return;
- // no need for https, because we are on localhost
- Browser.openBrowser("http://localhost:" + this.sb.getConfig(SwitchboardConstants.SERVER_PORT, "8090") + "/" + browserPopUpPage);
- }
+ /**
+ *
+ * @param browserPopUpPage relative path to the webserver root
+ */
+ private void openBrowserPage(final String browserPopUpPage) {
+ if(!this.menuEnabled) return;
+ // no need for https, because we are on localhost
+ Browser.openBrowser("http://localhost:" + this.sb.getConfig(SwitchboardConstants.SERVER_PORT, "8090") + "/" + browserPopUpPage);
+ }
- private PopupMenu getPopupMenu() {
- String label;
+ private PopupMenu getPopupMenu() {
+ String label;
- final PopupMenu menu = new PopupMenu();
+ final PopupMenu menu = new PopupMenu();
// Headline
this.menuItemHeadline = new MenuItem(this.startupMessage());
@@ -305,46 +305,46 @@ public final class Tray {
// Separator
menu.addSeparator();
- // YaCy Search
- if (deutsch)
- label = "YaCy Suche";
- else if (french)
- label = "Recherche YaCy";
- else
- label = "YaCy Search";
- this.menuItemSearch = new MenuItem(label);
- this.menuItemSearch.setEnabled(false);
- this.menuItemSearch.addActionListener(e -> Tray.this.openBrowserPage("index.html"));
- menu.add(this.menuItemSearch);
-
- // Peer Administration
- if (deutsch)
- label = "Administration";
- else if (french)
- label = "Administration";
- else
- label = "Administration";
- this.menuItemAdministration = new MenuItem(label);
+ // YaCy Search
+ if (deutsch)
+ label = "YaCy Suche";
+ else if (french)
+ label = "Recherche YaCy";
+ else
+ label = "YaCy Search";
+ this.menuItemSearch = new MenuItem(label);
+ this.menuItemSearch.setEnabled(false);
+ this.menuItemSearch.addActionListener(e -> Tray.this.openBrowserPage("index.html"));
+ menu.add(this.menuItemSearch);
+
+ // Peer Administration
+ if (deutsch)
+ label = "Administration";
+ else if (french)
+ label = "Administration";
+ else
+ label = "Administration";
+ this.menuItemAdministration = new MenuItem(label);
this.menuItemAdministration.setEnabled(false);
- this.menuItemAdministration.addActionListener(e -> Tray.this.openBrowserPage("Status.html"));
- menu.add(this.menuItemAdministration);
+ this.menuItemAdministration.addActionListener(e -> Tray.this.openBrowserPage("Status.html"));
+ menu.add(this.menuItemAdministration);
- // Separator
- menu.addSeparator();
+ // Separator
+ menu.addSeparator();
- // Quit
- if(deutsch)
- label = "YaCy Beenden";
- else if(french)
- label = "Arrêter YaCy";
- else
- label = "Shutdown YaCy";
- this.menuItemTerminate = new MenuItem(label);
+ // Quit
+ if(deutsch)
+ label = "YaCy Beenden";
+ else if(french)
+ label = "Arrêter YaCy";
+ else
+ label = "Shutdown YaCy";
+ this.menuItemTerminate = new MenuItem(label);
this.menuItemTerminate.setEnabled(false);
- this.menuItemTerminate.addActionListener(e -> Tray.this.sb.terminate("shutdown from tray"));
- menu.add(this.menuItemTerminate);
- return menu;
- }
+ this.menuItemTerminate.addActionListener(e -> Tray.this.sb.terminate("shutdown from tray"));
+ menu.add(this.menuItemTerminate);
+ return menu;
+ }
}