From: John Barnette <jbarn@mono-cvs.ximian.com>
Date: Tue, 25 Jun 2002 22:37:15 +0000 (-0000)
Subject: The raw beginnings of XML serialization of Monodoc XML.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=74b72351826d88e36cb78ab5a97b1b28299d248e;p=mono.git

The raw beginnings of XML serialization of Monodoc XML.

svn path=/trunk/mcs/; revision=5457
---

diff --git a/mcs/doctools/src/Core/AbstractDoc.cs b/mcs/doctools/src/Core/AbstractDoc.cs
index 48eb0b7b26f..da5b5badf2a 100644
--- a/mcs/doctools/src/Core/AbstractDoc.cs
+++ b/mcs/doctools/src/Core/AbstractDoc.cs
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Specialized;
+using System.Xml.Serialization;
 
 namespace Mono.Doc.Core
 {
@@ -45,33 +46,31 @@ namespace Mono.Doc.Core
 		{
 		}
 
+		[XmlElement(ElementName = "summary")]
 		public string Summary
 		{
 			get { return this.summary;  }
 			set { this.summary = value; }
 		}
 
+		[XmlElement(ElementName = "remarks")]
 		public string Remarks
 		{
 			get { return this.remarks;  }
 			set { this.remarks = value; }
 		}
 
+		[XmlAttribute(AttributeName = "name")]
 		public string Name
 		{
 			get { return this.name;  }
 			set { this.name = value; }
 		}
 
+		// TODO: correct xml serialization
 		public StringCollection SeeAlso
 		{
 			get { return this.seeAlso; }
 		}
-
-		public string Language
-		{
-			get { return this.language;  }
-			set { this.language = value; }
-		}
 	}
 }
diff --git a/mcs/doctools/src/Core/AbstractTypeDoc.cs b/mcs/doctools/src/Core/AbstractTypeDoc.cs
index 611024ed7fd..8b5e486d21d 100644
--- a/mcs/doctools/src/Core/AbstractTypeDoc.cs
+++ b/mcs/doctools/src/Core/AbstractTypeDoc.cs
@@ -20,6 +20,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 using System;
+using System.Xml.Serialization;
 
 namespace Mono.Doc.Core
 {
@@ -36,6 +37,8 @@ namespace Mono.Doc.Core
 		{
 		}
 
+
+		[XmlAttribute(AttributeName = "assembly")]
 		public string Assembly
 		{
 			get { return this.assembly;  }
diff --git a/mcs/doctools/src/Core/ClassDoc.cs b/mcs/doctools/src/Core/ClassDoc.cs
index 46a857d8edc..1131d2d2f24 100644
--- a/mcs/doctools/src/Core/ClassDoc.cs
+++ b/mcs/doctools/src/Core/ClassDoc.cs
@@ -20,9 +20,12 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 using System;
+using System.Xml.Serialization;
 
 namespace Mono.Doc.Core
 {
+
+	[XmlType(TypeName = "class")]
 	public class ClassDoc : AbstractClassStructDoc
 	{
 		public ClassDoc(string name) : base(name)
diff --git a/mcs/doctools/src/Core/Core.csproj b/mcs/doctools/src/Core/Core.csproj
index dc93538ea85..f0351b71f1d 100644
--- a/mcs/doctools/src/Core/Core.csproj
+++ b/mcs/doctools/src/Core/Core.csproj
@@ -161,6 +161,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "MonodocFile.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "NamingFlags.cs"
                     SubType = "Code"
diff --git a/mcs/doctools/src/Core/MonodocFile.cs b/mcs/doctools/src/Core/MonodocFile.cs
new file mode 100644
index 00000000000..5ab7ba75ac5
--- /dev/null
+++ b/mcs/doctools/src/Core/MonodocFile.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections;
+using System.Xml.Serialization;
+
+namespace Mono.Doc.Core
+{
+	[XmlRoot(ElementName="monodoc")]
+	public class MonodocFile
+	{
+		private string    language  = "en";
+		private ArrayList types     = new ArrayList();
+
+		public MonodocFile()
+		{
+		}
+
+		[XmlAttribute(AttributeName="language")]
+		public string Language
+		{
+			get { return language;  }
+			set { language = value; }
+		}
+
+		// TODO: add structs and delegates as XmlArrayItems
+		[XmlElement(Type = typeof(ClassDoc)), XmlElement(Type = typeof(InterfaceDoc))]
+		public ArrayList Types
+		{
+			get { return types; }
+		}
+	}
+}
diff --git a/mcs/doctools/src/Gui/Gui.csproj b/mcs/doctools/src/Gui/Gui.csproj
index 6e5ec50d107..4f60acdd078 100644
--- a/mcs/doctools/src/Gui/Gui.csproj
+++ b/mcs/doctools/src/Gui/Gui.csproj
@@ -196,16 +196,6 @@
                     DependentUpon = "ProjectOptionsForm.cs"
                     BuildAction = "EmbeddedResource"
                 />
-                <File
-                    RelPath = "TestingForm.cs"
-                    SubType = "Form"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "TestingForm.resx"
-                    DependentUpon = "TestingForm.cs"
-                    BuildAction = "EmbeddedResource"
-                />
                 <File
                     RelPath = "TextResources.resx"
                     Link = "..\..\etc\gui\TextResources.resx"
diff --git a/mcs/doctools/src/doctools.sln b/mcs/doctools/src/doctools.sln
index b336c2a1e26..ea182e32103 100644
--- a/mcs/doctools/src/doctools.sln
+++ b/mcs/doctools/src/doctools.sln
@@ -3,6 +3,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gui", "Gui\Gui.csproj", "{B
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{73F5A60D-A5E3-4852-B4C6-478275E733F9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xmltest", "xmltest\xmltest.csproj", "{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}"
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Debug
@@ -19,6 +21,10 @@ Global
 		{73F5A60D-A5E3-4852-B4C6-478275E733F9}.Debug.Build.0 = Release|.NET
 		{73F5A60D-A5E3-4852-B4C6-478275E733F9}.Release.ActiveCfg = Release|.NET
 		{73F5A60D-A5E3-4852-B4C6-478275E733F9}.Release.Build.0 = Release|.NET
+		{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}.Debug.ActiveCfg = Debug|.NET
+		{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}.Debug.Build.0 = Debug|.NET
+		{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}.Release.ActiveCfg = Release|.NET
+		{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}.Release.Build.0 = Release|.NET
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/mcs/doctools/src/xmltest/Driver.cs b/mcs/doctools/src/xmltest/Driver.cs
new file mode 100644
index 00000000000..7d06307b4f4
--- /dev/null
+++ b/mcs/doctools/src/xmltest/Driver.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Xml.Serialization;
+
+using Mono.Doc.Core;
+
+namespace Mono.Doc.XmlTest
+{
+	public class Driver
+	{
+		public Driver()
+		{
+		}
+
+		public static void Main(string[] args)
+		{
+			MonodocFile file  = new MonodocFile();
+			XmlSerializer ser = new XmlSerializer(file.GetType());
+
+			// a class
+			ClassDoc hashtable = new ClassDoc("System.Collections.Hashtable");
+			hashtable.Assembly = "corlib";
+
+			file.Types.Add(hashtable);
+
+			// an interface
+			InterfaceDoc icollection = new InterfaceDoc("System.Collections.ICollection");
+			icollection.Assembly     = "corlib";
+
+			file.Types.Add(icollection);
+
+			ser.Serialize(Console.Out, file);
+			Console.WriteLine("\n\n");
+		}
+	}
+}
diff --git a/mcs/doctools/src/xmltest/xmltest.csproj b/mcs/doctools/src/xmltest/xmltest.csproj
new file mode 100644
index 00000000000..b541b1b5d8e
--- /dev/null
+++ b/mcs/doctools/src/xmltest/xmltest.csproj
@@ -0,0 +1,93 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.0.9466"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "xmltest"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                RootNamespace = "Mono.Doc.XmlTest"
+                StartupObject = "Mono.Doc.XmlTest.Driver"
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "true"
+                    Optimize = "false"
+                    OutputPath = "..\..\build\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.XML"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
+                />
+                <Reference
+                    Name = "Core"
+                    Project = "{73F5A60D-A5E3-4852-B4C6-478275E733F9}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "Driver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+