Merge "InputStream returns -1 on EOF instead of throwing IOException"

[simantics/platform.git] / bundles / org.simantics.databoard / src / org / simantics / databoard / binding / impl / HashSetBinding.java

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 efeb38493eb08bf7d8fa205bb55438b7ec5a27d3..494b3d9e8e6f60de0a1dbcc0d0979e7daae99991 100644 (file)
--- 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
@@ -32,7 +32,7 @@ import org.simantics.databoard.type.RecordType;
  *
  * @author Toni Kalajainen <toni.kalajainen@vtt.fi>
  */\r
-@SuppressWarnings("all")
+@SuppressWarnings({"rawtypes", "unchecked"})\r
 public class HashSetBinding extends MapBinding {
        
        public HashSetBinding(MapType mapType, Binding elementBinding) {
@@ -43,7 +43,6 @@ public class HashSetBinding extends MapBinding {
                super(new MapType(elementBinding.type(), RecordType.VOID_TYPE), elementBinding, VoidBinding.VOID_BINDING);
        }
 
-       @SuppressWarnings("unchecked")
        @Override
        public void clear(Object set) throws BindingException {
                Set _set = (Set) set;
@@ -139,7 +138,6 @@ public class HashSetBinding extends MapBinding {
                keys.addAll(s);
        }
        \r
-       @SuppressWarnings("unchecked")\r
        @Override\r
        public int count(Object src, Object from, boolean fromInclusive,\r
                        Object end, boolean endInclusive) throws BindingException {\r
@@ -183,7 +181,6 @@ public class HashSetBinding extends MapBinding {
                s.add(key);
        }
        
-       @SuppressWarnings("unchecked")
        Object getComparableKey(Object set, Object key) {
                // if (keyIsComparable) return key;
                
@@ -201,11 +198,9 @@ public class HashSetBinding extends MapBinding {
                _set.addAll(from);
        }
        
-       @SuppressWarnings("unchecked")
        @Override
        public void putAll(Object setTo, Map from) throws BindingException {
                Set<Object> s = (Set<Object>) setTo;
-               Binding kb = getKeyBinding();
                for (Entry<Object, Object> e : (Set<Entry<Object, Object>>) from.entrySet()) {
                        Object k = getComparableKey(s, e.getKey());
                        s.remove(k);