From 57bb01cec77b91131d20a51e340652d6ba37e8b0 Mon Sep 17 00:00:00 2001 From: Lyubomir Marinov Date: Wed, 27 Feb 2013 11:48:38 +0000 Subject: [PATCH] Fixes multiple newly-introduced warnings. --- .../MsOutlookAddrBookContactQuery.java | 117 +++++++++--------- ...MsOutlookAddrBookContactSourceService.java | 1 - .../MsOutlookAddrBookSourceContact.java | 13 +- 3 files changed, 62 insertions(+), 69 deletions(-) diff --git a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java index c2fa88ccb..50aef571a 100644 --- a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java +++ b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java @@ -445,65 +445,68 @@ public static long getProperty( { switch(category) { - case Personal: - if(subCategories.contains(ContactDetail.SubCategory.Name)) - return MAPI_MAILUSER_PROP_IDS[PR_GIVEN_NAME]; - // PR_MIDDLE_NAME: - else if(subCategories.contains( - ContactDetail.SubCategory.LastName)) - return MAPI_MAILUSER_PROP_IDS[PR_SURNAME]; - else if(subCategories.contains( - ContactDetail.SubCategory.Nickname)) - return MAPI_MAILUSER_PROP_IDS[PR_NICKNAME]; - else if(subCategories.contains( - ContactDetail.SubCategory.HomePage)) - return MAPI_MAILUSER_PROP_IDS[PR_PERSONAL_HOME_PAGE]; - else - return MAPI_MAILUSER_PROP_IDS[PR_DISPLAY_NAME_PREFIX]; - case Organization: + case Personal: + if(subCategories.contains(ContactDetail.SubCategory.Name)) + return MAPI_MAILUSER_PROP_IDS[PR_GIVEN_NAME]; + // PR_MIDDLE_NAME: + else if(subCategories.contains( + ContactDetail.SubCategory.LastName)) + return MAPI_MAILUSER_PROP_IDS[PR_SURNAME]; + else if(subCategories.contains( + ContactDetail.SubCategory.Nickname)) + return MAPI_MAILUSER_PROP_IDS[PR_NICKNAME]; + else if(subCategories.contains( + ContactDetail.SubCategory.HomePage)) + return MAPI_MAILUSER_PROP_IDS[PR_PERSONAL_HOME_PAGE]; + else + return MAPI_MAILUSER_PROP_IDS[PR_DISPLAY_NAME_PREFIX]; + case Organization: + if(subCategories.contains(ContactDetail.SubCategory.Work)) + return MAPI_MAILUSER_PROP_IDS[PR_COMPANY_NAME]; + else + return MAPI_MAILUSER_PROP_IDS[PR_BUSINESS_HOME_PAGE]; + case Email: + return MAPI_MAILUSER_PROP_IDS[dispidEmail1EmailAddress]; + //dispidEmail2EmailAddress: + //dispidEmail3EmailAddress: + // PR_EMAIL_ADDRESS: + case Phone: + if(subCategories.contains(ContactDetail.SubCategory.Fax)) + { if(subCategories.contains(ContactDetail.SubCategory.Work)) - return MAPI_MAILUSER_PROP_IDS[PR_COMPANY_NAME]; - else - return MAPI_MAILUSER_PROP_IDS[PR_BUSINESS_HOME_PAGE]; - case Email: - return MAPI_MAILUSER_PROP_IDS[dispidEmail1EmailAddress]; - //dispidEmail2EmailAddress: - //dispidEmail3EmailAddress: - // PR_EMAIL_ADDRESS: - case Phone: - if(subCategories.contains(ContactDetail.SubCategory.Fax)) - { - if(subCategories.contains(ContactDetail.SubCategory.Work)) - return MAPI_MAILUSER_PROP_IDS[dispidFax1EmailAddress]; - else if(subCategories.contains( - ContactDetail.SubCategory.Home)) - return MAPI_MAILUSER_PROP_IDS[dispidFax2EmailAddress]; - else if(subCategories.contains( - ContactDetail.SubCategory.Other)) - return MAPI_MAILUSER_PROP_IDS[dispidFax3EmailAddress]; - } - else if(subCategories.contains(ContactDetail.SubCategory.Work)) - return MAPI_MAILUSER_PROP_IDS[PR_BUSINESS_TELEPHONE_NUMBER]; - // PR_BUSINESS2_TELEPHONE_NUMBER: - else if(subCategories.contains(ContactDetail.SubCategory.Home)) - return MAPI_MAILUSER_PROP_IDS[PR_HOME_TELEPHONE_NUMBER]; - // PR_HOME2_TELEPHONE_NUMBER: + return MAPI_MAILUSER_PROP_IDS[dispidFax1EmailAddress]; else if(subCategories.contains( - ContactDetail.SubCategory.Mobile)) - return MAPI_MAILUSER_PROP_IDS[PR_MOBILE_TELEPHONE_NUMBER]; - break; - //case InstantMessaging: - // return MAPI_MAILUSER_PROP_IDS[dispidInstMsg]; - //case Address: - // if(subCategories.contains(ContactDetail.SubCategory.Work)) - // return MAPI_MAILUSER_PROP_IDS[dispidWorkAddress]; - // else if(subCategories.contains( - // ContactDetail.SubCategory.Home)) - // return MAPI_MAILUSER_PROP_IDS[dispidHomeAddress]; - // else if(subCategories.contains( - // ContactDetail.SubCategory.Other)) - // return MAPI_MAILUSER_PROP_IDS[dispidOtherAddress]; - // break; + ContactDetail.SubCategory.Home)) + return MAPI_MAILUSER_PROP_IDS[dispidFax2EmailAddress]; + else if(subCategories.contains( + ContactDetail.SubCategory.Other)) + return MAPI_MAILUSER_PROP_IDS[dispidFax3EmailAddress]; + } + else if(subCategories.contains(ContactDetail.SubCategory.Work)) + return MAPI_MAILUSER_PROP_IDS[PR_BUSINESS_TELEPHONE_NUMBER]; + // PR_BUSINESS2_TELEPHONE_NUMBER: + else if(subCategories.contains(ContactDetail.SubCategory.Home)) + return MAPI_MAILUSER_PROP_IDS[PR_HOME_TELEPHONE_NUMBER]; + // PR_HOME2_TELEPHONE_NUMBER: + else if(subCategories.contains( + ContactDetail.SubCategory.Mobile)) + return MAPI_MAILUSER_PROP_IDS[PR_MOBILE_TELEPHONE_NUMBER]; + break; +// case InstantMessaging: +// return MAPI_MAILUSER_PROP_IDS[dispidInstMsg]; +// case Address: +// if(subCategories.contains(ContactDetail.SubCategory.Work)) +// return MAPI_MAILUSER_PROP_IDS[dispidWorkAddress]; +// else if(subCategories.contains( +// ContactDetail.SubCategory.Home)) +// return MAPI_MAILUSER_PROP_IDS[dispidHomeAddress]; +// else if(subCategories.contains( +// ContactDetail.SubCategory.Other)) +// return MAPI_MAILUSER_PROP_IDS[dispidOtherAddress]; +// break; + default: + // Silence the compiler. + break; } return -1; } diff --git a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactSourceService.java b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactSourceService.java index 00797ccd6..05c378e4a 100644 --- a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactSourceService.java +++ b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactSourceService.java @@ -6,7 +6,6 @@ */ package net.java.sip.communicator.plugin.addrbook.msoutlook; -import java.util.*; import java.util.regex.*; import net.java.sip.communicator.plugin.addrbook.*; diff --git a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookSourceContact.java b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookSourceContact.java index 1741981f8..34ad5ebdf 100644 --- a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookSourceContact.java +++ b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookSourceContact.java @@ -6,12 +6,10 @@ */ package net.java.sip.communicator.plugin.addrbook.msoutlook; -import net.java.sip.communicator.plugin.addrbook.*; -import net.java.sip.communicator.service.contactsource.*; -import net.java.sip.communicator.util.*; - import java.util.*; +import net.java.sip.communicator.service.contactsource.*; + /** * Implements a custom SourceContact for the Address Book of Microsoft * Outlook. @@ -22,13 +20,6 @@ public class MsOutlookAddrBookSourceContact extends GenericSourceContact implements EditableSourceContact { - /** - * The Logger used by the MsOutlookAddrBookSourceContact - * class and its instances for logging output. - */ - private static final Logger logger - = Logger.getLogger(MsOutlookAddrBookSourceContact.class); - /** * Initializes a new MsOutlookAddrBookSourceContact instance. *