Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mcs/class/monodoc/Monodoc/HelpSource.cs10
-rw-r--r--mcs/class/monodoc/Monodoc/Node.cs10
-rw-r--r--mcs/class/monodoc/Monodoc/RootTree.cs10
-rw-r--r--mcs/class/monodoc/Monodoc/Tree.cs6
-rw-r--r--mcs/class/monodoc/Monodoc/providers/EcmaDoc.cs20
-rw-r--r--mcs/class/monodoc/Monodoc/providers/ecma-provider.cs24
-rw-r--r--mcs/class/monodoc/Monodoc/providers/ecmaspec-provider.cs4
-rw-r--r--mcs/class/monodoc/Monodoc/providers/error-provider.cs4
-rwxr-xr-xmcs/class/monodoc/Monodoc/providers/man-provider.cs2
-rw-r--r--mcs/class/monodoc/Test/Monodoc/HelpSourceTests.cs2
-rw-r--r--mcs/class/monodoc/Test/Monodoc/TreeTest.cs2
11 files changed, 51 insertions, 43 deletions
diff --git a/mcs/class/monodoc/Monodoc/HelpSource.cs b/mcs/class/monodoc/Monodoc/HelpSource.cs
index 695714d118c..2c6257d409c 100644
--- a/mcs/class/monodoc/Monodoc/HelpSource.cs
+++ b/mcs/class/monodoc/Monodoc/HelpSource.cs
@@ -256,21 +256,21 @@ namespace Monodoc
var searchNode = new Node () { Element = strippedUrl };
do {
- int index = current.Nodes.BinarySearch (searchNode, NodeElementComparer.Instance);
+ int index = current.ChildNodes.BinarySearch (searchNode, NodeElementComparer.Instance);
if (index >= 0) {
- Node n = current.Nodes[index];
+ Node n = current.ChildNodes[index];
matchCache.Put (url, n);
return n;
}
index = ~index;
- if (index == current.Nodes.Count) {
+ if (index == current.ChildNodes.Count) {
return SlowMatchNode (Tree.RootNode, matchCache, strippedUrl);
}
if (index == 0)
return null;
- current = current.Nodes [index - 1];
+ current = current.ChildNodes [index - 1];
} while (true);
return null;
@@ -286,7 +286,7 @@ namespace Monodoc
//Console.WriteLine ("Entering slow path for {0} starting from {1}", url, current.Element);
while (current != null) {
bool stop = true;
- foreach (Node n in current.Nodes) {
+ foreach (Node n in current.ChildNodes) {
var element = n.Element.StartsWith (UriPrefix, StringComparison.OrdinalIgnoreCase) ? n.Element.Substring (UriPrefix.Length) : n.Element;
if (url.Equals (element, StringComparison.Ordinal)) {
matchCache.Put (url, n);
diff --git a/mcs/class/monodoc/Monodoc/Node.cs b/mcs/class/monodoc/Monodoc/Node.cs
index 4ac430f2dc5..92949018ade 100644
--- a/mcs/class/monodoc/Monodoc/Node.cs
+++ b/mcs/class/monodoc/Monodoc/Node.cs
@@ -3,6 +3,7 @@ using System.IO;
using System.Text;
using System.Linq;
using System.Xml;
+using System.Collections;
using System.Collections.Generic;
namespace Monodoc
@@ -106,7 +107,14 @@ namespace Monodoc
childrenLookup[child.element] = child;
}
- public List<Node> Nodes {
+ [Obsolete ("Use ChildNodes")]
+ public ArrayList Nodes {
+ get {
+ return new ArrayList (ChildNodes);
+ }
+ }
+
+ public List<Node> ChildNodes {
get {
EnsureLoaded ();
return nodes != null ? nodes : new List<Node> ();
diff --git a/mcs/class/monodoc/Monodoc/RootTree.cs b/mcs/class/monodoc/Monodoc/RootTree.cs
index 0a1df108f3c..bc10da51f86 100644
--- a/mcs/class/monodoc/Monodoc/RootTree.cs
+++ b/mcs/class/monodoc/Monodoc/RootTree.cs
@@ -142,7 +142,7 @@ namespace Monodoc
Node hsn = rootTree.RootNode.CreateNode (hs.Name, "root:/" + epath);
rootTree.nameToHelpSource [epath] = hs;
hsn.EnsureNodes ();
- foreach (Node n in hs.Tree.RootNode.Nodes)
+ foreach (Node n in hs.Tree.RootNode.ChildNodes)
hsn.AddNode (n);
}
@@ -214,7 +214,7 @@ namespace Monodoc
Console.Error.WriteLine ("node `{0}' is not defined on the documentation map", path);
node2 = node;
}
- foreach (Node current in helpSource.Tree.RootNode.Nodes) {
+ foreach (Node current in helpSource.Tree.RootNode.ChildNodes) {
node2.AddNode (current);
}
node2.Sort ();
@@ -229,7 +229,7 @@ namespace Monodoc
if (!node.Documented)
{
List<Node> list = new List<Node> ();
- foreach (Node current in node.Nodes)
+ foreach (Node current in node.ChildNodes)
{
bool flag = RootTree.PurgeNode (current);
if (flag)
@@ -237,7 +237,7 @@ namespace Monodoc
list.Add (current);
}
}
- result = (node.Nodes.Count == list.Count);
+ result = (node.ChildNodes.Count == list.Count);
foreach (Node current2 in list)
{
node.DeleteNode (current2);
@@ -405,7 +405,7 @@ namespace Monodoc
internalId = "root:";
node = this.LookupEntryPoint (name);
- return node == null ? null : node.Nodes.Select (n => n.Tree.HelpSource).Where (hs => hs != null).Distinct ().FirstOrDefault ();
+ return node == null ? null : node.ChildNodes.Select (n => n.Tree.HelpSource).Where (hs => hs != null).Distinct ().FirstOrDefault ();
}
public HelpSource GetHelpSourceFromId (int id)
diff --git a/mcs/class/monodoc/Monodoc/Tree.cs b/mcs/class/monodoc/Monodoc/Tree.cs
index c517f854746..3ed9648f0ef 100644
--- a/mcs/class/monodoc/Monodoc/Tree.cs
+++ b/mcs/class/monodoc/Monodoc/Tree.cs
@@ -188,11 +188,11 @@ namespace Monodoc
{
Indent ();
Console.WriteLine ("{0},{1}\t[PublicUrl: {2}]", node.Element, node.Caption, node.PublicUrl);
- if (node.Nodes.Count == 0)
+ if (node.ChildNodes.Count == 0)
return;
indent++;
- foreach (Node n in node.Nodes)
+ foreach (Node n in node.ChildNodes)
PrintTree (n);
indent--;
}
@@ -208,7 +208,7 @@ namespace Monodoc
writer.WriteAttributeString ("title", title ?? string.Empty);
writer.WriteElementString ("description", desc ?? string.Empty);
writer.WriteStartElement ("list");
- foreach (Node n in root.Nodes) {
+ foreach (Node n in root.ChildNodes) {
writer.WriteStartElement ("item");
writer.WriteAttributeString ("url", n.Element);
writer.WriteValue (n.Caption);
diff --git a/mcs/class/monodoc/Monodoc/providers/EcmaDoc.cs b/mcs/class/monodoc/Monodoc/providers/EcmaDoc.cs
index 62dab9e0b8a..e6e7e618bac 100644
--- a/mcs/class/monodoc/Monodoc/providers/EcmaDoc.cs
+++ b/mcs/class/monodoc/Monodoc/providers/EcmaDoc.cs
@@ -202,9 +202,9 @@ namespace Monodoc.Providers
// Namespace search
Node currentNode = tree.RootNode;
Node searchNode = new Node () { Caption = desc.Namespace };
- int index = currentNode.Nodes.BinarySearch (searchNode, EcmaGenericNodeComparer.Instance);
+ int index = currentNode.ChildNodes.BinarySearch (searchNode, EcmaGenericNodeComparer.Instance);
if (index >= 0)
- result = currentNode.Nodes[index];
+ result = currentNode.ChildNodes[index];
if (desc.DescKind == EcmaDesc.Kind.Namespace || index < 0)
return result;
@@ -212,9 +212,9 @@ namespace Monodoc.Providers
currentNode = result;
result = null;
searchNode.Caption = desc.ToCompleteTypeName ();
- index = currentNode.Nodes.BinarySearch (searchNode, EcmaTypeNodeComparer.Instance);
+ index = currentNode.ChildNodes.BinarySearch (searchNode, EcmaTypeNodeComparer.Instance);
if (index >= 0)
- result = currentNode.Nodes[index];
+ result = currentNode.ChildNodes[index];
if ((desc.DescKind == EcmaDesc.Kind.Type && !desc.IsEtc) || index < 0)
return result;
@@ -222,7 +222,7 @@ namespace Monodoc.Providers
currentNode = result;
result = null;
var caption = desc.IsEtc ? EtcKindToCaption (desc.Etc) : MemberKindToCaption (desc.DescKind);
- currentNode = FindNodeForCaption (currentNode.Nodes, caption);
+ currentNode = FindNodeForCaption (currentNode.ChildNodes, caption);
if (currentNode == null
|| (desc.IsEtc && desc.DescKind == EcmaDesc.Kind.Type && string.IsNullOrEmpty (desc.EtcFilter)))
return currentNode;
@@ -231,20 +231,20 @@ namespace Monodoc.Providers
result = null;
var format = desc.DescKind == EcmaDesc.Kind.Constructor ? EcmaDesc.Format.WithArgs : EcmaDesc.Format.WithoutArgs;
searchNode.Caption = desc.ToCompleteMemberName (format);
- index = currentNode.Nodes.BinarySearch (searchNode, EcmaGenericNodeComparer.Instance);
+ index = currentNode.ChildNodes.BinarySearch (searchNode, EcmaGenericNodeComparer.Instance);
if (index < 0)
return null;
- result = currentNode.Nodes[index];
- if (result.Nodes.Count == 0 || desc.IsEtc)
+ result = currentNode.ChildNodes[index];
+ if (result.ChildNodes.Count == 0 || desc.IsEtc)
return result;
// Overloads search
currentNode = result;
searchNode.Caption = desc.ToCompleteMemberName (EcmaDesc.Format.WithArgs);
- index = currentNode.Nodes.BinarySearch (searchNode, EcmaGenericNodeComparer.Instance);
+ index = currentNode.ChildNodes.BinarySearch (searchNode, EcmaGenericNodeComparer.Instance);
if (index < 0)
return result;
- result = result.Nodes[index];
+ result = result.ChildNodes[index];
return result;
}
diff --git a/mcs/class/monodoc/Monodoc/providers/ecma-provider.cs b/mcs/class/monodoc/Monodoc/providers/ecma-provider.cs
index 248ab3930f8..2ba55098769 100644
--- a/mcs/class/monodoc/Monodoc/providers/ecma-provider.cs
+++ b/mcs/class/monodoc/Monodoc/providers/ecma-provider.cs
@@ -340,8 +340,8 @@ namespace Monodoc.Providers
public override void PopulateIndex (IndexMaker index_maker)
{
- foreach (Node ns_node in Tree.RootNode.Nodes){
- foreach (Node type_node in ns_node.Nodes){
+ foreach (Node ns_node in Tree.RootNode.ChildNodes){
+ foreach (Node type_node in ns_node.ChildNodes){
string typename = type_node.Caption.Substring (0, type_node.Caption.IndexOf (' '));
string full = ns_node.Caption + "." + typename;
@@ -370,7 +370,7 @@ namespace Monodoc.Providers
index_maker.Add (type_node.Caption, typename, url);
index_maker.Add (full + " " + doc_tag, full, url);
- foreach (Node c in type_node.Nodes){
+ foreach (Node c in type_node.ChildNodes){
switch (c.Caption){
case "Constructors":
index_maker.Add (" constructors", typename+"0", url + "/C");
@@ -399,10 +399,10 @@ namespace Monodoc.Providers
//
string keybase = typename + "6.";
- foreach (Node c in type_node.Nodes){
+ foreach (Node c in type_node.ChildNodes){
var type = c.Caption[0];
- foreach (Node nc in c.Nodes) {
+ foreach (Node nc in c.ChildNodes) {
string res = nc.Caption;
string nurl = nc.PublicUrl;
@@ -492,8 +492,8 @@ namespace Monodoc.Providers
StringBuilder text = new StringBuilder ();
SearchableDocument searchDoc = new SearchableDocument ();
- foreach (Node ns_node in Tree.RootNode.Nodes) {
- foreach (Node type_node in ns_node.Nodes) {
+ foreach (Node ns_node in Tree.RootNode.ChildNodes) {
+ foreach (Node type_node in ns_node.ChildNodes) {
string typename = type_node.Caption.Substring (0, type_node.Caption.IndexOf (' '));
string full = ns_node.Caption + "." + typename;
string url = type_node.PublicUrl;
@@ -530,22 +530,22 @@ namespace Monodoc.Providers
var exportParsable = doc_tag[0] == 'C' && (ns_node.Caption.StartsWith ("MonoTouch") || ns_node.Caption.StartsWith ("MonoMac"));
//Add docs for contructors, methods, etc.
- foreach (Node c in type_node.Nodes) { // c = Constructors || Fields || Events || Properties || Methods || Operators
+ foreach (Node c in type_node.ChildNodes) { // c = Constructors || Fields || Events || Properties || Methods || Operators
if (c.Element == "*")
continue;
const float innerTypeBoost = 0.2f;
- IEnumerable<Node> ncnodes = c.Nodes;
+ IEnumerable<Node> ncnodes = c.ChildNodes;
// The rationale is that we need to properly handle method overloads
// so for those method node which have children, flatten them
if (c.Caption == "Methods") {
ncnodes = ncnodes
- .Where (n => n.Nodes == null || n.Nodes.Count == 0)
- .Concat (ncnodes.Where (n => n.Nodes.Count > 0).SelectMany (n => n.Nodes));
+ .Where (n => n.ChildNodes == null || n.ChildNodes.Count == 0)
+ .Concat (ncnodes.Where (n => n.ChildNodes.Count > 0).SelectMany (n => n.ChildNodes));
} else if (c.Caption == "Operators") {
ncnodes = ncnodes
.Where (n => !n.Caption.EndsWith ("Conversion"))
- .Concat (ncnodes.Where (n => n.Caption.EndsWith ("Conversion")).SelectMany (n => n.Nodes));
+ .Concat (ncnodes.Where (n => n.Caption.EndsWith ("Conversion")).SelectMany (n => n.ChildNodes));
}
var prematchedMembers = xdoc.Root.Element ("Members").Elements ("Member").ToLookup (n => (string)n.Attribute ("MemberName"), n => n);
diff --git a/mcs/class/monodoc/Monodoc/providers/ecmaspec-provider.cs b/mcs/class/monodoc/Monodoc/providers/ecmaspec-provider.cs
index 7ff5c5c8783..84cc4a1cb55 100644
--- a/mcs/class/monodoc/Monodoc/providers/ecmaspec-provider.cs
+++ b/mcs/class/monodoc/Monodoc/providers/ecmaspec-provider.cs
@@ -114,7 +114,7 @@ namespace Monodoc.Providers
public override void PopulateSearchableIndex (IndexWriter writer)
{
- foreach (Node n in Tree.RootNode.Nodes)
+ foreach (Node n in Tree.RootNode.ChildNodes)
AddDocuments (writer, n);
}
@@ -159,7 +159,7 @@ namespace Monodoc.Providers
if (node.IsLeaf)
return;
- foreach (Node n in node.Nodes)
+ foreach (Node n in node.ChildNodes)
AddDocuments (writer, n);
}
diff --git a/mcs/class/monodoc/Monodoc/providers/error-provider.cs b/mcs/class/monodoc/Monodoc/providers/error-provider.cs
index ba9f4f38a90..6a25518d2dd 100644
--- a/mcs/class/monodoc/Monodoc/providers/error-provider.cs
+++ b/mcs/class/monodoc/Monodoc/providers/error-provider.cs
@@ -178,13 +178,13 @@ namespace Monodoc.Providers
public override void PopulateIndex (IndexMaker index_maker)
{
- foreach (Node n in Tree.RootNode.Nodes)
+ foreach (Node n in Tree.RootNode.ChildNodes)
index_maker.Add (n.Caption, n.Caption, n.Element);
}
public override void PopulateSearchableIndex (IndexWriter writer)
{
- foreach (Node n in Tree.RootNode.Nodes) {
+ foreach (Node n in Tree.RootNode.ChildNodes) {
XmlSerializer reader = new XmlSerializer (typeof (ErrorDocumentation));
ErrorDocumentation d = (ErrorDocumentation)reader.Deserialize (GetHelpStream (n.Element.Substring (6)));
SearchableDocument doc = new SearchableDocument ();
diff --git a/mcs/class/monodoc/Monodoc/providers/man-provider.cs b/mcs/class/monodoc/Monodoc/providers/man-provider.cs
index 573ebe460a8..6e68626551b 100755
--- a/mcs/class/monodoc/Monodoc/providers/man-provider.cs
+++ b/mcs/class/monodoc/Monodoc/providers/man-provider.cs
@@ -71,7 +71,7 @@ namespace Monodoc.Providers
public ManHelpSource (string base_file, bool create) : base (base_file, create)
{
- nodesMap = Tree.RootNode.Nodes.ToDictionary (n => n.Element);
+ nodesMap = Tree.RootNode.ChildNodes.ToDictionary (n => n.Element);
}
// Since man always has a flat tree and rather small amount of item
diff --git a/mcs/class/monodoc/Test/Monodoc/HelpSourceTests.cs b/mcs/class/monodoc/Test/Monodoc/HelpSourceTests.cs
index 4838878b7d1..ad17eee6a88 100644
--- a/mcs/class/monodoc/Test/Monodoc/HelpSourceTests.cs
+++ b/mcs/class/monodoc/Test/Monodoc/HelpSourceTests.cs
@@ -87,7 +87,7 @@ namespace MonoTests.Monodoc
if (node.IsLeaf)
yield return node;
else {
- foreach (var child in node.Nodes) {
+ foreach (var child in node.ChildNodes) {
if (!string.IsNullOrEmpty (child.Element) && !child.Element.StartsWith ("root:/"))
yield return child;
foreach (var childLeaf in GetLeaves (child))
diff --git a/mcs/class/monodoc/Test/Monodoc/TreeTest.cs b/mcs/class/monodoc/Test/Monodoc/TreeTest.cs
index 1a5a9e559f6..e386e4745e3 100644
--- a/mcs/class/monodoc/Test/Monodoc/TreeTest.cs
+++ b/mcs/class/monodoc/Test/Monodoc/TreeTest.cs
@@ -38,7 +38,7 @@ namespace MonoTests.Monodoc
var tree = new Tree (null, filePath);
Assert.AreEqual (expectedVersion, tree.VersionNumber);
Assert.IsNotNull (tree.RootNode);
- Assert.AreEqual (expectedNodeCount, tree.RootNode.Nodes.Count);
+ Assert.AreEqual (expectedNodeCount, tree.RootNode.ChildNodes.Count);
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 15:50:06 +0300