Changeset 271

Timestamp:

Jun 12, 2007, 6:15:09 PM (17 years ago)

Author:

dai

Message:

SHFILEOPSTRUCT.hWnd → SHFILEOPSTRUCT.hwnd
System.IOに属するクラスに名前空間を適用した。

Files:

• Include/Classes/System/Collections/ArrayList.ab (modified) (1 diff)
• Include/Classes/System/IO/DirectoryInfo.ab (modified) (3 diffs)
• Include/Classes/System/IO/DriveInfo.ab (modified) (2 diffs)
• Include/Classes/System/IO/File.ab (modified) (2 diffs)
• Include/Classes/System/IO/FileInfo.ab (modified) (1 diff)
• Include/Classes/System/IO/FileStream.ab (modified) (2 diffs)
• Include/Classes/System/IO/FileSystemInfo.ab (modified) (2 diffs)
• Include/Classes/System/IO/Path.ab (modified) (2 diffs)
• Include/Classes/System/IO/Stream.ab (modified) (2 diffs)
• Include/Classes/System/IO/StreamReader.ab (modified) (1 diff)
• Include/Classes/System/IO/StreamWriter.ab (modified) (1 diff)
• Include/Classes/System/IO/index.ab (modified) (1 diff)
• Include/Classes/System/index.ab (modified) (1 diff)
• Include/Classes/index.ab (modified) (1 diff)
• Include/api_shell.sbp (modified) (2 diffs)
• TestCase/SimpleTestCase/PathTest.ab (modified) (1 diff)

Include/Classes/System/Collections/ArrayList.ab

@@ -224 +224 @@
     /*Const*/ Virtual Function IndexOf(object As Object, startIndex As Long, count As Long) As Long
         Dim i As Long
-        Dim last = Math.Min(startIndex + count - 1, size)
+        Dim last = System.Math.Min(startIndex + count - 1, size)
         For i = startIndex To last
             If object.Equals( pObject[i] ) Then

Include/Classes/System/IO/DirectoryInfo.ab

@@ +1 @@
+
+Namespace System
+Namespace IO
+
 Class DirectoryInfo
     Inherits FileSystemInfo
@@ -34 +38 @@
     End Sub
 
-/*  Override Sub Delete(recursive As Boolean)
-    End Sub*/
+    Sub Delete(recursive As Boolean)
+        If recursive Then
+            ' ディレクトリ内のすべての情報を削除する
+
+            Dim dirPath = FullPath As String
+
+            ' 終端の '\' を除去
+            If dirPath[dirPath.Length-1] = Asc("\\") Then
+                dirPath = dirPath.SubString(0, dirPath.Length-1)
+            End If
+
+            ' double null-terminated にする
+            dirPath = dirPath + Chr$(0)
+
+            Dim op As SHFILEOPSTRUCT
+            op.hwnd = NULL
+            op.wFunc = FO_DELETE
+            op.pFrom = dirPath.Chars
+            op.pTo = NULL
+            op.fFlags = FOF_NOCONFIRMATION or FOF_NOERRORUI or FOF_SILENT
+
+            If SHFileOperation(op) <> 0 Then
+                ' TODO: エラー処理
+                debug
+            End If
+        Else
+            ' ディレクトリが空の場合は削除する
+            This.Delete()
+        End If
+    End Sub
 
 /*  Function GetAccessControl() As DirectorySecurity
@@ -82 +114 @@
     TopDirectoryOnly
 End Enum
+
+End Namespace
+End Namespace

Include/Classes/System/IO/DriveInfo.ab

@@ +1 @@
+Namespace System
+Namespace IO
+
+
 Enum DriveType
     Unknown = 0
@@ -89 +93 @@
     End Function
 End Class
+
+
+End Namespace
+End Namespace

Include/Classes/System/IO/File.ab

@@ +1 @@
+Namespace System
+Namespace IO
+
 
 Enum FileAccess
@@ -244 +247 @@
 
 End Class
+
+
+End Namespace
+End Namespace

Include/Classes/System/IO/FileInfo.ab

@@ +1 @@
+Namespace System
+Namespace IO
+
 
 Class FileInfo
 End Class
+
+
+End Namespace
+End Namespace

Include/Classes/System/IO/FileStream.ab

@@ +1 @@
+Namespace System
+Namespace IO
+
 
 /* ほんとはmiscに入れるかかファイルを分けたほうがいいかもしれないが一先ず実装 */
@@ -366 +369 @@
     MemberwiseClone*/
 End Class
+
+
+End Namespace
+End Namespace

Include/Classes/System/IO/FileSystemInfo.ab

@@ +1 @@
+Namespace System
+Namespace IO
+
+
 Class FileSystemInfo
     m_CreationTime As FILETIME
@@ -193 +197 @@
     End Function
 End Class
+
+
+End Namespace
+End Namespace

Include/Classes/System/IO/Path.ab

@@ -2 +2 @@
 
 #require <Classes/System/Environment.ab>
+
+
+Namespace System
+Namespace IO
+
 
 Class Path
@@ -150 +155 @@
     Return GetTempFileName(pPathName, pPrefixString, uUnique, pTempFileName)
 End Function
+
+
+End Namespace
+End Namespace

Include/Classes/System/IO/Stream.ab

@@ +1 @@
+Namespace System
+Namespace IO
+
 
 Class Stream
@@ -65 +68 @@
     Virtual Function CreateWaitHandle() As System.Threading.WaitHandle: End Function
 End Class
+
+
+End Namespace
+End Namespace

Include/Classes/System/IO/StreamReader.ab

@@ +1 @@
+Namespace System
+Namespace IO
+
+
 Class StreamReader
     ' TODO: 実装
 End Class
+
+
+End Namespace
+End Namespace

Include/Classes/System/IO/StreamWriter.ab

@@ +1 @@
+Namespace System
+Namespace IO
+    
+    
 Class StreamWriter
     ' TODO: 実装
 End Class
+
+
+End Namespace
+End Namespace

Include/Classes/System/IO/index.ab

@@ -1 @@
-'#require "Directory.ab"
-'#require "DirectoryInfo.ab"
-
 #require "misc.ab"
 #require "DirectoryInfo.ab"

Include/Classes/System/index.ab

@@ -1 @@
-#require <Classes/System/DateTime.ab>
-#require <Classes/System/Math.ab>
-#require <Classes/System/Object.ab>
-#require <Classes/System/String.ab.
-#require <Classes/System/TimeSpan.ab>
-#require <Classes/System/TypeInfo.ab>
-#require <Classes/System/OperatingSystem.ab>
-#require <Classes/System/Version.ab>
-#require <Classes/System/Environment.ab>
-#require <Classes/System/Int32.ab>
-#require <Classes/System/UInt32.ab>
+#require "./DateTime.ab"
+#require "./Math.ab"
+#require "./Object.ab"
+#require "./String.ab.
+#require "./TimeSpan.ab"
+#require "./TypeInfo.ab"
+#require "./OperatingSystem.ab"
+#require "./Version.ab"
+#require "./Environment.ab"
+#require "./Int32.ab"
+#require "./UInt32.ab"
+
+#require "./Diagnostics/index.ab"
+#require "./IO/index.ab"
+#require "./Threading/index.ab"

Include/Classes/index.ab

@@ -2 +2 @@
 
 #require "System\index.ab"
-#require "System\Diagnostics\index.ab"
-#require "System\Threading\index.ab"

Include/api_shell.sbp

@@ -332 +332 @@
 Const FOF_NOCOPYSECURITYATTRIBS = &H0800
 Type SHFILEOPSTRUCTW
-    hWnd As HWND
+    hwnd As HWND
     wFunc As DWord
     pFrom As PCWSTR
@@ -342 +342 @@
 End Type
 Type SHFILEOPSTRUCTA
-    hWnd As HWND
+    hwnd As HWND
     wFunc As DWord
     pFrom As PCSTR

TestCase/SimpleTestCase/PathTest.ab

@@ -5 +5 @@
 
 Namespace PathTest
+
+Imports System.IO
 
 Sub TestMain()