2005-02-26 Atsushi Enomoto <[email protected]>

	* XslFunctions.cs : unparsed-entity-uri() should return SYSTEM ID
	  instead of BaseURI.

	* XmlEntity.cs : it was not returning SYSTEM ID when there is no
	  PUBLIC ID.
	* XmlDocumentNavigator.cs : On Whitespace followed by DocumentType,
	  get_NodeType() resulted in loop.


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

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

@@ -1,3 +1,8 @@
+2005-02-26  Atsushi Enomoto <[email protected]>
+
+	* XslFunctions.cs : unparsed-entity-uri() should return SYSTEM ID
+	  instead of BaseURI.
+
 2005-02-25  Atsushi Enomoto <[email protected]>
 
 	* XslTemplate.cs : According to the spec 5.7, it is an error for 

mcs/class/System.XML/Mono.Xml.Xsl/XslFunctions.cs

@@ -624,8 +624,7 @@ namespace Mono.Xml.Xsl
 			XmlEntity ent = doctype.Entities.GetNamedItem (arg0.EvaluateString (iter)) as XmlEntity;
 			if (ent == null)
 				return String.Empty;
-			else
-				return ent.BaseURI;
+			return ent.SystemId != null ? ent.SystemId : String.Empty;
 		}
 	}
 

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

@@ -1,3 +1,10 @@
+2005-02-26  Atsushi Enomoto <[email protected]>
+
+	* XmlEntity.cs : it was not returning SYSTEM ID when there is no
+	  PUBLIC ID.
+	* XmlDocumentNavigator.cs : On Whitespace followed by DocumentType,
+	  get_NodeType() resulted in loop.
+
 2005-02-25  Atsushi Enomoto <[email protected]>
 
 	* XmlComment.cs, XmlNode.cs, XmlText.cs, XmlProcessingInstruction.cs,

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

@@ -191,10 +191,10 @@ namespace System.Xml
 					switch (n.NodeType) {
 					case XmlNodeType.SignificantWhitespace:
 						sw = true;
-						n = GetNextSibling (node);
+						n = GetNextSibling (n);
 						break;
 					case XmlNodeType.Whitespace:
-						n = GetNextSibling (node);
+						n = GetNextSibling (n);
 						break;
 					case XmlNodeType.Text:
 					case XmlNodeType.CDATA:

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

@@ -106,21 +106,11 @@ namespace System.Xml
 		}
 
 		public string PublicId {
-			get {
-				if (publicId == null)
-					return null;
-				else
-					return publicId;
-			}
+			get { return publicId; }
 		}
 
 		public string SystemId {
-			get {
-				if (publicId == null)
-					return null;
-				else
-					return systemId;
-			}
+			get { return systemId; }
 		}
 		#endregion