fillDeclarables always take a Set now

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

jode/jode/expr/CheckNullOperator.java

@@ -26,7 +26,7 @@ import jode.flow.VariableSet;
 ///#ifdef JDK12
 ///import java.util.Set;
 ///#else
-import jode.util.SimpleSet;
+import jode.util.Set;
 ///#endif
 
 /**
@@ -81,11 +81,7 @@ public class CheckNullOperator extends Operator {
 	super.fillInGenSet(in, gen);
     }
 
-///#ifdef JDK12
+    public void fillDeclarables(Set used) {
-///    public void fillDeclarables(Set used) {
-///#else
-    public void fillDeclarables(SimpleSet used) {
-///#endif
 	used.add(local);
 	super.fillDeclarables(used);
     }

jode/jode/expr/ConstructorOperator.java

@@ -35,7 +35,7 @@ import java.lang.reflect.Modifier;
 ///#ifdef JDK12
 ///import java.util.Set;
 ///#else
-import jode.util.SimpleSet;
+import jode.util.Set;
 ///#endif
 
 public class ConstructorOperator extends Operator 
@@ -169,11 +169,7 @@ public class ConstructorOperator extends Operator
      * We add the named method scoped classes to the declarables, and
      * only fillDeclarables on the parameters we will print.
      */
-///#ifdef JDK12
+    public void fillDeclarables(Set used) {
-///    public void fillDeclarables(Set used) {
-///#else
-    public void fillDeclarables(SimpleSet used) {
-///#endif
 	ClassInfo clazz = getClassInfo();
 	InnerClassInfo outer = getOuterClassInfo(clazz);
 	ClassAnalyzer clazzAna = methodAnalyzer.getClassAnalyzer(clazz);

jode/jode/expr/Expression.java

@@ -26,7 +26,7 @@ import jode.flow.VariableSet;
 ///#ifdef JDK12
 ///import java.util.Set;
 ///#else
-import jode.util.SimpleSet;
+import jode.util.Set;
 ///#endif
 
 public abstract class Expression {
@@ -232,11 +232,7 @@ public abstract class Expression {
     public void fillInGenSet(VariableSet in, VariableSet gen) {
     }
 
-///#ifdef JDK12
+    public void fillDeclarables(Set used) {
-///    public void fillDeclarables(Set used) {
-///#else
-    public void fillDeclarables(SimpleSet used) {
-///#endif
     }
 
     public abstract void dumpExpression(TabbedPrintWriter writer) 

jode/jode/expr/Operator.java

@@ -26,7 +26,7 @@ import jode.flow.VariableSet;
 ///#ifdef JDK12
 ///import java.util.Set;
 ///#else
-import jode.util.SimpleSet;
+import jode.util.Set;
 ///#endif
 
 public abstract class Operator extends Expression {
@@ -176,11 +176,7 @@ public abstract class Operator extends Expression {
 	    subExpressions[i].fillInGenSet(in,gen);
     }
 
-///#ifdef JDK12
+    public void fillDeclarables(Set used) {
-///    public void fillDeclarables(Set used) {
-///#else
-    public void fillDeclarables(SimpleSet used) {
-///#endif
 	if (this instanceof LocalVarOperator) {
 	    used.add(((LocalVarOperator) this).getLocalInfo());
 	}