Changeset 451 for trunk/Include/Classes/System/Xml/XmlNode.ab

Timestamp:

Mar 3, 2008, 8:38:25 PM (16 years ago)

Author:

dai

Message:

XmlDocument.Saveメソッドを実装。
Xml文書生成処理を改良。

File:

• trunk/Include/Classes/System/Xml/XmlNode.ab (modified) (4 diffs)

trunk/Include/Classes/System/Xml/XmlNode.ab

@@ -43 +43 @@
     */
     Sub XmlNode( nodeType As XmlNodeType, prefix As String, localName As String, namespaceURI As String, doc As XmlDocument )
+        This.nodeType = nodeType
         This.prefix = prefix
         This.localName = localName
@@ -57 +58 @@
     */
     Sub XmlNode( nodeType As XmlNodeType, data As String, doc As XmlDocument )
+        This.nodeType = nodeType
         This.prefix = Nothing
         This.localName = Nothing
@@ -304 +306 @@
         End If
 
-        If childNodes.Count = 0 Then
+        If This.childNodes.Count = 0 Then
             Return indentStr + "<" + localName + This.GetAttributesStr() + " />" + crlfStr
         End If
@@ -310 +312 @@
         Dim result = ""
 
-        ' 開始タグ
-        result += indentStr + "<" + localName + This.GetAttributesStr() + ">" + crlfStr
-
-        ' 子ノードリスト
-        result += InnerXmlSupportedIndent( isIndent, indent + 1 )
-
-        ' 終了タグ
-        result += indentStr + "</" + localName + ">" + crlfStr
+        If This.FirstChild.NodeType = XmlNodeType.Text Then
+            ' 子ノードがテキストのときは開始タグ、終了タグの間にインデントや改行を入れない
+
+            ' 開始タグ
+            result += indentStr + "<" + localName + This.GetAttributesStr() + ">"
+
+            ' 子ノードリスト
+            result += InnerXmlSupportedIndent( isIndent, indent + 1 )
+
+            ' 終了タグ
+            result += "</" + localName + ">" + crlfStr
+        Else
+            ' 開始タグ
+            result += indentStr + "<" + localName + This.GetAttributesStr() + ">" + crlfStr
+
+            ' 子ノードリスト
+            result += InnerXmlSupportedIndent( isIndent, indent + 1 )
+
+            ' 終了タグ
+            result += indentStr + "</" + localName + ">" + crlfStr
+        End If
 
         Return result