scolebourne 2004/11/11 16:02:59
Modified: collections/src/java/org/apache/commons/collections/bidimap
TreeBidiMap.java
collections project.xml
Log:
Don't access static methods via instance variable
from Chris Tilden
Revision Changes Path
1.15 +5 -5
jakarta-commons/collections/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
Index: TreeBidiMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TreeBidiMap.java 26 May 2004 21:58:02 -0000 1.14
+++ TreeBidiMap.java 12 Nov 2004 00:02:58 -0000 1.15
@@ -1612,7 +1612,7 @@
expectedModifications++;
lastReturnedNode = null;
if (nextNode == null) {
- previousNode = main.greatestNode(main.rootNode[orderType],
orderType);
+ previousNode =
TreeBidiMap.greatestNode(main.rootNode[orderType], orderType);
} else {
previousNode = main.nextSmaller(nextNode, orderType);
}
@@ -1674,7 +1674,7 @@
*/
EntryView(final TreeBidiMap main, final int orderType, final int
dataType) {
super(main, orderType, dataType);
- this.oppositeType = main.oppositeIndex(orderType);
+ this.oppositeType = TreeBidiMap.oppositeIndex(orderType);
}
public boolean contains(Object obj) {
@@ -1979,14 +1979,14 @@
if (main.nodeCount == 0) {
throw new NoSuchElementException("Map is empty");
}
- return main.leastNode(main.rootNode[VALUE], VALUE).getValue();
+ return TreeBidiMap.leastNode(main.rootNode[VALUE],
VALUE).getValue();
}
public Object lastKey() {
if (main.nodeCount == 0) {
throw new NoSuchElementException("Map is empty");
}
- return main.greatestNode(main.rootNode[VALUE], VALUE).getValue();
+ return TreeBidiMap.greatestNode(main.rootNode[VALUE],
VALUE).getValue();
}
public Object nextKey(Object key) {
1.47 +3 -0 jakarta-commons/collections/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/project.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- project.xml 16 Oct 2004 21:26:14 -0000 1.46
+++ project.xml 12 Nov 2004 00:02:59 -0000 1.47
@@ -285,6 +285,9 @@
<name>Leo Sutic</name>
</contributor>
<contributor>
+ <name>Chris Tilden</name>
+ </contributor>
+ <contributor>
<name>Neil O'Toole</name>
</contributor>
<contributor>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
