fillInGenSet now takes Set, not VariableSet

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1039 379699f6-c40d-0410-875b-85095c16579e

jode/jode/expr/CheckNullOperator.java

@@ -21,7 +21,6 @@ package jode.expr;
 import jode.type.Type;
 import jode.decompiler.LocalInfo;
 import jode.decompiler.TabbedPrintWriter;
-import jode.flow.VariableSet;
 
 ///#ifdef JDK12
 ///import java.util.Set;
@@ -75,9 +74,9 @@ public class CheckNullOperator extends Operator {
 	local.remove();
     }
 
-    public void fillInGenSet(VariableSet in, VariableSet gen) {
+    public void fillInGenSet(Set in, Set gen) {
 	if (gen != null)
-	    gen.addElement(local);
+	    gen.add(local);
 	super.fillInGenSet(in, gen);
     }
 

jode/jode/expr/Expression.java

@@ -21,7 +21,6 @@ package jode.expr;
 import jode.type.Type;
 import jode.GlobalOptions;
 import jode.decompiler.TabbedPrintWriter;
-import jode.flow.VariableSet;
 
 ///#ifdef JDK12
 ///import java.util.Set;
@@ -229,7 +228,7 @@ public abstract class Expression {
         return true;
     }
 
-    public void fillInGenSet(VariableSet in, VariableSet gen) {
+    public void fillInGenSet(Set in, Set gen) {
     }
 
     public void fillDeclarables(Set used) {

jode/jode/expr/Operator.java

@@ -21,7 +21,6 @@ package jode.expr;
 import jode.type.Type;
 import jode.GlobalOptions;
 import jode.decompiler.TabbedPrintWriter;
-import jode.flow.VariableSet;
 
 ///#ifdef JDK12
 ///import java.util.Set;
@@ -164,13 +163,13 @@ public abstract class Operator extends Expression {
 	return this;
     }
 
-    public void fillInGenSet(VariableSet in, VariableSet gen) {
+    public void fillInGenSet(Set in, Set gen) {
 	if (this instanceof LocalVarOperator) {
             LocalVarOperator varOp = (LocalVarOperator) this;
             if (varOp.isRead() && in != null)
-                in.addElement(varOp.getLocalInfo());
+                in.add(varOp.getLocalInfo());
             if (gen != null)
-		gen.addElement(varOp.getLocalInfo());
+		gen.add(varOp.getLocalInfo());
 	}
         for (int i=0; i< subExpressions.length; i++)
 	    subExpressions[i].fillInGenSet(in,gen);