From fad746246cccf127d2ceb085135d4d1a8bda6484 Mon Sep 17 00:00:00 2001 From: jzhou Date: Sat, 19 Nov 2011 00:57:39 +0000 Subject: [PATCH] fix some MGC classes --- Robust/src/ClassLibrary/MGC/HashMap.java | 12 ++++++------ Robust/src/ClassLibrary/MGC/gnu/LinkedList.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Robust/src/ClassLibrary/MGC/HashMap.java b/Robust/src/ClassLibrary/MGC/HashMap.java index 1edd6c8f..e28991a3 100644 --- a/Robust/src/ClassLibrary/MGC/HashMap.java +++ b/Robust/src/ClassLibrary/MGC/HashMap.java @@ -156,13 +156,13 @@ public class HashMap implements Map { public int size() { - return size; + return numItems; } public Iterator iterator() { // Cannot create the iterator directly, because of LinkedHashMap. - return HashMapIterator(HashMap.this, 1); + return new HashMapIterator(HashMap.this, 1); } public void clear() @@ -182,14 +182,14 @@ public class HashMap implements Map { { public int size() { - return size; + return numItems; } public Iterator iterator() { // Cannot create the iterator directly, because of LinkedHashMap. //return HashMap.this.iterator(KEYS); - return HashMapIterator(HashMap.this, 0); + return new HashMapIterator(HashMap.this, 0); } public void clear() @@ -207,9 +207,9 @@ public class HashMap implements Map { // Test against the size of the HashMap to determine if anything // really got removed. This is necessary because the return value // of HashMap.remove() is ambiguous in the null case. - int oldsize = size; + int oldsize = numItems; HashMap.this.remove(o); - return oldsize != size; + return oldsize != numItems; } }; return keys; diff --git a/Robust/src/ClassLibrary/MGC/gnu/LinkedList.java b/Robust/src/ClassLibrary/MGC/gnu/LinkedList.java index e3991f9e..efbcfe93 100644 --- a/Robust/src/ClassLibrary/MGC/gnu/LinkedList.java +++ b/Robust/src/ClassLibrary/MGC/gnu/LinkedList.java @@ -21,7 +21,7 @@ public class LinkedList implements Queue { clear(); } - public void add(Object o) { + public boolean add(Object o) { if( tail == null ) { head = new LinkedListElement(o, null, null); tail = head; -- 2.34.1