Changeset 469 for trunk/Include/Classes/System/IO/Path.ab

Timestamp:

Mar 10, 2008, 10:54:32 AM (17 years ago)

Author:

OverTaker

Message:

Path.CheckPath()で、ディレクトリ区切り文字が連続した場合、例外を投げるのではなく、ひとつに置き換えるようにした。

File:

• trunk/Include/Classes/System/IO/Path.ab (modified) (3 diffs)

trunk/Include/Classes/System/IO/Path.ab

@@ -88 +88 @@
     */
     Static Function GetFullPath(path As String) As String
+        path = CheckPath(path)
         If IsPathRooted(path) Then
             Return path
@@ -207 +208 @@
     Static Function IsPathRooted(path As String) As Boolean
         path = CheckPath(path)
-        Return path.Contains(UniformNamingConventionString) _
+        Return path.StartsWith(UniformNamingConventionString) _
             or path.Contains(VolumeSeparatorChar) _
             or path.StartsWith(DirectorySeparatorChar)
@@ -238 +239 @@
         Next
 
-        If path.LastIndexOf(UniformNamingConventionString) > 0 Then
-            Throw New IOException("Path.CheckPath: The path is invalid value.")
-        End If
+        Dim continuousIndex = path.IndexOf("\\", 1)
+        While continuousIndex <> -1
+            path = path.Remove(continuousIndex, 1)
+            continuousIndex = path.IndexOf("\\", continuousIndex)
+        Wend
 
         If path.EndsWith(DirectorySeparatorChar) Then