From 9257d6d637ebbb06123df6d28bf9d6aef0782b0b Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Thu, 16 Apr 2009 22:33:52 +0000
Subject: [PATCH] Cleanup from audit

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@528 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/exchange/ExchangeSession.java    | 1 -
 src/java/davmail/ui/AcceptCertificateDialog.java  | 2 --
 src/java/davmail/ui/tray/DavGatewayTray.java      | 1 -
 src/java/davmail/ui/tray/OSXFrameGatewayTray.java | 2 --
 src/java/davmail/ui/tray/SwtGatewayTray.java      | 5 ++++-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index 6af0b708..1bd6bb9b 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -21,7 +21,6 @@ import org.htmlcleaner.HtmlCleaner;
 import org.htmlcleaner.TagNode;
 
 import javax.mail.MessagingException;
-import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
 import javax.mail.internet.MimePart;
diff --git a/src/java/davmail/ui/AcceptCertificateDialog.java b/src/java/davmail/ui/AcceptCertificateDialog.java
index e2292cb0..64d6a140 100644
--- a/src/java/davmail/ui/AcceptCertificateDialog.java
+++ b/src/java/davmail/ui/AcceptCertificateDialog.java
@@ -9,10 +9,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.lang.reflect.InvocationTargetException;
 import java.security.cert.X509Certificate;
-import java.text.SimpleDateFormat;
 import java.text.DateFormat;
 import java.util.Date;
-import java.util.Locale;
 
 /**
  * Accept certificate dialog
diff --git a/src/java/davmail/ui/tray/DavGatewayTray.java b/src/java/davmail/ui/tray/DavGatewayTray.java
index fe9465e6..eec6c3bf 100644
--- a/src/java/davmail/ui/tray/DavGatewayTray.java
+++ b/src/java/davmail/ui/tray/DavGatewayTray.java
@@ -1,7 +1,6 @@
 package davmail.ui.tray;
 
 import davmail.Settings;
-import davmail.ui.tray.OSXFrameGatewayTray;
 import davmail.exchange.NetworkDownException;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
diff --git a/src/java/davmail/ui/tray/OSXFrameGatewayTray.java b/src/java/davmail/ui/tray/OSXFrameGatewayTray.java
index 26288c38..1e6ebcf1 100644
--- a/src/java/davmail/ui/tray/OSXFrameGatewayTray.java
+++ b/src/java/davmail/ui/tray/OSXFrameGatewayTray.java
@@ -1,7 +1,5 @@
 package davmail.ui.tray;
 
-import davmail.ui.tray.DavGatewayTray;
-import davmail.ui.tray.FrameGatewayTray;
 import davmail.ui.OSXAdapter;
 
 import javax.swing.*;
diff --git a/src/java/davmail/ui/tray/SwtGatewayTray.java b/src/java/davmail/ui/tray/SwtGatewayTray.java
index 08ea2b08..65bb8d4f 100644
--- a/src/java/davmail/ui/tray/SwtGatewayTray.java
+++ b/src/java/davmail/ui/tray/SwtGatewayTray.java
@@ -280,10 +280,13 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
                 }
             }
         }.start();
-        while (!isReady) {
+        while (true) {
             // wait for SWT init
             try {
                 synchronized (mainThread) {
+                    if (isReady) {
+                        break;
+                    }
                     mainThread.wait(1000);
                 }
             } catch (InterruptedException e) {