externalization in progress

1 files changed, 63 insertions, 74 deletions

diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfInt.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfInt.java
index 2a8438c68f..fd0deae974 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfInt.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfInt.java
@@ -7,83 +7,72 @@ public final class HashtableOfInt {
 

 	int elementSize; // number of elements in the table

 	int threshold;

-	public HashtableOfInt() {

-		this(13);

-	}

-

-	public HashtableOfInt(int size) {

-		this.elementSize = 0;

-		this.threshold = size; // size represents the expected number of elements

-		int extraRoom = (int) (size * 1.75f);

-		if (this.threshold == extraRoom)

-			extraRoom++;

-		this.keyTable = new int[extraRoom];

-		this.valueTable = new Object[extraRoom];

-	}

-

-	public boolean containsKey(int key) {

-		int index = key % valueTable.length;

-		int currentKey;

-		while ((currentKey = keyTable[index]) != 0) {

-			if (currentKey == key)

-				return true;

-			index = (index + 1) % keyTable.length;

-		}

-		return false;

-	}

-

-	public Object get(int key) {

-		int index = key % valueTable.length;

-		int currentKey;

-		while ((currentKey = keyTable[index]) != 0) {

-			if (currentKey == key)

-				return valueTable[index];

-			index = (index + 1) % keyTable.length;

-		}

-		return null;

-	}

-

-	public Object put(int key, Object value) {

-		int index = key % valueTable.length;

-		int currentKey;

-		while ((currentKey = keyTable[index]) != 0) {

-			if (currentKey == key)

-				return valueTable[index] = value;

-			index = (index + 1) % keyTable.length;

-		}

-		keyTable[index] = key;

-		valueTable[index] = value;

-

-		// assumes the threshold is never equal to the size of the table

-		if (++elementSize > threshold)

-			rehash();

-		return value;

+public HashtableOfInt() {

+	this(13);

+}

+public HashtableOfInt(int size) {

+	this.elementSize = 0;

+	this.threshold = size; // size represents the expected number of elements

+	int extraRoom = (int) (size * 1.75f);

+	if (this.threshold == extraRoom)

+		extraRoom++;

+	this.keyTable = new int[extraRoom];

+	this.valueTable = new Object[extraRoom];

+}

+public boolean containsKey(int key) {

+	int index = key % valueTable.length;

+	int currentKey;

+	while ((currentKey = keyTable[index]) != 0) {

+		if (currentKey == key)

+			return true;

+		index = (index + 1) % keyTable.length;

 	}

-

-	private void rehash() {

-		HashtableOfInt newHashtable = new HashtableOfInt(elementSize * 2);

-		// double the number of expected elements

-		int currentKey;

-		for (int i = keyTable.length; --i >= 0;)

-			if ((currentKey = keyTable[i]) != 0)

-				newHashtable.put(currentKey, valueTable[i]);

-

-		this.keyTable = newHashtable.keyTable;

-		this.valueTable = newHashtable.valueTable;

-		this.threshold = newHashtable.threshold;

+	return false;

+}

+public Object get(int key) {

+	int index = key % valueTable.length;

+	int currentKey;

+	while ((currentKey = keyTable[index]) != 0) {

+		if (currentKey == key)	return valueTable[index];

+		index = (index + 1) % keyTable.length;

 	}

-

-	public int size() {

-		return elementSize;

+	return null;

+}

+public Object put(int key, Object value) {

+	int index = key % valueTable.length;

+	int currentKey;

+	while ((currentKey = keyTable[index]) != 0) {

+		if (currentKey == key)	return valueTable[index] = value;

+		index = (index + 1) % keyTable.length;

 	}

+	keyTable[index] = key;

+	valueTable[index] = value;

 

-	public String toString() {

-		String s = "";

-		Object object;

-		for (int i = 0, length = valueTable.length; i < length; i++)

-			if ((object = valueTable[i]) != null)

-				s += keyTable[i] + " -> " + object.toString() + "\n";

-		return s;

-	}

+	// assumes the threshold is never equal to the size of the table

+	if (++elementSize > threshold)

+		rehash();

+	return value;

+}

+private void rehash() {

+	HashtableOfInt newHashtable = new HashtableOfInt(elementSize * 2); // double the number of expected elements

+	int currentKey;

+	for (int i = keyTable.length; --i >= 0;)

+		if ((currentKey = keyTable[i]) != 0)

+			newHashtable.put(currentKey, valueTable[i]);

 

+	this.keyTable = newHashtable.keyTable;

+	this.valueTable = newHashtable.valueTable;

+	this.threshold = newHashtable.threshold;

+}

+public int size() {

+	return elementSize;

+}

+public String toString() {

+	String s = "";

+	Object object;

+	for (int i = 0, length = valueTable.length; i < length; i++)

+		if ((object = valueTable[i]) != null)

+			s += keyTable[i] + " -> " + object.toString() + "\n";

+	return s;

+}

 }