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%2FSetUnion.java;fp=bundles%2Forg.simantics.utils.datastructures%2Fsrc%2Forg%2Fsimantics%2Futils%2Fdatastructures%2FSetUnion.java;h=e5f2e45a784556c7f155296c32a8d43aac470592;hp=73d6c6922b522c549873760b3f3a5ad2538dc786;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hpb=24e2b34260f219f0d1644ca7a138894980e25b14

diff --git a/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/SetUnion.java b/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/SetUnion.java
index 73d6c6922..e5f2e45a7 100644
--- a/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/SetUnion.java
+++ b/bundles/org.simantics.utils.datastructures/src/org/simantics/utils/datastructures/SetUnion.java
@@ -1,116 +1,116 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.simantics.utils.datastructures;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-
-public class SetUnion<T> extends ImmutableCollection<T> {
-
-    private Set<T> set1;
-    private Set<T> set2;    
-    
-    public SetUnion(Set<T> set1, Set<T> set2) {
-        this.set1 = set1;
-        this.set2 = set2;
-    }
-
-    @Override
-    public boolean contains(Object o) {
-        return set1.contains(o) || set2.contains(o);
-    }
-
-    @Override
-    public boolean containsAll(Collection<?> c) {
-        for(Object o : c)
-            if(!contains(o))
-                return false;
-        return true;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return set1.isEmpty() && set2.isEmpty();
-    }
-
-    @Override
-    public Iterator<T> iterator() {
-        return new ImmutableIterator<T>() {
-
-            int setId = 0;
-            Iterator<T> it1 = set1.iterator();
-            Iterator<T> it2 = set2.iterator();
-            T element = null;
-            
-            @Override
-            public boolean hasNext() {
-                if(setId == 0) {
-                    if(it1.hasNext())
-                        return true;
-                    else {
-                        setId = 1;
-                        return hasNext();
-                    }
-                }
-                else {
-                    if(element != null)
-                        return true;
-                    while(it2.hasNext()) {                            
-                        element = it2.next();
-                        if(set1.contains(element)) 
-                            element = null;
-                        else
-                            return true;
-                    }
-                    return false;
-                }
-            }
-
-            @Override
-            public T next() {
-                if(setId == 0) {
-                    if(it1.hasNext())
-                        return it1.next();
-                    else {
-                        setId = 1;
-                        return next();
-                    }
-                }
-                else {
-                    if(element != null) {
-                        T ret = element;
-                        element = null;
-                        return ret;
-                    }
-                    while(it2.hasNext()) {                            
-                        T ret = it2.next();
-                        if(!set1.contains(ret)) 
-                            return ret;
-                    }
-                    return null;
-                }
-            }
-            
-        };
-    }
-
-    @Override
-    public int size() {
-        int count = set1.size();       
-        for(T o : set2)
-            if(!set1.contains(o))
-                ++count;
-        return count;
-    }       
-    
-}
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+package org.simantics.utils.datastructures;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
+public class SetUnion<T> extends ImmutableCollection<T> {
+
+    private Set<T> set1;
+    private Set<T> set2;    
+    
+    public SetUnion(Set<T> set1, Set<T> set2) {
+        this.set1 = set1;
+        this.set2 = set2;
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return set1.contains(o) || set2.contains(o);
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c) {
+        for(Object o : c)
+            if(!contains(o))
+                return false;
+        return true;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return set1.isEmpty() && set2.isEmpty();
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+        return new ImmutableIterator<T>() {
+
+            int setId = 0;
+            Iterator<T> it1 = set1.iterator();
+            Iterator<T> it2 = set2.iterator();
+            T element = null;
+            
+            @Override
+            public boolean hasNext() {
+                if(setId == 0) {
+                    if(it1.hasNext())
+                        return true;
+                    else {
+                        setId = 1;
+                        return hasNext();
+                    }
+                }
+                else {
+                    if(element != null)
+                        return true;
+                    while(it2.hasNext()) {                            
+                        element = it2.next();
+                        if(set1.contains(element)) 
+                            element = null;
+                        else
+                            return true;
+                    }
+                    return false;
+                }
+            }
+
+            @Override
+            public T next() {
+                if(setId == 0) {
+                    if(it1.hasNext())
+                        return it1.next();
+                    else {
+                        setId = 1;
+                        return next();
+                    }
+                }
+                else {
+                    if(element != null) {
+                        T ret = element;
+                        element = null;
+                        return ret;
+                    }
+                    while(it2.hasNext()) {                            
+                        T ret = it2.next();
+                        if(!set1.contains(ret)) 
+                            return ret;
+                    }
+                    return null;
+                }
+            }
+            
+        };
+    }
+
+    @Override
+    public int size() {
+        int count = set1.size();       
+        for(T o : set2)
+            if(!set1.contains(o))
+                ++count;
+        return count;
+    }       
+    
+}