Add dual license header in all the file of the XSD Diagrams core library.

Fix the right click exception.

DiagramControlContainer.cs

@@ -218,7 +218,7 @@ namespace XSDDiagram
 		private void vScrollBar_ValueChanged(object sender, EventArgs e)
 		{
 			this.virtualPoint = new Point(this.hScrollBar.Value, this.vScrollBar.Value);
-			System.Diagnostics.Trace.WriteLine("h: " + this.hScrollBar.Value + " (min: " + this.hScrollBar.Minimum + ", max: " + this.hScrollBar.Maximum + "), v: " + this.vScrollBar.Value + " (min: " + this.vScrollBar.Minimum + ", max: " + this.vScrollBar.Maximum + ")");
+			//System.Diagnostics.Trace.WriteLine("h: " + this.hScrollBar.Value + " (min: " + this.hScrollBar.Minimum + ", max: " + this.hScrollBar.Maximum + "), v: " + this.vScrollBar.Value + " (min: " + this.vScrollBar.Minimum + ", max: " + this.vScrollBar.Maximum + ")");
 			this.diagramControl.Invalidate(this.diagramControl.ClientRectangle);
 		}
 

LICENSE-MS-PL.txt

@@ -1,31 +1,60 @@
 Microsoft Public License (Ms-PL)
 
-This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
+This license governs use of the accompanying software. If you use the software,
+you accept this license. If you do not accept the license, do not use the 
+software.
 
 1. Definitions
 
-The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
+The terms "reproduce," "reproduction," "derivative works," and "distribution" 
+have the same meaning here as under U.S. copyright law.
 
-A "contribution" is the original software, or any additions or changes to the software.
+A "contribution" is the original software, or any additions or changes to the 
+software.
 
-A "contributor" is any person that distributes its contribution under this license.
+A "contributor" is any person that distributes its contribution under this
+license.
 
-"Licensed patents" are a contributor's patent claims that read directly on its contribution.
+"Licensed patents" are a contributor's patent claims that read directly on its
+contribution.
 
 2. Grant of Rights
 
-(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
+(A) Copyright Grant- Subject to the terms of this license, including the license
+conditions and limitations in section 3, each contributor grants you a
+non-exclusive, worldwide, royalty-free copyright license to reproduce its
+contribution, prepare derivative works of its contribution, and distribute its
+contribution or any derivative works that you create.
 
-(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
+(B) Patent Grant- Subject to the terms of this license, including the license
+conditions and limitations in section 3, each contributor grants you a
+non-exclusive, worldwide, royalty-free license under its licensed patents to
+make, have made, use, sell, offer for sale, import, and/or otherwise dispose of
+its contribution in the software or derivative works of the contribution in the
+software.
 
 3. Conditions and Limitations
 
-(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
+(A) No Trademark License- This license does not grant you rights to use any
+contributors' name, logo, or trademarks.
 
-(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
+(B) If you bring a patent claim against any contributor over patents that you
+claim are infringed by the software, your patent license from such contributor
+to the software ends automatically.
 
-(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
+(C) If you distribute any portion of the software, you must retain all
+copyright, patent, trademark, and attribution notices that are present in the
+software.
 
-(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
+(D) If you distribute any portion of the software in source code form, you may
+do so only under this license by including a complete copy of this license with
+your distribution. If you distribute any portion of the software in compiled or
+object code form, you may only do so under a license that complies with this
+license.
 
-(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
+(E) The software is licensed "as-is." You bear the risk of using it. The
+contributors give no express warranties, guarantees or conditions. You may have
+additional consumer rights under your local laws which this license cannot
+change. To the extent permitted under your local laws, the contributors exclude
+the implied warranties of merchantability, fitness for a particular purpose and
+non-infringement.

MainForm.cs

@@ -376,8 +376,11 @@ namespace XSDDiagram
 
 			if (element is DiagramItem)
 			{
-				if (this.schema.ElementsByName[element.FullName] != null)
-					this.toolStripComboBoxSchemaElement.SelectedItem = this.schema.ElementsByName[element.FullName];
+                //if (this.schema.ElementsByName[element.FullName] != null)
+                //	this.toolStripComboBoxSchemaElement.SelectedItem = this.schema.ElementsByName[element.FullName];
+                XSDObject xsdObject;
+                if (this.schema.ElementsByName.TryGetValue(element.FullName, out xsdObject) && xsdObject != null)
+                    this.toolStripComboBoxSchemaElement.SelectedItem = xsdObject;
 				else
 					this.toolStripComboBoxSchemaElement.SelectedItem = null;
 
@@ -438,8 +441,10 @@ namespace XSDDiagram
 					}
 					else if (element.type != null)
 					{
-						XSDObject xsdObject = this.schema.ElementsByName[QualifiedNameToFullName("type", element.type)] as XSDObject;
-						if (xsdObject != null)
+                        //XSDObject xsdObject = this.schema.ElementsByName[QualifiedNameToFullName("type", element.type)] as XSDObject;
+                        //if (xsdObject != null)
+                        XSDObject xsdObject;
+                        if (this.schema.ElementsByName.TryGetValue(QualifiedNameToFullName("type", element.type), out xsdObject) && xsdObject != null)
 						{
 							XMLSchema.annotated annotatedElement = xsdObject.Tag as XMLSchema.annotated;
 							if (annotatedElement is XMLSchema.complexType)
@@ -560,9 +565,11 @@ namespace XSDDiagram
 							if (annotatedContent is XMLSchema.extensionType)
 							{
 								XMLSchema.extensionType extensionType = annotatedContent as XMLSchema.extensionType;
-								XSDObject xsdExtensionType = this.schema.ElementsByName[QualifiedNameToFullName("type", extensionType.@base)] as XSDObject;
-								if (xsdExtensionType != null)
-								{
+                                //XSDObject xsdExtensionType = this.schema.ElementsByName[QualifiedNameToFullName("type", extensionType.@base)] as XSDObject;
+                                //if (xsdExtensionType != null)
+                                XSDObject xsdExtensionType;
+                                if (this.schema.ElementsByName.TryGetValue(QualifiedNameToFullName("type", extensionType.@base), out xsdExtensionType) && xsdExtensionType != null)
+                                {
 									XMLSchema.annotated annotatedExtension = xsdExtensionType.Tag as XMLSchema.annotated;
 									if (annotatedExtension != null)
 									{
@@ -588,9 +595,11 @@ namespace XSDDiagram
 							else if (annotatedContent is XMLSchema.restrictionType)
 							{
 								XMLSchema.restrictionType restrictionType = annotatedContent as XMLSchema.restrictionType;
-								XSDObject xsdRestrictionType = this.schema.ElementsByName[QualifiedNameToFullName("type", restrictionType.@base)] as XSDObject;
-								if (xsdRestrictionType != null)
-								{
+                                //XSDObject xsdRestrictionType = this.schema.ElementsByName[QualifiedNameToFullName("type", restrictionType.@base)] as XSDObject;
+                                //if (xsdRestrictionType != null)
+                                XSDObject xsdRestrictionType;
+                                if (this.schema.ElementsByName.TryGetValue(QualifiedNameToFullName("type", restrictionType.@base), out xsdRestrictionType) && xsdRestrictionType != null)
+                                {
 									XMLSchema.annotated annotatedRestriction = xsdRestrictionType.Tag as XMLSchema.annotated;
 									if (annotatedRestriction != null)
 									{
@@ -744,9 +753,11 @@ namespace XSDDiagram
 			{
 				if (attribute.type != null)
 				{
-					XSDObject xsdObject = this.schema.ElementsByName[QualifiedNameToFullName("type", attribute.type)] as XSDObject;
-					if (xsdObject != null)
-					{
+                    //XSDObject xsdObject = this.schema.ElementsByName[QualifiedNameToFullName("type", attribute.type)] as XSDObject;
+                    //if (xsdObject != null)
+                    XSDObject xsdObject;
+                    if (this.schema.ElementsByName.TryGetValue(QualifiedNameToFullName("type", attribute.type), out xsdObject) && xsdObject != null)
+                    {
 						XMLSchema.annotated annotatedElement = xsdObject.Tag as XMLSchema.annotated;
 						if (annotatedElement is XMLSchema.simpleType)
 							ShowEnumerate(annotatedElement as XMLSchema.simpleType);
@@ -768,9 +779,11 @@ namespace XSDDiagram
 				XMLSchema.element element = annotated as XMLSchema.element;
 				if (element != null && element.type != null)
 				{
-					XSDObject xsdObject = this.schema.ElementsByName[QualifiedNameToFullName("type", element.type)] as XSDObject;
-					if (xsdObject != null)
-					{
+                    //XSDObject xsdObject = this.schema.ElementsByName[QualifiedNameToFullName("type", element.type)] as XSDObject;
+                    //if (xsdObject != null)
+                    XSDObject xsdObject;
+                    if (this.schema.ElementsByName.TryGetValue(QualifiedNameToFullName("type", element.type), out xsdObject) && xsdObject != null)
+                    {
 						XMLSchema.annotated annotatedElement = xsdObject.Tag as XMLSchema.annotated;
 						if (annotatedElement is XMLSchema.simpleType)
 							ShowEnumerate(annotatedElement as XMLSchema.simpleType);
@@ -1018,7 +1031,7 @@ namespace XSDDiagram
 				if (resultRegion == DiagramHitTestRegion.Element) // && resultElement.Parent == null)
 				{
 					this.contextualMenuPointedElement = resultElement;
-					this.gotoXSDFileToolStripMenuItem.Enabled = true;
+                    this.gotoXSDFileToolStripMenuItem.Enabled = this.schema.ElementsByName.ContainsKey(this.contextualMenuPointedElement.FullName);
 					this.removeFromDiagramToolStripMenuItem.Enabled = true;
 				}
 			}
@@ -1028,8 +1041,10 @@ namespace XSDDiagram
 		{
 			if (this.contextualMenuPointedElement != null)
 			{
-				XSDObject xsdObject = this.schema.ElementsByName[this.contextualMenuPointedElement.FullName] as XSDObject;
-				if (xsdObject != null)
+				//XSDObject xsdObject = this.schema.ElementsByName[this.contextualMenuPointedElement.FullName] as XSDObject;
+                //if (xsdObject != null)
+				XSDObject xsdObject;
+                if (this.schema.ElementsByName.TryGetValue(this.contextualMenuPointedElement.FullName, out xsdObject) && xsdObject != null)
 				{
 					TabPage tabPage = this.hashtableTabPageByFilename[xsdObject.Filename];
 					if (tabPage != null)

Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
+[assembly: AssemblyVersion("0.10.0.0")]
+[assembly: AssemblyFileVersion("0.10.0.0")]

ReadMe.txt

@@ -1,6 +1,6 @@
 XSD Diagram is a free xml schema definition diagram viewer (http://regis.cosnier.free.fr).
 
-Version 0.9 Copyright © 2006-2011 Regis Cosnier, All Rights Reserved.
+Version 0.10 Copyright (c) 2006-2011 Regis Cosnier, All Rights Reserved.
 
 This program is free software and may be distributed
 according to the terms of the GNU General Public License (GPL).
@@ -8,7 +8,7 @@ according to the terms of the GNU General Public License (GPL).
 
 FEATURES:
 
-- GPL
+- GPL (Part of the source code are dual licensed with LGPL and MS-PL)
 - Need of the Microsoft Framework.NET 2.0 (if not already install) or Mono
 - Display the elements, the groups and the attributes
 - Show the text/HTML documentation of element and attribute when available
@@ -93,6 +93,9 @@ TODO LIST:
 
 CHANGES:
 
+version 0.10
+- Add the XSD Diagrams core library, thanks to Paul's refactoring !
+
 version 0.9 (2011-05-17)
 - Allow to expand restriction type (Thanks to Hermann).
 - Fix an unicode issue with infinity character when building xsd diagram on linux.

XSDDiagrams/Parsing/Schema.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 using System.Collections.Generic;

XSDDiagrams/Properties/AssemblyInfo.cs

@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("XSDDiagrams")]
+[assembly: AssemblyTitle("XSD Diagrams core library")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("XSDDiagrams")]
-[assembly: AssemblyCopyright("Copyright ©  2011")]
+[assembly: AssemblyProduct("XSD Diagrams")]
+[assembly: AssemblyCopyright("Copyright © 2011 Regis Cosnier, All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.10.0.0")]
+[assembly: AssemblyFileVersion("0.10.0.0")]

XSDDiagrams/Rendering/Diagram.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 using System.Drawing;

XSDDiagrams/Rendering/DiagramAlignement.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 

XSDDiagrams/Rendering/DiagramExporter.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 using System.IO;

XSDDiagrams/Rendering/DiagramGdiRenderer.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 using System.Drawing;

XSDDiagrams/Rendering/DiagramHitTestRegion.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 

XSDDiagrams/Rendering/DiagramItem.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 using System.Drawing;

XSDDiagrams/Rendering/DiagramItemGroupType.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 

XSDDiagrams/Rendering/DiagramItemType.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 

XSDDiagrams/Rendering/DiagramPrinter.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 using System.Windows.Forms;

XSDDiagrams/Rendering/DiagramRenderer.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 

XSDDiagrams/Rendering/DiagramSvgRenderer.cs

@@ -1,19 +1,14 @@
 //    XSDDiagram - A XML Schema Definition file viewer
 //    Copyright (C) 2006-2011  Regis COSNIER
+//    
+//    The content of this file is subject to the terms of either
+//    the GNU Lesser General Public License only (LGPL) or
+//    the Microsoft Public License (Ms-PL).
+//    Please see LICENSE-LGPL.txt and LICENSE-MS-PL.txt files for details.
 //
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//    Authors:
+//      Regis Cosnier (Initial developer)
+//      Paul Selormey (Refactoring)
 
 using System;
 using System.IO;