moparisthebest
/
davmail
mirror of https://github.com/moparisthebest/davmail
1
0
Fork 0
Code Issues Releases Wiki Activity

Java 7 fixed tray icon support => drop SWT on Java 7 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1995 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2012-08-24 09:19:54 +00:00
parent 711c621113
commit 1890dcdbfd
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java/davmail/ui/tray/DavGatewayTray.java
View File

@ -225,16 +225,18 @@ public final class DavGatewayTray {
*/ */
public static void init() { public static void init() {
if (!Settings.getBooleanProperty("davmail.server")) { if (!Settings.getBooleanProperty("davmail.server")) {
// first try to load SWT before with Java // first try to load SWT before with Java, except on 1.7
ClassLoader classloader = DavGatewayTray.class.getClassLoader(); if (System.getProperty("java.version").compareTo("1.7") < 0) {
try { ClassLoader classloader = DavGatewayTray.class.getClassLoader();
// trigger ClassNotFoundException try {
classloader.loadClass("org.eclipse.swt.SWT"); // trigger ClassNotFoundException
// SWT available, create tray classloader.loadClass("org.eclipse.swt.SWT");
davGatewayTray = new SwtGatewayTray(); // SWT available, create tray
davGatewayTray.init(); davGatewayTray = new SwtGatewayTray();
} catch (ClassNotFoundException e) { davGatewayTray.init();
DavGatewayTray.info(new BundleMessage("LOG_SWT_NOT_AVAILABLE")); } catch (ClassNotFoundException e) {
DavGatewayTray.info(new BundleMessage("LOG_SWT_NOT_AVAILABLE"));
}
} }
// try java6 tray support // try java6 tray support
if (davGatewayTray == null) { if (davGatewayTray == null) {

1
src/java/davmail/ui/tray/OSXAwtGatewayTray.java
View File

@ -35,6 +35,7 @@ import java.awt.image.RenderedImage;
/** /**
* Extended Awt tray with OSX extensions. * Extended Awt tray with OSX extensions.
*/ */
@SuppressWarnings("Since15")
public class OSXAwtGatewayTray extends AwtGatewayTray { public class OSXAwtGatewayTray extends AwtGatewayTray {
protected static final String OSX_TRAY_ACTIVE_PNG = "osxtray2.png"; protected static final String OSX_TRAY_ACTIVE_PNG = "osxtray2.png";
protected static final String OSX_TRAY_PNG = "osxtray.png"; protected static final String OSX_TRAY_PNG = "osxtray.png";