Removes "ensureDefaultValuePresent" and getAccountProperty with Object signature from AccountID.

17 files changed, 46 insertions, 121 deletions

diff --git a/src/net/java/sip/communicator/impl/globaldisplaydetails/GlobalStatusServiceImpl.java b/src/net/java/sip/communicator/impl/globaldisplaydetails/GlobalStatusServiceImpl.java
index be51e0f..dd01d0c 100644
--- a/src/net/java/sip/communicator/impl/globaldisplaydetails/GlobalStatusServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/globaldisplaydetails/GlobalStatusServiceImpl.java
@@ -56,11 +56,7 @@ public class GlobalStatusServiceImpl
 
             // We do not show hidden protocols in our status bar, so we do not
             // care about their status here.
-            boolean isProtocolHidden =
-                protocolProvider.getAccountID().getAccountProperty(
-                    ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
-
-            if (isProtocolHidden)
+            if (protocolProvider.getAccountID().isHidden())
                 continue;
 
             if (!protocolProvider.isRegistered())
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountList.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountList.java
index 03c3f1f..ae0a105 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountList.java
@@ -90,10 +90,7 @@ public class AccountList
         {
             AccountID accountID = storedAccounts.next();
 
-            boolean isHidden = accountID.getAccountPropertyBoolean(
-                ProtocolProviderFactory.IS_PROTOCOL_HIDDEN, false);
-
-            if (isHidden)
+            if (accountID.isHidden())
                 continue;
 
             Account uiAccount = null;
@@ -193,11 +190,7 @@ public class AccountList
 
         // If the protocol provider is hidden we don't want to show it in the
         // list.
-        boolean isHidden
-            = (protocolProvider.getAccountID().getAccountProperty
-                (ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null);
-
-        if (isHidden)
+        if (protocolProvider.getAccountID().isHidden())
             return;
 
         // Add or remove the protocol provider from our accounts list.
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index 0084211..66587f1 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -1272,9 +1272,7 @@ public class ChatPanel
     private boolean isGreyHistoryStyleDisabled(
         ProtocolProviderService protocolProvider)
     {
-        boolean isProtocolHidden =
-            protocolProvider.getAccountID().getAccountPropertyBoolean(
-                ProtocolProviderFactory.IS_PROTOCOL_HIDDEN, false);
+        boolean isProtocolHidden = protocolProvider.getAccountID().isHidden();
         boolean isGreyHistoryDisabled = false;
 
         String greyHistoryProperty
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/AutoAnswerMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/AutoAnswerMenu.java
index 64ca64d..b51ca9c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/AutoAnswerMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/AutoAnswerMenu.java
@@ -235,14 +235,7 @@ public class AutoAnswerMenu
             return;
         }
 
-        boolean isHidden
-            = protocolProvider
-                    .getAccountID()
-                        .getAccountProperty(
-                            ProtocolProviderFactory.IS_PROTOCOL_HIDDEN)
-                != null;
-
-        if (isHidden)
+        if (protocolProvider.getAccountID().isHidden())
             return;
 
         AutoAnswerMenuItem providerMenu =
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
index cd633c3..7e41e5e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
@@ -153,14 +153,7 @@ public class GlobalStatusSelectorBox
      */
     public void addAccount(ProtocolProviderService protocolProvider)
     {
-        boolean isHidden
-            = protocolProvider
-                    .getAccountID()
-                        .getAccountProperty(
-                            ProtocolProviderFactory.IS_PROTOCOL_HIDDEN)
-                != null;
-
-        if (isHidden)
+        if (protocolProvider.getAccountID().isHidden())
             return;
 
         OperationSetPersistentPresence presenceOpSet
diff --git a/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java b/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java
index 3a04337..13c90c0 100644
--- a/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java
+++ b/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java
@@ -255,14 +255,7 @@ public class StatusSubMenu
 
         for(ProtocolProviderService provider : getProtocolProviders())
         {
-            boolean isHidden
-                = provider
-                        .getAccountID()
-                            .getAccountProperty(
-                                ProtocolProviderFactory.IS_PROTOCOL_HIDDEN)
-                    != null;
-
-            if(!isHidden)
+            if(!provider.getAccountID().isHidden())
                 this.addAccount(provider);
         }
     }
@@ -362,11 +355,7 @@ public class StatusSubMenu
         {
             // We do not show hidden protocols in our status bar, so we do not
             // care about their status here.
-            boolean isProtocolHidden =
-                protocolProvider.getAccountID().getAccountProperty(
-                    ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
-
-            if (isProtocolHidden)
+            if (protocolProvider.getAccountID().isHidden())
                 continue;
 
             if (!protocolProvider.isRegistered())
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java
index 9771722..3782351 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java
@@ -276,8 +276,8 @@ public class OperationSetMessageWaitingSipImpl
     private Address getSubscribeAddress()
         throws ParseException
     {
-        String vmAddressURI = (String)provider.getAccountID()
-            .getAccountProperty(
+        String vmAddressURI = provider.getAccountID()
+            .getAccountPropertyString(
                     ProtocolProviderFactory.VOICEMAIL_URI);
 
         if(StringUtils.isNullOrEmpty(vmAddressURI))
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java
index 872466f..51369d1 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderFactorySipImpl.java
@@ -58,8 +58,9 @@ public class ProtocolProviderFactorySipImpl
         // property in the account properties provided.
         // if xcap password property exist, store it through credentialsStorage
         // service
-        Object password
-                = accountID.getAccountProperty(SipAccountID.OPT_CLIST_PASSWORD);
+        String password
+                = accountID.getAccountPropertyString(
+                        SipAccountID.OPT_CLIST_PASSWORD);
         if (password != null)
         {
             CredentialsStorageService credentialsStorage
@@ -67,7 +68,7 @@ public class ProtocolProviderFactorySipImpl
                 getBundleContext(),
                 CredentialsStorageService.class);
             String accountPrefix = accountID.getAccountUniqueID() + ".xcap";
-            credentialsStorage.storePassword(accountPrefix, (String)password);
+            credentialsStorage.storePassword(accountPrefix, password);
             // remove unsecured property
             accountID.removeAccountProperty(
                     SipAccountIDImpl.OPT_CLIST_PASSWORD);
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
index 86522b5..e118321 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
@@ -283,9 +283,9 @@ public class ProtocolProviderServiceSipImpl
          * Evaluate whether FORCE_PROXY_BYPASS is enabled for the account
          * before registering.
          */
-        forceLooseRouting = Boolean.valueOf((String)
-                getAccountID().getAccountProperty(
-                    ProtocolProviderFactory.FORCE_PROXY_BYPASS));
+        forceLooseRouting
+                = getAccountID().getAccountPropertyBoolean(
+                        ProtocolProviderFactory.FORCE_PROXY_BYPASS, false);
 
         sipStackSharing.addSipListener(this);
         // be warned when we will unregister, so that we can
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProxyRouter.java b/src/net/java/sip/communicator/impl/protocol/sip/ProxyRouter.java
index 29e32bc..9917a0a 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ProxyRouter.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ProxyRouter.java
@@ -128,9 +128,10 @@ public class ProxyRouter
 
             String proxy = sipProvider.getConnection().getOutboundProxyString();
 
-            boolean forceLooseRouting = Boolean.valueOf((String)
-                sipProvider.getAccountID().getAccountProperty(
-                    ProtocolProviderFactory.FORCE_PROXY_BYPASS));
+            boolean forceLooseRouting
+                = sipProvider.getAccountID()
+                    .getAccountPropertyBoolean(
+                        ProtocolProviderFactory.FORCE_PROXY_BYPASS, false);
 
             // P2P case
             if (proxy == null || forceLooseRouting )
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java b/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java
index 5bdd166..c198948 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/net/SslNetworkLayer.java
@@ -232,8 +232,8 @@ public class SslNetworkLayer
             }
 
             return certificateVerification.getSSLContext(
-                (String)id.getAccountProperty(
-                    ProtocolProviderFactory.CLIENT_TLS_CERTIFICATE),
+                    id.getAccountPropertyString(
+                        ProtocolProviderFactory.CLIENT_TLS_CERTIFICATE),
                 certificateVerification.getTrustManager(
                     identities,
                     null,
diff --git a/src/net/java/sip/communicator/plugin/simpleaccreg/SimpleAccountRegistrationActivator.java b/src/net/java/sip/communicator/plugin/simpleaccreg/SimpleAccountRegistrationActivator.java
index 1c6651b..0403238 100644
--- a/src/net/java/sip/communicator/plugin/simpleaccreg/SimpleAccountRegistrationActivator.java
+++ b/src/net/java/sip/communicator/plugin/simpleaccreg/SimpleAccountRegistrationActivator.java
@@ -151,12 +151,8 @@ public class SimpleAccountRegistrationActivator
                         registeredAccountIter.hasNext();)
                 {
                     AccountID accountID = registeredAccountIter.next();
-                    boolean isHidden
-                        = accountID.getAccountProperty(
-                                ProtocolProviderFactory.IS_PROTOCOL_HIDDEN)
-                            != null;
 
-                    if (!isHidden)
+                    if (!accountID.isHidden())
                     {
                         hasRegisteredAccounts = true;
                         break;
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
index e5e2429..da894a8 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
@@ -14,6 +14,8 @@ import javax.swing.event.*;
 import net.java.sip.communicator.service.certificate.*;
 import net.java.sip.communicator.plugin.desktoputil.*;
 
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.sip.*;
 import org.jitsi.util.*;
 
 /**
@@ -57,7 +59,9 @@ public class ConnectionPanel
     private JComboBox keepAliveMethodBox
         = new JComboBox(new String[] { "NONE", "REGISTER", "OPTIONS" });
 
-    private JTextField keepAliveIntervalValue = new JTextField();
+    private JTextField keepAliveIntervalValue
+            = new JTextField(SipAccountID.getDefaultStr(
+                    ProtocolProviderFactory.KEEP_ALIVE_INTERVAL));
 
     private JComboBox dtmfMethodBox
         = new JComboBox(
@@ -349,6 +353,9 @@ public class ConnectionPanel
         keepAliveIntervalExampleLabel
             .setBorder(BorderFactory.createEmptyBorder(0, 0, 8, 0));
 
+        keepAliveMethodBox.setSelectedItem(
+                SipAccountID.getDefaultStr(
+                        ProtocolProviderFactory.KEEP_ALIVE_METHOD));
         keepAliveValues.add(keepAliveMethodBox);
         keepAliveValues.add(keepAliveIntervalValue);
         keepAliveValues.add(keepAliveIntervalExampleLabel);
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
index 5e2fc2b..218160e 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/PresencePanel.java
@@ -11,6 +11,8 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.plugin.desktoputil.*;
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.sip.*;
 
 /**
  * The <tt>PresencePanel</tt> is the one containing presence information.
@@ -51,9 +53,13 @@ public class PresencePanel
     private JLabel subscribeExpiresLabel = new JLabel(
             Resources.getString("plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION"));
 
-    private JTextField pollPeriodField = new JTextField();
+    private JTextField pollPeriodField
+            = new JTextField(SipAccountID.getDefaultStr(
+                    ProtocolProviderFactory.POLLING_PERIOD));
 
-    private JTextField subscribeExpiresField = new JTextField();
+    private JTextField subscribeExpiresField
+            = new JTextField(SipAccountID.getDefaultStr(
+                    ProtocolProviderFactory.SUBSCRIPTION_EXPIRATION));
 
     private JTextField clistOptionServerUriValue = new JTextField();
 
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java
index ef8b1e1..bcbd6b2 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java
@@ -334,9 +334,9 @@ public class FirstWizardPage
         this.lastField.setText(accountID.getAccountPropertyString("last"));
         this.mailField.setText(accountID.getAccountPropertyString("mail"));
 
-        Boolean remember =
-            (Boolean) accountID.getAccountProperty("rememberContacts");
-        if (remember.booleanValue())
+        boolean remember = accountID
+                .getAccountPropertyBoolean("rememberContacts", true);
+        if (remember)
             this.rememberContacts.setSelected(true);
     }
 
diff --git a/src/net/java/sip/communicator/service/protocol/AccountID.java b/src/net/java/sip/communicator/service/protocol/AccountID.java
index 5865736..287c040 100644
--- a/src/net/java/sip/communicator/service/protocol/AccountID.java
+++ b/src/net/java/sip/communicator/service/protocol/AccountID.java
@@ -252,17 +252,6 @@ public abstract class AccountID
      * Returns the specific account property.
      *
      * @param key property key
-     * @return property value corresponding to property key
-     */
-    public Object getAccountProperty(Object key)
-    {
-        return accountProperties.get(key);
-    }
-
-    /**
-     * Returns the specific account property.
-     *
-     * @param key property key
      * @param defaultValue default value if the property does not exist
      * @return property value corresponding to property key
      */
@@ -342,10 +331,10 @@ public abstract class AccountID
      */
     public String getAccountPropertyString(Object key, String defValue)
     {
-        Object value = getAccountProperty(key);
+        String value = accountProperties.get(key);
         if(value == null)
             value = getDefaultString(key.toString());
-        return (value == null) ? defValue : value.toString();
+        return (value == null) ? defValue : value;
     }
 
     /**
@@ -715,7 +704,7 @@ public abstract class AccountID
      */
     public boolean isHidden()
     {
-        return getAccountProperty(
+        return getAccountPropertyString(
                 ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
     }
 
@@ -1083,11 +1072,6 @@ public abstract class AccountID
         if(accountIconPath != null)
             setAccountIconPath(accountIconPath);
 
-        ensureDefaultValuePresent(ProtocolProviderFactory.DTMF_METHOD);
-
-        ensureDefaultValuePresent(
-                ProtocolProviderFactory.DTMF_MINIMAL_TONE_DURATION);
-
         mergeProperties(this.accountProperties, accountProperties);
 
         // Removes encrypted password property, as it will be restored during
@@ -1096,23 +1080,6 @@ public abstract class AccountID
     }
 
     /**
-     * Ensures that there is value bound to given property key. If there isn't
-     * the default one will be used.
-     *
-     * @param key the property key
-     */
-    public void ensureDefaultValuePresent(String key)
-    {
-        String value = accountProperties.get(key);
-
-        if(value != null && value.trim().isEmpty())
-            value = null;
-
-        if(value == null)
-            accountProperties.put(key, getDefaultString(key));
-    }
-
-    /**
      * Gets default property value for given <tt>key</tt>.
      *
      * @param key the property key
diff --git a/src/net/java/sip/communicator/service/protocol/sip/SIPAccountRegistration.java b/src/net/java/sip/communicator/service/protocol/sip/SIPAccountRegistration.java
index 6da706d..a72f799 100644
--- a/src/net/java/sip/communicator/service/protocol/sip/SIPAccountRegistration.java
+++ b/src/net/java/sip/communicator/service/protocol/sip/SIPAccountRegistration.java
@@ -243,21 +243,6 @@ public class SIPAccountRegistration
 
         securityAccountRegistration.storeProperties(this.accountProperties);
 
-        ensureDefaultValuePresent(ProtocolProviderFactory.PROXY_AUTO_CONFIG);
-
-        ensureDefaultValuePresent(ProtocolProviderFactory.IS_PRESENCE_ENABLED);
-
-        ensureDefaultValuePresent(ProtocolProviderFactory.FORCE_P2P_MODE);
-
-        ensureDefaultValuePresent(ProtocolProviderFactory.KEEP_ALIVE_METHOD);
-
-        ensureDefaultValuePresent(ProtocolProviderFactory.KEEP_ALIVE_INTERVAL);
-
-        ensureDefaultValuePresent(ProtocolProviderFactory.POLLING_PERIOD);
-
-        ensureDefaultValuePresent(
-                ProtocolProviderFactory.SUBSCRIPTION_EXPIRATION);
-
         encodingsRegistration.storeProperties(this.accountProperties);
 
         if (isModification)