Index: /trunk/ab5.0/ablib/TestCase/SimpleTestCase/CollectionTest.ab
===================================================================
--- /trunk/ab5.0/ablib/TestCase/SimpleTestCase/CollectionTest.ab	(revision 537)
+++ /trunk/ab5.0/ablib/TestCase/SimpleTestCase/CollectionTest.ab	(revision 537)
@@ -0,0 +1,24 @@
+Namespace CollectionTest
+
+Sub TestMain()
+	Dim d As System.Collections.Generic.Dictionary<String, String>
+	d.Add("赤", "Red")
+	d.Add("黄", "Yellow")
+	d.Add("緑", "Green")
+	d.Add("青", "Blue")
+	d.Add("茶", "Tea")
+
+	UnitTest("Dictionary.Add, Item (1)", d.Item["赤"] = "Red")
+	UnitTest("Dictionary.Add, Item (2)", d.Item["黄"] = "Yellow")
+	UnitTest("Dictionary.Add, Item (3)", d.Item("緑") = "Green")
+	UnitTest("Dictionary.Add, Item (4)", d.Item("青") = "Blue")
+
+	UnitTest("Dictionary.Remove", d.Remove("茶"))
+
+	UnitTest("Dictionary.Count", d.Count = 4)
+
+End Sub
+
+End Namespace
+
+CollectionTest.TestMain()
Index: /trunk/ab5.0/ablib/TestCase/SimpleTestCase/SimpleTestCase.idx
===================================================================
--- /trunk/ab5.0/ablib/TestCase/SimpleTestCase/SimpleTestCase.idx	(revision 536)
+++ /trunk/ab5.0/ablib/TestCase/SimpleTestCase/SimpleTestCase.idx	(revision 537)
@@ -40,4 +40,6 @@
 #include "SerializeTest.ab"
 _ClearNamespaceImported
+#include ".\CollectionTest.ab"
+_ClearNamespaceImported
 
 'リソースファイル
Index: /trunk/ab5.0/ablib/TestCase/SimpleTestCase/SimpleTestCase.pj
===================================================================
--- /trunk/ab5.0/ablib/TestCase/SimpleTestCase/SimpleTestCase.pj	(revision 536)
+++ /trunk/ab5.0/ablib/TestCase/SimpleTestCase/SimpleTestCase.pj	(revision 537)
@@ -43,2 +43,3 @@
 XmlTest.ab
 SerializeTest.ab
+.\CollectionTest.ab
Index: /trunk/ab5.0/ablib/src/Classes/System/Collections/Generic/Dictionary.ab
===================================================================
--- /trunk/ab5.0/ablib/src/Classes/System/Collections/Generic/Dictionary.ab	(revision 536)
+++ /trunk/ab5.0/ablib/src/Classes/System/Collections/Generic/Dictionary.ab	(revision 537)
@@ -40,5 +40,5 @@
 
 	Virtual Function Item(key As Key) As T
-		If Object.ReferenceEquals(key, Nothing) Then
+		If ActiveBasic.IsNothing(key) Then
 			Throw New ArgumentNullException("key")
 		End If
@@ -61,7 +61,6 @@
 
 	Virtual Sub Item(key As Key, value As T)
-		If Object.ReferenceEquals(key, Nothing) Then
-			'Throw ArgumentNullError
-			Exit Sub
+		If ActiveBasic.IsNothing(key) Then
+			Throw New ArgumentNullException("key")
 		End If
 
@@ -100,7 +99,6 @@
 	'Methods
 	Sub Add(key As Key, value As T)
-		If Object.ReferenceEquals(key, Nothing) Then
-			'Throw ArgumentNullError
-			Exit Sub
+		If ActiveBasic.IsNothing(key) Then
+			Throw New ArgumentNullException("key")
 		End If
 
@@ -108,5 +106,5 @@
 		Dim a = al[hash] As ArrayList
 
-		If Object.ReferenceEquals(a, Nothing) Then
+		If ActiveBasic.IsNothing(a) Then
 			a = New ArrayList
 			al[hash] = a
@@ -142,6 +140,33 @@
 '	End Function
 '	Function GetEnumerator() As Enumerator
-'	Function Remove(key As Key) As Boolean
-'	End Function
+
+	/*!
+	@biref	指定されたキーの要素を削除する。
+	@date	2008/07/11
+	@param[in] key	削除対象のキー
+	@retval True	対象要素が見つかって削除されたとき
+	@retval False	見つからず削除されなかったとき
+	@author Egtra
+	*/
+	Function Remove(key As Key) As Boolean
+		Remove = False
+		If Not ActiveBasic.IsNothing(key) Then
+			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
+						a.RemoveAt(i)
+						Remove = True
+						count--
+						Exit Function
+					End If
+				Next
+			End If
+		End If
+	End Function
+
 '	Function TryGetValue(key As Key, ByRef value As T) As Boolean
 '	End Function
Index: /trunk/ab5.0/ablib/src/basic/prompt.sbp
===================================================================
--- /trunk/ab5.0/ablib/src/basic/prompt.sbp	(revision 536)
+++ /trunk/ab5.0/ablib/src/basic/prompt.sbp	(revision 537)
@@ -124,5 +124,5 @@
 					SetBkMode(hDC, TRANSPARENT)
 				Else
-					Debug
+'					Debug
 					ret = SetBkMode(hDC, OPAQUE)
 					ret = SetBkColor(hDC, currentLineCharInfo[i2].BackColor)
@@ -454,5 +454,5 @@
 End Function
 
-Function PromptMain(dwData As Long) As Long
+Function PromptMain(data As VoidPtr) As DWord
 	Dim i As Long
 	'Allocate