Author: chatellier Date: 2008-11-05 15:38:53 +0000 (Wed, 05 Nov 2008) New Revision: 1583 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java Log: Use only JSE6 SystemTray, remove JDIC native dependency. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java 2008-10-31 12:13:47 UTC (rev 1582) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java 2008-11-05 15:38:53 UTC (rev 1583) @@ -31,45 +31,37 @@ package fr.ifremer.isisfish; -import static org.codelutin.i18n.I18nf._; +import static org.codelutin.i18n.I18n._; import static org.codelutin.i18n.I18n.n_; +import static org.codelutin.i18n.I18nf._; import java.awt.AWTException; -import java.awt.MenuItem; -import java.awt.PopupMenu; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; +import java.awt.SystemTray; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import javax.swing.ImageIcon; -import javax.swing.JMenuItem; -import javax.swing.JPopupMenu; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.Resource; -import org.jdesktop.jdic.tray.SystemTray; -import org.jdesktop.jdic.tray.TrayIcon; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.launcher.SimulationJob; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; - /** * @author poussin * */ - public abstract class IsisTray implements SimulationServiceListener, PropertyChangeListener { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(IsisTray.class); + protected static Log log = LogFactory.getLog(IsisTray.class); - static final private ImageIcon TRAY_IMAGE_STOP = Resource.getIcon("/images/BulbR.gif"); - static final private ImageIcon TRAY_IMAGE_START = Resource.getIcon("/images/BulbG.gif"); + protected static final ImageIcon TRAY_IMAGE_STOP = Resource.getIcon("/images/BulbR.gif"); + protected static final ImageIcon TRAY_IMAGE_START = Resource.getIcon("/images/BulbG.gif"); static final public String NO_SIMULATION_TEXT = n_("isisfish.tray.simulation.no"); /** text a utiliser pour afficher l'etat de la simulation en cours @@ -88,8 +80,6 @@ if (instance == null) { if (AWTSystemTray.isSupported()) { instance = new AWTSystemTray(); - } else if (JDICSystemTray.isSupported()){ - instance = new JDICSystemTray(); } else { instance = new DummySystemTray(); } @@ -153,7 +143,7 @@ protected java.awt.TrayIcon trayIcon = null; static public boolean isSupported() { - boolean result = java.awt.SystemTray.isSupported(); + boolean result = SystemTray.isSupported(); return result; } @@ -167,12 +157,12 @@ } public AWTSystemTray() { - if (java.awt.SystemTray.isSupported()) { + if (SystemTray.isSupported()) { // get the SystemTray instance - java.awt.SystemTray tray = java.awt.SystemTray.getSystemTray(); + SystemTray tray = SystemTray.getSystemTray(); // create a action listener to listen for default action executed on the tray icon - ActionListener trayListener = new ActionListener() { + /*ActionListener trayListener = new ActionListener() { public void actionPerformed(ActionEvent e) { System.out.println("**DEBUG** Clicked tray"); } @@ -181,19 +171,19 @@ public void actionPerformed(ActionEvent e) { System.out.println("**DEBUG** Clicked menu"); } - }; + };*/ // create a popup menu - PopupMenu popup = new PopupMenu(); + /*PopupMenu popup = new PopupMenu(); // create menu item for the default action MenuItem defaultItem = new MenuItem("Mon menu item"); defaultItem.addActionListener(listener); - popup.add(defaultItem); + popup.add(defaultItem);*/ /// ... add other items // construct a TrayIcon - trayIcon = new java.awt.TrayIcon(TRAY_IMAGE_STOP.getImage(), "Tray Demo", popup); + trayIcon = new java.awt.TrayIcon(TRAY_IMAGE_STOP.getImage(), "Tray Demo", null); trayIcon.setImageAutoSize(true); // set the TrayIcon properties - trayIcon.addActionListener(trayListener); + //trayIcon.addActionListener(trayListener); // ... // add the tray image try { @@ -211,63 +201,4 @@ } } } - - - static class JDICSystemTray extends IsisTray { - protected TrayIcon trayIcon = null; - - static public boolean isSupported() { - boolean result = true; - try { - SystemTray.getDefaultSystemTray(); - } catch (Throwable eee) { - result = false; - } - return result; - } - - @Override - public void setImage(ImageIcon image) { - trayIcon.setIcon(image); - } - @Override - public void setToolTip(String text) { - trayIcon.setToolTip(text); - } - - public JDICSystemTray() { - System.out.println("java.library.path = " + System.getProperty("java.library.path")); - // get the SystemTray instance - SystemTray tray = SystemTray.getDefaultSystemTray(); - - // create a action listener to listen for default action executed on the tray icon - ActionListener trayListener = new ActionListener() { - public void actionPerformed(ActionEvent e) { - System.out.println("**DEBUG** Clicked tray"); - } - }; - ActionListener listener = new ActionListener() { - public void actionPerformed(ActionEvent e) { - System.out.println("**DEBUG** Clicked menu"); - } - }; - // create a popup menu - JPopupMenu popup = new JPopupMenu(); - // create menu item for the default action - JMenuItem defaultItem = new JMenuItem("Mon menu item"); - defaultItem.addActionListener(listener); - popup.add(defaultItem); - /// ... add other items - // construct a TrayIcon - trayIcon = new TrayIcon(TRAY_IMAGE_STOP, "Tray Demo", popup); - trayIcon.setIconAutoSize(true); - // set the TrayIcon properties - trayIcon.addActionListener(trayListener); - // ... - // add the tray image - tray.addTrayIcon(trayIcon); - } - } } - -