System.Resources: Tidy file headers

15 files changed, 208 insertions, 168 deletions

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/HelperClasses_ITRS.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/HelperClasses_ITRS.cs
index f21db5dd849..9e5915cb043 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/HelperClasses_ITRS.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/HelperClasses_ITRS.cs
@@ -1,4 +1,13 @@
-// Permission is hereby granted, free of charge, to any person obtaining
+//
+// HelperClasses_ITRS.cs : Various ITypeResolutionService implementations 
+// for use during testing.
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
+// 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,
@@ -16,11 +25,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//	Gary Barnett
 
 using System;
 using System.ComponentModel.Design;
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/HelperClasses_Resources.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/HelperClasses_Resources.cs
index 4d5474b32c0..0339f1f469e 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/HelperClasses_Resources.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/HelperClasses_Resources.cs
@@ -1,4 +1,14 @@
-// Permission is hereby granted, free of charge, to any person obtaining
+//
+// HelperClasses_Resources.cs : Various types to use as resources during 
+// testing. Note some more are present in DummyAssembly project and 
+// WriterTest.cs
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
+// 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,
@@ -16,11 +26,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//	Gary Barnett
 
 using System;
 using System.Runtime.Serialization;
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeAliasTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeAliasTests.cs
index 6ba9e6acbed..371e821e119 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeAliasTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeAliasTests.cs
@@ -1,3 +1,13 @@
+//
+// ResXDataNodeAliasTests.cs : These tests are not a lot of use. Support for 
+// Aliases not implemented as of Aug 2012. 
+// FIXME: delete these tests?
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
 // 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
@@ -16,11 +26,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//	Gary Barnett
 
 #if NET_2_0
 using System;
@@ -64,7 +69,7 @@ namespace MonoTests.System.Resources {
 		}
 
 		[Test]
-		public void CanAccessValueWereOnlyFullNameAndQualifiedAssemblyInResXForEmbedded ()
+		public void CanAccessValueWereFullNameAndQualifiedAssemblyInResXForEmbedded ()
 		{
 			ResXDataNode node = GetNodeFromResXReader (convertableResXQualifiedAssemblyName);
 			Assert.IsNotNull (node, "#A1");
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeByteArrayTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeByteArrayTests.cs
index d3b5bd9d318..401ca18b8ad 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeByteArrayTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeByteArrayTests.cs
@@ -1,3 +1,12 @@
+//
+// ResXDataNodeByteArrayTests.cs : Tests how ResXDataNode handles byte[]
+// type resources.
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
 // 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
@@ -16,11 +25,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//	Gary Barnett
 
 #if NET_2_0
 using System;
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTests.cs
index 62da032aaec..f1f86597ca2 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTests.cs
@@ -1,4 +1,12 @@
-// Permission is hereby granted, free of charge, to any person obtaining
+//
+// ResXDataNodeFileRefGetValueTests.cs
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
+// 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,
@@ -16,11 +24,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//  Gary Barnett
 
 #if NET_2_0
 using System;
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTypeNameTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTypeNameTests.cs
index efc347059f6..19b650d1dd0 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTypeNameTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTypeNameTests.cs
@@ -1,4 +1,12 @@
-// Permission is hereby granted, free of charge, to any person obtaining
+//
+// ResXDataNodeFileRefGetValueTypeNameTests.cs
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
+// 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,
@@ -16,11 +24,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//  Gary Barnett
 
 #if NET_2_0
 using System;
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerialisedGetValueTypeNameTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerialisedGetValueTypeNameTests.cs
index f5ac969b5a7..ea5d9fc69c3 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerialisedGetValueTypeNameTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerialisedGetValueTypeNameTests.cs
@@ -1,4 +1,12 @@
-// Permission is hereby granted, free of charge, to any person obtaining
+//
+// ResXDataNodeSerializedGetValueTypeNameTests.cs
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
+// 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,
@@ -16,11 +24,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//	Gary Barnett
 
 #if NET_2_0
 using System;
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerializedGetValueTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerializedGetValueTests.cs
index 6690e8c013c..c1fc9fe71d5 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerializedGetValueTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeSerializedGetValueTests.cs
@@ -1,4 +1,12 @@
-// Permission is hereby granted, free of charge, to any person obtaining
+//
+// ResXDataNodeSerializedGetValueTests.cs
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
+// 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,
@@ -16,11 +24,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//	Gary Barnett
 
 #if NET_2_0
 using System;
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTest.cs
index 7c077d009e6..fb231e26345 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTest.cs
@@ -23,7 +23,7 @@
 //
 // Authors:
 //		Andreia Gaita	(avidigal@novell.com)
-//  	Gary Barnett
+//  		Gary Barnett	(gary.barnett.mono@gmail.com)
 
 
 #if NET_2_0
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTests.cs
index 0d56c3cd58d..3b96d3aa2b0 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTests.cs
@@ -1,4 +1,12 @@
-// Permission is hereby granted, free of charge, to any person obtaining
+//
+// ResXDataNodeTypeConverterGetValueTests.cs
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
+// 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,
@@ -16,11 +24,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//	Gary Barnett
 
 #if NET_2_0
 using System;
@@ -131,6 +134,53 @@ namespace MonoTests.System.Resources
 			Assert.IsInstanceOfType (typeof (ThisAssemblyConvertable), obj, "#A2");
 		}
 
+		#region initial
+		
+		[Test]
+		public void NullAssemblyNamesOK ()
+		{
+			ResXDataNode node = GetNodeEmdeddedIcon ();
+			
+			Object ico = node.GetValue ((AssemblyName []) null);
+			Assert.IsNotNull (ico, "#A1");
+			Assert.IsInstanceOfType (typeof (Icon), ico, "#A2");
+		}
+		
+		[Test]
+		public void NullITRSOK ()
+		{
+			ResXDataNode node = GetNodeEmdeddedIcon ();
+			
+			Object ico = node.GetValue ((ITypeResolutionService) null);
+			Assert.IsNotNull (ico, "#A1");
+			Assert.IsInstanceOfType (typeof (Icon), ico, "#A2");
+		}
+		
+		[Test]
+		public void WrongITRSOK ()
+		{
+			ResXDataNode node = GetNodeEmdeddedIcon ();
+			
+			Object ico = node.GetValue (new DummyITRS ());
+			Assert.IsNotNull (ico, "#A1");
+			Assert.IsInstanceOfType (typeof (Icon), ico, "#A2");
+		}
+		
+		[Test]
+		public void WrongAssemblyNamesOK ()
+		{
+			ResXDataNode node = GetNodeEmdeddedIcon ();
+			AssemblyName [] ass = new AssemblyName [1];
+			
+			ass [0] = new AssemblyName ("System.Design");
+			
+			Object ico = node.GetValue (ass);
+			Assert.IsNotNull (ico, "#A1");
+			Assert.IsInstanceOfType (typeof (Icon), ico, "#A2");
+		}
+		
+#endregion
+
 		static string typeconResXInvalidType =
 @"<?xml version=""1.0"" encoding=""utf-8""?>
 <root>
@@ -267,54 +317,6 @@ namespace MonoTests.System.Resources
 	<value>im a name	im a value</value>
   </data>
 </root>";
-
-		#region initial
-
-		[Test]
-		public void NullAssemblyNamesOK ()
-		{
-			ResXDataNode node = GetNodeEmdeddedIcon ();
-
-			Object ico = node.GetValue ((AssemblyName []) null);
-			Assert.IsNotNull (ico, "#A1");
-			Assert.IsInstanceOfType (typeof (Icon), ico, "#A2");
-		}
-
-		[Test]
-		public void NullITRSOK ()
-		{
-			ResXDataNode node = GetNodeEmdeddedIcon ();
-
-			Object ico = node.GetValue ((ITypeResolutionService) null);
-			Assert.IsNotNull (ico, "#A1");
-			Assert.IsInstanceOfType (typeof (Icon), ico, "#A2");
-		}
-
-		[Test]
-		public void WrongITRSOK ()
-		{
-			ResXDataNode node = GetNodeEmdeddedIcon ();
-
-			Object ico = node.GetValue (new DummyITRS ());
-			Assert.IsNotNull (ico, "#A1");
-			Assert.IsInstanceOfType (typeof (Icon), ico, "#A2");
-		}
-
-		[Test]
-		public void WrongAssemblyNamesOK ()
-		{
-			ResXDataNode node = GetNodeEmdeddedIcon ();
-			AssemblyName [] ass = new AssemblyName [1];
-
-			ass [0] = new AssemblyName ("System.Design");
-
-			Object ico = node.GetValue (ass);
-			Assert.IsNotNull (ico, "#A1");
-			Assert.IsInstanceOfType (typeof (Icon), ico, "#A2");
-		}
-
-		#endregion
-
 	}
 
 
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTypeNameTests.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTypeNameTests.cs
index 565af58b08b..4c41d011e24 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTypeNameTests.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeTypeConverterGetValueTypeNameTests.cs
@@ -1,4 +1,12 @@
-// Permission is hereby granted, free of charge, to any person obtaining
+//
+// ResXDataNodeTypeConverterGetValueTypeNameTests.cs
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
+// 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,
@@ -16,11 +24,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//	Gary Barnett
 
 #if NET_2_0
 using System;
@@ -130,6 +133,49 @@ namespace MonoTests.System.Resources
 			Assert.AreEqual ("DummyAssembly.Convertable", nameWithNullParam, "#A3");
 		}
 
+		#region initial
+		
+		[Test]
+		public void NullITRSServiceOK ()
+		{
+			ResXDataNode node = GetNodeEmdeddedIcon ();
+			
+			string name = node.GetValueTypeName ((ITypeResolutionService) null);
+			Assert.AreEqual (typeof (Icon).AssemblyQualifiedName, name);
+		}
+		
+		[Test]
+		public void WrongITRSOK ()
+		{
+			ResXDataNode node = GetNodeEmdeddedIcon ();
+			
+			string name = node.GetValueTypeName (new DummyITRS ());
+			Assert.AreEqual (typeof (Icon).AssemblyQualifiedName, name);
+		}
+		
+		[Test]
+		public void WrongAssemblyNamesOK ()
+		{
+			ResXDataNode node = GetNodeEmdeddedIcon ();
+			AssemblyName [] ass = new AssemblyName [1];
+			
+			ass [0] = new AssemblyName ("System.Design");
+			
+			string name = node.GetValueTypeName (ass);
+			Assert.AreEqual (typeof (Icon).AssemblyQualifiedName, name);
+		}
+		
+		[Test]
+		public void NullAssemblyNamesOK ()
+		{
+			ResXDataNode node = GetNodeEmdeddedIcon ();
+			
+			string name = node.GetValueTypeName ((AssemblyName []) null);
+			Assert.AreEqual (typeof (Icon).AssemblyQualifiedName, name);
+		}
+		
+#endregion
+
 		static string typeconResXInvalidMimeTypeAndType =
 @"<?xml version=""1.0"" encoding=""utf-8""?>
 <root>
@@ -268,52 +314,6 @@ namespace MonoTests.System.Resources
   </data>
 </root>";
 
-
-		#region initial
-
-		[Test]
-		public void NullITRSServiceOK ()
-		{
-			ResXDataNode node = GetNodeEmdeddedIcon ();
-
-			string name = node.GetValueTypeName ((ITypeResolutionService) null);
-			Assert.AreEqual (typeof (Icon).AssemblyQualifiedName, name);
-		}
-
-		[Test]
-		public void WrongITRSOK ()
-		{
-			ResXDataNode node = GetNodeEmdeddedIcon ();
-
-			string name = node.GetValueTypeName (new DummyITRS ());
-			Assert.AreEqual (typeof (Icon).AssemblyQualifiedName, name);
-		}
-
-		[Test]
-		public void WrongAssemblyNamesOK ()
-		{
-			ResXDataNode node = GetNodeEmdeddedIcon ();
-			AssemblyName [] ass = new AssemblyName [1];
-
-			ass [0] = new AssemblyName ("System.Design");
-
-			string name = node.GetValueTypeName (ass);
-			Assert.AreEqual (typeof (Icon).AssemblyQualifiedName, name);
-		}
-
-		[Test]
-		public void NullAssemblyNamesOK ()
-		{
-			ResXDataNode node = GetNodeEmdeddedIcon ();
-
-			string name = node.GetValueTypeName ((AssemblyName []) null);
-			Assert.AreEqual (typeof (Icon).AssemblyQualifiedName, name);
-		}
-
-		#endregion
-		
-
-
 	}
 
 
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeWriteBehavior.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeWriteBehavior.cs
index 409a1bb6444..03171e400c4 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeWriteBehavior.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXDataNodeWriteBehavior.cs
@@ -1,4 +1,13 @@
-// Permission is hereby granted, free of charge, to any person obtaining
+//
+// ResXDataNodeWriteBehavior.cs : Tests how ResXDataNode's are written to
+// resx files.
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
+// 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,
@@ -16,11 +25,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//	Gary Barnett
 
 #if NET_2_0
 using System;
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXResourceReaderTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXResourceReaderTest.cs
index 9d25425e3d0..79188cd8b3b 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXResourceReaderTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXResourceReaderTest.cs
@@ -4,7 +4,7 @@
 // Authors:
 //     Gert Driesen <drieseng@users.sourceforge.net>
 //     Olivier Dufour <olivier.duff@gmail.com>
-//
+//     Gary Barnett <gary.barnett.mono@gmail.com>
 
 using System;
 using System.Collections;
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResourcesTestHelper.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResourcesTestHelper.cs
index a8746ea4242..138d2742566 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResourcesTestHelper.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResourcesTestHelper.cs
@@ -1,4 +1,13 @@
-// Permission is hereby granted, free of charge, to any person obtaining
+//
+// ResourcesTestHelper.cs : Base class for new resource tests with methods 
+// required across many.
+// 
+// Author:
+//	Gary Barnett (gary.barnett.mono@gmail.com)
+// 
+// Copyright (C) Gary Barnett (2012)
+//
+// 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,
@@ -16,11 +25,6 @@
 // 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.
-//
-// Copyright (c) 2012 Gary Barnett
-//
-// Authors:
-//	Gary Barnett
 
 #if NET_2_0
 
diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Resources/WriterTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Resources/WriterTest.cs
index 9ae1f68076c..b4a72a83276 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Resources/WriterTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Resources/WriterTest.cs
@@ -3,7 +3,7 @@
 //
 // Authors:
 //     Robert Jordan <robertj@gmx.net>
-//     Gary Barnett
+//     Gary Barnett <gary.barnett.mono@gmail.com>
 
 using System;
 using System.Collections;