X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics%2Fsrc%2Forg%2Fsimantics%2FSimanticsBindings.java;h=92f97bc649f6b6b9811ae8bbb183d42e17c9ea77;hp=6268a719bb889841b9da084040a6ff15062f139e;hb=48bb50bb6640506d1f150ca8e4fa5a6e878464be;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics/src/org/simantics/SimanticsBindings.java b/bundles/org.simantics/src/org/simantics/SimanticsBindings.java
index 6268a719b..92f97bc64 100644
--- a/bundles/org.simantics/src/org/simantics/SimanticsBindings.java
+++ b/bundles/org.simantics/src/org/simantics/SimanticsBindings.java
@@ -1,53 +1,42 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2011 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;
-
-import org.simantics.databoard.binding.Binding;
-import org.simantics.databoard.binding.error.BindingConstructionException;
-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;
-
-/**
- * This class creates bindings for Resource-interface, and Variable-interface.<<
- *   
- * @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 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;
-	}	
-
-}
+/*******************************************************************************
+ * 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
+ * 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;
+
+import org.simantics.databoard.binding.Binding;
+import org.simantics.databoard.binding.error.BindingConstructionException;
+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.layer0.bindings.ResourceBinding;
+
+/**
+ * This class creates bindings for Resource-interface, and Variable-interface.<<
+ *   
+ * @author toni.kalajainen
+ */
+public class SimanticsBindings implements BindingProvider {
+
+	ResourceBinding resourceBinding;
+
+	public SimanticsBindings() {
+		this.resourceBinding = new ResourceBinding();
+	}
+
+	public Binding provideBinding(ClassBindingFactory master, BindingRequest request) throws BindingConstructionException {
+		if (Resource.class.isAssignableFrom( request.getClazz() )) {
+			return resourceBinding;
+		}
+		return null;
+	}
+
+}