Fixed all line endings of the repository

[simantics/platform.git] / bundles / org.simantics.utils.datastructures / src / org / simantics / utils / datastructures / Pair2.java

diff --git a/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/Pair2.java b/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/Pair2.java
index d5217e6fe788ec9d53d611b9fd204684c913a9aa..70c153cc041ccceb0687c6ed2d7c3aed81f815b1 100644 (file)
--- a/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/Pair2.java
+++ b/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/Pair2.java
@@ -1,78 +1,78 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management\r
- * in Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-/*\r
- *\r
- * @author Toni Kalajainen\r
- */\r
-package org.simantics.utils.datastructures;\r
-\r
-import org.simantics.utils.datastructures.internal.ObjectUtils;\r
-import org.simantics.utils.datastructures.map.Tuple;\r
-\r
-/**\r
- * A generic Pair (2-tuple) structure for containing two object instances of\r
- * chosen types.\r
- * \r
- * Allows nulls\r
- * \r
- * @param <T1> type of first element\r
- * @param <T2> type of second element\r
- * @deprecated Replaced with {@link Tuple}\r
- */\r
-public final class Pair2<T1, T2> {\r
-    public final T1 first;\r
-    public final T2 second;\r
-    private final int hash;\r
-\r
-    public static <T1, T2> Pair2<T1, T2> make(T1 t1, T2 t2) {\r
-        return new Pair2<T1, T2>(t1, t2);\r
-    }\r
-\r
-    public Pair2(T1 first, T2 second) {\r
-        this.first = first;\r
-        this.second = second;\r
-        this.hash = makeHash();\r
-    }\r
-    \r
-    @Override\r
-    public boolean equals(Object obj) {\r
-        if (obj == null)\r
-            return false;\r
-        if (!(obj.getClass().equals(this.getClass())))\r
-            return false;\r
-        Pair2<?, ?> other = (Pair2<?, ?>) obj;\r
-        if (!ObjectUtils.objectEquals(other.first, first))\r
-            return false;\r
-        if (!ObjectUtils.objectEquals(other.second, second))\r
-            return false;\r
-        return true;\r
-    }\r
-    \r
-    @Override\r
-    public int hashCode() {\r
-        return hash;\r
-    }\r
-    \r
-    @Override\r
-    public String toString() {\r
-        return "<"+first+", "+second+">";\r
-    }\r
-    \r
-    private int makeHash() {\r
-       int result = 0;\r
-       if (first!=null)\r
-               result ^= first.hashCode();\r
-       if (second!=null)\r
-               result ^= second.hashCode();\r
-        return result;\r
-    }\r
-}\r
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+/*
+ *
+ * @author Toni Kalajainen
+ */
+package org.simantics.utils.datastructures;
+
+import org.simantics.utils.datastructures.internal.ObjectUtils;
+import org.simantics.utils.datastructures.map.Tuple;
+
+/**
+ * A generic Pair (2-tuple) structure for containing two object instances of
+ * chosen types.
+ * 
+ * Allows nulls
+ * 
+ * @param <T1> type of first element
+ * @param <T2> type of second element
+ * @deprecated Replaced with {@link Tuple}
+ */
+public final class Pair2<T1, T2> {
+    public final T1 first;
+    public final T2 second;
+    private final int hash;
+
+    public static <T1, T2> Pair2<T1, T2> make(T1 t1, T2 t2) {
+        return new Pair2<T1, T2>(t1, t2);
+    }
+
+    public Pair2(T1 first, T2 second) {
+        this.first = first;
+        this.second = second;
+        this.hash = makeHash();
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null)
+            return false;
+        if (!(obj.getClass().equals(this.getClass())))
+            return false;
+        Pair2<?, ?> other = (Pair2<?, ?>) obj;
+        if (!ObjectUtils.objectEquals(other.first, first))
+            return false;
+        if (!ObjectUtils.objectEquals(other.second, second))
+            return false;
+        return true;
+    }
+    
+    @Override
+    public int hashCode() {
+        return hash;
+    }
+    
+    @Override
+    public String toString() {
+        return "<"+first+", "+second+">";
+    }
+    
+    private int makeHash() {
+       int result = 0;
+       if (first!=null)
+               result ^= first.hashCode();
+       if (second!=null)
+               result ^= second.hashCode();
+        return result;
+    }
+}