From 0f4a12b3c4c827de5ac27a40d71d9928620457b9 Mon Sep 17 00:00:00 2001 From: mguessan Date: Tue, 9 Oct 2007 12:01:58 +0000 Subject: [PATCH] Move tray classes in separate package git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@82 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- src/java/davmail/AbstractConnection.java | 1 + src/java/davmail/AbstractServer.java | 2 ++ src/java/davmail/DavGateway.java | 1 + src/java/davmail/Settings.java | 2 ++ src/java/davmail/imap/ImapConnection.java | 2 +- src/java/davmail/pop/PopConnection.java | 2 +- src/java/davmail/smtp/SmtpConnection.java | 2 +- src/java/davmail/{ => tray}/AwtGatewayTray.java | 7 ++++++- src/java/davmail/{ => tray}/DavGatewayTray.java | 6 +++++- src/java/davmail/{ => tray}/DavGatewayTrayInterface.java | 2 +- src/java/davmail/{ => tray}/SwtGatewayTray.java | 7 ++++++- 11 files changed, 27 insertions(+), 7 deletions(-) rename src/java/davmail/{ => tray}/AwtGatewayTray.java (94%) rename src/java/davmail/{ => tray}/DavGatewayTray.java (95%) rename src/java/davmail/{ => tray}/DavGatewayTrayInterface.java (88%) rename src/java/davmail/{ => tray}/SwtGatewayTray.java (95%) diff --git a/src/java/davmail/AbstractConnection.java b/src/java/davmail/AbstractConnection.java index d7db8dc1..4a61b384 100644 --- a/src/java/davmail/AbstractConnection.java +++ b/src/java/davmail/AbstractConnection.java @@ -1,6 +1,7 @@ package davmail; import davmail.exchange.ExchangeSession; +import davmail.tray.DavGatewayTray; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/java/davmail/AbstractServer.java b/src/java/davmail/AbstractServer.java index 2d56d6d8..d455e7e7 100644 --- a/src/java/davmail/AbstractServer.java +++ b/src/java/davmail/AbstractServer.java @@ -1,5 +1,7 @@ package davmail; +import davmail.tray.DavGatewayTray; + import java.io.IOException; import java.net.ServerSocket; import java.net.Socket; diff --git a/src/java/davmail/DavGateway.java b/src/java/davmail/DavGateway.java index 3aa1257f..41a977c1 100644 --- a/src/java/davmail/DavGateway.java +++ b/src/java/davmail/DavGateway.java @@ -2,6 +2,7 @@ package davmail; import davmail.pop.PopServer; import davmail.smtp.SmtpServer; +import davmail.tray.DavGatewayTray; import java.io.IOException; diff --git a/src/java/davmail/Settings.java b/src/java/davmail/Settings.java index 9c0847eb..a967a4b3 100644 --- a/src/java/davmail/Settings.java +++ b/src/java/davmail/Settings.java @@ -1,5 +1,7 @@ package davmail; +import davmail.tray.DavGatewayTray; + import java.util.Properties; import java.io.File; import java.io.FileReader; diff --git a/src/java/davmail/imap/ImapConnection.java b/src/java/davmail/imap/ImapConnection.java index b1afa1ff..9b69b8ca 100644 --- a/src/java/davmail/imap/ImapConnection.java +++ b/src/java/davmail/imap/ImapConnection.java @@ -6,7 +6,7 @@ import java.util.List; import java.io.IOException; import davmail.AbstractConnection; -import davmail.DavGatewayTray; +import davmail.tray.DavGatewayTray; import davmail.exchange.ExchangeSession; /** diff --git a/src/java/davmail/pop/PopConnection.java b/src/java/davmail/pop/PopConnection.java index 9920f39f..bcd1edc9 100644 --- a/src/java/davmail/pop/PopConnection.java +++ b/src/java/davmail/pop/PopConnection.java @@ -1,7 +1,7 @@ package davmail.pop; import davmail.AbstractConnection; -import davmail.DavGatewayTray; +import davmail.tray.DavGatewayTray; import davmail.exchange.ExchangeSession; import java.io.IOException; diff --git a/src/java/davmail/smtp/SmtpConnection.java b/src/java/davmail/smtp/SmtpConnection.java index e77ad1e0..7cd1d76b 100644 --- a/src/java/davmail/smtp/SmtpConnection.java +++ b/src/java/davmail/smtp/SmtpConnection.java @@ -1,7 +1,7 @@ package davmail.smtp; import davmail.AbstractConnection; -import davmail.DavGatewayTray; +import davmail.tray.DavGatewayTray; import davmail.exchange.ExchangeSession; import sun.misc.BASE64Decoder; diff --git a/src/java/davmail/AwtGatewayTray.java b/src/java/davmail/tray/AwtGatewayTray.java similarity index 94% rename from src/java/davmail/AwtGatewayTray.java rename to src/java/davmail/tray/AwtGatewayTray.java index b62a330a..54a61bb6 100644 --- a/src/java/davmail/AwtGatewayTray.java +++ b/src/java/davmail/tray/AwtGatewayTray.java @@ -1,4 +1,4 @@ -package davmail; +package davmail.tray; import org.apache.log4j.Logger; import org.apache.log4j.Priority; @@ -12,6 +12,11 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.net.URL; +import davmail.tray.DavGatewayTrayInterface; +import davmail.tray.DavGatewayTray; +import davmail.SettingsFrame; +import davmail.Settings; + /** * Tray icon handler based on java 1.6 */ diff --git a/src/java/davmail/DavGatewayTray.java b/src/java/davmail/tray/DavGatewayTray.java similarity index 95% rename from src/java/davmail/DavGatewayTray.java rename to src/java/davmail/tray/DavGatewayTray.java index f433b7e3..5eba9ccf 100644 --- a/src/java/davmail/DavGatewayTray.java +++ b/src/java/davmail/tray/DavGatewayTray.java @@ -1,9 +1,13 @@ -package davmail; +package davmail.tray; import org.apache.log4j.Priority; import java.awt.SystemTray; +import davmail.tray.AwtGatewayTray; +import davmail.tray.DavGatewayTrayInterface; +import davmail.tray.SwtGatewayTray; + /** * Tray icon handler diff --git a/src/java/davmail/DavGatewayTrayInterface.java b/src/java/davmail/tray/DavGatewayTrayInterface.java similarity index 88% rename from src/java/davmail/DavGatewayTrayInterface.java rename to src/java/davmail/tray/DavGatewayTrayInterface.java index ecafa664..42527467 100644 --- a/src/java/davmail/DavGatewayTrayInterface.java +++ b/src/java/davmail/tray/DavGatewayTrayInterface.java @@ -1,4 +1,4 @@ -package davmail; +package davmail.tray; import org.apache.log4j.Priority; diff --git a/src/java/davmail/SwtGatewayTray.java b/src/java/davmail/tray/SwtGatewayTray.java similarity index 95% rename from src/java/davmail/SwtGatewayTray.java rename to src/java/davmail/tray/SwtGatewayTray.java index a2379ef8..2baa2fa6 100644 --- a/src/java/davmail/SwtGatewayTray.java +++ b/src/java/davmail/tray/SwtGatewayTray.java @@ -1,4 +1,4 @@ -package davmail; +package davmail.tray; import org.apache.log4j.Logger; import org.apache.log4j.Priority; @@ -17,6 +17,11 @@ import java.io.IOException; import java.net.URL; import java.awt.*; +import davmail.tray.DavGatewayTray; +import davmail.tray.DavGatewayTrayInterface; +import davmail.SettingsFrame; +import davmail.Settings; + /** * Tray icon handler based on SWT */