X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.databoard%2Fsrc%2Forg%2Fsimantics%2Fdataboard%2Fbinding%2Fimpl%2FTreeSetBinding.java;h=b36e016aa5d1b234024baabaf393cd09290d4b4d;hb=1dfc44ff89362fb4500ee9427432541b92d1953f;hp=50028b3a164914a10d1d859f4d1e1a7f724f9190;hpb=36282d240b9ac295894a6705672efa11eb26e4d2;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/TreeSetBinding.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/TreeSetBinding.java
index 50028b3a1..b36e016aa 100644
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/TreeSetBinding.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/TreeSetBinding.java
@@ -1,34 +1,34 @@
-/*******************************************************************************
- *  Copyright (c) 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
- *******************************************************************************/
+/*******************************************************************************
+ *  Copyright (c) 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.databoard.binding.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.simantics.databoard.binding.ArrayBinding;
-import org.simantics.databoard.binding.Binding;
-import org.simantics.databoard.binding.MapBinding;
-import org.simantics.databoard.binding.error.BindingException;
-import org.simantics.databoard.binding.reflection.VoidBinding;
-import org.simantics.databoard.type.MapType;
-import org.simantics.databoard.type.RecordType;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.simantics.databoard.binding.ArrayBinding;
+import org.simantics.databoard.binding.Binding;
+import org.simantics.databoard.binding.MapBinding;
+import org.simantics.databoard.binding.error.BindingException;
+import org.simantics.databoard.binding.reflection.VoidBinding;
+import org.simantics.databoard.type.MapType;
+import org.simantics.databoard.type.RecordType;
 
 /**
  * Binds java.util.TreeSet to Map(T, {})
  *
  * @author Toni Kalajainen <toni.kalajainen@vtt.fi>
- */
+ */
 @SuppressWarnings("unchecked")
 public class TreeSetBinding extends MapBinding {
 	
@@ -58,14 +58,14 @@ public class TreeSetBinding extends MapBinding {
 		return false;
 	}
 
-    @Override
-    public Object create() throws BindingException {
-        return new TreeSet<Object>( getKeyBinding() );
-    }
-
-	public Object create(Set<?> initialSet) throws BindingException {
-	    if (initialSet instanceof TreeSet && ((TreeSet<?>) initialSet).comparator() == getKeyBinding())
-	        return initialSet;
+    @Override
+    public Object create() throws BindingException {
+        return new TreeSet<Object>( getKeyBinding() );
+    }
+
+	public Object create(Set<?> initialSet) throws BindingException {
+	    if (initialSet instanceof TreeSet && ((TreeSet<?>) initialSet).comparator() == getKeyBinding())
+	        return initialSet;
 	    
 		TreeSet<Object> result = new TreeSet<Object>(getKeyBinding());
 		result.addAll(initialSet);
@@ -100,7 +100,7 @@ public class TreeSetBinding extends MapBinding {
 	@Override
 	public Object get(Object set, Object key) throws BindingException {
 		return null;
-	}
+	}
 	
     @Override
     public <K, V> void getAll(Object setFrom, Map<K, V> to) throws BindingException {
@@ -118,7 +118,8 @@ public class TreeSetBinding extends MapBinding {
 		for (Object k : _setFrom) {
 			keys[i] = k;
 			values[i] = null;
-		}		
+			i++;
+		}
 	}
 
 	@Override
@@ -131,24 +132,24 @@ public class TreeSetBinding extends MapBinding {
 	public void getKeys(Object set, Set<Object> keys) throws BindingException {
 		TreeSet<Object> s = (TreeSet<Object>) set;
 		keys.addAll(s);
-	}
-	
-	@Override
-	public Object[] getValues(Object set) throws BindingException {
-		TreeSet<Object> _set = (TreeSet<Object>) set;
-		return new Object[_set.size()];
-	}
-	
-	@Override
-	public int count(Object src, Object from, boolean fromInclusive, Object end, boolean endInclusive) throws BindingException {
-		TreeSet<Object> m = (TreeSet<Object>) src;		
-		Set<Object> sm = m.subSet(from, fromInclusive, end, endInclusive);
-		return sm.size();
-	}
-	
-	@Override
-	public int getEntries(Object src, Object from, boolean fromInclusive, Object end, boolean endInclusive, ArrayBinding dstKeyArrayBinding, Object dstKeyArray, ArrayBinding dstValueArrayBinding, Object dstValueArray, int limit) throws BindingException {
-		return 0;
+	}
+	
+	@Override
+	public Object[] getValues(Object set) throws BindingException {
+		TreeSet<Object> _set = (TreeSet<Object>) set;
+		return new Object[_set.size()];
+	}
+	
+	@Override
+	public int count(Object src, Object from, boolean fromInclusive, Object end, boolean endInclusive) throws BindingException {
+		TreeSet<Object> m = (TreeSet<Object>) src;		
+		Set<Object> sm = m.subSet(from, fromInclusive, end, endInclusive);
+		return sm.size();
+	}
+	
+	@Override
+	public int getEntries(Object src, Object from, boolean fromInclusive, Object end, boolean endInclusive, ArrayBinding dstKeyArrayBinding, Object dstKeyArray, ArrayBinding dstValueArrayBinding, Object dstValueArray, int limit) throws BindingException {
+		return 0;
 	}
 
 	@Override