From cfbb41dcded8d37258b92871ea344023a042fec2 Mon Sep 17 00:00:00 2001 From: mguessan Date: Thu, 15 Mar 2012 13:41:16 +0000 Subject: [PATCH] Fixes from audit git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1926 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- .../exchange/dav/ExchangeSearchMethod.java | 14 ++++---- src/java/davmail/exchange/ews/DeleteType.java | 2 +- src/java/davmail/exchange/ews/Field.java | 2 -- src/java/davmail/imap/ImapConnection.java | 2 +- src/java/davmail/ldap/LdapConnection.java | 36 +++++++++---------- src/java/davmail/ui/PasswordPromptDialog.java | 2 +- src/java/davmail/ui/SettingsFrame.java | 2 +- 7 files changed, 28 insertions(+), 32 deletions(-) diff --git a/src/java/davmail/exchange/dav/ExchangeSearchMethod.java b/src/java/davmail/exchange/dav/ExchangeSearchMethod.java index f288a5a3..eeb2ee78 100644 --- a/src/java/davmail/exchange/dav/ExchangeSearchMethod.java +++ b/src/java/davmail/exchange/dav/ExchangeSearchMethod.java @@ -19,17 +19,11 @@ package davmail.exchange.dav; import davmail.util.StringUtil; -import org.apache.jackrabbit.webdav.header.DepthHeader; -import org.apache.jackrabbit.webdav.property.DavPropertyName; -import org.apache.jackrabbit.webdav.property.DavPropertyNameIterator; -import org.apache.jackrabbit.webdav.property.DavPropertyNameSet; import org.apache.log4j.Logger; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; -import java.util.HashMap; -import java.util.Map; /** * Custom Exchange PROPFIND method. @@ -40,13 +34,17 @@ public class ExchangeSearchMethod extends ExchangeDavMethod { protected final String searchRequest; + /** + * Create search method. + * + * @param uri method uri + * @param searchRequest Exchange search request + */ public ExchangeSearchMethod(String uri, String searchRequest) { super(uri); this.searchRequest = searchRequest; } - - protected byte[] generateRequestContent() { try { diff --git a/src/java/davmail/exchange/ews/DeleteType.java b/src/java/davmail/exchange/ews/DeleteType.java index 18731f11..0b543172 100644 --- a/src/java/davmail/exchange/ews/DeleteType.java +++ b/src/java/davmail/exchange/ews/DeleteType.java @@ -22,7 +22,7 @@ package davmail.exchange.ews; * DeleteItem disposal type. */ @SuppressWarnings({"JavaDoc", "UnusedDeclaration"}) -public class DeleteType extends AttributeOption { +public final class DeleteType extends AttributeOption { private DeleteType(String value) { super("DeleteType", value); } diff --git a/src/java/davmail/exchange/ews/Field.java b/src/java/davmail/exchange/ews/Field.java index f508ecbd..07fd375a 100644 --- a/src/java/davmail/exchange/ews/Field.java +++ b/src/java/davmail/exchange/ews/Field.java @@ -18,8 +18,6 @@ */ package davmail.exchange.ews; -import davmail.exchange.dav.PropertyType; - import java.util.HashMap; import java.util.Map; diff --git a/src/java/davmail/imap/ImapConnection.java b/src/java/davmail/imap/ImapConnection.java index e3b87706..e422c214 100644 --- a/src/java/davmail/imap/ImapConnection.java +++ b/src/java/davmail/imap/ImapConnection.java @@ -1014,7 +1014,7 @@ public class ImapConnection extends AbstractConnection { } protected void appendEnvelopeHeaderValue(StringBuilder buffer, String value) throws UnsupportedEncodingException { - if (value.indexOf('"') >= 0 || value.indexOf("\\") >= 0) { + if (value.indexOf('"') >= 0 || value.indexOf('\\') >= 0) { buffer.append('{'); buffer.append(value.length()); buffer.append("}\r\n"); diff --git a/src/java/davmail/ldap/LdapConnection.java b/src/java/davmail/ldap/LdapConnection.java index 1746481f..960d77d8 100644 --- a/src/java/davmail/ldap/LdapConnection.java +++ b/src/java/davmail/ldap/LdapConnection.java @@ -512,7 +512,7 @@ public class LdapConnection extends AbstractConnection { DavGatewayTray.resetIcon(); } - protected static final byte[] EMPTY_BYTE_ARRAY= new byte[0]; + protected static final byte[] EMPTY_BYTE_ARRAY = new byte[0]; protected void handleRequest(byte[] inbuf, int offset) throws IOException { //dumpBer(inbuf, offset); @@ -545,32 +545,32 @@ public class LdapConnection extends AbstractConnection { } } // handle other callbacks - for (Callback callback:callbacks) { + for (Callback callback : callbacks) { if (callback instanceof AuthorizeCallback) { - ((AuthorizeCallback)callback).setAuthorized(true); + ((AuthorizeCallback) callback).setAuthorized(true); } else if (callback instanceof PasswordCallback) { if (password != null) { - ((PasswordCallback)callback).setPassword(password.toCharArray()); + ((PasswordCallback) callback).setPassword(password.toCharArray()); } } - } + } } }; int status; if (reqBer.bytesLeft() > 0 && saslServer != null) { - byte[] clientResponse = reqBer.parseOctetString(Ber.ASN_OCTET_STR, null); - serverResponse = saslServer.evaluateResponse(clientResponse); - status = LDAP_SUCCESS; + byte[] clientResponse = reqBer.parseOctetString(Ber.ASN_OCTET_STR, null); + serverResponse = saslServer.evaluateResponse(clientResponse); + status = LDAP_SUCCESS; - DavGatewayTray.debug(new BundleMessage("LOG_LDAP_REQ_BIND_USER", currentMessageId, userName)); - try { - session = ExchangeSessionFactory.getInstance(userName, password); - DavGatewayTray.debug(new BundleMessage("LOG_LDAP_REQ_BIND_SUCCESS")); - } catch (IOException e) { - serverResponse = EMPTY_BYTE_ARRAY; - status = LDAP_INVALID_CREDENTIALS; - DavGatewayTray.debug(new BundleMessage("LOG_LDAP_REQ_BIND_INVALID_CREDENTIALS")); - } + DavGatewayTray.debug(new BundleMessage("LOG_LDAP_REQ_BIND_USER", currentMessageId, userName)); + try { + session = ExchangeSessionFactory.getInstance(userName, password); + DavGatewayTray.debug(new BundleMessage("LOG_LDAP_REQ_BIND_SUCCESS")); + } catch (IOException e) { + serverResponse = EMPTY_BYTE_ARRAY; + status = LDAP_INVALID_CREDENTIALS; + DavGatewayTray.debug(new BundleMessage("LOG_LDAP_REQ_BIND_INVALID_CREDENTIALS")); + } } else { Map properties = new HashMap(); @@ -1630,7 +1630,7 @@ public class LdapConnection extends AbstractConnection { try { calendar.setTime(parser.parse(value)); } catch (ParseException e) { - throw new IOException(e); + throw new IOException(e + " " + e.getMessage()); } if ("birthday".equals(ldapAttribute)) { value = String.valueOf(calendar.get(Calendar.DAY_OF_MONTH)); diff --git a/src/java/davmail/ui/PasswordPromptDialog.java b/src/java/davmail/ui/PasswordPromptDialog.java index 0fb11e3b..71306f67 100644 --- a/src/java/davmail/ui/PasswordPromptDialog.java +++ b/src/java/davmail/ui/PasswordPromptDialog.java @@ -23,7 +23,6 @@ import davmail.ui.tray.DavGatewayTray; import javax.swing.*; import javax.swing.border.EmptyBorder; -import javax.swing.border.LineBorder; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -68,6 +67,7 @@ public class PasswordPromptDialog extends JDialog { setTitle(BundleMessage.format("UI_PASSWORD_PROMPT")); try { + //noinspection Since15 setIconImage(DavGatewayTray.getFrameIcon()); } catch (NoSuchMethodError error) { DavGatewayTray.debug(new BundleMessage("LOG_UNABLE_TO_SET_ICON_IMAGE")); diff --git a/src/java/davmail/ui/SettingsFrame.java b/src/java/davmail/ui/SettingsFrame.java index 90f47e7b..0a9c358b 100644 --- a/src/java/davmail/ui/SettingsFrame.java +++ b/src/java/davmail/ui/SettingsFrame.java @@ -381,7 +381,7 @@ public class SettingsFrame extends JFrame { allowRemoteField.setSelected(Settings.getBooleanProperty("davmail.allowRemote")); bindAddressField = new JTextField(Settings.getProperty("davmail.bindAddress"), 15); - clientSoTimeoutField = new JTextField(Settings.getProperty("davmail.clientSoTimeout"), 15);; + clientSoTimeoutField = new JTextField(Settings.getProperty("davmail.clientSoTimeout"), 15); certHashField = new JTextField(Settings.getProperty("davmail.server.certificate.hash"), 15);