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%2FBindings.java;h=f9cf1002317a7c4ddd2285e8a6306bd17e3812a5;hp=138ca5c058970908ba96fdbbb76557503c0a9468;hb=48bb50bb6640506d1f150ca8e4fa5a6e878464be;hpb=91ea7a38f29bb1b02dbf55947d791d7876462e4e

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/Bindings.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/Bindings.java
index 138ca5c05..f9cf10023 100644
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/Bindings.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/Bindings.java
@@ -71,7 +71,7 @@ import org.simantics.databoard.binding.reflection.VoidBinding;
 import org.simantics.databoard.serialization.RuntimeSerializerConstructionException;
 import org.simantics.databoard.serialization.Serializer;
 import org.simantics.databoard.serialization.SerializerConstructionException;
-import org.simantics.databoard.serialization.SerializerFactory;
+import org.simantics.databoard.serialization.SerializerScheme;
 import org.simantics.databoard.type.ArrayType;
 import org.simantics.databoard.type.Datatype;
 import org.simantics.databoard.util.DataValueUtil;
@@ -112,7 +112,7 @@ public class Bindings {
     public static final ClassBindingFactory 		 classBindingFactory;
 
     /** Serializer Factory */
-    public static final SerializerFactory        	 serializationFactory;
+    public static final SerializerScheme        	 serializationFactory;
 
     /** Adapter Factory */
 	public static final AdapterFactory           	 adapterFactory;
@@ -500,7 +500,7 @@ public class Bindings {
 	 * @throws SerializerConstructionException
 	 */
 	public static Serializer getSerializer(Binding binding) throws SerializerConstructionException {
-		return serializationFactory.construct(binding);
+		return serializationFactory.getSerializer(binding);
 	}
 
 	/**
@@ -511,11 +511,7 @@ public class Bindings {
 	 * @throws RuntimeSerializerConstructionException
 	 */
 	public static Serializer getSerializerUnchecked(Binding binding) throws RuntimeSerializerConstructionException {
-		try {
-			return serializationFactory.construct(binding);
-		} catch (SerializerConstructionException e) {
-			throw new RuntimeSerializerConstructionException(e);
-		}
+		return serializationFactory.getSerializerUnchecked(binding);
 	}
 
 	/**
@@ -528,7 +524,7 @@ public class Bindings {
 	public static Serializer getSerializer(Class<?> clazz) throws SerializerConstructionException {
 		try {
 			Binding binding = getBinding(clazz);
-			return serializationFactory.construct(binding);
+			return serializationFactory.getSerializer(binding);
 		} catch (BindingConstructionException e) {
 			throw new SerializerConstructionException( e );
 		}
@@ -544,9 +540,7 @@ public class Bindings {
 	public static Serializer getSerializerUnchecked(Class<?> clazz) throws RuntimeSerializerConstructionException {
 		try {
 			Binding binding = getBinding(clazz);
-			return serializationFactory.construct(binding);
-		} catch (SerializerConstructionException e) {
-			throw new RuntimeSerializerConstructionException(e);
+			return serializationFactory.getSerializerUnchecked(binding);
 		} catch (BindingConstructionException e) {
 			throw new RuntimeSerializerConstructionException( new SerializerConstructionException(e) );
 		}