From b2fa5b3d7c11bf48083f4893c1684b79d30b9a69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Laval?= Date: Thu, 20 Dec 2012 20:15:36 +0100 Subject: [PATCH] [monkeydoc] Change namespace base from MonkeyDoc to Monodoc. --- mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaDesc.cs | 4 ++-- mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlParser.jay | 2 +- mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlParserDriver.cs | 4 ++-- mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlTokenizer.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/HelpSource.cs | 6 +++--- mcs/tools/monkeydoc/MonkeyDoc/HelpSource_Legacy.cs | 6 +++--- mcs/tools/monkeydoc/MonkeyDoc/Node.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/Node_Legacy.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/Provider.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/RootTree.cs | 4 ++-- mcs/tools/monkeydoc/MonkeyDoc/RootTree_Legacy.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/SearchableDocument.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/SearchableIndex.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/Tree.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/Tree_Legacy.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/TypeUtils.cs | 4 ++-- mcs/tools/monkeydoc/MonkeyDoc/cache.cs | 6 +++--- mcs/tools/monkeydoc/MonkeyDoc/caches/FileCache.cs | 4 ++-- mcs/tools/monkeydoc/MonkeyDoc/caches/NullCache.cs | 4 ++-- mcs/tools/monkeydoc/MonkeyDoc/generator.cs | 4 ++-- mcs/tools/monkeydoc/MonkeyDoc/generators/HtmlGenerator.cs | 6 +++--- mcs/tools/monkeydoc/MonkeyDoc/generators/RawGenerator.cs | 4 ++-- .../monkeydoc/MonkeyDoc/generators/html/Addin2Html.cs | 8 ++++---- .../monkeydoc/MonkeyDoc/generators/html/Ecma2Html.cs | 4 ++-- .../monkeydoc/MonkeyDoc/generators/html/Ecmaspec2Html.cs | 4 ++-- .../monkeydoc/MonkeyDoc/generators/html/Error2Html.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/generators/html/Idem.cs | 8 ++++---- mcs/tools/monkeydoc/MonkeyDoc/generators/html/Man2Html.cs | 8 ++++---- .../monkeydoc/MonkeyDoc/generators/html/MonoBook2Html.cs | 8 ++++---- mcs/tools/monkeydoc/MonkeyDoc/generators/html/Toc2Html.cs | 4 ++-- mcs/tools/monkeydoc/MonkeyDoc/index.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/providers/EcmaDoc.cs | 4 ++-- .../monkeydoc/MonkeyDoc/providers/addins-provider.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/providers/ecma-provider.cs | 4 ++-- .../monkeydoc/MonkeyDoc/providers/ecmaspec-provider.cs | 2 +- .../MonkeyDoc/providers/ecmauncompiled-provider.cs | 6 +++--- mcs/tools/monkeydoc/MonkeyDoc/providers/error-provider.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/providers/man-provider.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/providers/xhtml-provider.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/settings.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/storage.cs | 4 ++-- mcs/tools/monkeydoc/MonkeyDoc/storage/NullStorage.cs | 2 +- .../monkeydoc/MonkeyDoc/storage/UncompiledDocStorage.cs | 2 +- mcs/tools/monkeydoc/MonkeyDoc/storage/ZipStorage.cs | 4 ++-- mcs/tools/monkeydoc/Test/MonkeyDoc.Ecma/EcmaUrlTests.cs | 6 +++--- mcs/tools/monkeydoc/Test/MonkeyDoc/HelpSourceTests.cs | 6 +++--- mcs/tools/monkeydoc/Test/MonkeyDoc/SettingsTest.cs | 4 ++-- .../Test/Monkeydoc.Generators/RawGeneratorTests.cs | 6 +++--- 48 files changed, 92 insertions(+), 92 deletions(-) diff --git a/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaDesc.cs b/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaDesc.cs index 19c3ce4ea56..3f1160c5cab 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaDesc.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaDesc.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; using System.Collections.Generic; -namespace MonkeyDoc.Ecma +namespace Monodoc.Ecma { /* Some properties might not be filled/meaningful depending on kind * like a namespace EcmaUrl won't have a valid TypeName @@ -330,4 +330,4 @@ namespace MonkeyDoc.Ecma } } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlParser.jay b/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlParser.jay index e136bc21dab..0717914a8a3 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlParser.jay +++ b/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlParser.jay @@ -5,7 +5,7 @@ using System; using System.Linq; using System.Collections.Generic; -namespace MonkeyDoc.Ecma +namespace Monodoc.Ecma { public class EcmaUrlParser { diff --git a/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlParserDriver.cs b/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlParserDriver.cs index af3978fac10..8a938255122 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlParserDriver.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlParserDriver.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace MonkeyDoc.Ecma +namespace Monodoc.Ecma { public class EcmaUrlParserDriver { @@ -14,4 +14,4 @@ namespace MonkeyDoc.Ecma Console.WriteLine (parser.yyparse (lexer)); } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlTokenizer.cs b/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlTokenizer.cs index 91bf6dbc5f3..151192096b1 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlTokenizer.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc.Ecma/EcmaUrlTokenizer.cs @@ -2,7 +2,7 @@ using System; using System.Text; using System.Globalization; -namespace MonkeyDoc.Ecma +namespace Monodoc.Ecma { public class EcmaUrlTokenizer : yyParser.yyInput { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/HelpSource.cs b/mcs/tools/monkeydoc/MonkeyDoc/HelpSource.cs index 39ac903d7df..c200e88311d 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/HelpSource.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/HelpSource.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using Mono.Utilities; using Lucene.Net.Index; -namespace MonkeyDoc +namespace Monodoc { public enum SortType { Caption, @@ -50,7 +50,7 @@ namespace MonkeyDoc this.name = Path.GetFileName (base_filename); this.basePath = Path.GetDirectoryName (base_filename); this.treeFilePath = base_filename + ".tree"; - this.storage = new MonkeyDoc.Storage.ZipStorage (base_filename + ".zip"); + this.storage = new Monodoc.Storage.ZipStorage (base_filename + ".zip"); this.cache = DocCacheHelper.GetDefaultCache (Name); tree = create ? new Tree (this, string.Empty, string.Empty) : new Tree (this, treeFilePath); @@ -351,4 +351,4 @@ namespace MonkeyDoc } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/HelpSource_Legacy.cs b/mcs/tools/monkeydoc/MonkeyDoc/HelpSource_Legacy.cs index ac2008e2488..15f73ef80b9 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/HelpSource_Legacy.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/HelpSource_Legacy.cs @@ -10,7 +10,7 @@ using Lucene.Net.Index; #if LEGACY_MODE -namespace MonkeyDoc +namespace Monodoc { using Generators; @@ -25,9 +25,9 @@ namespace MonkeyDoc [Obsolete] public static bool UseWebdocCache; - [Obsolete ("Use MonkeyDoc.Providers.HtmlGenerator.InlineCss")] + [Obsolete ("Use Monodoc.Providers.HtmlGenerator.InlineCss")] public string InlineCss { - get { return MonkeyDoc.Generators.HtmlGenerator.InlineCss; } + get { return Monodoc.Generators.HtmlGenerator.InlineCss; } } [Obsolete] diff --git a/mcs/tools/monkeydoc/MonkeyDoc/Node.cs b/mcs/tools/monkeydoc/MonkeyDoc/Node.cs index 1ab59cb8bfc..d44db60fcce 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/Node.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/Node.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Xml; using System.Collections.Generic; -namespace MonkeyDoc +namespace Monodoc { public #if LEGACY_MODE diff --git a/mcs/tools/monkeydoc/MonkeyDoc/Node_Legacy.cs b/mcs/tools/monkeydoc/MonkeyDoc/Node_Legacy.cs index 9e51217faae..6e3d7f5315a 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/Node_Legacy.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/Node_Legacy.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; #if LEGACY_MODE -namespace MonkeyDoc +namespace Monodoc { public partial class Node { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/Provider.cs b/mcs/tools/monkeydoc/MonkeyDoc/Provider.cs index 03c54e59b6c..4f078047fdf 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/Provider.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/Provider.cs @@ -1,6 +1,6 @@ using System; -namespace MonkeyDoc +namespace Monodoc { public abstract class Provider { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/RootTree.cs b/mcs/tools/monkeydoc/MonkeyDoc/RootTree.cs index 620c2258fd1..697db0f2708 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/RootTree.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/RootTree.cs @@ -9,11 +9,11 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Xml; -using MonkeyDoc.Providers; +using Monodoc.Providers; using Lucene.Net.Analysis.Standard; using Lucene.Net.Index; -namespace MonkeyDoc +namespace Monodoc { public #if LEGACY_MODE diff --git a/mcs/tools/monkeydoc/MonkeyDoc/RootTree_Legacy.cs b/mcs/tools/monkeydoc/MonkeyDoc/RootTree_Legacy.cs index cb01c8d1266..b0d033d1b4e 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/RootTree_Legacy.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/RootTree_Legacy.cs @@ -10,7 +10,7 @@ using Lucene.Net.Index; #if LEGACY_MODE -namespace MonkeyDoc +namespace Monodoc { using Generators; diff --git a/mcs/tools/monkeydoc/MonkeyDoc/SearchableDocument.cs b/mcs/tools/monkeydoc/MonkeyDoc/SearchableDocument.cs index eebcc3ac484..f7b9dba85ce 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/SearchableDocument.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/SearchableDocument.cs @@ -6,7 +6,7 @@ // using Lucene.Net.Documents; -namespace MonkeyDoc +namespace Monodoc { struct SearchableDocument { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/SearchableIndex.cs b/mcs/tools/monkeydoc/MonkeyDoc/SearchableIndex.cs index 7eb24fe5fa0..f32340926e2 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/SearchableIndex.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/SearchableIndex.cs @@ -17,7 +17,7 @@ using Lucene.Net.Search; using Lucene.Net.QueryParsers; using Lucene.Net.Store; -namespace MonkeyDoc +namespace Monodoc { public class SearchableIndex { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/Tree.cs b/mcs/tools/monkeydoc/MonkeyDoc/Tree.cs index 11d3b834b76..86fc78559c9 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/Tree.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/Tree.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Xml; using System.Collections.Generic; -namespace MonkeyDoc +namespace Monodoc { /// /// This tree is populated by the documentation providers, or populated diff --git a/mcs/tools/monkeydoc/MonkeyDoc/Tree_Legacy.cs b/mcs/tools/monkeydoc/MonkeyDoc/Tree_Legacy.cs index d1e97ba67c6..f55ceaed73d 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/Tree_Legacy.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/Tree_Legacy.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Xml; using System.Collections.Generic; -namespace MonkeyDoc +namespace Monodoc { public partial class Tree { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/TypeUtils.cs b/mcs/tools/monkeydoc/MonkeyDoc/TypeUtils.cs index 2e756630a52..33a2838b926 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/TypeUtils.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/TypeUtils.cs @@ -1,6 +1,6 @@ using System; -namespace MonkeyDoc +namespace Monodoc { public static class TypeUtils { @@ -37,4 +37,4 @@ namespace MonkeyDoc return true; } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/cache.cs b/mcs/tools/monkeydoc/MonkeyDoc/cache.cs index 1c26f055836..43b17d9a36f 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/cache.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/cache.cs @@ -3,9 +3,9 @@ using System.Linq; using System.IO; using System.Configuration; using System.Collections.Specialized; -using MonkeyDoc.Caches; +using Monodoc.Caches; -namespace MonkeyDoc +namespace Monodoc { public enum DocEntity { @@ -50,4 +50,4 @@ namespace MonkeyDoc return new FileCache (Path.Combine (cacheBaseDirectory, name)); } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/caches/FileCache.cs b/mcs/tools/monkeydoc/MonkeyDoc/caches/FileCache.cs index 333f33b44a2..75ccdd8ab75 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/caches/FileCache.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/caches/FileCache.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace MonkeyDoc.Caches +namespace Monodoc.Caches { public class FileCache : IDocCache { @@ -72,4 +72,4 @@ namespace MonkeyDoc.Caches } catch {} } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/caches/NullCache.cs b/mcs/tools/monkeydoc/MonkeyDoc/caches/NullCache.cs index 1514d661d53..628397efd64 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/caches/NullCache.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/caches/NullCache.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace MonkeyDoc.Caches +namespace Monodoc.Caches { // This is basically a no-cache implementation public class NullCache : IDocCache @@ -51,4 +51,4 @@ namespace MonkeyDoc.Caches } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/generator.cs b/mcs/tools/monkeydoc/MonkeyDoc/generator.cs index f0949b9d686..2e7c8661326 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/generator.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/generator.cs @@ -1,6 +1,6 @@ using System; -namespace MonkeyDoc +namespace Monodoc { // All type of documents that a generator may find as input public enum DocumentType { @@ -24,4 +24,4 @@ namespace MonkeyDoc // for the given ID and use the right engine internally TOutput Generate (HelpSource hs, string internalId); } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/generators/HtmlGenerator.cs b/mcs/tools/monkeydoc/MonkeyDoc/generators/HtmlGenerator.cs index d7eeeb803eb..c91c49b31dd 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/generators/HtmlGenerator.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/generators/HtmlGenerator.cs @@ -4,9 +4,9 @@ using System.Text; using System.Linq; using System.Collections.Generic; -using MonkeyDoc; +using Monodoc; -namespace MonkeyDoc.Generators +namespace Monodoc.Generators { using Html; @@ -129,4 +129,4 @@ namespace MonkeyDoc.Generators return key; } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/generators/RawGenerator.cs b/mcs/tools/monkeydoc/MonkeyDoc/generators/RawGenerator.cs index c1e4bb26c62..818d435197f 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/generators/RawGenerator.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/generators/RawGenerator.cs @@ -4,9 +4,9 @@ using System.Text; using System.Linq; using System.Collections.Generic; -using MonkeyDoc; +using Monodoc; -namespace MonkeyDoc.Generators +namespace Monodoc.Generators { /// /// This generators returns the raw content of the HelpSource without any transformation diff --git a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Addin2Html.cs b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Addin2Html.cs index 3d37482a568..2cd5ea0366d 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Addin2Html.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Addin2Html.cs @@ -6,7 +6,7 @@ using System.Xml.Xsl; using System.Xml.XPath; using System.Collections.Generic; -namespace MonkeyDoc.Generators.Html +namespace Monodoc.Generators.Html { public class Addin2Html : IHtmlExporter { @@ -45,11 +45,11 @@ namespace MonkeyDoc.Generators.Html public string Htmlize (XmlElement addin, string urlType, string addinId, string fileId, string path) { - if (urlType == MonkeyDoc.Providers.AddinsHelpSource.AddinPrefix) + if (urlType == Monodoc.Providers.AddinsHelpSource.AddinPrefix) return GetAddinTextFromUrl (addin, addinId, fileId); - else if (urlType == MonkeyDoc.Providers.AddinsHelpSource.ExtensionPrefix) + else if (urlType == Monodoc.Providers.AddinsHelpSource.ExtensionPrefix) return GetExtensionTextFromUrl (addin, addinId, fileId, path); - else if (urlType == MonkeyDoc.Providers.AddinsHelpSource.ExtensionNodePrefix) + else if (urlType == Monodoc.Providers.AddinsHelpSource.ExtensionNodePrefix) return GetExtensionNodeTextFromUrl (addin, addinId, fileId, path); return null; diff --git a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Ecma2Html.cs b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Ecma2Html.cs index ed329e35154..85a9511511f 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Ecma2Html.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Ecma2Html.cs @@ -10,7 +10,7 @@ using System.Collections.Generic; using Mono.Documentation; using BF = System.Reflection.BindingFlags; -namespace MonkeyDoc.Generators.Html +namespace Monodoc.Generators.Html { public class Ecma2Html : IHtmlExporter { @@ -304,4 +304,4 @@ namespace MonkeyDoc.Generators.Html } } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Ecmaspec2Html.cs b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Ecmaspec2Html.cs index 95f4064083f..bafc0baf3fc 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Ecmaspec2Html.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Ecmaspec2Html.cs @@ -5,7 +5,7 @@ using System.Xml.Xsl; using System.Xml.XPath; using System.Collections.Generic; -namespace MonkeyDoc.Generators.Html +namespace Monodoc.Generators.Html { public class Ecmaspec2Html : IHtmlExporter { @@ -63,4 +63,4 @@ namespace MonkeyDoc.Generators.Html return output.ToString (); } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Error2Html.cs b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Error2Html.cs index 167d1f54248..67e6c9c4899 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Error2Html.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Error2Html.cs @@ -5,7 +5,7 @@ using System.Xml; using System.Xml.XPath; using System.Collections.Generic; -namespace MonkeyDoc.Generators.Html +namespace Monodoc.Generators.Html { public class Error2Html : IHtmlExporter { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Idem.cs b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Idem.cs index 0a58b213afc..0c020601866 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Idem.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Idem.cs @@ -3,10 +3,10 @@ using System.IO; using System.Text; using System.Collections.Generic; -using MonkeyDoc; -using MonkeyDoc.Generators; +using Monodoc; +using Monodoc.Generators; -namespace MonkeyDoc.Generators.Html +namespace Monodoc.Generators.Html { // Input is expected to be already HTML so just return it public class Idem : IHtmlExporter @@ -31,4 +31,4 @@ namespace MonkeyDoc.Generators.Html return input; } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Man2Html.cs b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Man2Html.cs index 68ed5ed9280..d4f9cc2665b 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Man2Html.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Man2Html.cs @@ -3,10 +3,10 @@ using System.IO; using System.Text; using System.Collections.Generic; -using MonkeyDoc; -using MonkeyDoc.Generators; +using Monodoc; +using Monodoc.Generators; -namespace MonkeyDoc.Generators.Html +namespace Monodoc.Generators.Html { public class Man2Html : IHtmlExporter { @@ -313,4 +313,4 @@ namespace MonkeyDoc.Generators.Html } } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/MonoBook2Html.cs b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/MonoBook2Html.cs index 89a531c2168..847c375c2c7 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/MonoBook2Html.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/MonoBook2Html.cs @@ -4,10 +4,10 @@ using System.Text; using System.Xml; using System.Collections.Generic; -using MonkeyDoc; -using MonkeyDoc.Generators; +using Monodoc; +using Monodoc.Generators; -namespace MonkeyDoc.Generators.Html +namespace Monodoc.Generators.Html { // Input is expected to be already HTML so just return it public class MonoBook2Html : IHtmlExporter @@ -84,4 +84,4 @@ namespace MonkeyDoc.Generators.Html return reader.ReadInnerXml (); } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Toc2Html.cs b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Toc2Html.cs index eef17c234f0..ee6a95b993c 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Toc2Html.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/generators/html/Toc2Html.cs @@ -6,7 +6,7 @@ using System.Xml.XPath; using System.Reflection; using System.Collections.Generic; -namespace MonkeyDoc.Generators.Html +namespace Monodoc.Generators.Html { public class Toc2Html : IHtmlExporter { @@ -41,4 +41,4 @@ namespace MonkeyDoc.Generators.Html } } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/index.cs b/mcs/tools/monkeydoc/MonkeyDoc/index.cs index b365b9edf9e..b9aefff7ca2 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/index.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/index.cs @@ -33,7 +33,7 @@ using System.IO; using System.Text; using System.Collections.Generic; -namespace MonkeyDoc +namespace Monodoc { public class Topic { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/providers/EcmaDoc.cs b/mcs/tools/monkeydoc/MonkeyDoc/providers/EcmaDoc.cs index 1d3c9fb2efa..b93672ac831 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/providers/EcmaDoc.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/providers/EcmaDoc.cs @@ -6,7 +6,7 @@ using System.Xml; using System.Xml.Linq; using System.Collections.Generic; -namespace MonkeyDoc.Providers +namespace Monodoc.Providers { // Common functionality between ecma-provider and ecmauncompiled-provider internal class EcmaDoc @@ -233,4 +233,4 @@ namespace MonkeyDoc.Providers } } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/providers/addins-provider.cs b/mcs/tools/monkeydoc/MonkeyDoc/providers/addins-provider.cs index 3768717ac19..5c97de4d8eb 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/providers/addins-provider.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/providers/addins-provider.cs @@ -35,7 +35,7 @@ using System.IO; using System.Xml; using System.Collections.Generic; -namespace MonkeyDoc.Providers +namespace Monodoc.Providers { public class AddinsProvider : Provider { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/providers/ecma-provider.cs b/mcs/tools/monkeydoc/MonkeyDoc/providers/ecma-provider.cs index a30872b0fa4..ee5b86174d6 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/providers/ecma-provider.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/providers/ecma-provider.cs @@ -20,10 +20,10 @@ using System.Collections.Generic; using Lucene.Net.Index; using Lucene.Net.Documents; -using MonkeyDoc.Ecma; +using Monodoc.Ecma; using Mono.Utilities; -namespace MonkeyDoc.Providers +namespace Monodoc.Providers { public enum EcmaNodeType { Invalid, diff --git a/mcs/tools/monkeydoc/MonkeyDoc/providers/ecmaspec-provider.cs b/mcs/tools/monkeydoc/MonkeyDoc/providers/ecmaspec-provider.cs index 6b4c0507d66..aa86eab5e61 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/providers/ecmaspec-provider.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/providers/ecmaspec-provider.cs @@ -20,7 +20,7 @@ using System.Collections.Generic; using Lucene.Net.Index; using Lucene.Net.Documents; -namespace MonkeyDoc.Providers +namespace Monodoc.Providers { public class EcmaSpecProvider : Provider { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/providers/ecmauncompiled-provider.cs b/mcs/tools/monkeydoc/MonkeyDoc/providers/ecmauncompiled-provider.cs index 272eb64a39b..7352b1a38c7 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/providers/ecmauncompiled-provider.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/providers/ecmauncompiled-provider.cs @@ -9,11 +9,11 @@ using System.Collections.Generic; using Lucene.Net.Index; using Lucene.Net.Documents; -using MonkeyDoc.Ecma; -using MonkeyDoc.Storage; +using Monodoc.Ecma; +using Monodoc.Storage; using Mono.Utilities; -namespace MonkeyDoc.Providers +namespace Monodoc.Providers { public class EcmaUncompiledHelpSource : EcmaHelpSource { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/providers/error-provider.cs b/mcs/tools/monkeydoc/MonkeyDoc/providers/error-provider.cs index 2acb26efcf9..a8e88991d77 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/providers/error-provider.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/providers/error-provider.cs @@ -19,7 +19,7 @@ using System.Linq; using Lucene.Net.Index; using Lucene.Net.Documents; -namespace MonkeyDoc.Providers +namespace Monodoc.Providers { public class ErrorProviderConfig { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/providers/man-provider.cs b/mcs/tools/monkeydoc/MonkeyDoc/providers/man-provider.cs index 26ece40fb48..cf7984e54ad 100755 --- a/mcs/tools/monkeydoc/MonkeyDoc/providers/man-provider.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/providers/man-provider.cs @@ -14,7 +14,7 @@ using System.Xml; using System.Linq; using System.Collections.Generic; -namespace MonkeyDoc.Providers +namespace Monodoc.Providers { public class ManProvider : Provider { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/providers/xhtml-provider.cs b/mcs/tools/monkeydoc/MonkeyDoc/providers/xhtml-provider.cs index ad70f36e75d..424be4a2814 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/providers/xhtml-provider.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/providers/xhtml-provider.cs @@ -16,7 +16,7 @@ using System.Text.RegularExpressions; using System.Xml; using System.Xml.Linq; -namespace MonkeyDoc.Providers +namespace Monodoc.Providers { public class XhtmlProvider : Provider { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/settings.cs b/mcs/tools/monkeydoc/MonkeyDoc/settings.cs index ad73e424adc..1b5d4a62f9c 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/settings.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/settings.cs @@ -2,7 +2,7 @@ using System; using System.Configuration; using System.Collections.Specialized; -namespace MonkeyDoc +namespace Monodoc { public static class Settings { diff --git a/mcs/tools/monkeydoc/MonkeyDoc/storage.cs b/mcs/tools/monkeydoc/MonkeyDoc/storage.cs index 9085ff5e40c..25ddc595289 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/storage.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/storage.cs @@ -2,7 +2,7 @@ using System; using System.IO; using System.Collections.Generic; -namespace MonkeyDoc +namespace Monodoc { // Define a storage mechanism for a help source public interface IDocStorage : IDisposable @@ -50,4 +50,4 @@ namespace MonkeyDoc return revManager.RetrieveWithRevision (id, revManager.LatestRevisionForId (id)); } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/MonkeyDoc/storage/NullStorage.cs b/mcs/tools/monkeydoc/MonkeyDoc/storage/NullStorage.cs index 891a965f628..7605aa4cf37 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/storage/NullStorage.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/storage/NullStorage.cs @@ -4,7 +4,7 @@ using System.Xml; using System.Linq; using System.Collections.Generic; -namespace MonkeyDoc.Storage +namespace Monodoc.Storage { // A storage that doesn't store public class NullStorage : IDocStorage diff --git a/mcs/tools/monkeydoc/MonkeyDoc/storage/UncompiledDocStorage.cs b/mcs/tools/monkeydoc/MonkeyDoc/storage/UncompiledDocStorage.cs index fe3976a74ea..e807c022f9a 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/storage/UncompiledDocStorage.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/storage/UncompiledDocStorage.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using System.Collections.Generic; -namespace MonkeyDoc.Storage +namespace Monodoc.Storage { // A read-only storage to access ecma XML document based on a standard directory layout // id are relative path inside the base doc directory diff --git a/mcs/tools/monkeydoc/MonkeyDoc/storage/ZipStorage.cs b/mcs/tools/monkeydoc/MonkeyDoc/storage/ZipStorage.cs index 81ed1c5bd66..4945dbdd3d0 100644 --- a/mcs/tools/monkeydoc/MonkeyDoc/storage/ZipStorage.cs +++ b/mcs/tools/monkeydoc/MonkeyDoc/storage/ZipStorage.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using ICSharpCode.SharpZipLib.Zip; -namespace MonkeyDoc.Storage +namespace Monodoc.Storage { public class ZipStorage : IDocStorage { @@ -128,4 +128,4 @@ namespace MonkeyDoc.Storage return String.Format ("{0}", code++); } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/Test/MonkeyDoc.Ecma/EcmaUrlTests.cs b/mcs/tools/monkeydoc/Test/MonkeyDoc.Ecma/EcmaUrlTests.cs index 26389671f98..bcfeac51847 100644 --- a/mcs/tools/monkeydoc/Test/MonkeyDoc.Ecma/EcmaUrlTests.cs +++ b/mcs/tools/monkeydoc/Test/MonkeyDoc.Ecma/EcmaUrlTests.cs @@ -5,10 +5,10 @@ using System.Collections.Generic; using NUnit.Framework; -using MonkeyDoc; -using MonkeyDoc.Ecma; +using Monodoc; +using Monodoc.Ecma; -namespace MonoTests.MonkeyDoc.Ecma +namespace MonoTests.Monodoc.Ecma { [TestFixture] public class EcmaUrlTests diff --git a/mcs/tools/monkeydoc/Test/MonkeyDoc/HelpSourceTests.cs b/mcs/tools/monkeydoc/Test/MonkeyDoc/HelpSourceTests.cs index 354fe91f4dd..38b8f67b2e8 100644 --- a/mcs/tools/monkeydoc/Test/MonkeyDoc/HelpSourceTests.cs +++ b/mcs/tools/monkeydoc/Test/MonkeyDoc/HelpSourceTests.cs @@ -5,9 +5,9 @@ using System.Collections.Generic; using NUnit.Framework; -using MonkeyDoc; +using Monodoc; -namespace MonoTests.MonkeyDoc +namespace MonoTests.Monodoc { [TestFixture] public class HelpSourceTest @@ -96,4 +96,4 @@ namespace MonoTests.MonkeyDoc } } } -} \ No newline at end of file +} diff --git a/mcs/tools/monkeydoc/Test/MonkeyDoc/SettingsTest.cs b/mcs/tools/monkeydoc/Test/MonkeyDoc/SettingsTest.cs index 9d9fd8c0e79..e7f372fcd30 100644 --- a/mcs/tools/monkeydoc/Test/MonkeyDoc/SettingsTest.cs +++ b/mcs/tools/monkeydoc/Test/MonkeyDoc/SettingsTest.cs @@ -5,9 +5,9 @@ using System.Collections.Generic; using NUnit.Framework; -using MonkeyDoc; +using Monodoc; -namespace MonoTests.MonkeyDoc +namespace MonoTests.Monodoc { [TestFixture] public class SettingsTest diff --git a/mcs/tools/monkeydoc/Test/Monkeydoc.Generators/RawGeneratorTests.cs b/mcs/tools/monkeydoc/Test/Monkeydoc.Generators/RawGeneratorTests.cs index 9e3b02b7dae..8d31c36cf3d 100644 --- a/mcs/tools/monkeydoc/Test/Monkeydoc.Generators/RawGeneratorTests.cs +++ b/mcs/tools/monkeydoc/Test/Monkeydoc.Generators/RawGeneratorTests.cs @@ -6,10 +6,10 @@ using System.Collections.Generic; using NUnit.Framework; -using MonkeyDoc; -using MonkeyDoc.Generators; +using Monodoc; +using Monodoc.Generators; -namespace MonoTests.MonkeyDoc.Generators +namespace MonoTests.Monodoc.Generators { [TestFixture] public class RawGeneratorTests -- 2.25.1