Apache/commons-collections
1
0
Fork 0
mirror of https://github.com/apache/commons-collections.git synced 2025-02-17 23:44:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename private variables to prevent hiding

Browse Source 
Don't assign to null twice

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1023917 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2010-10-18 17:36:03 +00:00
parent fa805c3732
commit b29dd0968d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
View File

@ -595,7 +595,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>> imple
* @return the specified node
*/
private Node<K, V> nextGreater(final Node<K, V> node, final DataElement dataElement) {
Node<K, V> rval = null;
Node<K, V> rval;
if (node == null) {
rval = null;
} else if (node.getRight(dataElement) != null) {
@ -629,7 +629,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>> imple
* @return the specified node
*/
private Node<K, V> nextSmaller(final Node<K, V> node, final DataElement dataElement) {
Node<K, V> rval = null;
Node<K, V> rval;
if (node == null) {
rval = null;
} else if (node.getLeft(dataElement) != null) {
@ -2007,11 +2007,11 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>> imple
class Inverse implements OrderedBidiMap<V, K> {
/** Store the keySet once created. */
private Set<V> keySet;
private Set<V> inverseKeySet;
/** Store the valuesSet once created. */
private Set<K> valuesSet;
private Set<K> inverseValuesSet;
/** Store the entrySet once created. */
private Set<Map.Entry<V, K>> entrySet;
private Set<Map.Entry<V, K>> inverseEntrySet;
public int size() {
return TreeBidiMap.this.size();
@ -2088,24 +2088,24 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>> imple
}
public Set<V> keySet() {
if (keySet == null) {
keySet = new ValueView(VALUE);
if (inverseKeySet == null) {
inverseKeySet = new ValueView(VALUE);
}
return keySet;
return inverseKeySet;
}
public Collection<K> values() {
if (valuesSet == null) {
valuesSet = new KeyView(VALUE);
if (inverseValuesSet == null) {
inverseValuesSet = new KeyView(VALUE);
}
return valuesSet;
return inverseValuesSet;
}
public Set<Map.Entry<V, K>> entrySet() {
if (entrySet == null) {
entrySet = new InverseEntryView();
if (inverseEntrySet == null) {
inverseEntrySet = new InverseEntryView();
}
return entrySet;
return inverseEntrySet;
}
public OrderedMapIterator<V, K> mapIterator() {