Skip to content

Remove the unused enumerators from CustomHashtable #4367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vogella wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −101
Open

Remove the unused enumerators from CustomHashtable #4367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 0 additions & 101 deletions bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CustomHashtable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@

package org.eclipse.jface.viewers;

import java.util.Enumeration;
import java.util.NoSuchElementException;

/**
* CustomHashtable associates keys with values. Keys and values cannot be null.
* The size of the Hashtable is the number of key/value pairs it contains.
Expand Down Expand Up @@ -52,55 +49,6 @@ private static class HashMapEntry {
}
}

private static final class EmptyEnumerator implements Enumeration {
@Override
public boolean hasMoreElements() {
return false;
}

@Override
public Object nextElement() {
throw new NoSuchElementException();
}
}

private class HashEnumerator implements Enumeration {
boolean key;

int start;

HashMapEntry entry;

HashEnumerator(boolean isKey) {
key = isKey;
start = firstSlot;
}

@Override
public boolean hasMoreElements() {
if (entry != null) {
return true;
}
while (start <= lastSlot) {
if (elementData[start++] != null) {
entry = elementData[start - 1];
return true;
}
}
return false;
}

@Override
public Object nextElement() {
if (hasMoreElements()) {
Object result = key ? entry.key : entry.value;
entry = entry.next;
return result;
}
throw new NoSuchElementException();
}
}

transient int elementCount;

transient HashMapEntry[] elementData;
Expand All @@ -109,14 +57,8 @@ public Object nextElement() {

private int threshold;

transient int firstSlot = 0;

transient int lastSlot = -1;

transient private IElementComparer comparer;

private static final EmptyEnumerator emptyEnumerator = new EmptyEnumerator();

/**
* The default capacity used when not specified in the constructor.
*/
Expand Down Expand Up @@ -166,7 +108,6 @@ public CustomHashtable(int capacity, IElementComparer comparer) {
if (capacity >= 0) {
elementCount = 0;
elementData = new HashMapEntry[capacity == 0 ? 1 : capacity];
firstSlot = elementData.length;
loadFactor = 0.75f;
computeMaxSize();
} else {
Expand Down Expand Up @@ -224,20 +165,6 @@ public boolean containsKey(Object key) {
return getEntry(key) != null;
}

/**
* Answers an Enumeration on the values of this Hashtable. The
* results of the Enumeration may be affected if the contents
* of this Hashtable are modified.
*
* @return an Enumeration of the values of this Hashtable
*/
public Enumeration elements() {
if (elementCount == 0) {
return emptyEnumerator;
}
return new HashEnumerator(false);
}

/**
* Answers the value associated with the specified key in
* this Hashtable.
Expand Down Expand Up @@ -290,20 +217,6 @@ private boolean keyEquals(Object a, Object b) {
return comparer.equals(a, b);
}

/**
* Answers an Enumeration on the keys of this Hashtable. The
* results of the Enumeration may be affected if the contents
* of this Hashtable are modified.
*
* @return an Enumeration of the keys of this Hashtable
*/
public Enumeration keys() {
if (elementCount == 0) {
return emptyEnumerator;
}
return new HashEnumerator(true);
}

/**
* Associate the specified value with the specified key in this Hashtable.
* If the key already exists, the old value is replaced. The key and value
Expand All @@ -327,12 +240,6 @@ public Object put(Object key, Object value) {
rehash();
index = indexFor(hash);
}
if (index < firstSlot) {
firstSlot = index;
}
if (index > lastSlot) {
lastSlot = index;
}
entry = new HashMapEntry(key, value, hash);
entry.next = elementData[index];
elementData[index] = entry;
Expand All @@ -355,19 +262,11 @@ private void rehash() {
if (length == 0) {
length = 1;
}
firstSlot = length;
lastSlot = -1;
HashMapEntry[] newData = new HashMapEntry[length];
for (int i = elementData.length; --i >= 0;) {
HashMapEntry entry = elementData[i];
while (entry != null) {
int index = (entry.hash & 0x7FFFFFFF) % length;
if (index < firstSlot) {
firstSlot = index;
}
if (index > lastSlot) {
lastSlot = index;
}
HashMapEntry next = entry.next;
entry.next = newData[index];
newData[index] = entry;
Expand Down
Loading