From 341eda2789d6d79ccf60b8c3b3ebacff6d8c536b Mon Sep 17 00:00:00 2001 From: mguessan Date: Fri, 6 Jul 2012 21:59:01 +0000 Subject: [PATCH] Fixes from audit git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1973 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- .../davmail/exchange/ExchangeSessionFactory.java | 1 + src/java/davmail/exchange/VCalendar.java | 12 ++++++++++++ src/java/davmail/exchange/XMLStreamUtil.java | 1 + .../davmail/exchange/dav/DavExchangeSession.java | 2 +- .../davmail/exchange/ews/EwsExchangeSession.java | 4 ++-- src/java/davmail/ui/tray/FrameGatewayTray.java | 2 +- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/java/davmail/exchange/ExchangeSessionFactory.java b/src/java/davmail/exchange/ExchangeSessionFactory.java index e41adfa1..6094f71d 100644 --- a/src/java/davmail/exchange/ExchangeSessionFactory.java +++ b/src/java/davmail/exchange/ExchangeSessionFactory.java @@ -293,6 +293,7 @@ public final class ExchangeSessionFactory { enumeration = NetworkInterface.getNetworkInterfaces(); while (!up && enumeration.hasMoreElements()) { NetworkInterface networkInterface = enumeration.nextElement(); + //noinspection Since15 up = networkInterface.isUp() && !networkInterface.isLoopback() && networkInterface.getInetAddresses().hasMoreElements(); } diff --git a/src/java/davmail/exchange/VCalendar.java b/src/java/davmail/exchange/VCalendar.java index 7e4da857..3dfe1d55 100644 --- a/src/java/davmail/exchange/VCalendar.java +++ b/src/java/davmail/exchange/VCalendar.java @@ -130,6 +130,12 @@ public class VCalendar extends VObject { return firstVevent != null && isCdoAllDay(firstVevent); } + /** + * Get email from property value. + * + * @param property property + * @return email value + */ public String getEmailValue(VProperty property) { if (property == null) { return null; @@ -536,6 +542,12 @@ public class VCalendar extends VObject { } + /** + * Get properties by name from first VEVENT. + * + * @param name property name + * @return properties + */ public List getFirstVeventProperties(String name) { if (firstVevent == null) { return null; diff --git a/src/java/davmail/exchange/XMLStreamUtil.java b/src/java/davmail/exchange/XMLStreamUtil.java index 6f3c5879..88cb74b8 100644 --- a/src/java/davmail/exchange/XMLStreamUtil.java +++ b/src/java/davmail/exchange/XMLStreamUtil.java @@ -34,6 +34,7 @@ import java.util.Map; /** * XmlStreamReader utility methods */ +@SuppressWarnings("Since15") public final class XMLStreamUtil { private static final Logger LOGGER = Logger.getLogger(XMLStreamUtil.class); diff --git a/src/java/davmail/exchange/dav/DavExchangeSession.java b/src/java/davmail/exchange/dav/DavExchangeSession.java index b0a29e0a..8b971015 100644 --- a/src/java/davmail/exchange/dav/DavExchangeSession.java +++ b/src/java/davmail/exchange/dav/DavExchangeSession.java @@ -2974,7 +2974,7 @@ public class DavExchangeSession extends ExchangeSession { LOGGER.debug("Deleted to :" + destination); } - protected String getItemProperty(String permanentUrl, String propertyName) throws IOException, DavException, MessagingException { + protected String getItemProperty(String permanentUrl, String propertyName) throws IOException, DavException { String result = null; DavPropertyNameSet davPropertyNameSet = new DavPropertyNameSet(); davPropertyNameSet.add(Field.getPropertyName(propertyName)); diff --git a/src/java/davmail/exchange/ews/EwsExchangeSession.java b/src/java/davmail/exchange/ews/EwsExchangeSession.java index 2039468e..7e9293af 100644 --- a/src/java/davmail/exchange/ews/EwsExchangeSession.java +++ b/src/java/davmail/exchange/ews/EwsExchangeSession.java @@ -481,7 +481,7 @@ public class EwsExchangeSession extends ExchangeSession { } - public void sendMessage(String itemClass, byte[] messageBody) throws IOException { + protected void sendMessage(String itemClass, byte[] messageBody) throws IOException { EWSMethod.Item item = new EWSMethod.Item(); item.type = "Message"; item.mimeContent = Base64.encodeBase64(messageBody); @@ -2037,7 +2037,7 @@ public class EwsExchangeSession extends ExchangeSession { } - public FolderId getFolderId(String folderPath) throws IOException { + protected FolderId getFolderId(String folderPath) throws IOException { FolderId folderId = getFolderIdIfExists(folderPath); if (folderId == null) { throw new HttpNotFoundException("Folder '" + folderPath + "' not found"); diff --git a/src/java/davmail/ui/tray/FrameGatewayTray.java b/src/java/davmail/ui/tray/FrameGatewayTray.java index dbd8b9d7..622abcbc 100644 --- a/src/java/davmail/ui/tray/FrameGatewayTray.java +++ b/src/java/davmail/ui/tray/FrameGatewayTray.java @@ -266,7 +266,7 @@ public class FrameGatewayTray implements DavGatewayTrayInterface { inactiveImage = DavGatewayTray.loadImage(AwtGatewayTray.TRAY_INACTIVE_PNG); mainFrame = new JFrame(); - mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + mainFrame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); mainFrame.setTitle(BundleMessage.format("UI_DAVMAIL_GATEWAY")); mainFrame.setIconImage(image);