Merge commit 'cf5da99'HEADmaster

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

1 files changed, 81 insertions, 81 deletions

diff --git a/src/net/java/sip/communicator/plugin/otr/ScSessionID.java b/src/net/java/sip/communicator/plugin/otr/ScSessionID.java
index 4392045..1a55fcd 100644
--- a/src/net/java/sip/communicator/plugin/otr/ScSessionID.java
+++ b/src/net/java/sip/communicator/plugin/otr/ScSessionID.java
@@ -1,4 +1,4 @@
-/*

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

-

-import java.util.*;

-

-import net.java.otr4j.session.*;

-

-/**

- * Class used to associate a random UUID to an OTR4J SessionID.

- *

- * @author Daniel Perren

- */

-public class ScSessionID

-{

-    private final UUID guid = UUID.randomUUID();

-

-    private final SessionID sessionID;

-

-    /**

-     * Creates a new instance of this class.

-     *

-     * @param sessionID the OTR4J SessionID that is being wrapped.

-     */

-    public ScSessionID(SessionID sessionID)

-    {

-        this.sessionID = sessionID;

-    }

-

-    /**

-     * Overrides equals() for the ability to get the hashcode from sessionID.

-     *

-     * @param obj the object to compare

-     * @return true if the objects are considered equal.

-     */

-    @Override

-    public boolean equals(Object obj)

-    {

-        return (obj != null) && sessionID.toString().equals(obj.toString());

-    }

-

-    /**

-     * Get the current GUID.

-     *

-     * @return The GUID generated for this SessionID.

-     */

-    public UUID getGUID()

-    {

-        return guid;

-    }

-

-    /**

-     * Gets the wrapped session ID

-     *

-     * @return sessionID

-     */

-    public SessionID getSessionID()

-    {

-        return sessionID;

-    }

-

-    /**

-     * Returns {@link SessionID#hashCode()} of the wrapped SessionID.

-     *

-     * @return HashCode of the wrapped SessionID.

-     */

-    @Override

-    public int hashCode()

-    {

-        return sessionID.hashCode();

-    }

-

-    /**

-     * Returns {@link SessionID#toString()} of the wrapped SessionID.

-     * @return String representation of the wrapped SessionID.

-     */

-    @Override

-    public String toString()

-    {

-        return sessionID.toString();

-    }

-}

+package net.java.sip.communicator.plugin.otr;
+
+import java.util.*;
+
+import net.java.otr4j.session.*;
+
+/**
+ * Class used to associate a random UUID to an OTR4J SessionID.
+ *
+ * @author Daniel Perren
+ */
+public class ScSessionID
+{
+    private final UUID guid = UUID.randomUUID();
+
+    private final SessionID sessionID;
+
+    /**
+     * Creates a new instance of this class.
+     *
+     * @param sessionID the OTR4J SessionID that is being wrapped.
+     */
+    public ScSessionID(SessionID sessionID)
+    {
+        this.sessionID = sessionID;
+    }
+
+    /**
+     * Overrides equals() for the ability to get the hashcode from sessionID.
+     *
+     * @param obj the object to compare
+     * @return true if the objects are considered equal.
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        return (obj != null) && sessionID.toString().equals(obj.toString());
+    }
+
+    /**
+     * Get the current GUID.
+     *
+     * @return The GUID generated for this SessionID.
+     */
+    public UUID getGUID()
+    {
+        return guid;
+    }
+
+    /**
+     * Gets the wrapped session ID
+     *
+     * @return sessionID
+     */
+    public SessionID getSessionID()
+    {
+        return sessionID;
+    }
+
+    /**
+     * Returns {@link SessionID#hashCode()} of the wrapped SessionID.
+     *
+     * @return HashCode of the wrapped SessionID.
+     */
+    @Override
+    public int hashCode()
+    {
+        return sessionID.hashCode();
+    }
+
+    /**
+     * Returns {@link SessionID#toString()} of the wrapped SessionID.
+     * @return String representation of the wrapped SessionID.
+     */
+    @Override
+    public String toString()
+    {
+        return sessionID.toString();
+    }
+}