X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.databoard%2Fsrc%2Forg%2Fsimantics%2Fdataboard%2Fbinding%2Ffactory%2FBindingRepository.java;h=ba24353712c7f90f415b4b2652f7699dba5b27d0;hp=f1472068f33e83ca402c63a407fb0a38c92a9e62;hb=a1696e5257fae039410c924155fdeffc1ce1b3e9;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/BindingRepository.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/BindingRepository.java
index f1472068f..ba2435371 100644
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/BindingRepository.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/binding/factory/BindingRepository.java
@@ -1,122 +1,135 @@
-/*******************************************************************************
- * 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.databoard.binding.factory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.simantics.databoard.binding.Binding;
-import org.simantics.databoard.binding.reflection.BindingRequest;
-
-public class BindingRepository {
-	
-	/**
-	 * This map contains all the bindings
-	 */
-	Map<BindingRequest, Binding> requestMap;
-	
-	/**
-	 * This map contains bindings for non-generic classes. 
-	 */
-	Map<Class<?>, Binding> classMap;
-	
-	public BindingRepository() {		
-		requestMap = new HashMap<BindingRequest, Binding>();
-		classMap = new HashMap<Class<?>, Binding>();
-	}
-	
-	public BindingRepository(Map<BindingRequest, Binding> requests) {
-		this.requestMap = requests;
-		for (Entry<BindingRequest, Binding> e : requests.entrySet()) {
-			if ( isClassRequest( e.getKey() ) ) {
-				classMap.put(e.getKey().getClazz(), e.getValue());
-			}
-		}
-	}
-	
-	/**
-	 * Get binding for a class. May return the class if it is in the class map.
-	 * If not, the user should try request map with some arguments (component bindings)
-	 * 
-	 * @param clazz
-	 * @return binding
-	 */
-	public synchronized Binding get(Class<?> clazz) {
-		return classMap.get( clazz );
-	}
-	
-	/**
-	 * Get binding for a binding request
-	 * 
-	 * @param request
-	 * @return binding or null
-	 */
-	public synchronized Binding get( BindingRequest request ) {
-		return requestMap.get( request );
-	}
-	
-	/**
-	 * Adds binding to the repository. If the request has no arguments, the 
-	 * class is added to classMap, and is available with class request.  
-	 * 
-	 * @param request
-	 * @param binding
-	 */
-	public synchronized void put( BindingRequest request, Binding binding ) {
-		if ( isClassRequest(request) ) {
-			classMap.put( request.getClazz(), binding );
-		}
-		requestMap.put( request, binding );
-	}
-	
-	public synchronized void remove(Binding binding) {
-		for (Entry<BindingRequest, Binding> e : requestMap.entrySet()) {
-			if (e.getValue() == binding) {
-				requestMap.remove(e.getValue());
-				break;
-			}
-		}
-		
-		for (Entry<Class<?>, Binding> e : classMap.entrySet()) {
-			if (e.getValue() == binding) {
-				classMap.remove(e.getValue());
-				break;
-			}
-		}
-}
-	
-	public synchronized boolean containsRequest( BindingRequest request ) {
-		return requestMap.containsKey( request );
-	}
-	
-	/**
-	 * Checks if repository contains a class without arguments
-	 * 
-	 * @param clazz 
-	 * @return true if contains class (without args)
-	 */
-	public synchronized boolean containsClass( Class<?> clazz ) {
-		return classMap.containsKey( clazz );
-	}
-	
-	public synchronized void clear() {
-		requestMap.clear();
-		classMap.clear();
-	}
-
-	boolean isClassRequest( BindingRequest request )
-	{
-		return request.className != null && (request.annotations==null || request.annotations.length==0);
-	}
-
-}
+/*******************************************************************************
+ * 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
+ *     Semantum Oy - gitlab #82
+ *******************************************************************************/
+package org.simantics.databoard.binding.factory;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.simantics.databoard.binding.Binding;
+import org.simantics.databoard.binding.reflection.BindingRequest;
+import org.simantics.databoard.type.Datatype;
+
+public class BindingRepository {
+	
+	/**
+	 * This map contains all the bindings
+	 */
+	Map<BindingRequest, Binding> requestMap;
+	
+	/**
+	 * This map contains bindings for non-generic classes. 
+	 */
+	Map<Class<?>, Binding> classMap;
+	
+	public BindingRepository() {		
+		requestMap = new HashMap<BindingRequest, Binding>();
+		classMap = new HashMap<Class<?>, Binding>();
+	}
+	
+	public BindingRepository(Map<BindingRequest, Binding> requests) {
+		this.requestMap = requests;
+		for (Entry<BindingRequest, Binding> e : requests.entrySet()) {
+			if ( isClassRequest( e.getKey() ) ) {
+				classMap.put(e.getKey().getClazz(), e.getValue());
+			}
+		}
+	}
+	
+	/**
+	 * Get binding for a class. May return the class if it is in the class map.
+	 * If not, the user should try request map with some arguments (component bindings)
+	 * 
+	 * @param clazz
+	 * @return binding
+	 */
+	public synchronized Binding get(Class<?> clazz) {
+		return classMap.get( clazz );
+	}
+	
+	/**
+	 * Get binding for a binding request
+	 * 
+	 * @param request
+	 * @return binding or null
+	 */
+	public synchronized Binding get( BindingRequest request ) {
+		return requestMap.get( request );
+	}
+	
+	/**
+	 * Adds binding to the repository. If the request has no arguments, the 
+	 * class is added to classMap, and is available with class request.  
+	 * 
+	 * @param request
+	 * @param binding
+	 */
+	public synchronized void put( BindingRequest request, Binding binding ) {
+		if ( isClassRequest(request) ) {
+			classMap.put( request.getClazz(), binding );
+		}
+		requestMap.put( request, binding );
+	}
+	
+	public synchronized void remove(Binding binding) {
+		for (Entry<BindingRequest, Binding> e : requestMap.entrySet()) {
+			if (e.getValue() == binding) {
+				requestMap.remove(e.getValue());
+				break;
+			}
+		}
+		
+		for (Entry<Class<?>, Binding> e : classMap.entrySet()) {
+			if (e.getValue() == binding) {
+				classMap.remove(e.getValue());
+				break;
+			}
+		}
+}
+	
+	public synchronized boolean containsRequest( BindingRequest request ) {
+		return requestMap.containsKey( request );
+	}
+	
+	/**
+	 * Checks if repository contains a class without arguments
+	 * 
+	 * @param clazz 
+	 * @return true if contains class (without args)
+	 */
+	public synchronized boolean containsClass( Class<?> clazz ) {
+		return classMap.containsKey( clazz );
+	}
+	
+	public synchronized void clear() {
+		requestMap.clear();
+		classMap.clear();
+	}
+
+	/**
+	 * {@link Datatype} class has annotations but it can be considered a "class
+	 * request" as it is a fundamental building block of Databoard and it has a
+	 * fixed structure. Therefore {@link #classMap} is allowed to contain a cached
+	 * Datatype.class -> Binding mapping.
+	 */
+	private static final String DATATYPE_CLASS_NAME = Datatype.class.getName();
+
+	boolean isClassRequest( BindingRequest request )
+	{
+		return (request.className != null
+				&& ((request.annotations==null || request.annotations.length==0)
+						|| DATATYPE_CLASS_NAME.equals(request.className))
+				);
+	}
+
+}