2007-08-09 Atsushi Enomoto <[email protected]>

	* XmlReader.cs XmlNodeReader2.cs XmlTextReader.cs XmlTextReader2.cs
	  XmlNodeReaderImpl.cs EntityResolvingXmlReader.cs :
	  The previous attempt was wrong. Those internal-virtualized ones
	  could be used in System.Xml.Core classes and outside the assembly
	  any derived XmlReaders would have thrown throw Exception.
	  Now I marked them as nonexistent-in-2.1 or privatized.
	* XmlWriter.cs : actually only this class is affected (if there
	  were DOM or XSD they would have been affected as well).

	* SubtreeXmlReader.cs XmlFilterReader.cs : further dependent changes.


svn path=/trunk/mcs/; revision=83706

mcs/class/System.XML/Mono.Xml/ChangeLog

@@ -1,3 +1,7 @@
+2007-08-09  Atsushi Enomoto <[email protected]>
+
+	* SubtreeXmlReader.cs XmlFilterReader.cs : further dependent changes.
+
 2007-08-09  Atsushi Enomoto <[email protected]>
 
 	* SubtreeXmlReader.cs XmlFilterReader.cs : dependent changes due to

mcs/class/System.XML/Mono.Xml/SubtreeXmlReader.cs

@@ -92,14 +92,11 @@ namespace Mono.Xml
 			get { return initial ? 0 : li != null ? li.LinePosition : 0; }
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool HasValue {
+#if !NET_2_1
+		public override bool HasValue {
 			get { return initial ? false : Reader.HasValue; }
 		}
+#endif
 
 		public override string LocalName {
 			get { return initial ? String.Empty : Reader.LocalName; }
@@ -232,29 +229,21 @@ namespace Mono.Xml
 			return false;
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool ReadAttributeValue ()
+#if !NET_2_1
+		public override bool ReadAttributeValue ()
 		{
 			if (initial || eof)
 				return false;
 			return Reader.ReadAttributeValue ();
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override void ResolveEntity ()
+		public override void ResolveEntity ()
 		{
 			if (initial || eof)
 				return;
 			Reader.ResolveEntity ();
 		}
+#endif
 	}
 }
 

mcs/class/System.XML/Mono.Xml/XmlFilterReader.cs

@@ -96,14 +96,11 @@ namespace Mono.Xml
 			get { return reader.Prefix; }
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool HasValue {
+#if !NET_2_1
+		public override bool HasValue {
 			get { return reader.HasValue; }
 		}
+#endif
 
 		public override int Depth {
 			get { return reader.Depth; }
@@ -278,24 +275,16 @@ namespace Mono.Xml
 			return reader.LookupNamespace (prefix);
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override void ResolveEntity ()
+#if !NET_2_1
+		public override void ResolveEntity ()
 		{
 			reader.ResolveEntity ();
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool ReadAttributeValue () {
+		public override bool ReadAttributeValue () {
 			return reader.ReadAttributeValue ();
 		}
+#endif
 		#endregion
 	}
 }

mcs/class/System.XML/System.Xml/ChangeLog

@@ -1,3 +1,14 @@
+2007-08-09  Atsushi Enomoto  <[email protected]>
+
+	* XmlReader.cs XmlNodeReader2.cs XmlTextReader.cs XmlTextReader2.cs
+	  XmlNodeReaderImpl.cs EntityResolvingXmlReader.cs :
+	  The previous attempt was wrong. Those internal-virtualized ones
+	  could be used in System.Xml.Core classes and outside the assembly
+	  any derived XmlReaders would have thrown throw Exception.
+	  Now I marked them as nonexistent-in-2.1 or privatized.
+	* XmlWriter.cs : actually only this class is affected (if there
+	  were DOM or XSD they would have been affected as well).
+
 2007-08-09  Atsushi Enomoto  <[email protected]>
 
 	* XmlReader.cs : HasValue, ReadAttributeValue() and ResolveEntity()

mcs/class/System.XML/System.Xml/EntityResolvingXmlReader.cs

@@ -116,14 +116,11 @@ namespace Mono.Xml
 			get { return source.EOF; }
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool HasValue {
+#if !NET_2_1
+		public override bool HasValue {
 			get { return Current.HasValue; }
 		}
+#endif
 
 		public override bool IsDefault {
 			get { return Current.IsDefault; }
@@ -402,12 +399,8 @@ namespace Mono.Xml
 			}
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool ReadAttributeValue ()
+#if !NET_2_1
+		public override bool ReadAttributeValue ()
 		{
 			if (entity != null && entity_inside_attr) {
 				if (entity.EOF) {
@@ -421,18 +414,17 @@ namespace Mono.Xml
 			}
 			return Current.ReadAttributeValue ();
 		}
+#endif
 
 		public override string ReadString ()
 		{
 			return base.ReadString ();
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
+#if !NET_2_1
+		public override
 #endif
-		override void ResolveEntity ()
+		void ResolveEntity ()
 		{
 #if NET_2_0
 			DoResolveEntity ();

mcs/class/System.XML/System.Xml/XmlNodeReader2.cs

@@ -126,14 +126,11 @@ namespace System.Xml
 			get { return Current.HasAttributes; }
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool HasValue {
+#if !NET_2_1
+		public override bool HasValue {
 			get { return Current.HasValue; }
 		}
+#endif
 
 		public override bool IsDefault {
 			get { return Current.IsDefault; }
@@ -363,12 +360,8 @@ namespace System.Xml
 				return source.Read ();
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool ReadAttributeValue ()
+#if !NET_2_1
+		public override bool ReadAttributeValue ()
 		{
 			if (entity != null && entityInsideAttribute) {
 				if (entity.EOF)
@@ -380,6 +373,7 @@ namespace System.Xml
 			}
 			return Current.ReadAttributeValue ();
 		}
+#endif
 
 #if NET_2_0
 		public override int ReadContentAsBase64 (
@@ -444,12 +438,8 @@ namespace System.Xml
 			return base.ReadString ();
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override void ResolveEntity ()
+#if !NET_2_1
+		public override void ResolveEntity ()
 		{
 			if (entity != null)
 				entity.ResolveEntity ();
@@ -459,6 +449,7 @@ namespace System.Xml
 				entity = new XmlNodeReader (source, insideAttribute);
 			}
 		}
+#endif
 
 		public override void Skip ()
 		{

mcs/class/System.XML/System.Xml/XmlNodeReaderImpl.cs

@@ -161,12 +161,8 @@ namespace System.Xml
 			}
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool HasValue {
+#if !NET_2_1
+		public override bool HasValue {
 			get {
 				if (current == null)
 					return false;
@@ -186,6 +182,7 @@ namespace System.Xml
 			}
 			      
 		}
+#endif
 
 		public override bool IsDefault {
 			get {
@@ -792,12 +789,8 @@ namespace System.Xml
 			}
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool ReadAttributeValue ()
+#if !NET_2_1
+		public override bool ReadAttributeValue ()
 		{
 			if (current.NodeType == XmlNodeType.Attribute) {
 				if (current.FirstChild == null)
@@ -812,21 +805,19 @@ namespace System.Xml
 			} else
 				return false;
 		}
+#endif
 
 		public override string ReadString ()
 		{
 			return base.ReadString ();
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override void ResolveEntity ()
+#if !NET_2_1
+		public override void ResolveEntity ()
 		{
 			throw new NotSupportedException ("Should not happen.");
 		}
+#endif
 
 		public override void Skip ()
 		{

mcs/class/System.XML/System.Xml/XmlReader.cs

@@ -123,11 +123,7 @@ namespace System.Xml
 			get { return AttributeCount > 0; }
 		}
 
-#if NET_2_1
-		internal virtual bool HasValue {
-			get { throw new Exception ("Should not reach here"); }
-		}
-#else
+#if !NET_2_1
 		public abstract bool HasValue { get; }
 #endif
 
@@ -556,12 +552,7 @@ namespace System.Xml
 
 		public abstract bool Read ();
 
-#if NET_2_1
-		internal virtual bool ReadAttributeValue ()
-		{
-			throw new Exception ("Should not reach here");
-		}
-#else
+#if !NET_2_1
 		public abstract bool ReadAttributeValue ();
 #endif
 
@@ -1277,12 +1268,7 @@ namespace System.Xml
 				binary = new XmlReaderBinarySupport (this);
 		}
 
-#if NET_2_1
-		internal virtual void ResolveEntity ()
-		{
-			throw new Exception ("Should not reach here");
-		}
-#else
+#if !NET_2_1
 		public abstract void ResolveEntity ();
 #endif
 

mcs/class/System.XML/System.Xml/XmlTextReader.cs

@@ -253,14 +253,11 @@ namespace System.Xml
 			get { return readState == ReadState.EndOfFile; }
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool HasValue {
+#if !NET_2_1
+		public override bool HasValue {
 			get { return cursorToken.Value != null; }
 		}
+#endif
 
 		public override bool IsDefault {
 			// XmlTextReader does not expand default attributes.
@@ -619,12 +616,8 @@ namespace System.Xml
 			return more;
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool ReadAttributeValue ()
+#if !NET_2_1
+		public override bool ReadAttributeValue ()
 		{
 			if (readState == ReadState.Initial && startNodeType == XmlNodeType.Attribute) {
 				Read ();
@@ -644,6 +637,7 @@ namespace System.Xml
 			else
 				return false;
 		}
+#endif
 
 		public int ReadBase64 (byte [] buffer, int offset, int length)
 		{
@@ -706,16 +700,13 @@ namespace System.Xml
 			Clear ();
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override void ResolveEntity ()
+#if !NET_2_1
+		public override void ResolveEntity ()
 		{
 			// XmlTextReader does not resolve entities.
 			throw new InvalidOperationException ("XmlTextReader cannot resolve external entities.");
 		}
+#endif
 
 #if NET_2_0
 		[MonoTODO] // FIXME: Implement, for performance improvement

mcs/class/System.XML/System.Xml/XmlTextReader2.cs

@@ -181,14 +181,11 @@ namespace System.Xml
 			get { return source.EOF; }
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool HasValue {
+#if !NET_2_1
+		public override bool HasValue {
 			get { return Current.HasValue; }
 		}
+#endif
 
 		public override bool IsDefault {
 			get { return Current.IsDefault; }
@@ -564,12 +561,8 @@ namespace System.Xml
 			}
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
-#endif
-		override bool ReadAttributeValue ()
+#if !NET_2_1
+		public override bool ReadAttributeValue ()
 		{
 			if (entity != null && entityInsideAttribute) {
 				if (entity.EOF)
@@ -581,6 +574,7 @@ namespace System.Xml
 			}
 			return Current.ReadAttributeValue ();
 		}
+#endif
 
 		public override string ReadString ()
 		{
@@ -594,12 +588,10 @@ namespace System.Xml
 			source.ResetState ();
 		}
 
-#if NET_2_1
-		internal
-#else
-		public
+#if !NET_2_1
+		public override
 #endif
-		override void ResolveEntity ()
+		void ResolveEntity ()
 		{
 			if (entity != null)
 				entity.ResolveEntity ();

mcs/class/System.XML/System.Xml/XmlWriter.cs

@@ -177,6 +177,10 @@ namespace System.Xml
 				return;
 
 			WriteStartAttribute (reader.Prefix, reader.LocalName, reader.NamespaceURI);
+#if NET_2_1
+			// no ReadAttributeValue() in 2.1 profile.
+			WriteString (reader.Value);
+#else
 			while (reader.ReadAttributeValue ()) {
 				switch (reader.NodeType) {
 				case XmlNodeType.Text:
@@ -187,6 +191,7 @@ namespace System.Xml
 					break;
 				}
 			}
+#endif
 			WriteEndAttribute ();
 		}