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

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/serialization/impl/ModifiedUTF8StringSerializer.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/serialization/impl/ModifiedUTF8StringSerializer.java
index 9105a786d..29792febb 100644
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/serialization/impl/ModifiedUTF8StringSerializer.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/serialization/impl/ModifiedUTF8StringSerializer.java
@@ -1,94 +1,94 @@
-package org.simantics.databoard.serialization.impl;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.simantics.databoard.binding.StringBinding;
-import org.simantics.databoard.binding.error.BindingException;
-import org.simantics.databoard.serialization.SerializationException;
-import org.simantics.databoard.serialization.Serializer.NonRecursiveSerializer;
-import org.simantics.databoard.util.binary.Endian;
-import org.simantics.databoard.util.binary.UTF8;
-
-/**
- * Serializes strings to Modified UTF-8, 
- * see http://download.oracle.com/javase/6/docs/api/java/io/DataInput.html
- * 
- * @author Toni Kalajainen
- */
-public class ModifiedUTF8StringSerializer extends NonRecursiveSerializer {
-	
-	StringBinding binding;
-	
-	public ModifiedUTF8StringSerializer(StringBinding binding) {
-		this.binding = binding;
-	}
-
-	@Override
-	public Object deserialize(DataInput in) throws IOException {
-		try {
-			int len = Endian.readDynamicUInt32(in);
-			assertRemainingBytes(in, len); 
-			String str = UTF8.readModifiedUTF(in, len);
-			return binding.create(str);
-		} catch (BindingException e) {
-			throw new IOException( e ); 
-		}
-			
-	}
-	
-	@Override
-	public void deserializeTo(DataInput in, Object obj) throws IOException {
-		try {
-			int len = Endian.readDynamicUInt32(in);
-			assertRemainingBytes(in, len); 
-			String str = UTF8.readModifiedUTF(in, len);
-			binding.setValue(obj, str);
-		} catch (BindingException e) {
-			throw new IOException( e ); 
-		}
-	}
-	
-	@Override
-	public void skip(DataInput in) throws IOException, SerializationException {
-		int length = Endian.readDynamicUInt32(in);
-		in.skipBytes(length);
-	}
-	
-	@Override
-	public void serialize(DataOutput out, Object obj) throws IOException {
-		try {
-			String str = binding.getValue(obj);
-			int utflen = UTF8.getModifiedUTF8EncodingByteLength(str);
-			Endian.writeDynamicUInt32(out, utflen);
-			UTF8.writeModifiedUTF(out, str);
-		} catch (BindingException e) {
-			throw new IOException( e ); 
-		}
-	}
-	
-	@Override
-	public Integer getConstantSize() {			
-		return null;
-	}
-
-	@Override
-	public int getSize(Object obj) throws IOException {
-		try {
-			String string = binding.getValue(obj);
-			int stringByteLength = UTF8.getModifiedUTF8EncodingByteLength( string ); 
-			int lengthLength = Endian.getDynamicUInt32Length( stringByteLength ); 				
-			return lengthLength + stringByteLength;
-		} catch (BindingException e) {
-			throw new IOException( e ); 
-		}
-	}
-	
-	@Override
-	public int getMinSize() {
-		return 1;
-	}
-	
-}
-
+package org.simantics.databoard.serialization.impl;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.simantics.databoard.binding.StringBinding;
+import org.simantics.databoard.binding.error.BindingException;
+import org.simantics.databoard.serialization.SerializationException;
+import org.simantics.databoard.serialization.Serializer.NonRecursiveSerializer;
+import org.simantics.databoard.util.binary.Endian;
+import org.simantics.databoard.util.binary.UTF8;
+
+/**
+ * Serializes strings to Modified UTF-8, 
+ * see http://download.oracle.com/javase/6/docs/api/java/io/DataInput.html
+ * 
+ * @author Toni Kalajainen
+ */
+public class ModifiedUTF8StringSerializer extends NonRecursiveSerializer {
+	
+	StringBinding binding;
+	
+	public ModifiedUTF8StringSerializer(StringBinding binding) {
+		this.binding = binding;
+	}
+
+	@Override
+	public Object deserialize(DataInput in) throws IOException {
+		try {
+			int len = Endian.readDynamicUInt32(in);
+			assertRemainingBytes(in, len); 
+			String str = UTF8.readModifiedUTF(in, len);
+			return binding.create(str);
+		} catch (BindingException e) {
+			throw new IOException( e ); 
+		}
+			
+	}
+	
+	@Override
+	public void deserializeTo(DataInput in, Object obj) throws IOException {
+		try {
+			int len = Endian.readDynamicUInt32(in);
+			assertRemainingBytes(in, len); 
+			String str = UTF8.readModifiedUTF(in, len);
+			binding.setValue(obj, str);
+		} catch (BindingException e) {
+			throw new IOException( e ); 
+		}
+	}
+	
+	@Override
+	public void skip(DataInput in) throws IOException, SerializationException {
+		int length = Endian.readDynamicUInt32(in);
+		in.skipBytes(length);
+	}
+	
+	@Override
+	public void serialize(DataOutput out, Object obj) throws IOException {
+		try {
+			String str = binding.getValue(obj);
+			int utflen = UTF8.getModifiedUTF8EncodingByteLength(str);
+			Endian.writeDynamicUInt32(out, utflen);
+			UTF8.writeModifiedUTF(out, str);
+		} catch (BindingException e) {
+			throw new IOException( e ); 
+		}
+	}
+	
+	@Override
+	public Integer getConstantSize() {			
+		return null;
+	}
+
+	@Override
+	public int getSize(Object obj) throws IOException {
+		try {
+			String string = binding.getValue(obj);
+			int stringByteLength = UTF8.getModifiedUTF8EncodingByteLength( string ); 
+			int lengthLength = Endian.getDynamicUInt32Length( stringByteLength ); 				
+			return lengthLength + stringByteLength;
+		} catch (BindingException e) {
+			throw new IOException( e ); 
+		}
+	}
+	
+	@Override
+	public int getMinSize() {
+		return 1;
+	}
+	
+}
+