X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.databoard%2Fsrc%2Forg%2Fsimantics%2Fdataboard%2Fadapter%2FNewAdapterFactory.java;h=742b54689149e31a72c5fc7479665e00452d4903;hb=a1696e5257fae039410c924155fdeffc1ce1b3e9;hp=a41619f728ef91386304ab810d623e9cc591506f;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/NewAdapterFactory.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/NewAdapterFactory.java
index a41619f72..742b54689 100644
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/NewAdapterFactory.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/NewAdapterFactory.java
@@ -1,105 +1,105 @@
-package org.simantics.databoard.adapter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.simantics.databoard.binding.Binding;
-import org.simantics.databoard.binding.error.BindingConstructionException;
-import org.simantics.databoard.binding.error.RuntimeBindingConstructionException;
-import org.simantics.databoard.type.Datatype;
-
-public abstract class NewAdapterFactory {
-	
-	/**
-	 * Map of failed constructions. 
-	 */
-	protected Map<Datatype, BindingConstructionException> failures = new HashMap<Datatype, BindingConstructionException>();
-	
-	/**
-	 * Map that contains in incomplete constructions.
-	 */
-	protected Map<Datatype, Binding> inprogress = new HashMap<Datatype, Binding>();
-	
-	/**
-	 * Repository where successful constructions are placed. 
-	 */
-	protected Map<Datatype, Binding> repository;	
-	
-	/**
-	 * Create a scheme factory. 
-	 */
-	public NewAdapterFactory() {		
-	}
-	
-	/**
-	 * Create scheme factory that appends constructed bindings to the user given
-	 * repository  
-	 * 
-	 * @param repository repository where bindings are placed
-	 */
-	public NewAdapterFactory(Map<Datatype, Binding> repository) {
-		this.repository = repository;
-	}
-	
-	/**
-	 * Get adapter repository
-	 * 
-	 * @return adapter repository
-	 */
-	public Map<Datatype, Binding> getRepository() {
-		return repository;
-	}
-
-	/**
-	 * Constructs a binding to comply to datatype request.
-	 * This is the method sub-classes implement. 
-	 * The implementation should use the inprogress -map for construction of 
-	 * bindings that have component types.
-	 * 
-	 *  e.g. 
-	 *   inprogress.put(request, notCompletelyConstructedBinding);
-	 *   Binding componentBinding = construct( componentRequest );
-	 *   notCompletelyConstructedBinding.setChild( componentBinding );
-	 *   inprogress.remove(request);
-	 *   
-	 * try-finally is not needed.
-	 * 
-	 * @param request
-	 * @return
-	 * @throws BindingConstructionException
-	 */
-	protected abstract Binding doConstruct(Datatype request) throws BindingConstructionException;
-	
-	public Binding construct(Datatype request) throws BindingConstructionException
-	{
-		if (failures.containsKey(request)) throw failures.get(request);
-		if (inprogress.containsKey(request)) return inprogress.get(request);
-		if (repository.containsKey(request)) return repository.get(request);
-		
-		// Start construction
-		try {			
-			Binding binding = doConstruct(request);
-			repository.put(request, binding);
-			return binding;
-		} catch (BindingConstructionException e) {
-			inprogress.remove( request );
-			failures.put(request, e);
-			throw e;
-		}
-	}
-
-	public Binding getBinding(Datatype type)
-			throws BindingConstructionException {		
-		return construct(type);
-	}
-	
-	public Binding getBindingUnchecked(Datatype type)
-			throws RuntimeBindingConstructionException {
-		try {
-			return construct(type);
-		} catch (BindingConstructionException e) {
-			throw new RuntimeBindingConstructionException(e);
-		}
-	}	
-
-}
+package org.simantics.databoard.adapter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.simantics.databoard.binding.Binding;
+import org.simantics.databoard.binding.error.BindingConstructionException;
+import org.simantics.databoard.binding.error.RuntimeBindingConstructionException;
+import org.simantics.databoard.type.Datatype;
+
+public abstract class NewAdapterFactory {
+	
+	/**
+	 * Map of failed constructions. 
+	 */
+	protected Map<Datatype, BindingConstructionException> failures = new HashMap<Datatype, BindingConstructionException>();
+	
+	/**
+	 * Map that contains in incomplete constructions.
+	 */
+	protected Map<Datatype, Binding> inprogress = new HashMap<Datatype, Binding>();
+	
+	/**
+	 * Repository where successful constructions are placed. 
+	 */
+	protected Map<Datatype, Binding> repository;	
+	
+	/**
+	 * Create a scheme factory. 
+	 */
+	public NewAdapterFactory() {		
+	}
+	
+	/**
+	 * Create scheme factory that appends constructed bindings to the user given
+	 * repository  
+	 * 
+	 * @param repository repository where bindings are placed
+	 */
+	public NewAdapterFactory(Map<Datatype, Binding> repository) {
+		this.repository = repository;
+	}
+	
+	/**
+	 * Get adapter repository
+	 * 
+	 * @return adapter repository
+	 */
+	public Map<Datatype, Binding> getRepository() {
+		return repository;
+	}
+
+	/**
+	 * Constructs a binding to comply to datatype request.
+	 * This is the method sub-classes implement. 
+	 * The implementation should use the inprogress -map for construction of 
+	 * bindings that have component types.
+	 * 
+	 *  e.g. 
+	 *   inprogress.put(request, notCompletelyConstructedBinding);
+	 *   Binding componentBinding = construct( componentRequest );
+	 *   notCompletelyConstructedBinding.setChild( componentBinding );
+	 *   inprogress.remove(request);
+	 *   
+	 * try-finally is not needed.
+	 * 
+	 * @param request
+	 * @return
+	 * @throws BindingConstructionException
+	 */
+	protected abstract Binding doConstruct(Datatype request) throws BindingConstructionException;
+	
+	public Binding construct(Datatype request) throws BindingConstructionException
+	{
+		if (failures.containsKey(request)) throw failures.get(request);
+		if (inprogress.containsKey(request)) return inprogress.get(request);
+		if (repository.containsKey(request)) return repository.get(request);
+		
+		// Start construction
+		try {			
+			Binding binding = doConstruct(request);
+			repository.put(request, binding);
+			return binding;
+		} catch (BindingConstructionException e) {
+			inprogress.remove( request );
+			failures.put(request, e);
+			throw e;
+		}
+	}
+
+	public Binding getBinding(Datatype type)
+			throws BindingConstructionException {		
+		return construct(type);
+	}
+	
+	public Binding getBindingUnchecked(Datatype type)
+			throws RuntimeBindingConstructionException {
+		try {
+			return construct(type);
+		} catch (BindingConstructionException e) {
+			throw new RuntimeBindingConstructionException(e);
+		}
+	}	
+
+}