X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.databoard%2Fsrc%2Forg%2Fsimantics%2Fdataboard%2Fbinding%2Fimpl%2FHashSetBinding.java;h=ce245d187a0fe9372abc4aaaa1e3c3952101aa58;hb=HEAD;hp=494b3d9e8e6f60de0a1dbcc0d0979e7daae99991;hpb=86adc86522decdf79259743cde5ec3688af3d908;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/HashSetBinding.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/HashSetBinding.java index 494b3d9e8..ce245d187 100644 --- a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/HashSetBinding.java +++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/impl/HashSetBinding.java @@ -1,38 +1,38 @@ -/******************************************************************************* - * 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.Arrays; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -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.Arrays; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +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 Databoard Map(T, {}) to java.util.Set and instantiates java.util.HashSet * * @author Toni Kalajainen - */ -@SuppressWarnings({"rawtypes", "unchecked"}) + */ +@SuppressWarnings({"rawtypes", "unchecked"}) public class HashSetBinding extends MapBinding { public HashSetBinding(MapType mapType, Binding elementBinding) { @@ -121,7 +121,8 @@ public class HashSetBinding extends MapBinding { for (Object k : _setFrom) { keys[i] = k; values[i] = null; - } + i++; + } } @Override @@ -137,25 +138,25 @@ public class HashSetBinding extends MapBinding { Set s = (Set) set; keys.addAll(s); } - - @Override - public int count(Object src, Object from, boolean fromInclusive, - Object end, boolean endInclusive) throws BindingException { - int result = 0; - Set m = ((Set)src); - for (Object k : m) { - int fk = keyBinding.compare(from, k); - int ek = keyBinding.compare(k, end); - boolean fromMatches = fromInclusive ? fk<=0 : fk<0; - boolean endMatches = endInclusive ? ek<=0 : ek <0; - if ( fromMatches && endMatches ) result++; - } - return result; - } - - 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 int count(Object src, Object from, boolean fromInclusive, + Object end, boolean endInclusive) throws BindingException { + int result = 0; + Set m = ((Set)src); + for (Object k : m) { + int fk = keyBinding.compare(from, k); + int ek = keyBinding.compare(k, end); + boolean fromMatches = fromInclusive ? fk<=0 : fk<0; + boolean endMatches = endInclusive ? ek<=0 : ek <0; + if ( fromMatches && endMatches ) result++; + } + return result; + } + + 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 {