diff --git a/src/java/davmail/AbstractConnection.java b/src/java/davmail/AbstractConnection.java index aa33df8c..4544fec8 100644 --- a/src/java/davmail/AbstractConnection.java +++ b/src/java/davmail/AbstractConnection.java @@ -150,7 +150,7 @@ public class AbstractConnection extends Thread { return new String(Base64.encode(value.getBytes())); } - protected String base64Decode(String value) throws IOException { + protected String base64Decode(String value) { return new String(Base64.decode(value.getBytes())); } } diff --git a/src/java/davmail/AbstractServer.java b/src/java/davmail/AbstractServer.java index 41d154d8..fe3d4a3e 100644 --- a/src/java/davmail/AbstractServer.java +++ b/src/java/davmail/AbstractServer.java @@ -11,7 +11,7 @@ import java.net.Socket; * Generic abstract server common to SMTP and POP3 implementations */ public abstract class AbstractServer extends Thread { - private int port; + private final int port; private ServerSocket serverSocket; /** diff --git a/src/java/davmail/exchange/ExchangeSessionFactory.java b/src/java/davmail/exchange/ExchangeSessionFactory.java index 69016dfe..33bfc90f 100644 --- a/src/java/davmail/exchange/ExchangeSessionFactory.java +++ b/src/java/davmail/exchange/ExchangeSessionFactory.java @@ -16,14 +16,14 @@ import java.util.*; /** * Create ExchangeSession instances. */ -public class ExchangeSessionFactory { +public final class ExchangeSessionFactory { private static final Object LOCK = new Object(); private static final Map poolMap = new HashMap(); static class PoolKey { - public String url; - public String userName; - public String password; + public final String url; + public final String userName; + public final String password; public PoolKey(String url, String userName, String password) { this.url = url; @@ -177,8 +177,8 @@ public class ExchangeSessionFactory { ExchangeSession.LOGGER.error(message, exc); throw new IOException(message); } else { - message += "All network interfaces down !"; - ExchangeSession.LOGGER.error(message, exc); + message = "All network interfaces down !"; + ExchangeSession.LOGGER.error(message); throw new NetworkDownException(message); } diff --git a/src/java/davmail/http/DavGatewaySSLProtocolSocketFactory.java b/src/java/davmail/http/DavGatewaySSLProtocolSocketFactory.java index 8f297b7e..e9efe8d0 100644 --- a/src/java/davmail/http/DavGatewaySSLProtocolSocketFactory.java +++ b/src/java/davmail/http/DavGatewaySSLProtocolSocketFactory.java @@ -2,6 +2,7 @@ package davmail.http; import org.apache.commons.httpclient.protocol.SSLProtocolSocketFactory; import org.apache.commons.httpclient.protocol.Protocol; +import org.apache.commons.httpclient.HttpsURL; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; @@ -33,7 +34,7 @@ public class DavGatewaySSLProtocolSocketFactory extends SSLProtocolSocketFactory if ("https".equals(protocol)) { int port = url.getPort(); if (port < 0) { - port = 443; + port = HttpsURL.DEFAULT_PORT; } Protocol.registerProtocol(url.getProtocol(), new Protocol(protocol, new DavGatewaySSLProtocolSocketFactory(), port)); diff --git a/src/java/davmail/pop/PopConnection.java b/src/java/davmail/pop/PopConnection.java index 94a80257..19c824fe 100644 --- a/src/java/davmail/pop/PopConnection.java +++ b/src/java/davmail/pop/PopConnection.java @@ -260,7 +260,7 @@ public class PopConnection extends AbstractConnection { protected static final int BODY = 4; protected int maxLines; - protected int STATE = START; + protected int state = START; public TopOutputStream(OutputStream os, int maxLines) { super(os); @@ -269,34 +269,34 @@ public class PopConnection extends AbstractConnection { @Override public void write(int b) throws IOException { - if (STATE != BODY || maxLines > 0) { + if (state != BODY || maxLines > 0) { super.write(b); } - if (STATE == BODY) { + if (state == BODY) { if (b == '\n') { maxLines--; } - } else if (STATE == START) { + } else if (state == START) { if (b == '\r') { - STATE = CR; + state = CR; } - } else if (STATE == CR) { + } else if (state == CR) { if (b == '\n') { - STATE = CRLF; + state = CRLF; } else { - STATE = START; + state = START; } - } else if (STATE == CRLF) { + } else if (state == CRLF) { if (b == '\r') { - STATE = CRLFCR; + state = CRLFCR; } else { - STATE = START; + state = START; } - } else if (STATE == CRLFCR) { + } else if (state == CRLFCR) { if (b == '\n') { - STATE = BODY; + state = BODY; } else { - STATE = START; + state = START; } } } diff --git a/src/java/davmail/pop/PopServer.java b/src/java/davmail/pop/PopServer.java index 76e50210..130e13c1 100644 --- a/src/java/davmail/pop/PopServer.java +++ b/src/java/davmail/pop/PopServer.java @@ -17,6 +17,7 @@ public class PopServer extends AbstractServer { * Create a ServerSocket to listen for connections. * Start the thread. * @param port pop listen port, 110 if not defined (0) + * @throws java.io.IOException on error */ public PopServer(int port) throws IOException { super("PopServer", port, PopServer.DEFAULT_PORT); diff --git a/src/java/davmail/tray/SwtGatewayTray.java b/src/java/davmail/tray/SwtGatewayTray.java index 44856ded..219c8435 100644 --- a/src/java/davmail/tray/SwtGatewayTray.java +++ b/src/java/davmail/tray/SwtGatewayTray.java @@ -33,6 +33,8 @@ public class SwtGatewayTray implements DavGatewayTrayInterface { private boolean isActive = true; private boolean isReady = false; + private final Thread mainThread = Thread.currentThread(); + public java.awt.Image getFrameIcon() { return awtImage; } @@ -84,15 +86,14 @@ public class SwtGatewayTray implements DavGatewayTrayInterface { } else if (priority == Priority.ERROR) { messageType = SWT.ICON_ERROR; } - if (messageType == 0) { - trayItem.setToolTipText("DavMail gateway \n" + message); - } else { + if (messageType != 0) { final ToolTip toolTip = new ToolTip(shell, SWT.BALLOON | messageType); toolTip.setText("DavMail gateway"); toolTip.setMessage(message); trayItem.setToolTip(toolTip); toolTip.setVisible(true); } + trayItem.setToolTipText("DavMail gateway \n" + message); } }); } @@ -129,8 +130,6 @@ public class SwtGatewayTray implements DavGatewayTrayInterface { DavGatewayTray.warn("Unable to set look and feel"); } - final Thread mainThread = Thread.currentThread(); - new Thread("SWT") { public void run() { display = new Display(); diff --git a/src/java/davmail/ui/AboutFrame.java b/src/java/davmail/ui/AboutFrame.java index 2c99289d..fdc77e5e 100644 --- a/src/java/davmail/ui/AboutFrame.java +++ b/src/java/davmail/ui/AboutFrame.java @@ -20,7 +20,7 @@ import java.net.URISyntaxException; * About frame */ public class AboutFrame extends JFrame { - protected JEditorPane jEditorPane; + private final JEditorPane jEditorPane; public AboutFrame() { setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); @@ -86,7 +86,7 @@ public class AboutFrame extends JFrame { getSize().height / 2); } - public String getContent() { + String getContent() { Package davmailPackage = DavGateway.class.getPackage(); StringBuilder buffer = new StringBuilder(); buffer.append("DavMail Gateway
"); diff --git a/src/java/davmail/ui/AwtDesktopBrowser.java b/src/java/davmail/ui/AwtDesktopBrowser.java index 3aa04ce8..4581e6c8 100644 --- a/src/java/davmail/ui/AwtDesktopBrowser.java +++ b/src/java/davmail/ui/AwtDesktopBrowser.java @@ -7,7 +7,9 @@ import java.awt.*; /** * Wrapper class to call Java6 Desktop class to launch default browser. */ -public class AwtDesktopBrowser { +public final class AwtDesktopBrowser { + private AwtDesktopBrowser() { + } public static void browse(URI location) throws IOException { Desktop desktop = Desktop.getDesktop(); diff --git a/src/java/davmail/ui/DesktopBrowser.java b/src/java/davmail/ui/DesktopBrowser.java index 9729981b..46dddf22 100644 --- a/src/java/davmail/ui/DesktopBrowser.java +++ b/src/java/davmail/ui/DesktopBrowser.java @@ -9,7 +9,10 @@ import java.net.URISyntaxException; /** * Open default browser. */ -public class DesktopBrowser { +public final class DesktopBrowser { + private DesktopBrowser() { + } + public static void browse(URI location) { try { // trigger ClassNotFoundException diff --git a/src/java/davmail/ui/SwtDesktopBrowser.java b/src/java/davmail/ui/SwtDesktopBrowser.java index f0e640a2..f9e57ad3 100644 --- a/src/java/davmail/ui/SwtDesktopBrowser.java +++ b/src/java/davmail/ui/SwtDesktopBrowser.java @@ -8,11 +8,11 @@ import java.net.URI; /** * Wrapper class to call SWT Program class to launch default browser. */ -public class SwtDesktopBrowser { +public final class SwtDesktopBrowser { private SwtDesktopBrowser() { } - public static void browse(URI location) throws IOException { + public static void browse(URI location) { Program.launch(location.toString()); } diff --git a/src/site/site.xml b/src/site/site.xml index 84d63956..0beea82e 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -19,7 +19,6 @@ -