X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.databoard%2Fsrc%2Forg%2Fsimantics%2Fdataboard%2Fserialization%2Fimpl%2FVariantSerializer.java;h=afc00f0663b51612675c8e05b121715175d215e9;hb=HEAD;hp=ccf79382f8e0a4bc90f44933cdc786306aac02ee;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/serialization/impl/VariantSerializer.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/serialization/impl/VariantSerializer.java
index ccf79382f..afc00f066 100644
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/serialization/impl/VariantSerializer.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/serialization/impl/VariantSerializer.java
@@ -1,139 +1,139 @@
-package org.simantics.databoard.serialization.impl;
-
-import gnu.trove.map.hash.TObjectIntHashMap;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.simantics.databoard.Bindings;
-import org.simantics.databoard.binding.Binding;
-import org.simantics.databoard.binding.VariantBinding;
-import org.simantics.databoard.binding.error.BindingException;
-import org.simantics.databoard.serialization.Serializer;
-import org.simantics.databoard.serialization.Serializer.RecursiveSerializer;
-import org.simantics.databoard.serialization.SerializerScheme;
-import org.simantics.databoard.type.Datatype;
-
-/**
- * Serializes Variant instances using bindings from Bindings.getBinding for
- * deserialization. These are assumed to be immutable bindings.
- * 
- * @author Toni Kalajainen
- */
-public class VariantSerializer extends RecursiveSerializer {
-	
-	VariantBinding binding;
-	Serializer datatypeSerializer;		
-	SerializerScheme scheme;
-	
-	public VariantSerializer(VariantBinding binding, SerializerScheme scheme) {			
-		this.binding = binding;			
-		this.scheme = scheme;
-	}
-	
-	@Override
-	public void finalizeConstruction() {
-		Binding dataTypeBinding = Bindings.getBindingUnchecked( Datatype.class );
-		this.datatypeSerializer = scheme.getSerializerUnchecked(dataTypeBinding);
-	}
-
-	@Override
-	public Object deserialize(DataInput in, List<Object> identities) throws IOException {			
-		try {
-			List<Object> typeIdentities = new ArrayList<Object>(1);
-			Datatype type = (Datatype) datatypeSerializer.deserialize(in, typeIdentities);
-			Binding valueBinding = Bindings.getBinding(type);
-			Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
-			assertRemainingBytes(in, valueSerializer.getMinSize());
-			Object value = valueSerializer.deserialize(in, identities);
-			return binding.create(valueBinding, value);
-		} catch (BindingException e) {
-			throw new IOException( e ); 
-		}
-	}
-	
-	@Override
-	public void deserializeTo(DataInput in, List<Object> identities, Object obj) throws IOException {
-		try {
-			List<Object> typeIdentities = new ArrayList<Object>(1);				
-			Datatype type = (Datatype) datatypeSerializer.deserialize(in, typeIdentities);
-			Datatype oldType = binding.getContentType(obj);
-		
-			if (type.equals(oldType)) {
-				Binding valueBinding = binding.getContentBinding(obj);
-				Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
-				Object component = binding.getContent(obj);
-//				assertRemainingBytes(in, valueSerializer.getMinSize());
-				component = valueSerializer.deserializeToTry(in, identities, component);
-				binding.setContent(obj, valueBinding, component);
-			} else {
-				Binding valueBinding = Bindings.getBinding(type);
-				Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
-//				assertRemainingBytes(in, valueSerializer.getMinSize());
-				Object component = valueSerializer.deserialize(in, identities);
-				binding.setContent(obj, valueBinding, component);
-			}
-		} catch (BindingException e) {
-			throw new IOException( e ); 
-		}
-	}
-
-	@Override
-	public void skip(DataInput in, List<Object> identities) throws IOException {
-		List<Object> typeIdentities = new ArrayList<Object>(1);				
-		Datatype type = (Datatype) datatypeSerializer.deserialize(in, typeIdentities);				
-		Binding valueBinding = Bindings.getBinding(type);
-		Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
-		valueSerializer.skip(in, identities);
-	}		
-	
-	@Override
-	public void serialize(DataOutput out, TObjectIntHashMap<Object> identities, Object variant) throws IOException {
-		try {
-			TObjectIntHashMap<Object> typeIdentities = new TObjectIntHashMap<Object>(1);
-			Datatype type = binding.getContentType(variant);
-			datatypeSerializer.serialize(out, typeIdentities, type);				
-				
-			Binding valueBinding = binding.getContentBinding(variant);
-			Object value = binding.getContent(variant, valueBinding);
-				
-			Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
-			valueSerializer.serialize(out, identities, value);
-		} catch (BindingException e) {
-			throw new IOException( e ); 
-		}
-	}
-
-	@Override
-	public Integer getConstantSize() {			
-		return null;
-	}
-
-	@Override
-	public int getSize(Object variant, TObjectIntHashMap<Object> identities) throws IOException 
-	{
-		try {
-			TObjectIntHashMap<Object> typeIdentities = new TObjectIntHashMap<Object>(1);
-			Datatype type = binding.getContentType(variant);
-			int size = datatypeSerializer.getSize(type, typeIdentities);
-				
-			Binding valueBinding = binding.getContentBinding(variant);
-			Object value = binding.getContent(variant, valueBinding);
-				
-			Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
-			size += valueSerializer.getSize(value, identities);
-			return size;
-		} catch (BindingException e) {
-			throw new IOException( e ); 
-		}
-	}
-	
-	@Override
-	public int getMinSize() {
-		return datatypeSerializer.getMinSize();
-	}
-	
+package org.simantics.databoard.serialization.impl;
+
+import gnu.trove.map.hash.TObjectIntHashMap;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.simantics.databoard.Bindings;
+import org.simantics.databoard.binding.Binding;
+import org.simantics.databoard.binding.VariantBinding;
+import org.simantics.databoard.binding.error.BindingException;
+import org.simantics.databoard.serialization.Serializer;
+import org.simantics.databoard.serialization.Serializer.RecursiveSerializer;
+import org.simantics.databoard.serialization.SerializerScheme;
+import org.simantics.databoard.type.Datatype;
+
+/**
+ * Serializes Variant instances using bindings from Bindings.getBinding for
+ * deserialization. These are assumed to be immutable bindings.
+ * 
+ * @author Toni Kalajainen
+ */
+public class VariantSerializer extends RecursiveSerializer {
+	
+	VariantBinding binding;
+	Serializer datatypeSerializer;		
+	SerializerScheme scheme;
+	
+	public VariantSerializer(VariantBinding binding, SerializerScheme scheme) {			
+		this.binding = binding;			
+		this.scheme = scheme;
+	}
+	
+	@Override
+	public void finalizeConstruction() {
+		Binding dataTypeBinding = Bindings.getBindingUnchecked( Datatype.class );
+		this.datatypeSerializer = scheme.getSerializerUnchecked(dataTypeBinding);
+	}
+
+	@Override
+	public Object deserialize(DataInput in, List<Object> identities) throws IOException {			
+		try {
+			List<Object> typeIdentities = new ArrayList<Object>(1);
+			Datatype type = (Datatype) datatypeSerializer.deserialize(in, typeIdentities);
+			Binding valueBinding = Bindings.getBinding(type);
+			Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
+			assertRemainingBytes(in, valueSerializer.getMinSize());
+			Object value = valueSerializer.deserialize(in, identities);
+			return binding.create(valueBinding, value);
+		} catch (BindingException e) {
+			throw new IOException( e ); 
+		}
+	}
+	
+	@Override
+	public void deserializeTo(DataInput in, List<Object> identities, Object obj) throws IOException {
+		try {
+			List<Object> typeIdentities = new ArrayList<Object>(1);				
+			Datatype type = (Datatype) datatypeSerializer.deserialize(in, typeIdentities);
+			Datatype oldType = binding.getContentType(obj);
+		
+			if (type.equals(oldType)) {
+				Binding valueBinding = binding.getContentBinding(obj);
+				Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
+				Object component = binding.getContent(obj);
+//				assertRemainingBytes(in, valueSerializer.getMinSize());
+				component = valueSerializer.deserializeToTry(in, identities, component);
+				binding.setContent(obj, valueBinding, component);
+			} else {
+				Binding valueBinding = Bindings.getBinding(type);
+				Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
+//				assertRemainingBytes(in, valueSerializer.getMinSize());
+				Object component = valueSerializer.deserialize(in, identities);
+				binding.setContent(obj, valueBinding, component);
+			}
+		} catch (BindingException e) {
+			throw new IOException( e ); 
+		}
+	}
+
+	@Override
+	public void skip(DataInput in, List<Object> identities) throws IOException {
+		List<Object> typeIdentities = new ArrayList<Object>(1);				
+		Datatype type = (Datatype) datatypeSerializer.deserialize(in, typeIdentities);				
+		Binding valueBinding = Bindings.getBinding(type);
+		Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
+		valueSerializer.skip(in, identities);
+	}		
+	
+	@Override
+	public void serialize(DataOutput out, TObjectIntHashMap<Object> identities, Object variant) throws IOException {
+		try {
+			TObjectIntHashMap<Object> typeIdentities = new TObjectIntHashMap<Object>(1);
+			Datatype type = binding.getContentType(variant);
+			datatypeSerializer.serialize(out, typeIdentities, type);				
+				
+			Binding valueBinding = binding.getContentBinding(variant);
+			Object value = binding.getContent(variant, valueBinding);
+				
+			Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
+			valueSerializer.serialize(out, identities, value);
+		} catch (BindingException e) {
+			throw new IOException( e ); 
+		}
+	}
+
+	@Override
+	public Integer getConstantSize() {			
+		return null;
+	}
+
+	@Override
+	public int getSize(Object variant, TObjectIntHashMap<Object> identities) throws IOException 
+	{
+		try {
+			TObjectIntHashMap<Object> typeIdentities = new TObjectIntHashMap<Object>(1);
+			Datatype type = binding.getContentType(variant);
+			int size = datatypeSerializer.getSize(type, typeIdentities);
+				
+			Binding valueBinding = binding.getContentBinding(variant);
+			Object value = binding.getContent(variant, valueBinding);
+				
+			Serializer valueSerializer = scheme.getSerializerUnchecked(valueBinding);
+			size += valueSerializer.getSize(value, identities);
+			return size;
+		} catch (BindingException e) {
+			throw new IOException( e ); 
+		}
+	}
+	
+	@Override
+	public int getMinSize() {
+		return datatypeSerializer.getMinSize();
+	}
+	
 }
\ No newline at end of file