# HG changeset patch
# User Jacob Carlborg <doob@me.com>
# Date 1281297599 -7200
# Node ID c4e7e64ffb679985d2779925426945dcc6daf25b
# Parent  091ff1b263dbf67a311eb0255a23d091dc12ccf0
Changed toData/fromData to take an instance of the serializer instead of the archive.

diff -r 091ff1b263db -r c4e7e64ffb67 orange/serialization/Serializer.d
--- a/orange/serialization/Serializer.d	Sun Aug 08 21:27:10 2010 +0200
+++ b/orange/serialization/Serializer.d	Sun Aug 08 21:59:59 2010 +0200
@@ -149,7 +149,7 @@
 					wrapper(value, this, key);
 				}
 				
-				else static if (isSerializable!(T, ArchiveType))
+				else static if (isSerializable!(T, Serializer))
 					value.toData(this, key);
 				
 				else
@@ -177,7 +177,7 @@
 				
 				else
 				{
-					static if (isSerializable!(T, ArchiveType))
+					static if (isSerializable!(T, Serializer))
 						value.toData(this, key);
 					
 					else
@@ -217,7 +217,7 @@
 				wrapper(value, this, key);
 			}
 			
-			else static if (isSerializable!(T, ArchiveType))
+			else static if (isSerializable!(T, Serializer))
 				value.toData(this, key);
 			
 			else
@@ -316,7 +316,7 @@
 					wrapper(value, this, key);
 				}
 				
-				else static if (isSerializable!(T, ArchiveType))
+				else static if (isSerializable!(T, Serializer))
 					value.fromData(this, key);
 				
 				else
@@ -348,7 +348,7 @@
 				
 				else
 				{
-					static if (isSerializable!(T, ArchiveType))
+					static if (isSerializable!(T, Serializer))
 						value.fromData(this, key);
 					
 					else
@@ -394,7 +394,7 @@
 				wrapper(value, this, key);
 			}
 			
-			else static if (isSerializable!(T, ArchiveType))
+			else static if (isSerializable!(T, Serializer))
 				value.fromData(this, key);
 			
 			else
diff -r 091ff1b263db -r c4e7e64ffb67 orange/util/Traits.d
--- a/orange/util/Traits.d	Sun Aug 08 21:27:10 2010 +0200
+++ b/orange/util/Traits.d	Sun Aug 08 21:59:59 2010 +0200
@@ -190,9 +190,9 @@
 	
 }
 
-template isSerializable (T, ArchiveType)
+template isSerializable (T, SerializerType)
 {
-	const isSerializable = is(typeof(T.toData(ArchiveType.init, ArchiveType.DataType.init))) && is(typeof(T.fromData(ArchiveType.init, ArchiveType.DataType.init)));
+	const isSerializable = is(typeof(T.toData(SerializerType.init, SerializerType.DataType.init))) && is(typeof(T.fromData(SerializerType.init, SerializerType.DataType.init)));
 }
 
 template isISerializable (T)