Author: atsushi
Date: 2005-11-07 03:48:22 -0500 (Mon, 07 Nov 2005)
New Revision: 52637
Modified:
trunk/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
trunk/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
trunk/mcs/class/System.XML/System.Xml.XPath/ChangeLog
trunk/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
trunk/mcs/class/System.XML/System.Xml.XPath/XPathNodeIterator.cs
trunk/mcs/class/System.XML/System.Xml/ChangeLog
trunk/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
trunk/mcs/class/System.XML/System.Xml/XmlReader.cs
trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs
Log:
2005-11-07 Atsushi Enomoto <[EMAIL PROTECTED]>
* XsdValidatingReader.cs : XmlReader.ReadTypedValue() does not exist
anymore, so it is not override.
* XmlNamespaceManager.cs : NameTable is virtual in 2.0 RTM.
* XmlReader.cs : IsEmptyElement is reverted to be abstract in 2.0 RTM.
ReadTypedValue() is removed.
* XmlValidatingReader.cs : ReadTypedValue() is not virtual now.
* XmlWriter.cs : Settings is virtual.
* XPathNodeIterator.cs : added [DebuggerDisplay]. pretty useless tho.
* XPathNavigator.cs : [DebuggerDisplay] as well.
SelectSingleNode() and AppendChildElement() are now virtual.
Modified: trunk/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog 2005-11-07
08:43:14 UTC (rev 52636)
+++ trunk/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog 2005-11-07
08:48:22 UTC (rev 52637)
@@ -1,3 +1,8 @@
+2005-11-07 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * XsdValidatingReader.cs : XmlReader.ReadTypedValue() does not exist
+ anymore, so it is not override.
+
2005-09-30 Atsushi Enomoto <[EMAIL PROTECTED]>
* XsdValidatingReader.cs: make ParserContext and its NamespaceManager
Modified: trunk/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
2005-11-07 08:43:14 UTC (rev 52636)
+++ trunk/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
2005-11-07 08:48:22 UTC (rev 52637)
@@ -218,12 +218,7 @@
}
// It is used only for independent XmlReader use, not for
XmlValidatingReader.
-#if NET_2_0
- [Obsolete]
- public override object ReadTypedValue ()
-#else
public object ReadTypedValue ()
-#endif
{
object o = XmlSchemaUtil.ReadTypedValue (this,
SchemaType, NamespaceManager,
Modified: trunk/mcs/class/System.XML/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/ChangeLog 2005-11-07 08:43:14 UTC
(rev 52636)
+++ trunk/mcs/class/System.XML/System.Xml/ChangeLog 2005-11-07 08:48:22 UTC
(rev 52637)
@@ -1,3 +1,11 @@
+2005-11-07 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * XmlNamespaceManager.cs : NameTable is virtual in 2.0 RTM.
+ * XmlReader.cs : IsEmptyElement is reverted to be abstract in 2.0 RTM.
+ ReadTypedValue() is removed.
+ * XmlValidatingReader.cs : ReadTypedValue() is not virtual now.
+ * XmlWriter.cs : Settings is virtual.
+
2005-10-23 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlDocumentNavigator.cs : now MoveToFirst() invokes internal
Modified: trunk/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
2005-11-07 08:43:14 UTC (rev 52636)
+++ trunk/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
2005-11-07 08:48:22 UTC (rev 52637)
@@ -120,7 +120,11 @@
get { return defaultNamespace == null ? string.Empty :
defaultNamespace; }
}
+#if NET_2_0
+ public virtual XmlNameTable NameTable {
+#else
public XmlNameTable NameTable {
+#endif
get { return nameTable; }
}
Modified: trunk/mcs/class/System.XML/System.Xml/XmlReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlReader.cs 2005-11-07 08:43:14 UTC
(rev 52636)
+++ trunk/mcs/class/System.XML/System.Xml/XmlReader.cs 2005-11-07 08:48:22 UTC
(rev 52637)
@@ -122,15 +122,13 @@
public abstract bool HasValue { get; }
+ public abstract bool IsEmptyElement { get; }
+
#if NET_2_0
public virtual bool IsDefault {
get { return false; }
}
- public virtual bool IsEmptyElement {
- get { return false; }
- }
-
public virtual string this [int i] {
get { return GetAttribute (i); }
}
@@ -145,8 +143,6 @@
#else
public abstract bool IsDefault { get; }
- public abstract bool IsEmptyElement { get; }
-
public abstract string this [int i] { get; }
public abstract string this [string name] { get; }
@@ -876,16 +872,6 @@
return new SubtreeXmlReader (this);
}
- [MonoTODO]
- [Obsolete]
- public virtual object ReadTypedValue ()
- {
- if (NodeType == XmlNodeType.Element)
- return ReadElementContentAs (ValueType, this as
IXmlNamespaceResolver);
- else
- return ReadContentAs (ValueType, this as
IXmlNamespaceResolver);
- }
-
private string ReadContentString ()
{
switch (NodeType) {
Modified: trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
2005-11-07 08:43:14 UTC (rev 52636)
+++ trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
2005-11-07 08:48:22 UTC (rev 52637)
@@ -536,11 +536,7 @@
}
#endif
-#if NET_2_0
- public override object ReadTypedValue ()
-#else
public object ReadTypedValue ()
-#endif
{
if (dtdReader == null)
return null;
Modified: trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs 2005-11-07 08:43:14 UTC
(rev 52636)
+++ trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs 2005-11-07 08:48:22 UTC
(rev 52637)
@@ -58,7 +58,7 @@
#region Properties
#if NET_2_0
- public XmlWriterSettings Settings {
+ public virtual XmlWriterSettings Settings {
get {
if (settings == null)
settings = new XmlWriterSettings ();
Modified: trunk/mcs/class/System.XML/System.Xml.XPath/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.XPath/ChangeLog 2005-11-07
08:43:14 UTC (rev 52636)
+++ trunk/mcs/class/System.XML/System.Xml.XPath/ChangeLog 2005-11-07
08:48:22 UTC (rev 52637)
@@ -1,3 +1,9 @@
+2005-11-07 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * XPathNodeIterator.cs : added [DebuggerDisplay]. pretty useless tho.
+ * XPathNavigator.cs : [DebuggerDisplay] as well.
+ SelectSingleNode() and AppendChildElement() are now virtual.
+
2005-10-23 Atsushi Enomoto <[EMAIL PROTECTED]>
* XPathNavigator.cs : now 2.0 MoveToFirst() invokes internal
Modified: trunk/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
2005-11-07 08:43:14 UTC (rev 52636)
+++ trunk/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
2005-11-07 08:48:22 UTC (rev 52637)
@@ -50,6 +50,7 @@
namespace System.Xml.XPath
{
#if NET_2_0
+ [DebuggerDisplay ("Name")]
public abstract class XPathNavigator : XPathItem,
ICloneable, IXPathNavigable, IXmlNamespaceResolver
#else
@@ -851,7 +852,7 @@
return SelectSingleNode (expr);
}
- public XPathNavigator SelectSingleNode (XPathExpression
expression)
+ public virtual XPathNavigator SelectSingleNode (XPathExpression
expression)
{
XPathNodeIterator iter = Select (expression);
if (iter.MoveNext ())
@@ -1043,7 +1044,7 @@
AppendChild (new XPathNavigatorReader (nav));
}
- public void AppendChildElement (string prefix, string name,
string ns, string value)
+ public virtual void AppendChildElement (string prefix, string
name, string ns, string value)
{
XmlWriter xw = AppendChild ();
xw.WriteStartElement (prefix, name, ns);
Modified: trunk/mcs/class/System.XML/System.Xml.XPath/XPathNodeIterator.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.XPath/XPathNodeIterator.cs
2005-11-07 08:43:14 UTC (rev 52636)
+++ trunk/mcs/class/System.XML/System.Xml.XPath/XPathNodeIterator.cs
2005-11-07 08:48:22 UTC (rev 52637)
@@ -37,6 +37,7 @@
namespace System.Xml.XPath
{
#if NET_2_0
+ [DebuggerDisplay ("Current")]
public abstract class XPathNodeIterator : ICloneable, IEnumerable
#else
public abstract class XPathNodeIterator : ICloneable
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
