Merge commit 'cf5da99'HEADmaster

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

1 files changed, 68 insertions, 68 deletions

diff --git a/src/net/java/sip/communicator/service/contactsource/AsyncContactSourceService.java b/src/net/java/sip/communicator/service/contactsource/AsyncContactSourceService.java
index 848a723..14d06a4 100644
--- a/src/net/java/sip/communicator/service/contactsource/AsyncContactSourceService.java
+++ b/src/net/java/sip/communicator/service/contactsource/AsyncContactSourceService.java
@@ -1,4 +1,4 @@
-/*

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

-

-import java.util.regex.*;

-

-/**

- * Declares the interface of a <tt>ContactSourceService</tt> which performs

- * <tt>ContactQuery</tt>s in a separate <tt>Thread</tt>.

- *

- * @author Lyubomir Marinov

- */

-public abstract class AsyncContactSourceService

-    implements ExtendedContactSourceService

-{

-    /**

-     * Creates query that searches for <tt>SourceContact</tt>s

-     * which match a specific <tt>query</tt> <tt>String</tt>.

-     *

-     * @param query the <tt>String</tt> which this <tt>ContactSourceService</tt>

-     * is being queried for

-     * @return a <tt>ContactQuery</tt> which represents the query of this

-     * <tt>ContactSourceService</tt> implementation for the specified

-     * <tt>String</tt> and via which the matching <tt>SourceContact</tt>s (if

-     * any) will be returned

-     * @see ContactSourceService#queryContactSource(String)

-     */

-    public ContactQuery createContactQuery(String query)

-    {

-        return createContactQuery(

-            Pattern.compile(query, Pattern.CASE_INSENSITIVE | Pattern.LITERAL));

-    }

-

-    /**

-     * Creates query that searches for <tt>SourceContact</tt>s

-     * which match a specific <tt>query</tt> <tt>String</tt>.

-     *

-     * @param query the <tt>String</tt> which this <tt>ContactSourceService</tt>

-     * is being queried for

-     * @param contactCount the maximum count of result contacts

-     * @return a <tt>ContactQuery</tt> which represents the query of this

-     * <tt>ContactSourceService</tt> implementation for the specified

-     * <tt>String</tt> and via which the matching <tt>SourceContact</tt>s (if

-     * any) will be returned

-     * @see ContactSourceService#queryContactSource(String)

-     */

-    public ContactQuery createContactQuery(String query, int contactCount)

-    {

-        return createContactQuery(

-            Pattern.compile(query, Pattern.CASE_INSENSITIVE | Pattern.LITERAL));

-    }

-

-    /**

-     * Stops this <tt>ContactSourceService</tt>.

-     */

-    public abstract void stop();

-

-    /**

-     * Defines whether using this contact source service (Outlook or MacOSX

-     * Contacs) can be used as result for the search field. This is

-     * useful when an external plugin looks for result of this contact source

-     * service, but want to display the search field result from its own (avoid

-     * duplicate results).

-     *

-     * @return True if this contact source service can be used to perform search

-     * for contacts. False otherwise.

-     */

-    public abstract boolean canBeUsedToSearchContacts();

-}

+package net.java.sip.communicator.service.contactsource;
+
+import java.util.regex.*;
+
+/**
+ * Declares the interface of a <tt>ContactSourceService</tt> which performs
+ * <tt>ContactQuery</tt>s in a separate <tt>Thread</tt>.
+ *
+ * @author Lyubomir Marinov
+ */
+public abstract class AsyncContactSourceService
+    implements ExtendedContactSourceService
+{
+    /**
+     * Creates query that searches for <tt>SourceContact</tt>s
+     * which match a specific <tt>query</tt> <tt>String</tt>.
+     *
+     * @param query the <tt>String</tt> which this <tt>ContactSourceService</tt>
+     * is being queried for
+     * @return a <tt>ContactQuery</tt> which represents the query of this
+     * <tt>ContactSourceService</tt> implementation for the specified
+     * <tt>String</tt> and via which the matching <tt>SourceContact</tt>s (if
+     * any) will be returned
+     * @see ContactSourceService#queryContactSource(String)
+     */
+    public ContactQuery createContactQuery(String query)
+    {
+        return createContactQuery(
+            Pattern.compile(query, Pattern.CASE_INSENSITIVE | Pattern.LITERAL));
+    }
+
+    /**
+     * Creates query that searches for <tt>SourceContact</tt>s
+     * which match a specific <tt>query</tt> <tt>String</tt>.
+     *
+     * @param query the <tt>String</tt> which this <tt>ContactSourceService</tt>
+     * is being queried for
+     * @param contactCount the maximum count of result contacts
+     * @return a <tt>ContactQuery</tt> which represents the query of this
+     * <tt>ContactSourceService</tt> implementation for the specified
+     * <tt>String</tt> and via which the matching <tt>SourceContact</tt>s (if
+     * any) will be returned
+     * @see ContactSourceService#queryContactSource(String)
+     */
+    public ContactQuery createContactQuery(String query, int contactCount)
+    {
+        return createContactQuery(
+            Pattern.compile(query, Pattern.CASE_INSENSITIVE | Pattern.LITERAL));
+    }
+
+    /**
+     * Stops this <tt>ContactSourceService</tt>.
+     */
+    public abstract void stop();
+
+    /**
+     * Defines whether using this contact source service (Outlook or MacOSX
+     * Contacs) can be used as result for the search field. This is
+     * useful when an external plugin looks for result of this contact source
+     * service, but want to display the search field result from its own (avoid
+     * duplicate results).
+     *
+     * @return True if this contact source service can be used to perform search
+     * for contacts. False otherwise.
+     */
+    public abstract boolean canBeUsedToSearchContacts();
+}