Initial support for concurrency in databoard, bindings and serializers

[simantics/platform.git] / bundles / org.simantics / src / org / simantics / SimanticsBindings.java

diff --git a/bundles/org.simantics/src/org/simantics/SimanticsBindings.java b/bundles/org.simantics/src/org/simantics/SimanticsBindings.java
index cf81a68f8d4ae1c65961797f65fb9b8b3931cec2..92f97bc649f6b6b9811ae8bbb183d42e17c9ea77 100644 (file)
--- a/bundles/org.simantics/src/org/simantics/SimanticsBindings.java
+++ b/bundles/org.simantics/src/org/simantics/SimanticsBindings.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management in
+ * Copyright (c) 2007, 2018 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
@@ -17,7 +17,6 @@ import org.simantics.databoard.binding.reflection.BindingProvider;
 import org.simantics.databoard.binding.reflection.BindingRequest;
 import org.simantics.databoard.binding.reflection.ClassBindingFactory;
 import org.simantics.db.Resource;
-import org.simantics.db.Session;
 import org.simantics.db.layer0.bindings.ResourceBinding;
 
 /**
@@ -26,28 +25,18 @@ import org.simantics.db.layer0.bindings.ResourceBinding;
  * @author toni.kalajainen
  */
 public class SimanticsBindings implements BindingProvider {
-       
+
        ResourceBinding resourceBinding;
-       //VariableBinding variableBinding;
-       
-       public SimanticsBindings(Session session) {
-               this.resourceBinding = new ResourceBinding((Session) null);
-               //this.variableBinding = new VariableBinding(session);          
+
+       public SimanticsBindings() {
+               this.resourceBinding = new ResourceBinding();
        }
-       
+
        public Binding provideBinding(ClassBindingFactory master, BindingRequest request) throws BindingConstructionException {
                if (Resource.class.isAssignableFrom( request.getClazz() )) {
                        return resourceBinding;
                }
-               
-               // Tuukka: disabled because the implementation is deadlock prone
-               // and therefore Variables should not be used directly in Bean classes
-               // until we figure out a way to fix VariableBinding or just throw it away.
-//             if (Variable.class.isAssignableFrom( request.getClazz() )) {
-//                     return variableBinding;
-//             }
-               
                return null;
-       }       
+       }
 
 }