From 279afbcfaad7cd84d01a496ed6d49a86cf4c5bdc Mon Sep 17 00:00:00 2001
From: paweldomas <pawel.domas@jitsi.org>
Date: Mon, 8 Jul 2013 12:18:36 +0200
Subject: [PATCH] Adds isHidden and isPreferredProvider methods to AccountID.

---
 .../main/contactlist/AddContactDialog.java    | 30 ++--------------
 .../service/protocol/AccountID.java           | 34 +++++++++++++++++++
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java
index 2446fe26b..8af1c3a93 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java
@@ -281,10 +281,7 @@ public void itemStateChanged(ItemEvent e)
         {
             ProtocolProviderService provider = providers.next();
 
-            boolean isHidden = provider.getAccountID().getAccountProperty(
-                    ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
-
-            if(isHidden)
+            if(provider.getAccountID().isHidden())
                 continue;
 
             OperationSet opSet
@@ -295,7 +292,7 @@ public void itemStateChanged(ItemEvent e)
 
             accountCombo.addItem(provider);
 
-            if (isPreferredProvider(provider.getAccountID()))
+            if (provider.getAccountID().isPreferredProvider())
                 accountCombo.setSelectedItem(provider);
         }
 
@@ -621,29 +618,6 @@ public void loadSkin()
         imageLabel.setVerticalAlignment(JLabel.TOP);
     }
 
-    /**
-     * Returns the first <tt>ProtocolProviderService</tt> implementation
-     * corresponding to the preferred protocol
-     *
-     * @return the <tt>ProtocolProviderService</tt> corresponding to the
-     * preferred protocol
-     */
-    private boolean isPreferredProvider(AccountID accountID)
-    {
-        String preferredProtocolProp
-            = accountID.getAccountPropertyString(
-                ProtocolProviderFactory.IS_PREFERRED_PROTOCOL);
-
-        if (preferredProtocolProp != null
-            && preferredProtocolProp.length() > 0
-            && Boolean.parseBoolean(preferredProtocolProp))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Adds a rename listener.
      *
diff --git a/src/net/java/sip/communicator/service/protocol/AccountID.java b/src/net/java/sip/communicator/service/protocol/AccountID.java
index 8b15d0093..5865736be 100644
--- a/src/net/java/sip/communicator/service/protocol/AccountID.java
+++ b/src/net/java/sip/communicator/service/protocol/AccountID.java
@@ -708,6 +708,40 @@ public void setTlsClientCertificate(String id)
         setOrRemoveIfEmpty(ProtocolProviderFactory.CLIENT_TLS_CERTIFICATE, id);
     }
 
+    /**
+     * Checks if the account is hidden.
+     * @return <tt>true</tt> if this account is hidden or <tt>false</tt>
+     *         otherwise.
+     */
+    public boolean isHidden()
+    {
+        return getAccountProperty(
+                ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
+    }
+
+    /**
+     * Returns the first <tt>ProtocolProviderService</tt> implementation
+     * corresponding to the preferred protocol
+     *
+     * @return the <tt>ProtocolProviderService</tt> corresponding to the
+     * preferred protocol
+     */
+    public boolean isPreferredProvider()
+    {
+        String preferredProtocolProp
+                = getAccountPropertyString(
+                        ProtocolProviderFactory.IS_PREFERRED_PROTOCOL);
+
+        if (preferredProtocolProp != null
+                && preferredProtocolProp.length() > 0
+                && Boolean.parseBoolean(preferredProtocolProp))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Set the account properties.
      *