Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-10-04 11:26:44 -04:00
Code Issues Projects Releases Wiki Activity

TMI-XXX: New code style + minor housekeeping changes.

Browse Source
This commit is contained in:
Harald Kuhr
2013-01-31 15:41:59 +01:00
parent f666610184
commit 00f47e81a4
5 changed files with 48 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java
View File

@@ -46,7 +46,7 @@ public abstract class AbstractTokenIterator implements TokenIterator {
public void remove() {
// TODO: This is not difficult:
// - Convert String to StringBuilder in constructor
// - delete(pos, mNext.lenght())
// - delete(pos, next.lenght())
// - Add toString() method
// BUT: Would it ever be useful? :-)

1
common/common-lang/src/main/java/com/twelvemonkeys/util/LRUHashMap.java
View File

@@ -205,6 +205,7 @@ public class LRUHashMap<K, V> extends LinkedHashMap<K, V> implements ExpiringMap
*/
public void removeLRU() {
int removeCount = (int) Math.max((size() * trimFactor), 1);
Iterator<Map.Entry<K, V>> entries = entrySet().iterator();
while ((removeCount--) > 0 && entries.hasNext()) {
entries.next();

5
common/common-lang/src/main/java/com/twelvemonkeys/util/LRUMap.java
View File

@@ -45,7 +45,7 @@ import java.util.Map;
* </ul>
*
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LRUMap.java#1 $
* @version $Id: com/twelvemonkeys/util/LRUMap.java#1 $
*/
public class LRUMap<K, V> extends LinkedMap<K, V> implements ExpiringMap<K, V> {
@@ -222,8 +222,9 @@ public class LRUMap<K, V> extends LinkedMap<K, V> implements ExpiringMap<K, V> {
*/
public void removeLRU() {
int removeCount = (int) Math.max((size() * trimFactor), 1);
while ((removeCount--) > 0) {
removeEntry(head.mNext);
removeEntry(head.next);
}
}
}

32
common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedMap.java
View File

@@ -181,19 +181,19 @@ public class LinkedMap<K, V> extends AbstractDecoratedMap<K, V> implements Seria
return "head";
}
};
head.mPrevious = head.mNext = head;
head.previous = head.next = head;
}
public boolean containsValue(Object pValue) {
// Overridden to take advantage of faster iterator
if (pValue == null) {
for (LinkedEntry e = head.mNext; e != head; e = e.mNext) {
for (LinkedEntry e = head.next; e != head; e = e.next) {
if (e.mValue == null) {
return true;
}
}
} else {
for (LinkedEntry e = head.mNext; e != head; e = e.mNext) {
for (LinkedEntry e = head.next; e != head; e = e.next) {
if (pValue.equals(e.mValue)) {
return true;
}
@@ -215,7 +215,7 @@ public class LinkedMap<K, V> extends AbstractDecoratedMap<K, V> implements Seria
}
private abstract class LinkedMapIterator<E> implements Iterator<E> {
LinkedEntry<K, V> mNextEntry = head.mNext;
LinkedEntry<K, V> mNextEntry = head.next;
LinkedEntry<K, V> mLastReturned = null;
/**
@@ -254,7 +254,7 @@ public class LinkedMap<K, V> extends AbstractDecoratedMap<K, V> implements Seria
}
LinkedEntry<K, V> e = mLastReturned = mNextEntry;
mNextEntry = e.mNext;
mNextEntry = e.next;
return e;
}
@@ -309,7 +309,7 @@ public class LinkedMap<K, V> extends AbstractDecoratedMap<K, V> implements Seria
oldValue = null;
// Remove eldest entry if instructed, else grow capacity if appropriate
LinkedEntry<K, V> eldest = head.mNext;
LinkedEntry<K, V> eldest = head.next;
if (removeEldestEntry(eldest)) {
removeEntry(eldest);
}
@@ -407,13 +407,13 @@ public class LinkedMap<K, V> extends AbstractDecoratedMap<K, V> implements Seria
* Linked list implementation of {@code Map.Entry}.
*/
protected static class LinkedEntry<K, V> extends BasicEntry<K, V> implements Serializable {
LinkedEntry<K, V> mPrevious;
LinkedEntry<K, V> mNext;
LinkedEntry<K, V> previous;
LinkedEntry<K, V> next;
LinkedEntry(K pKey, V pValue, LinkedEntry<K, V> pNext) {
super(pKey, pValue);
mNext = pNext;
next = pNext;
}
/**
@@ -423,19 +423,19 @@ public class LinkedMap<K, V> extends AbstractDecoratedMap<K, V> implements Seria
* @param pExisting the entry to add before
*/
void addBefore(LinkedEntry<K, V> pExisting) {
mNext = pExisting;
mPrevious = pExisting.mPrevious;
next = pExisting;
previous = pExisting.previous;
mPrevious.mNext = this;
mNext.mPrevious = this;
previous.next = this;
next.previous = this;
}
/**
* Removes this entry from the linked list.
*/
void remove() {
mPrevious.mNext = mNext;
mNext.mPrevious = mPrevious;
previous.next = next;
next.previous = previous;
}
/**
@@ -456,7 +456,7 @@ public class LinkedMap<K, V> extends AbstractDecoratedMap<K, V> implements Seria
/**
* Removes this entry from the linked list.
*
* @param pMap the map to record remoal from
* @param pMap the map to record removal from
*/
protected void recordRemoval(Map<K, V> pMap) {
// TODO: Is this REALLY correct?