From 11e68af500303db1f7afb812783791d1545af141 Mon Sep 17 00:00:00 2001
From: sjfink <sjfink@f5eafffb-2e1d-0410-98e4-8ec43c5233c4>
Date: Fri, 14 Dec 2007 22:09:35 +0000
Subject: [PATCH] fix some generics

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@2194 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
---
 .../cast/java/examples/ast/SynchronizedBlockDuplicator.java  | 2 +-
 .../translator/polyglot/PolyglotJava2CAstTranslator.java     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/examples/ast/SynchronizedBlockDuplicator.java b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/examples/ast/SynchronizedBlockDuplicator.java
index c6eb43a51..e7b98d00c 100644
--- a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/examples/ast/SynchronizedBlockDuplicator.java
+++ b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/examples/ast/SynchronizedBlockDuplicator.java
@@ -136,7 +136,7 @@ public class SynchronizedBlockDuplicator extends
     return null;
   }
 
-  protected CAstNode copyNodes(CAstNode n, RewriteContext<UnwindKey> c, Map nodeMap) {
+  protected CAstNode copyNodes(CAstNode n, RewriteContext<UnwindKey> c, Map<Pair, CAstNode> nodeMap) {
     String varName;
     if (n instanceof CAstOperator) {
       return n;
diff --git a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java
index ebdea11bb..4de4c7add 100644
--- a/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java
+++ b/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java
@@ -1999,8 +1999,9 @@ public class PolyglotJava2CAstTranslator implements TranslatorToCAst {
       fPI = pi;
     }
 
-    public Collection getCatchTargets(Type label) {
-      return Collections.singleton(Pair.make(fREType, CAstControlFlowMap.EXCEPTION_TO_EXIT));
+    public Collection<Pair<Type, Object>> getCatchTargets(Type label) {
+      Collection<Pair<Type, Object>> result = Collections.singleton(Pair.<Type,Object>make(fREType, CAstControlFlowMap.EXCEPTION_TO_EXIT));
+      return result;
     }
 
     public CodeInstance getEnclosingMethod() {