In System/System.ComponentModel.Design.Serialization:

	* CodeDomSerializerException.cs: Move to System.Design.dll.

In System.Design:
	* System.ComponentModel.Design.Serialization/CodeDomSerializerException.cs:
	Moved new-ish implementation here from System.dll.

svn path=/trunk/mcs/; revision=57774

5 files changed, 40 insertions, 97 deletions

diff --git a/mcs/class/System.Design/ChangeLog b/mcs/class/System.Design/ChangeLog
index a15e899632e..0c40d9f0a7d 100644
--- a/mcs/class/System.Design/ChangeLog
+++ b/mcs/class/System.Design/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10  Raja R Harinath  <rharinath@novell.com>
+
+	* System.ComponentModel.Design.Serialization/CodeDomSerializerException.cs:
+	Moved new-ish implementation here from System.dll.
+
 2006-01-22  Chris Toshok  <toshok@ximian.com>
 
 	* System.Design.dll.sources: add in all the stubbed/partially
diff --git a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializerException.cs b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializerException.cs
index b125a3ccf5a..7b673a35574 100644
--- a/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializerException.cs
+++ b/mcs/class/System.Design/System.ComponentModel.Design.Serialization/CodeDomSerializerException.cs
@@ -1,12 +1,10 @@
 //
 // System.ComponentModel.Design.Serialization.CodeDomSerializerException.cs
 //
-// Authors:
-//      Martin Willemoes Hansen (mwh@sysrq.dk)
+// Author:
+//   Zoltan Varga (vargaz@gmail.com)
 //
-// (C) 2003 Martin Willemoes Hansen
-//
-
+// Copyright (C) 2004-2005 Novell (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -31,41 +29,39 @@
 using System.CodeDom;
 using System.Runtime.Serialization;
 
-namespace System.ComponentModel.Design.Serialization
+namespace System.ComponentModel.Design.Serialization {
+
+public class CodeDomSerializerException : SystemException
 {
-	public class CodeDomSerializerException : SystemException
-	{
-		[MonoTODO]
-		public CodeDomSerializerException (Exception ex, 
-						   CodeLinePragma code_line_pragma)
-		{
-			throw new NotImplementedException();
-		}
+	private CodeLinePragma linePragma;
 
-		[MonoTODO]
-		protected CodeDomSerializerException (SerializationInfo info, 
-						      StreamingContext context)
-		{
-			throw new NotImplementedException();
-		}
+	public CodeDomSerializerException (Exception ex, CodeLinePragma linePragma)
+		: base (String.Empty, ex) {
 
-		[MonoTODO]
-		public CodeDomSerializerException (string str, 
-						   CodeLinePragma code_line_pragma)
-		{
-			throw new NotImplementedException();
-		}
+		this.linePragma = linePragma;
+	}
 
-		public CodeLinePragma LinePragma {
-			[MonoTODO]
-			get { throw new NotImplementedException(); }
-		}
+	public CodeDomSerializerException (String message, CodeLinePragma linePragma)
+		: base (message) {
 
-		[MonoTODO]
-		public override void GetObjectData (SerializationInfo info,
-						    StreamingContext context)
-		{
-			throw new NotImplementedException();
+		this.linePragma = linePragma;
+	}
+
+	[MonoTODO]
+	protected CodeDomSerializerException (SerializationInfo info, StreamingContext context) {
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public override void GetObjectData (SerializationInfo info, StreamingContext context)
+	{
+		throw new NotImplementedException();
+	}
+
+	public CodeLinePragma LinePragma {
+		get {
+			return linePragma;
 		}
 	}
 }
+}
diff --git a/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog b/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog
index ed372ceb4dc..41fe1e9c49c 100644
--- a/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog
+++ b/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-10  Raja R Harinath  <rharinath@novell.com>
+
+	* CodeDomSerializerException.cs: Move to System.Design.dll.
+
 2006-03-09  Zoltan Varga  <vargaz@gmail.com>
 
 	* CodeDomSerializerException.cs: New file.
diff --git a/mcs/class/System/System.ComponentModel.Design.Serialization/CodeDomSerializerException.cs b/mcs/class/System/System.ComponentModel.Design.Serialization/CodeDomSerializerException.cs
deleted file mode 100644
index 6c19230fa75..00000000000
--- a/mcs/class/System/System.ComponentModel.Design.Serialization/CodeDomSerializerException.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// System.ComponentModel.Design.Serialization.CodeDomSerializerException.cs
-//
-// Author:
-//   Zoltan Varga (vargaz@gmail.com)
-//
-// Copyright (C) 2004-2005 Novell (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.CodeDom;
-using System.Runtime.Serialization;
-
-namespace System.ComponentModel.Design.Serialization {
-
-public class CodeDomSerializerException : SystemException
-{
-	private CodeLinePragma linePragma;
-
-	public CodeDomSerializerException (Exception ex, CodeLinePragma linePragma)
-		: base (String.Empty, ex) {
-
-		this.linePragma = linePragma;
-	}
-
-	public CodeDomSerializerException (String message, CodeLinePragma linePragma)
-		: base (message) {
-
-		this.linePragma = linePragma;
-	}
-
-	[MonoTODO]
-	protected CodeDomSerializerException (SerializationInfo info, StreamingContext context) {
-		throw new NotImplementedException ();
-	}
-
-	public CodeLinePragma LinePragma {
-		get {
-			return linePragma;
-		}
-	}
-}
-}
diff --git a/mcs/class/System/System.dll.sources b/mcs/class/System/System.dll.sources
index f0feb23d363..416cfe80a55 100644
--- a/mcs/class/System/System.dll.sources
+++ b/mcs/class/System/System.dll.sources
@@ -237,7 +237,6 @@ System.ComponentModel.Design/MenuCommand.cs
 System.ComponentModel/DesignOnlyAttribute.cs
 System.ComponentModel.Design/RuntimeLicenseContext.cs
 System.ComponentModel.Design/SelectionTypes.cs
-System.ComponentModel.Design.Serialization/CodeDomSerializerException.cs
 System.ComponentModel.Design.Serialization/ContextStack.cs
 System.ComponentModel.Design.Serialization/DesignerLoader.cs
 System.ComponentModel.Design.Serialization/DesignerSerializerAttribute.cs