Changeset 655 for trunk/ab5.0/ablib/src/Classes/System/Xml/XmlDocument.ab

Timestamp:

Nov 9, 2008, 2:21:49 PM (15 years ago)

Author:

イグトランス (egtra)

Message:

#161完了。StreamReaderのUnicode対応。

File:

• trunk/ab5.0/ablib/src/Classes/System/Xml/XmlDocument.ab (modified) (5 diffs)

trunk/ab5.0/ablib/src/Classes/System/Xml/XmlDocument.ab

@@ -95 +95 @@
     /*!
     @brief  指定したストリームからXML文書を読み込む。
+    @param  reader 読み込むリーダ。
+    */
+    Virtual Sub Load( reader As System.IO.TextReader )
+        This.RemoveAll()
+        ActiveBasic.Xml.Parser.Parse( reader.ReadToEnd(), This )
+    End Sub
+
+    /*!
+    @brief  指定したストリームからXML文書を読み込む。
     @param  stream 読み込み先のストリーム。
     */
     Virtual Sub Load( inStream As System.IO.Stream )
-        Dim length = inStream.Length As DWord
-        Dim xmlBuffer = calloc( length + 1 ) As *Char
-        inStream.Read( xmlBuffer As *Byte, 0, length )
-        inStream.Close()
-        Dim xmlString = New String( xmlBuffer )
-        free( xmlBuffer )
-
-        This.RemoveAll()
-        ActiveBasic.Xml.Parser.Parse( xmlString, This )
+        Load( New System.IO.StreamReader( inStream ) )
     End Sub
 
@@ -114 +115 @@
     */
     Virtual Sub Load( filename As String )
-        Dim fileStream As System.IO.FileStream( filename, System.IO.FileMode.Open, System.IO.FileAccess.Read )
-        Load( fileStream )
+        Dim r = New System.IO.StreamReader( filename )
+        Load( r )
+        r.Dispose()
     End Sub
 
@@ -123 +125 @@
     */
     Virtual Sub Save( outStream As System.IO.Stream )
-        Dim xmlStr = InnerXmlSupportedIndent( True )
-        outStream.Write( xmlStr.StrPtr As *Byte, 0, xmlStr.Length * SizeOf( Char ) )
-        outStream.Close()
+        Dim writer = New IO.StreamWriter( outStream )
+        Save( writer )
+        writer.Flush()
     End Sub
 
@@ -133 +135 @@
     */
     Virtual Sub Save( filename As String )
-        Dim fileStream As System.IO.FileStream( filename, System.IO.FileMode.Create, System.IO.FileAccess.Write )
-        Save( fileStream )
+        Dim w = New IO.StreamWriter( filename )
+        Save( w )
+        w.Dispose()
     End Sub
 
@@ -142 +145 @@
     */
     Virtual Sub Save( writer As System.IO.TextWriter )
-        writer.Write(InnerXmlSupportedIndent( True ))
+        writer.Write( InnerXmlSupportedIndent( True ) )
     End Sub
 End Class