mirror of
https://github.com/moparisthebest/davmail
synced 2024-12-13 11:12:22 -05:00
Revert 1.7 test on SWT, tray implementation is still broken on Linux
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1817 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
parent
8f43693ef5
commit
5852fe662b
@ -225,18 +225,16 @@ public final class DavGatewayTray {
|
||||
*/
|
||||
public static void init() {
|
||||
if (!Settings.getBooleanProperty("davmail.server")) {
|
||||
// first try to load SWT before with Java before 1.7
|
||||
if ("1.7".compareTo(System.getProperty("java.specification.version")) > 0) {
|
||||
ClassLoader classloader = DavGatewayTray.class.getClassLoader();
|
||||
try {
|
||||
// trigger ClassNotFoundException
|
||||
classloader.loadClass("org.eclipse.swt.SWT");
|
||||
// SWT available, create tray
|
||||
davGatewayTray = new SwtGatewayTray();
|
||||
davGatewayTray.init();
|
||||
} catch (ClassNotFoundException e) {
|
||||
DavGatewayTray.info(new BundleMessage("LOG_SWT_NOT_AVAILABLE"));
|
||||
}
|
||||
// first try to load SWT before with Java
|
||||
ClassLoader classloader = DavGatewayTray.class.getClassLoader();
|
||||
try {
|
||||
// trigger ClassNotFoundException
|
||||
classloader.loadClass("org.eclipse.swt.SWT");
|
||||
// SWT available, create tray
|
||||
davGatewayTray = new SwtGatewayTray();
|
||||
davGatewayTray.init();
|
||||
} catch (ClassNotFoundException e) {
|
||||
DavGatewayTray.info(new BundleMessage("LOG_SWT_NOT_AVAILABLE"));
|
||||
}
|
||||
// try java6 tray support
|
||||
if (davGatewayTray == null) {
|
||||
|
Loading…
Reference in New Issue
Block a user