Author: atsushi
Date: 2005-03-07 02:15:45 -0500 (Mon, 07 Mar 2005)
New Revision: 41507
Modified:
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlFilteredXmlReader.cs
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlSimplified.cs
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlStructures.cs
Log:
2005-03-07 Atsushi Enomoto <[EMAIL PROTECTED]>
* NvdlFilteredXmlReader.cs, NvdlStructures.cs, NvdlSimplified.cs :
"PlaceHolderNamespace" is not proper name (for "virtualElement").
Modified: trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog
===================================================================
--- trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog
2005-03-07 07:08:31 UTC (rev 41506)
+++ trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog
2005-03-07 07:15:45 UTC (rev 41507)
@@ -1,5 +1,10 @@
2005-03-07 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * NvdlFilteredXmlReader.cs, NvdlStructures.cs, NvdlSimplified.cs :
+ "PlaceHolderNamespace" is not proper name (for "virtualElement").
+
+2005-03-07 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* NvdlBuiltInValidationProvider.cs :
When it is "allow", it should not always return false.
* NvdlFilteredXmlReader.cs :
Modified:
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlFilteredXmlReader.cs
===================================================================
---
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlFilteredXmlReader.cs
2005-03-07 07:08:31 UTC (rev 41506)
+++
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlFilteredXmlReader.cs
2005-03-07 07:15:45 UTC (rev 41507)
@@ -266,7 +266,7 @@
switch (placeHolder) {
case XmlNodeType.Element:
case XmlNodeType.EndElement:
- return Nvdl.PlaceHolderNamespace;
+ return Nvdl.InstanceNamespace;
case XmlNodeType.Attribute:
return placeHolderLocalNameAttr ?
"localName" : "ns";
@@ -402,7 +402,7 @@
// empty prefix. So we have to handle empty prefix as if
// it was mapped to the namespace.
if (placeHolder != XmlNodeType.None && prefix ==
String.Empty)
- return Nvdl.PlaceHolderNamespace;
+ return Nvdl.InstanceNamespace;
return reader.LookupNamespace (prefix);
}
Modified: trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlSimplified.cs
===================================================================
--- trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlSimplified.cs
2005-03-07 07:08:31 UTC (rev 41506)
+++ trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlSimplified.cs
2005-03-07 07:15:45 UTC (rev 41507)
@@ -561,7 +561,7 @@
{
XmlDocument doc = new XmlDocument ();
XmlElement el = doc.CreateElement ("virtualElement",
- Nvdl.PlaceHolderNamespace);
+ Nvdl.InstanceNamespace);
for (int i = 0; i < reader.AttributeCount; i++) {
reader.MoveToAttribute (i);
if (reader.NamespaceURI != ns)
Modified: trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlStructures.cs
===================================================================
--- trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlStructures.cs
2005-03-07 07:08:31 UTC (rev 41506)
+++ trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlStructures.cs
2005-03-07 07:15:45 UTC (rev 41507)
@@ -15,7 +15,7 @@
public const string Namespace =
"http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0";;
public const string BuiltInValidationNamespace =
"http://purl.oclc.org/dsdl/nvdl/ns/predefinedSchema/1.0";;
- public const string PlaceHolderNamespace =
"http://purl.oclc.org/dsdl/nvdl/ns/instance/1.0";;
+ public const string InstanceNamespace =
"http://purl.oclc.org/dsdl/nvdl/ns/instance/1.0";;
internal const string XmlNamespaceUri =
"http://www.w3.org/xml/1998/namespace";;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
