Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 303 insertions, 303 deletions

diff --git a/src/net/java/sip/communicator/util/account/AccountUtils.java b/src/net/java/sip/communicator/util/account/AccountUtils.java
index ec69aca..82c9108 100644
--- a/src/net/java/sip/communicator/util/account/AccountUtils.java
+++ b/src/net/java/sip/communicator/util/account/AccountUtils.java
@@ -1,4 +1,4 @@
-/*

+/*
  * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
  *
  * Copyright @ 2015 Atlassian Pty Ltd
@@ -15,305 +15,305 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.sip.communicator.util.account;

-

-import java.util.*;

-

-import net.java.sip.communicator.service.protocol.*;

-import net.java.sip.communicator.util.*;

-

-import org.osgi.framework.*;

-

-/**

- * The <tt>AccountUtils</tt> provides utility methods helping us to easily

- * obtain an account or a groups of accounts or protocol providers by some

- * specific criteria.

- *

- * @author Yana Stamcheva

- */

-public class AccountUtils

-{

-    /**

-     * The logger.

-     */

-    private static Logger logger = Logger.getLogger(AccountUtils.class);

-

-    /**

-     * Returns an iterator over a list of all stored <tt>AccountID</tt>-s.

-     *

-     * @return an iterator over a list of all stored <tt>AccountID</tt>-s

-     */

-    public static Collection<AccountID> getStoredAccounts()

-    {

-        AccountManager accountManager

-            = ServiceUtils.getService(  UtilActivator.bundleContext,

-                                        AccountManager.class);

-

-        return accountManager.getStoredAccounts();

-    }

-

-    /**

-     * Return the <tt>AccountID</tt> corresponding to the given string account

-     * identifier.

-     *

-     * @param accountID the account identifier string

-     * @return the <tt>AccountID</tt> corresponding to the given string account

-     * identifier

-     */

-    public static AccountID getAccountForID(String accountID)

-    {

-        Collection<AccountID> allAccounts = getStoredAccounts();

-

-        for(AccountID account : allAccounts)

-        {

-            if(account.getAccountUniqueID().equals(accountID))

-                return account;

-        }

-        return null;

-    }

-

-    /**

-     * Returns a list of all currently registered providers, which support the

-     * given <tt>operationSetClass</tt>.

-     *

-     * @param opSetClass the operation set class for which we're looking

-     * for providers

-     * @return a list of all currently registered providers, which support the

-     * given <tt>operationSetClass</tt>

-     */

-    public static List<ProtocolProviderService> getRegisteredProviders(

-            Class<? extends OperationSet> opSetClass)

-    {

-        List<ProtocolProviderService> opSetProviders

-            = new LinkedList<ProtocolProviderService>();

-

-        for (ProtocolProviderFactory providerFactory

-                : UtilActivator.getProtocolProviderFactories().values())

-        {

-            for (AccountID accountID : providerFactory.getRegisteredAccounts())

-            {

-                ServiceReference<ProtocolProviderService> ref

-                    = providerFactory.getProviderForAccount(accountID);

-

-                if (ref != null)

-                {

-                    ProtocolProviderService protocolProvider

-                        = UtilActivator.bundleContext.getService(ref);

-

-                    if ((protocolProvider.getOperationSet(opSetClass) != null)

-                            && protocolProvider.isRegistered())

-                    {

-                        opSetProviders.add(protocolProvider);

-                    }

-                }

-            }

-        }

-        return opSetProviders;

-    }

-

-

-    /**

-     * Returns a list of all currently registered telephony providers for the

-     * given protocol name.

-     * @param protocolName the protocol name

-     * @param opSetClass the operation set class for which we're looking for

-     * providers

-     * @return a list of all currently registered providers for the given

-     * <tt>protocolName</tt> and supporting the given <tt>operationSetClass</tt>

-     */

-    public static List<ProtocolProviderService> getRegisteredProviders(

-            String protocolName,

-            Class<? extends OperationSet> opSetClass)

-    {

-        List<ProtocolProviderService> opSetProviders

-            = new LinkedList<ProtocolProviderService>();

-        ProtocolProviderFactory providerFactory

-            = getProtocolProviderFactory(protocolName);

-

-        if (providerFactory != null)

-        {

-            for (AccountID accountID : providerFactory.getRegisteredAccounts())

-            {

-                ServiceReference<ProtocolProviderService> ref

-                    = providerFactory.getProviderForAccount(accountID);

-

-                if (ref != null)

-                {

-                    ProtocolProviderService protocolProvider

-                        = UtilActivator.bundleContext.getService(ref);

-

-                    if ((protocolProvider.getOperationSet(opSetClass) != null)

-                            && protocolProvider.isRegistered())

-                    {

-                        opSetProviders.add(protocolProvider);

-                    }

-                }

-            }

-        }

-        return opSetProviders;

-    }

-

-    /**

-     * Returns a list of all registered protocol providers that could be used

-     * for the operation given by the operation set. Prefers the given preferred

-     * protocol provider and preferred protocol name if they're available and

-     * registered.

-     *

-     * @param opSet

-     * @param preferredProvider

-     * @param preferredProtocolName

-     * @return a list of all registered protocol providers that could be used

-     * for the operation given by the operation set

-     */

-    public static List<ProtocolProviderService> getOpSetRegisteredProviders(

-            Class<? extends OperationSet> opSet,

-            ProtocolProviderService preferredProvider,

-            String preferredProtocolName)

-    {

-        List<ProtocolProviderService> providers

-            = new ArrayList<ProtocolProviderService>();

-

-        if (preferredProvider != null)

-        {

-            if (preferredProvider.isRegistered())

-            {

-                providers.add(preferredProvider);

-            }

-            // If we have a provider, but it's not registered we try to

-            // obtain all registered providers for the same protocol as the

-            // given preferred provider.

-            else

-            {

-                providers

-                    = getRegisteredProviders(

-                            preferredProvider.getProtocolName(),

-                            opSet);

-            }

-        }

-        // If we don't have a preferred provider we try to obtain a

-        // preferred protocol name and all registered providers for it.

-        else

-        {

-            if (preferredProtocolName != null)

-            {

-                providers

-                    = getRegisteredProviders(preferredProtocolName, opSet);

-            }

-            // If the protocol name is null we simply obtain all telephony

-            // providers.

-            else

-            {

-                providers = getRegisteredProviders(opSet);

-            }

-        }

-

-        return providers;

-    }

-

-    /**

-     * Returns the <tt>ProtocolProviderService</tt> corresponding to the given

-     * account identifier that is registered in the given factory

-     * @param accountID the identifier of the account

-     * @return the <tt>ProtocolProviderService</tt> corresponding to the given

-     * account identifier that is registered in the given factory

-     */

-    public static ProtocolProviderService getRegisteredProviderForAccount(

-                                                        AccountID accountID)

-    {

-        for (ProtocolProviderFactory factory

-                : UtilActivator.getProtocolProviderFactories().values())

-        {

-            if (factory.getRegisteredAccounts().contains(accountID))

-            {

-                ServiceReference<ProtocolProviderService> ref

-                    = factory.getProviderForAccount(accountID);

-

-                if (ref != null)

-                {

-                    return UtilActivator.bundleContext.getService(ref);

-                }

-            }

-        }

-        return null;

-    }

-

-    /**

-     * Returns a <tt>ProtocolProviderFactory</tt> for a given protocol

-     * provider.

-     * @param protocolProvider the <tt>ProtocolProviderService</tt>, which

-     * factory we're looking for

-     * @return a <tt>ProtocolProviderFactory</tt> for a given protocol

-     * provider

-     */

-    public static ProtocolProviderFactory getProtocolProviderFactory(

-            ProtocolProviderService protocolProvider)

-    {

-        return getProtocolProviderFactory(protocolProvider.getProtocolName());

-    }

-

-    /**

-     * Returns a <tt>ProtocolProviderFactory</tt> for a given protocol

-     * provider.

-     * @param protocolName the name of the protocol

-     * @return a <tt>ProtocolProviderFactory</tt> for a given protocol

-     * provider

-     */

-    public static ProtocolProviderFactory getProtocolProviderFactory(

-            String protocolName)

-    {

-        String osgiFilter

-            = "(" + ProtocolProviderFactory.PROTOCOL + "=" + protocolName + ")";

-        ProtocolProviderFactory protocolProviderFactory = null;

-

-        try

-        {

-            Collection<ServiceReference<ProtocolProviderFactory>> refs

-                = UtilActivator.bundleContext.getServiceReferences(

-                        ProtocolProviderFactory.class,

-                        osgiFilter);

-

-            if ((refs != null) && !refs.isEmpty())

-            {

-                protocolProviderFactory

-                    = UtilActivator.bundleContext.getService(

-                            refs.iterator().next());

-            }

-        }

-        catch (InvalidSyntaxException ex)

-        {

-            logger.error("AccountUtils : " + ex);

-        }

-        return protocolProviderFactory;

-    }

-

-

-    /**

-     * Returns all registered protocol providers.

-     *

-     * @return a list of all registered providers

-     */

-    public static Collection<ProtocolProviderService> getRegisteredProviders()

-    {

-        List<ProtocolProviderService> registeredProviders

-            = new LinkedList<ProtocolProviderService>();

-

-        for (ProtocolProviderFactory providerFactory

-                : UtilActivator.getProtocolProviderFactories().values())

-        {

-            for (AccountID accountID : providerFactory.getRegisteredAccounts())

-            {

-                ServiceReference<ProtocolProviderService> ref

-                    = providerFactory.getProviderForAccount(accountID);

-

-                if (ref != null)

-                {

-                    ProtocolProviderService protocolProvider

-                        = UtilActivator.bundleContext.getService(ref);

-

-                    registeredProviders.add(protocolProvider);

-                }

-            }

-        }

-        return registeredProviders;

-    }

-}

+package net.java.sip.communicator.util.account;
+
+import java.util.*;
+
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.util.*;
+
+import org.osgi.framework.*;
+
+/**
+ * The <tt>AccountUtils</tt> provides utility methods helping us to easily
+ * obtain an account or a groups of accounts or protocol providers by some
+ * specific criteria.
+ *
+ * @author Yana Stamcheva
+ */
+public class AccountUtils
+{
+    /**
+     * The logger.
+     */
+    private static Logger logger = Logger.getLogger(AccountUtils.class);
+
+    /**
+     * Returns an iterator over a list of all stored <tt>AccountID</tt>-s.
+     *
+     * @return an iterator over a list of all stored <tt>AccountID</tt>-s
+     */
+    public static Collection<AccountID> getStoredAccounts()
+    {
+        AccountManager accountManager
+            = ServiceUtils.getService(  UtilActivator.bundleContext,
+                                        AccountManager.class);
+
+        return accountManager.getStoredAccounts();
+    }
+
+    /**
+     * Return the <tt>AccountID</tt> corresponding to the given string account
+     * identifier.
+     *
+     * @param accountID the account identifier string
+     * @return the <tt>AccountID</tt> corresponding to the given string account
+     * identifier
+     */
+    public static AccountID getAccountForID(String accountID)
+    {
+        Collection<AccountID> allAccounts = getStoredAccounts();
+
+        for(AccountID account : allAccounts)
+        {
+            if(account.getAccountUniqueID().equals(accountID))
+                return account;
+        }
+        return null;
+    }
+
+    /**
+     * Returns a list of all currently registered providers, which support the
+     * given <tt>operationSetClass</tt>.
+     *
+     * @param opSetClass the operation set class for which we're looking
+     * for providers
+     * @return a list of all currently registered providers, which support the
+     * given <tt>operationSetClass</tt>
+     */
+    public static List<ProtocolProviderService> getRegisteredProviders(
+            Class<? extends OperationSet> opSetClass)
+    {
+        List<ProtocolProviderService> opSetProviders
+            = new LinkedList<ProtocolProviderService>();
+
+        for (ProtocolProviderFactory providerFactory
+                : UtilActivator.getProtocolProviderFactories().values())
+        {
+            for (AccountID accountID : providerFactory.getRegisteredAccounts())
+            {
+                ServiceReference<ProtocolProviderService> ref
+                    = providerFactory.getProviderForAccount(accountID);
+
+                if (ref != null)
+                {
+                    ProtocolProviderService protocolProvider
+                        = UtilActivator.bundleContext.getService(ref);
+
+                    if ((protocolProvider.getOperationSet(opSetClass) != null)
+                            && protocolProvider.isRegistered())
+                    {
+                        opSetProviders.add(protocolProvider);
+                    }
+                }
+            }
+        }
+        return opSetProviders;
+    }
+
+
+    /**
+     * Returns a list of all currently registered telephony providers for the
+     * given protocol name.
+     * @param protocolName the protocol name
+     * @param opSetClass the operation set class for which we're looking for
+     * providers
+     * @return a list of all currently registered providers for the given
+     * <tt>protocolName</tt> and supporting the given <tt>operationSetClass</tt>
+     */
+    public static List<ProtocolProviderService> getRegisteredProviders(
+            String protocolName,
+            Class<? extends OperationSet> opSetClass)
+    {
+        List<ProtocolProviderService> opSetProviders
+            = new LinkedList<ProtocolProviderService>();
+        ProtocolProviderFactory providerFactory
+            = getProtocolProviderFactory(protocolName);
+
+        if (providerFactory != null)
+        {
+            for (AccountID accountID : providerFactory.getRegisteredAccounts())
+            {
+                ServiceReference<ProtocolProviderService> ref
+                    = providerFactory.getProviderForAccount(accountID);
+
+                if (ref != null)
+                {
+                    ProtocolProviderService protocolProvider
+                        = UtilActivator.bundleContext.getService(ref);
+
+                    if ((protocolProvider.getOperationSet(opSetClass) != null)
+                            && protocolProvider.isRegistered())
+                    {
+                        opSetProviders.add(protocolProvider);
+                    }
+                }
+            }
+        }
+        return opSetProviders;
+    }
+
+    /**
+     * Returns a list of all registered protocol providers that could be used
+     * for the operation given by the operation set. Prefers the given preferred
+     * protocol provider and preferred protocol name if they're available and
+     * registered.
+     *
+     * @param opSet
+     * @param preferredProvider
+     * @param preferredProtocolName
+     * @return a list of all registered protocol providers that could be used
+     * for the operation given by the operation set
+     */
+    public static List<ProtocolProviderService> getOpSetRegisteredProviders(
+            Class<? extends OperationSet> opSet,
+            ProtocolProviderService preferredProvider,
+            String preferredProtocolName)
+    {
+        List<ProtocolProviderService> providers
+            = new ArrayList<ProtocolProviderService>();
+
+        if (preferredProvider != null)
+        {
+            if (preferredProvider.isRegistered())
+            {
+                providers.add(preferredProvider);
+            }
+            // If we have a provider, but it's not registered we try to
+            // obtain all registered providers for the same protocol as the
+            // given preferred provider.
+            else
+            {
+                providers
+                    = getRegisteredProviders(
+                            preferredProvider.getProtocolName(),
+                            opSet);
+            }
+        }
+        // If we don't have a preferred provider we try to obtain a
+        // preferred protocol name and all registered providers for it.
+        else
+        {
+            if (preferredProtocolName != null)
+            {
+                providers
+                    = getRegisteredProviders(preferredProtocolName, opSet);
+            }
+            // If the protocol name is null we simply obtain all telephony
+            // providers.
+            else
+            {
+                providers = getRegisteredProviders(opSet);
+            }
+        }
+
+        return providers;
+    }
+
+    /**
+     * Returns the <tt>ProtocolProviderService</tt> corresponding to the given
+     * account identifier that is registered in the given factory
+     * @param accountID the identifier of the account
+     * @return the <tt>ProtocolProviderService</tt> corresponding to the given
+     * account identifier that is registered in the given factory
+     */
+    public static ProtocolProviderService getRegisteredProviderForAccount(
+                                                        AccountID accountID)
+    {
+        for (ProtocolProviderFactory factory
+                : UtilActivator.getProtocolProviderFactories().values())
+        {
+            if (factory.getRegisteredAccounts().contains(accountID))
+            {
+                ServiceReference<ProtocolProviderService> ref
+                    = factory.getProviderForAccount(accountID);
+
+                if (ref != null)
+                {
+                    return UtilActivator.bundleContext.getService(ref);
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns a <tt>ProtocolProviderFactory</tt> for a given protocol
+     * provider.
+     * @param protocolProvider the <tt>ProtocolProviderService</tt>, which
+     * factory we're looking for
+     * @return a <tt>ProtocolProviderFactory</tt> for a given protocol
+     * provider
+     */
+    public static ProtocolProviderFactory getProtocolProviderFactory(
+            ProtocolProviderService protocolProvider)
+    {
+        return getProtocolProviderFactory(protocolProvider.getProtocolName());
+    }
+
+    /**
+     * Returns a <tt>ProtocolProviderFactory</tt> for a given protocol
+     * provider.
+     * @param protocolName the name of the protocol
+     * @return a <tt>ProtocolProviderFactory</tt> for a given protocol
+     * provider
+     */
+    public static ProtocolProviderFactory getProtocolProviderFactory(
+            String protocolName)
+    {
+        String osgiFilter
+            = "(" + ProtocolProviderFactory.PROTOCOL + "=" + protocolName + ")";
+        ProtocolProviderFactory protocolProviderFactory = null;
+
+        try
+        {
+            Collection<ServiceReference<ProtocolProviderFactory>> refs
+                = UtilActivator.bundleContext.getServiceReferences(
+                        ProtocolProviderFactory.class,
+                        osgiFilter);
+
+            if ((refs != null) && !refs.isEmpty())
+            {
+                protocolProviderFactory
+                    = UtilActivator.bundleContext.getService(
+                            refs.iterator().next());
+            }
+        }
+        catch (InvalidSyntaxException ex)
+        {
+            logger.error("AccountUtils : " + ex);
+        }
+        return protocolProviderFactory;
+    }
+
+
+    /**
+     * Returns all registered protocol providers.
+     *
+     * @return a list of all registered providers
+     */
+    public static Collection<ProtocolProviderService> getRegisteredProviders()
+    {
+        List<ProtocolProviderService> registeredProviders
+            = new LinkedList<ProtocolProviderService>();
+
+        for (ProtocolProviderFactory providerFactory
+                : UtilActivator.getProtocolProviderFactories().values())
+        {
+            for (AccountID accountID : providerFactory.getRegisteredAccounts())
+            {
+                ServiceReference<ProtocolProviderService> ref
+                    = providerFactory.getProviderForAccount(accountID);
+
+                if (ref != null)
+                {
+                    ProtocolProviderService protocolProvider
+                        = UtilActivator.bundleContext.getService(ref);
+
+                    registeredProviders.add(protocolProvider);
+                }
+            }
+        }
+        return registeredProviders;
+    }
+}