Author: andreia
Date: 2007-05-23 21:59:25 -0400 (Wed, 23 May 2007)
New Revision: 77887
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Resources/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Resources/ResXResourceReader.cs
Log:
2007-05-23 Andreia Gaita <[EMAIL PROTECTED]>
* ResXResourceReader.cs: Ignore comment nodes, for now. Fixes
for failing tests.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Resources/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Resources/ChangeLog
2007-05-24 01:55:10 UTC (rev 77886)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Resources/ChangeLog
2007-05-24 01:59:25 UTC (rev 77887)
@@ -1,5 +1,10 @@
2007-05-23 Andreia Gaita <[EMAIL PROTECTED]>
+ * ResXResourceReader.cs: Ignore comment nodes, for now. Fix
+ failing tests.
+
+2007-05-23 Andreia Gaita <[EMAIL PROTECTED]>
+
* ResXResourceReader.cs: Fix CDATA detection
2007-05-21 Andreia Gaita <[EMAIL PROTECTED]>
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Resources/ResXResourceReader.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Resources/ResXResourceReader.cs
2007-05-24 01:55:10 UTC (rev 77886)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Resources/ResXResourceReader.cs
2007-05-24 01:59:25 UTC (rev 77887)
@@ -220,11 +220,20 @@
while (xmlReader.Read ()) {
if (xmlReader.NodeType ==
XmlNodeType.EndElement && xmlReader.LocalName == "data")
break;
- if ((xmlReader.NodeType == XmlNodeType.Element
&& xmlReader.Name == "value") ||
- (xmlReader.NodeType ==
XmlNodeType.CDATA)) {
- value = xmlReader.ReadString ().Trim ();
- break;
+
+ if (xmlReader.NodeType == XmlNodeType.Element) {
+ if (xmlReader.Name.Equals ("value")) {
+ xmlReader.WhitespaceHandling =
WhitespaceHandling.Significant;
+ value = xmlReader.ReadString ();
+ xmlReader.WhitespaceHandling =
WhitespaceHandling.None;
+ } else if (xmlReader.Name.Equals
("comment")) {
+ xmlReader.Skip ();
+ if (xmlReader.NodeType ==
XmlNodeType.EndElement && xmlReader.LocalName == "data")
+ break;
+ }
}
+ else
+ value = xmlReader.Value.Trim ();
}
#else
xmlReader.Read ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
