X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.utils.datastructures%2Fsrc%2Forg%2Fsimantics%2Futils%2Fdatastructures%2FPair2.java;fp=bundles%2Forg.simantics.utils.datastructures%2Fsrc%2Forg%2Fsimantics%2Futils%2Fdatastructures%2FPair2.java;h=70c153cc041ccceb0687c6ed2d7c3aed81f815b1;hp=d5217e6fe788ec9d53d611b9fd204684c913a9aa;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hpb=24e2b34260f219f0d1644ca7a138894980e25b14

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 d5217e6fe..70c153cc0 100644
--- 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 @@
-/*******************************************************************************
- * 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;
-    }
-}
+/*******************************************************************************
+ * 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;
+    }
+}