Merge commit 'cf5da99'HEADmaster

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

1 files changed, 77 insertions, 77 deletions

diff --git a/src/net/java/sip/communicator/plugin/phonenumbercontactsource/PhoneNumberContactSource.java b/src/net/java/sip/communicator/plugin/phonenumbercontactsource/PhoneNumberContactSource.java
index 3f916a7..954f5d5 100644
--- a/src/net/java/sip/communicator/plugin/phonenumbercontactsource/PhoneNumberContactSource.java
+++ b/src/net/java/sip/communicator/plugin/phonenumbercontactsource/PhoneNumberContactSource.java
@@ -1,4 +1,4 @@
-/*

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

-

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

-

-/**

- * The <tt>PhoneNumberContactSource</tt> is a source of phone numbers coming

- * from the server stored contact info of all contacts for all protocol

- * providers.

- *

- * @author Yana Stamcheva

- */

-public class PhoneNumberContactSource

-    implements ContactSourceService

-{

-    /**

-     * Returns DEFAULT_TYPE to indicate that this contact source is a default

-     * source.

-     *

-     * @return the type of this contact source

-     */

-    public int getType()

-    {

-        return DEFAULT_TYPE;

-    }

-

-    /**

-     * Returns a user-friendly string that identifies this contact source.

-     *

-     * @return the display name of this contact source

-     */

-    public String getDisplayName()

-    {

-        return PNContactSourceActivator.getResources().getI18NString(

-            "plugin.phonenumbercontactsource.DISPLAY_NAME");

-    }

-

-    /**

-     *  Creates query for the given <tt>queryString</tt>.

-     *

-     * @param queryString the string to search for

-     * @return the created query

-     */

-    public ContactQuery createContactQuery(String queryString)

-    {

-        return createContactQuery(queryString, -1);

-    }

-

-    /**

-     *  Creates query for the given <tt>queryString</tt>.

-     *

-     * @param queryString the string to search for

-     * @param contactCount the maximum count of result contacts

-     * @return the created query

-     */

-    public ContactQuery createContactQuery( String queryString,

-                                            int contactCount)

-    {

-        if (queryString == null)

-            queryString = "";

-

-        PhoneNumberContactQuery contactQuery

-            = new PhoneNumberContactQuery(this, queryString, contactCount);

-

-        return contactQuery;

-    }

-

-    /**

-     * Returns the index of the contact source in the result list.

-     *

-     * @return the index of the contact source in the result list

-     */

-    public int getIndex()

-    {

-        return -1;

-    }

-}

+package net.java.sip.communicator.plugin.phonenumbercontactsource;
+
+import net.java.sip.communicator.service.contactsource.*;
+
+/**
+ * The <tt>PhoneNumberContactSource</tt> is a source of phone numbers coming
+ * from the server stored contact info of all contacts for all protocol
+ * providers.
+ *
+ * @author Yana Stamcheva
+ */
+public class PhoneNumberContactSource
+    implements ContactSourceService
+{
+    /**
+     * Returns DEFAULT_TYPE to indicate that this contact source is a default
+     * source.
+     *
+     * @return the type of this contact source
+     */
+    public int getType()
+    {
+        return DEFAULT_TYPE;
+    }
+
+    /**
+     * Returns a user-friendly string that identifies this contact source.
+     *
+     * @return the display name of this contact source
+     */
+    public String getDisplayName()
+    {
+        return PNContactSourceActivator.getResources().getI18NString(
+            "plugin.phonenumbercontactsource.DISPLAY_NAME");
+    }
+
+    /**
+     *  Creates query for the given <tt>queryString</tt>.
+     *
+     * @param queryString the string to search for
+     * @return the created query
+     */
+    public ContactQuery createContactQuery(String queryString)
+    {
+        return createContactQuery(queryString, -1);
+    }
+
+    /**
+     *  Creates query for the given <tt>queryString</tt>.
+     *
+     * @param queryString the string to search for
+     * @param contactCount the maximum count of result contacts
+     * @return the created query
+     */
+    public ContactQuery createContactQuery( String queryString,
+                                            int contactCount)
+    {
+        if (queryString == null)
+            queryString = "";
+
+        PhoneNumberContactQuery contactQuery
+            = new PhoneNumberContactQuery(this, queryString, contactCount);
+
+        return contactQuery;
+    }
+
+    /**
+     * Returns the index of the contact source in the result list.
+     *
+     * @return the index of the contact source in the result list
+     */
+    public int getIndex()
+    {
+        return -1;
+    }
+}