Tons of dependency fixes and updates

[simantics/platform.git] / bundles / org.simantics.databoard / src / org / simantics / databoard / adapter / AdapterFactory.java

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/AdapterFactory.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/AdapterFactory.java
index a674943d50b996e6e62cf654043bd83e9a4ff4d6..066ed4c886e7bb4eb6500174b978fda5232c877a 100644 (file)
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/AdapterFactory.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/AdapterFactory.java
@@ -14,8 +14,8 @@ package org.simantics.databoard.adapter;
 import java.util.ArrayList;
 import java.util.Map;
 
-import org.apache.commons.collections.map.ReferenceMap;
-import org.simantics.databoard.Bindings;
+import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
+import org.apache.commons.collections4.map.ReferenceMap;
 import org.simantics.databoard.Units;
 import org.simantics.databoard.binding.ArrayBinding;
 import org.simantics.databoard.binding.Binding;
@@ -52,9 +52,8 @@ import org.simantics.databoard.util.ObjectUtils;
  */
 public class AdapterFactory {
 
-       @SuppressWarnings( "unchecked" )
-    Map<AdapterRequest, AbstractAdapter> cache = (Map<AdapterRequest, AbstractAdapter>) new ReferenceMap(ReferenceMap.SOFT, ReferenceMap.HARD);
-               
+       Map<AdapterRequest, AbstractAdapter> cache = new ReferenceMap<>(ReferenceStrength.SOFT, ReferenceStrength.HARD);
+
        public synchronized Adapter getAdapter(Binding domain, Binding range, boolean typeAdapter, boolean mustClone)
        throws AdapterConstructionException
        {