Changeset 542 for trunk/ab5.0/ablib/src/Classes/System

Timestamp:

Jul 13, 2008, 2:29:17 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

Controlをデリゲートベースにした。DictionaryのContainsKeyとTryGetValueを実装。デリゲートの追加・削除の右辺にNothingを指定可能にした。

Location:

trunk/ab5.0/ablib/src/Classes/System

Files:

• Collections/Generic/Dictionary.ab (modified) (4 diffs)
• Delegate.ab (modified) (1 diff)

trunk/ab5.0/ablib/src/Classes/System/Collections/Generic/Dictionary.ab

@@ -47 +47 @@
         Dim a = al[hash] As ArrayList
 
-        If Not Object.ReferenceEquals(a, Nothing) Then
+        If Not ActiveBasic.IsNothing(a) Then
             Dim i As Long
             For i = 0 To ELM(a.Count)
@@ -77 +77 @@
                 If pair.Key.Equals(key) Then
                     pair.Value = value
+                    Exit Sub
                 End If
             Next
@@ -135 +136 @@
     End Function
 
-'   Function ContainsKey(key As Key) As Boolean
-'   End Function
+    /*!
+    @biref  指定されたキーが格納されているか調べる。
+    @date   2008/07/11
+    @param[in] key  検索対象のキー
+    @retval True    格納されていたとき
+    @retval False   格納されていなかったとき
+    @throw ArgumentNullException    keyがNothingだったとき
+    @author Egtra
+    */
+    Function ContainsKey(key As Key) As Boolean
+        If ActiveBasic.IsNothing(key) Then
+            Throw New ArgumentNullException("key")
+        End If
+        ContainsKey = False
+
+        Dim hash = getHash(key)
+        Dim a = al[hash] As ArrayList
+
+        If Not ActiveBasic.IsNothing(a) Then
+            Dim i As Long
+            For i = 0 To ELM(a.Count)
+                Dim pair = a[i] As Detail.Pair
+                If pair.Key.Equals(key) Then
+                    ContainsKey = True
+                    Exit Function
+                End If
+            Next
+        End If
+    End Function
+
 '   Function ContainsValue(value As T) As Boolean
 '   End Function
@@ -169 +198 @@
     End Function
 
-'   Function TryGetValue(key As Key, ByRef value As T) As Boolean
-'   End Function
+    Function TryGetValue(key As Key, ByRef value As T) As Boolean
+        If ActiveBasic.IsNothing(key) Then
+            Throw New ArgumentNullException("key")
+        End If
+        TryGetValue = False
+        value = Nothing
+
+        Dim hash = getHash(key)
+        Dim a = al[hash] As ArrayList
+
+        If Not ActiveBasic.IsNothing(a) Then
+            Dim i As Long
+            For i = 0 To ELM(a.Count)
+                Dim pair = a[i] As Detail.Pair
+                If pair.Key.Equals(key) Then
+                    TryGetValue = True
+                    value = pair.Value
+                    Exit Function
+                End If
+            Next
+        End If
+    End Function
 
     'Classses

trunk/ab5.0/ablib/src/Classes/System/Delegate.ab

@@ -29 +29 @@
 
     Sub _Add( dg As DelegateBase )
-        Dim i As Long
-        For i=0 To ELM(dg.simpleDelegates.Count)
-            simpleDelegates.Add( dg.simpleDelegates[i] )
-        Next
+        If Not ActiveBasic.IsNothing(dg) Then
+            Dim i As Long
+            For i=0 To ELM(dg.simpleDelegates.Count)
+                simpleDelegates.Add( dg.simpleDelegates[i] )
+            Next
+        End If
     End Sub
 
     Sub _Delete( dg As DelegateBase )
-        Dim i As Long
-        For i=0 To ELM(This.simpleDelegates.Count)
-            Dim i2 As Long
-            Dim isExist = False
-            For i2=0 To ELM(dg.simpleDelegates.Count)
-                If This.simpleDelegates[i].IsEqual( dg.simpleDelegates[i2] ) Then
-                    isExist = True
+        If Not ActiveBasic.IsNothing(dg) Then
+            Dim i As Long
+            For i=0 To ELM(This.simpleDelegates.Count)
+                Dim i2 As Long
+                Dim isExist = False
+                For i2=0 To ELM(dg.simpleDelegates.Count)
+                    If This.simpleDelegates[i].IsEqual( dg.simpleDelegates[i2] ) Then
+                        isExist = True
+                    End If
+                Next
+                If isExist Then
+                    This.simpleDelegates.RemoveAt( i )
                 End If
             Next
-            If isExist Then
-                This.simpleDelegates.RemoveAt( i )
-            End If
-        Next
+        End If
     End Sub