DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

deprecate Mapper 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@3718 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
sjfink 2009-07-08 15:17:46 +00:00
parent 933043fccf
commit ac17daa979
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
com.ibm.wala.core/src/com/ibm/wala/demandpa/genericutil/Mapper.java
View File

@ -37,9 +37,14 @@
*/ */
package com.ibm.wala.demandpa.genericutil; package com.ibm.wala.demandpa.genericutil;
import com.ibm.wala.util.functions.Function;
/** /**
* A simple interface for defining a function that maps objects. * A simple interface for defining a function that maps objects.
*
* @deprecated use {@link Function} instead
*/ */
@Deprecated
public interface Mapper<T,U> { public interface Mapper<T,U> {
public U map(T obj_); public U map(T obj_);
} }

9
com.ibm.wala.core/src/com/ibm/wala/demandpa/genericutil/Util.java
View File

@ -53,6 +53,7 @@ import java.util.Set;
import com.ibm.wala.util.Predicate; import com.ibm.wala.util.Predicate;
import com.ibm.wala.util.collections.HashSetFactory; import com.ibm.wala.util.collections.HashSetFactory;
import com.ibm.wala.util.functions.Function;
/** /**
* Miscellaneous utility functions. * Miscellaneous utility functions.
@ -218,13 +219,13 @@ public class Util {
* *
* @throws IllegalArgumentException if srcList == null * @throws IllegalArgumentException if srcList == null
*/ */
public static <T, U> List<U> map(List<T> srcList, Mapper<T, U> mapper) throws IllegalArgumentException { public static <T, U> List<U> map(List<T> srcList, Function<T, U> f) throws IllegalArgumentException {
if (srcList == null) { if (srcList == null) {
throw new IllegalArgumentException("srcList == null"); throw new IllegalArgumentException("srcList == null");
} }
ArrayList<U> result = new ArrayList<U>(); ArrayList<U> result = new ArrayList<U>();
for (Iterator<T> srcIter = srcList.iterator(); srcIter.hasNext();) { for (Iterator<T> srcIter = srcList.iterator(); srcIter.hasNext();) {
result.add(mapper.map(srcIter.next())); result.add(f.apply(srcIter.next()));
} }
return result; return result;
} }
@ -267,13 +268,13 @@ public class Util {
* *
* @throws IllegalArgumentException if srcSet == null * @throws IllegalArgumentException if srcSet == null
*/ */
public static <T, U> Set<U> mapToSet(Collection<T> srcSet, Mapper<T, U> mapper) throws IllegalArgumentException { public static <T, U> Set<U> mapToSet(Collection<T> srcSet, Function<T, U> f) throws IllegalArgumentException {
if (srcSet == null) { if (srcSet == null) {
throw new IllegalArgumentException("srcSet == null"); throw new IllegalArgumentException("srcSet == null");
} }
HashSet<U> result = HashSetFactory.make(); HashSet<U> result = HashSetFactory.make();
for (Iterator<T> srcIter = srcSet.iterator(); srcIter.hasNext();) { for (Iterator<T> srcIter = srcSet.iterator(); srcIter.hasNext();) {
result.add(mapper.map(srcIter.next())); result.add(f.apply(srcIter.next()));
} }
return result; return result;
} }