Author: scolebourne
Date: Sat Nov 4 05:57:57 2006
New Revision: 471189
URL: http://svn.apache.org/viewvc?view=rev&rev=471189
Log:
Remove getMap(), getOrderedMap() and getSortedMap() - use decorated()
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/ListOrderedMap.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/MultiValueMap.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TransformedMap.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java?view=diff&rev=471189&r1=471188&r2=471189
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
Sat Nov 4 05:57:57 2006
@@ -71,16 +71,6 @@
* Gets the map being decorated.
*
* @return the decorated map
- * @deprecated use decorated()
- */
- protected Map<K, V> getMap() {
- return decorated();
- }
-
- /**
- * Gets the map being decorated.
- *
- * @return the decorated map
*/
protected Map<K, V> decorated() {
return map;
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java?view=diff&rev=471189&r1=471188&r2=471189
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
Sat Nov 4 05:57:57 2006
@@ -16,8 +16,6 @@
*/
package org.apache.commons.collections.map;
-import java.util.Map;
-
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.OrderedMap;
import org.apache.commons.collections.OrderedMapIterator;
@@ -59,16 +57,6 @@
*/
public AbstractOrderedMapDecorator(OrderedMap map) {
super(map);
- }
-
- /**
- * Gets the map being decorated.
- *
- * @return the decorated map
- * @deprecated use decorated()
- */
- protected OrderedMap getOrderedMap() {
- return decorated();
}
/**
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java?view=diff&rev=471189&r1=471188&r2=471189
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
Sat Nov 4 05:57:57 2006
@@ -64,16 +64,6 @@
* Gets the map being decorated.
*
* @return the decorated map
- * @deprecated use decorated()
- */
- protected SortedMap<K, V> getSortedMap() {
- return decorated();
- }
-
- /**
- * Gets the map being decorated.
- *
- * @return the decorated map
*/
protected SortedMap<K, V> decorated() {
return (SortedMap<K, V>) super.decorated();
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/ListOrderedMap.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/ListOrderedMap.java?view=diff&rev=471189&r1=471188&r2=471189
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/ListOrderedMap.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/ListOrderedMap.java
Sat Nov 4 05:57:57 2006
@@ -109,7 +109,7 @@
*/
protected ListOrderedMap(Map map) {
super(map);
- insertOrder.addAll(getMap().keySet());
+ insertOrder.addAll(decorated().keySet());
}
//-----------------------------------------------------------------------
@@ -206,12 +206,12 @@
//-----------------------------------------------------------------------
public Object put(Object key, Object value) {
- if (getMap().containsKey(key)) {
+ if (decorated().containsKey(key)) {
// re-adding doesn't change order
- return getMap().put(key, value);
+ return decorated().put(key, value);
} else {
// first add, so add to both map and list
- Object result = getMap().put(key, value);
+ Object result = decorated().put(key, value);
insertOrder.add(key);
return result;
}
@@ -225,13 +225,13 @@
}
public Object remove(Object key) {
- Object result = getMap().remove(key);
+ Object result = decorated().remove(key);
insertOrder.remove(key);
return result;
}
public void clear() {
- getMap().clear();
+ decorated().clear();
insertOrder.clear();
}
@@ -399,7 +399,7 @@
* @since Commons Collections 3.2
*/
public Object put(int index, Object key, Object value) {
- Map m = getMap();
+ Map m = decorated();
if (m.containsKey(key)) {
Object result = m.remove(key);
int pos = insertOrder.indexOf(key);
@@ -535,7 +535,7 @@
private Set getEntrySet() {
if (entrySet == null) {
- entrySet = parent.getMap().entrySet();
+ entrySet = parent.decorated().entrySet();
}
return entrySet;
}
@@ -608,7 +608,7 @@
public void remove() {
super.remove();
- parent.getMap().remove(last);
+ parent.decorated().remove(last);
}
}
@@ -626,7 +626,7 @@
}
public Object setValue(Object value) {
- return parent.getMap().put(key, value);
+ return parent.decorated().put(key, value);
}
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/MultiValueMap.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/MultiValueMap.java?view=diff&rev=471189&r1=471188&r2=471189
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/MultiValueMap.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/MultiValueMap.java
Sat Nov 4 05:57:57 2006
@@ -137,7 +137,7 @@
// Collection coll = (Collection) keyValuePair.getValue();
// coll.clear();
// }
- getMap().clear();
+ decorated().clear();
}
/**
@@ -177,7 +177,7 @@
* @return true if the map contains the value
*/
public boolean containsValue(Object value) {
- Set pairs = getMap().entrySet();
+ Set pairs = decorated().entrySet();
if (pairs == null) {
return false;
}
@@ -210,7 +210,7 @@
coll.add(value);
if (coll.size() > 0) {
// only add if non-zero size to maintain class state
- getMap().put(key, coll);
+ decorated().put(key, coll);
result = true; // map definitely changed
}
} else {
@@ -279,7 +279,7 @@
* @return the collection mapped to the key, null if no mapping
*/
public Collection getCollection(Object key) {
- return (Collection) getMap().get(key);
+ return (Collection) decorated().get(key);
}
/**
@@ -315,7 +315,7 @@
coll.addAll(values);
if (coll.size() > 0) {
// only add if non-zero size to maintain class state
- getMap().put(key, coll);
+ decorated().put(key, coll);
result = true; // map definitely changed
}
} else {
@@ -345,7 +345,7 @@
*/
public int totalSize() {
int total = 0;
- Collection values = getMap().values();
+ Collection values = decorated().values();
for (Iterator it = values.iterator(); it.hasNext();) {
Collection coll = (Collection) it.next();
total += coll.size();
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TransformedMap.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TransformedMap.java?view=diff&rev=471189&r1=471188&r2=471189
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TransformedMap.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TransformedMap.java
Sat Nov 4 05:57:57 2006
@@ -93,7 +93,7 @@
if (map.size() > 0) {
Map transformed = decorated.transformMap(map);
decorated.clear();
- decorated.getMap().putAll(transformed); // avoids double
transformation
+ decorated.decorated().putAll(transformed); // avoids double
transformation
}
return decorated;
}
@@ -218,12 +218,12 @@
public Object put(Object key, Object value) {
key = transformKey(key);
value = transformValue(value);
- return getMap().put(key, value);
+ return decorated().put(key, value);
}
public void putAll(Map mapToCopy) {
mapToCopy = transformMap(mapToCopy);
- getMap().putAll(mapToCopy);
+ decorated().putAll(mapToCopy);
}
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TransformedSortedMap.java?view=diff&rev=471189&r1=471188&r2=471189
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
Sat Nov 4 05:57:57 2006
@@ -85,7 +85,7 @@
if (map.size() > 0) {
Map transformed = decorated.transformMap(map);
decorated.clear();
- decorated.getMap().putAll(transformed); // avoids double
transformation
+ decorated.decorated().putAll(transformed); // avoids double
transformation
}
return decorated;
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java?view=diff&rev=471189&r1=471188&r2=471189
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
Sat Nov 4 05:57:57 2006
@@ -102,12 +102,12 @@
//-----------------------------------------------------------------------
public MapIterator mapIterator() {
- MapIterator it = getOrderedMap().mapIterator();
+ MapIterator it = decorated().mapIterator();
return UnmodifiableMapIterator.decorate(it);
}
public OrderedMapIterator orderedMapIterator() {
- OrderedMapIterator it = getOrderedMap().orderedMapIterator();
+ OrderedMapIterator it = decorated().orderedMapIterator();
return UnmodifiableOrderedMapIterator.decorate(it);
}
Modified:
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java?view=diff&rev=471189&r1=471188&r2=471189
==============================================================================
---
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
(original)
+++
jakarta/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
Sat Nov 4 05:57:57 2006
@@ -131,29 +131,29 @@
//-----------------------------------------------------------------------
public Object firstKey() {
- return getSortedMap().firstKey();
+ return decorated().firstKey();
}
public Object lastKey() {
- return getSortedMap().lastKey();
+ return decorated().lastKey();
}
public Comparator comparator() {
- return getSortedMap().comparator();
+ return decorated().comparator();
}
public SortedMap subMap(Object fromKey, Object toKey) {
- SortedMap map = getSortedMap().subMap(fromKey, toKey);
+ SortedMap map = decorated().subMap(fromKey, toKey);
return new UnmodifiableSortedMap(map);
}
public SortedMap headMap(Object toKey) {
- SortedMap map = getSortedMap().headMap(toKey);
+ SortedMap map = decorated().headMap(toKey);
return new UnmodifiableSortedMap(map);
}
public SortedMap tailMap(Object fromKey) {
- SortedMap map = getSortedMap().tailMap(fromKey);
+ SortedMap map = decorated().tailMap(fromKey);
return new UnmodifiableSortedMap(map);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
