Author: atsushi
Date: 2006-01-30 03:10:05 -0500 (Mon, 30 Jan 2006)
New Revision: 56239
Modified:
trunk/mcs/class/System.XML/System.Xml/ChangeLog
trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
trunk/mcs/class/System.XML/System.Xml/XmlException.cs
trunk/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs
trunk/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs
trunk/mcs/class/System.XML/System.Xml/XmlReader.cs
trunk/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs
trunk/mcs/class/System.XML/System.Xml/XmlTextReader.cs
trunk/mcs/class/System.XML/System.Xml/XmlTextWriter.cs
trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs
Log:
2006-01-30 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlNodeReader2.cs XmlException.cs XmlReader.cs XmlTextReader.cs
XmlWriter.cs XmlTextWriter.cs XmlValidatingReader.cs
XmlNodeReaderImpl.cs DTDValidatingReader.cs XmlSecureResolver.cs:
cleaning up obsolete NET_1_0 code.
Modified: trunk/mcs/class/System.XML/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/ChangeLog 2006-01-30 06:08:52 UTC
(rev 56238)
+++ trunk/mcs/class/System.XML/System.Xml/ChangeLog 2006-01-30 08:10:05 UTC
(rev 56239)
@@ -1,3 +1,10 @@
+2006-01-30 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * XmlNodeReader2.cs XmlException.cs XmlReader.cs XmlTextReader.cs
+ XmlWriter.cs XmlTextWriter.cs XmlValidatingReader.cs
+ XmlNodeReaderImpl.cs DTDValidatingReader.cs XmlSecureResolver.cs:
+ cleaning up obsolete NET_1_0 code.
+
2006-01-28 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlTextWriter.cs : avoid case-insensitive String.Compare().
Modified: trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
2006-01-30 06:08:52 UTC (rev 56238)
+++ trunk/mcs/class/System.XML/System.Xml/DTDValidatingReader.cs
2006-01-30 08:10:05 UTC (rev 56239)
@@ -949,26 +949,6 @@
return reader.ReadAttributeValue ();
}
-#if NET_1_0
- public override string ReadInnerXml ()
- {
- // MS.NET 1.0 has a serious bug here. It skips
validation.
- return reader.ReadInnerXml ();
- }
-
- public override string ReadOuterXml ()
- {
- // MS.NET 1.0 has a serious bug here. It skips
validation.
- return reader.ReadOuterXml ();
- }
-#endif
-
- public override string ReadString ()
- {
- // It seems to be the same as ReadInnerXml().
- return base.ReadStringInternal ();
- }
-
public override void ResolveEntity ()
{
if (resolver == null)
Modified: trunk/mcs/class/System.XML/System.Xml/XmlException.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlException.cs 2006-01-30
06:08:52 UTC (rev 56238)
+++ trunk/mcs/class/System.XML/System.Xml/XmlException.cs 2006-01-30
08:10:05 UTC (rev 56239)
@@ -47,13 +47,11 @@
#region Constructors
-#if NET_1_0
-#else
public XmlException ()
: base ()
{
}
-#endif
+
public XmlException (string message, Exception innerException)
: base (message, innerException)
{
@@ -67,11 +65,7 @@
this.sourceUri = info.GetString ("sourceUri");
}
-#if NET_1_0
- internal XmlException (string message)
-#else
public XmlException (string message)
-#endif
: base (message)
{
}
@@ -95,12 +89,8 @@
}
this.sourceUri = sourceUri;
}
-
-#if NET_1_0
- internal XmlException (string message, Exception
innerException, int lineNumber, int linePosition)
-#else
+
public XmlException (string message, Exception innerException,
int lineNumber, int linePosition)
-#endif
: base (message, innerException)
{
this.lineNumber = lineNumber;
Modified: trunk/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs 2006-01-30
06:08:52 UTC (rev 56238)
+++ trunk/mcs/class/System.XML/System.Xml/XmlNodeReader2.cs 2006-01-30
08:10:05 UTC (rev 56239)
@@ -426,21 +426,9 @@
}
#endif
-#if NET_1_0
- public override string ReadInnerXml ()
- {
- return ReadInnerXmlInternal ();
- }
-
- public override string ReadOuterXml ()
- {
- return ReadOuterXmlInternal ();
- }
-#endif
-
public override string ReadString ()
{
- return ReadStringInternal ();
+ return base.ReadString ();
}
public override void ResolveEntity ()
Modified: trunk/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs 2006-01-30
06:08:52 UTC (rev 56238)
+++ trunk/mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs 2006-01-30
08:10:05 UTC (rev 56239)
@@ -821,21 +821,9 @@
return false;
}
-#if NET_1_0
- public override string ReadInnerXml ()
- {
- return ReadInnerXmlInternal ();
- }
-
- public override string ReadOuterXml ()
- {
- return ReadOuterXmlInternal ();
- }
-#endif
-
public override string ReadString ()
{
- return ReadStringInternal ();
+ return base.ReadString ();
}
public override void ResolveEntity ()
Modified: trunk/mcs/class/System.XML/System.Xml/XmlReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlReader.cs 2006-01-30 06:08:52 UTC
(rev 56238)
+++ trunk/mcs/class/System.XML/System.Xml/XmlReader.cs 2006-01-30 08:10:05 UTC
(rev 56239)
@@ -647,25 +647,8 @@
Read ();
}
-#if NET_1_0
- public abstract string ReadInnerXml ();
-
- public abstract string ReadOuterXml ();
-
-#else
public virtual string ReadInnerXml ()
{
- return ReadInnerXmlInternal ();
- }
-
- public virtual string ReadOuterXml ()
- {
- return ReadOuterXmlInternal ();
- }
-#endif
-
- internal string ReadInnerXmlInternal ()
- {
if (ReadState != ReadState.Interactive || NodeType ==
XmlNodeType.EndElement)
return String.Empty;
@@ -692,7 +675,7 @@
return sw.ToString ();
}
- internal string ReadOuterXmlInternal ()
+ public virtual string ReadOuterXml ()
{
if (ReadState != ReadState.Interactive || NodeType ==
XmlNodeType.EndElement)
return String.Empty;
@@ -749,17 +732,8 @@
Read ();
}
-#if NET_1_0
- public abstract string ReadString ();
-#else
public virtual string ReadString ()
{
- return ReadStringInternal ();
- }
-#endif
-
- internal string ReadStringInternal ()
- {
if (readStringBuffer == null)
readStringBuffer = new StringBuilder ();
readStringBuffer.Length = 0;
Modified: trunk/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs 2006-01-30
06:08:52 UTC (rev 56238)
+++ trunk/mcs/class/System.XML/System.Xml/XmlSecureResolver.cs 2006-01-30
08:10:05 UTC (rev 56239)
@@ -1,3 +1,11 @@
+//
+// System.Xml.XmlSecureResolver.cs
+//
+// Author: Atsushi Enomoto ([EMAIL PROTECTED])
+//
+// (C) 2003 Atsushi Enomoto
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
//
// Permission is hereby granted, free of charge, to any person obtaining
@@ -19,17 +27,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_1_0
-#endif
-#if NET_1_1
-//
-// System.Xml.XmlSecureResolver.cs
-//
-// Author: Atsushi Enomoto ([EMAIL PROTECTED])
-//
-// (C) 2003 Atsushi Enomoto
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
using System.Net;
using System.Security;
@@ -135,4 +132,3 @@
}
}
-#endif
Modified: trunk/mcs/class/System.XML/System.Xml/XmlTextReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlTextReader.cs 2006-01-30
06:08:52 UTC (rev 56238)
+++ trunk/mcs/class/System.XML/System.Xml/XmlTextReader.cs 2006-01-30
08:10:05 UTC (rev 56239)
@@ -655,23 +655,6 @@
return ReadCharsInternal (buffer, offset, length);
}
-#if NET_1_0
- public override string ReadInnerXml ()
- {
- return ReadInnerXmlInternal ();
- }
-
- public override string ReadOuterXml ()
- {
- return ReadOuterXmlInternal ();
- }
-
- public override string ReadString ()
- {
- return ReadStringInternal ();
- }
-#endif
-
public void ResetState ()
{
throw new InvalidOperationException ("Cannot call
ResetState when parsing an XML fragment.");
Modified: trunk/mcs/class/System.XML/System.Xml/XmlTextWriter.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlTextWriter.cs 2006-01-30
06:08:52 UTC (rev 56238)
+++ trunk/mcs/class/System.XML/System.Xml/XmlTextWriter.cs 2006-01-30
08:10:05 UTC (rev 56239)
@@ -782,11 +782,7 @@
}
// Note that null namespace with "xmlns" are allowed.
-#if NET_1_0
- if ((prefix == "xmlns" || localName == "xmlns" &&
prefix == String.Empty) && ns != XmlnsNamespace)
-#else
if ((prefix == "xmlns" || localName == "xmlns" &&
prefix == String.Empty) && ns != null && ns != XmlnsNamespace)
-#endif
throw ArgumentError (String.Format ("The
'xmlns' attribute is bound to the reserved namespace '{0}'", XmlnsNamespace));
if (ns == XmlnsNamespace) // see bug #77083
Modified: trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
2006-01-30 06:08:52 UTC (rev 56238)
+++ trunk/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs
2006-01-30 08:10:05 UTC (rev 56239)
@@ -512,35 +512,10 @@
return validatingReader.ReadAttributeValue ();
}
-#if NET_1_0
- // LAMESPEC: MS.NET 1.0 has critical bug here.
- // After calling these methods, validation does not work
anymore!
- public override string ReadInnerXml ()
- {
- if (validatingReader == null)
- return "";
- return validatingReader.ReadInnerXml ();
- }
-
- public override string ReadOuterXml ()
- {
- if (validatingReader == null)
- return "";
- return validatingReader.ReadOuterXml ();
- }
-#endif
-
-#if NET_1_0
public override string ReadString ()
{
- return base.ReadStringInternal ();
- }
-#else
- public override string ReadString ()
- {
return base.ReadString ();
}
-#endif
public object ReadTypedValue ()
{
Modified: trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs 2006-01-30 06:08:52 UTC
(rev 56238)
+++ trunk/mcs/class/System.XML/System.Xml/XmlWriter.cs 2006-01-30 08:10:05 UTC
(rev 56239)
@@ -254,11 +254,6 @@
// In MS.NET (1.0), this check is done *here*, not at
WriteStartAttribute.
// (XmlTextWriter.WriteStartAttribute("xmlns",
"anyname", null) throws an exception.
-#if NET_1_0
- if ((prefix == "xmlns" || (prefix == "" && localName ==
"xmlns")) && ns == null)
- ns = "http://www.w3.org/2000/xmlns/";
-#endif
-
WriteStartAttribute (prefix, localName, ns);
WriteString (value);
WriteEndAttribute ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches