Changeset 366

Timestamp:

Oct 31, 2007, 4:24:47 AM (16 years ago)

Author:

dai

Message:

Dictionary.Countメソッドを実装。
String.Equalsメソッドのコードミスを修正。

Location:

trunk/Include/Classes/System

Files:

• Collections/Generic/Dictionary.ab (modified) (5 diffs)
• String.ab (modified) (1 diff)

trunk/Include/Classes/System/Collections/Generic/Dictionary.ab

@@ -44 +44 @@
         If Object.ReferenceEquals(key, Nothing) Then
             'Throw ArgumentNullError
-            Exit Sub
+            debug
+            Exit Function
         End If
 
@@ -59 +60 @@
             Next
         End If
+        debug
         'KeyNotFoundException
         Return Nothing
@@ -130 +132 @@
 
         a.Add(New Pair(key, value))
+
+        count ++
     End Sub
 
@@ -138 +142 @@
         Next
     End Sub
+
+    Function Count() As Long
+        Return count
+    End Function
 
 '   Function ContainsKey(key As Key) As Boolean
@@ -162 +170 @@
         Dim e = al[0]
         Dim p = ObjPtr(e) As ULONG_PTR
+
+        count = 0
     End Sub
 
     al As ArrayList
+    count As Long
 
 End Class

trunk/Include/Classes/System/String.ab

@@ -251 +251 @@
 
         Override Function Equals(s As Object) As Boolean
-            If This.GetType = s.GetType Then
+            If Object.Equals( This.GetType(), s.GetType() ) Then
                 Return This.Equals(s As String)
             End If