Fixed incorrect AddIn.xsd, and make BuildAddinDocumentation validate the schema before saving it (http://community.sharpdevelop.net/forums/t/12508.aspx)

15 years ago · 01c619cdf0
5 changed files with 21 additions and 10 deletions
--- a/data/schemas/AddIn.xsd
+++ b/data/schemas/AddIn.xsd
@ -732,7 +732,7 @@
				@@ -732,7 +732,7 @@
 				<xs:choice minOccurs="0" maxOccurs="unbounded">
 					<xs:element ref="ComplexCondition" />
 					<xs:element ref="Condition" />
-					<xs:element ref="IOptionPanel" />
+					<xs:element ref="OptionPanel" />
 					<xs:element ref="Include" />
 				</xs:choice>
 				<xs:attribute name="class" use="optional" type="xs:string">
--- a/doc/technotes/ConditionList.html
+++ b/doc/technotes/ConditionList.html
@ -5,7 +5,7 @@
				@@ -5,7 +5,7 @@
 </head><body>
 <h1>Condition List</h1>
 <p class="notice">This file was generated by the tool 'BuildAddinDocumentation'.
-It is based on SharpDevelop 4.0.0.7014.</p>
+It is based on SharpDevelop 4.0.0.7070.</p>
 <ul>
  <li><a href="#ActiveContentExtension">ActiveContentExtension</a>
  <li><a href="#ActiveViewContentUntitled">ActiveViewContentUntitled</a>
--- a/doc/technotes/DoozerList.html
+++ b/doc/technotes/DoozerList.html
@ -5,7 +5,7 @@
				@@ -5,7 +5,7 @@
 </head><body>
 <h1>Doozer List</h1>
 <p class="notice">This file was generated by the tool 'BuildAddinDocumentation'.
-It is based on SharpDevelop 4.0.0.7014.</p>
+It is based on SharpDevelop 4.0.0.7070.</p>
 <ul>
  <li><a href="#Class">Class</a>
  <li><a href="#CodeCompletionBinding">CodeCompletionBinding</a>
--- a/src/Main/Base/Project/Src/Internal/Doozers/OptionPanelDoozer.cs
+++ b/src/Main/Base/Project/Src/Internal/Doozers/OptionPanelDoozer.cs
@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop
				@@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop
 	/// <attribute name="label" use="required">
 	/// Caption of the dialog panel.
 	/// </attribute>
-	/// <children childTypes="IOptionPanel">
+	/// <children childTypes="OptionPanel">
 	/// In the SharpDevelop options, option pages can have subpages by specifying them
 	/// as children in the AddInTree.
 	/// </children>
--- a/src/Tools/BuildAddinDocumentation/MainClass.cs
+++ b/src/Tools/BuildAddinDocumentation/MainClass.cs
@ -10,6 +10,7 @@ using System.Diagnostics;
				@@ -10,6 +10,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml;
+using System.Xml.Schema;

 namespace BuildAddinDocumentation
 {
@ -71,13 +72,23 @@ namespace BuildAddinDocumentation
				@@ -71,13 +72,23 @@ namespace BuildAddinDocumentation
 			XmlDocument doc = new XmlDocument();
 			doc.Load(Path.Combine(srcDir, "..\\data\\schemas\\Addin.xsd"));
 			UpdateSchema(doc, doozers, conditions);
-			using (XmlTextWriter writer = new XmlTextWriter(Path.Combine(srcDir, "..\\data\\schemas\\Addin.xsd"), System.Text.Encoding.UTF8)) {
-				writer.Formatting = Formatting.Indented;
-				writer.IndentChar = '\t';
-				writer.Indentation = 1;
-				doc.Save(writer);
+			
+			// Test the schema
+			int errors = 0;
+			ValidationEventHandler validation = (sender, e) => { Debug.WriteLine(e.Message); errors++; };
+			XmlSchema.Read(new XmlNodeReader(doc.DocumentElement), validation).Compile(validation);
+			if (errors == 0) {
+				// save only if correct
+				using (XmlTextWriter writer = new XmlTextWriter(Path.Combine(srcDir, "..\\data\\schemas\\Addin.xsd"), System.Text.Encoding.UTF8)) {
+					writer.Formatting = Formatting.Indented;
+					writer.IndentChar = '\t';
+					writer.Indentation = 1;
+					doc.Save(writer);
+				}
+				Debug.WriteLine("Finished");
+			} else {
+				Debug.WriteLine("Finished (with errors)");
 			}
-			Debug.WriteLine("Finished");
 		}
 		
 		static void RecursiveInsertDoozerList(XmlElement e, List<XmlElement> doozers, List<XmlElement> conditionList)