From d0d0fcdeb2cdd55f2ea0072d4899c094650044ac Mon Sep 17 00:00:00 2001
From: msridhar1 <msridhar1@f5eafffb-2e1d-0410-98e4-8ec43c5233c4>
Date: Wed, 12 Mar 2008 05:00:50 +0000
Subject: [PATCH] add a type parameter to TabulationDomain for tabulation
 solver node type, seen in PathEdges

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@2695 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
---
 .../src/com/ibm/wala/dataflow/IFDS/TabulationDomain.java      | 4 ++--
 .../src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java      | 1 +
 .../src/com/ibm/wala/dataflow/IFDS/UnorderedDomain.java       | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationDomain.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationDomain.java
index a1a7b688c..5a9bf533d 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationDomain.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationDomain.java
@@ -16,7 +16,7 @@ import com.ibm.wala.util.intset.OrdinalSetMapping;
  * @author sfink
  *
  */
-public interface TabulationDomain<T> extends OrdinalSetMapping<T> {
+public interface TabulationDomain<T,U> extends OrdinalSetMapping<T> {
 
   /**
    * returns <code>true</code> if p1 should be processed before
@@ -27,7 +27,7 @@ public interface TabulationDomain<T> extends OrdinalSetMapping<T> {
    * 
    * return false otherwise
    */
-  boolean hasPriorityOver(PathEdge p1, PathEdge p2);
+  boolean hasPriorityOver(PathEdge<U> p1, PathEdge<U> p2);
 
 
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java
index b539a7563..0cbcfb96a 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java
@@ -962,6 +962,7 @@ public class TabulationSolver<T, P> {
       super(100);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     protected boolean compareElements(PathEdge<T> p1, PathEdge<T> p2) {
       if (p1.d2 != p2.d2) { // TODO should we remove this check?
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/UnorderedDomain.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/UnorderedDomain.java
index 961e6efc9..495ef9e2d 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/UnorderedDomain.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/UnorderedDomain.java
@@ -16,12 +16,12 @@ import com.ibm.wala.util.intset.MutableMapping;
  * @author sfink
  *
  */
-public class UnorderedDomain<T> extends MutableMapping<T> implements TabulationDomain<T> {
+public class UnorderedDomain<T,U> extends MutableMapping<T> implements TabulationDomain<T,U> {
 
   /* 
    * @see com.ibm.wala.dataflow.IFDS.TabulationDomain#isWeakerThan(int, int)
    */
-  public boolean hasPriorityOver(PathEdge p1, PathEdge p2) {
+  public boolean hasPriorityOver(PathEdge<U> p1, PathEdge<U> p2) {
     return false;
   }