From 13bdde31de03e0bcdf8c9373ef69444c37e0a9de Mon Sep 17 00:00:00 2001
From: Quoc-Sang Phan <dark2bright@gmail.com>
Date: Fri, 10 Nov 2017 15:36:08 -0800
Subject: [PATCH] refactor

---
 .../jpf/testsuites/InitVarsVisitor.java       | 34 ------------------
 .../jpf/testsuites/TestGenVisitor.java        | 36 +++++++++++++++++++
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/jpf/starlib/jpf/testsuites/InitVarsVisitor.java b/src/jpf/starlib/jpf/testsuites/InitVarsVisitor.java
index abe92a5..ec0b4da 100644
--- a/src/jpf/starlib/jpf/testsuites/InitVarsVisitor.java
+++ b/src/jpf/starlib/jpf/testsuites/InitVarsVisitor.java
@@ -99,38 +99,4 @@ public boolean isClassVariable(Variable var) {
 		return classVars.contains(var.getName());
 	}
 	
-	public String standardizeName(Variable var) {
-		String name = var.getName();
-		
-		if (isInstanceVariable(var))
-			name = name.replace("this_", objName + ".");
-		else if (isClassVariable(var))
-			name = name.replace(clsName + "_", clsName + ".");
-		
-		return name;
-	}
-	
-	/*
-	 * Generate the declaration for this variable
-	 */
-	public String makeDeclaration(Variable var) {
-		String name = var.getName();
-		
-		if (isInstanceVariable(var))
-			name = name.replace("this_", objName + ".");
-		else if (isClassVariable(var))
-			name = name.replace(clsName + "_", clsName + ".");
-		else 
-			name = var.getType() + " " + name;
-		
-		return name;
-	}
-	
-	public String makeDeclAndInit(Variable var, String value) {
-		return "\t\t" + makeDeclaration(var) + " = " + value + ";\n";
-	}
-
-	public String makeDeclAndInitWithConstructor(Variable var) {
-		return makeDeclAndInit(var,"new " + var.getType() + "()");
-	}
 }
diff --git a/src/jpf/starlib/jpf/testsuites/TestGenVisitor.java b/src/jpf/starlib/jpf/testsuites/TestGenVisitor.java
index b10537e..f8d27d1 100644
--- a/src/jpf/starlib/jpf/testsuites/TestGenVisitor.java
+++ b/src/jpf/starlib/jpf/testsuites/TestGenVisitor.java
@@ -70,4 +70,40 @@ private void genDefaultVars() {
 			}
 		}
 	}
+	
+	public String standardizeName(Variable var) {
+		String name = var.getName();
+		
+		if (isInstanceVariable(var))
+			name = name.replace("this_", objName + ".");
+		else if (isClassVariable(var))
+			name = name.replace(clsName + "_", clsName + ".");
+		
+		return name;
+	}
+	
+	/*
+	 * Generate the declaration for this variable
+	 */
+	public String makeDeclaration(Variable var) {
+		String name = var.getName();
+		
+		if (isInstanceVariable(var))
+			name = name.replace("this_", objName + ".");
+		else if (isClassVariable(var))
+			name = name.replace(clsName + "_", clsName + ".");
+		else 
+			name = var.getType() + " " + name;
+		
+		return name;
+	}
+	
+	public String makeDeclAndInit(Variable var, String value) {
+		return "\t\t" + makeDeclaration(var) + " = " + value + ";\n";
+	}
+
+	public String makeDeclAndInitWithConstructor(Variable var) {
+		return makeDeclAndInit(var,"new " + var.getType() + "()");
+	}
+	
 }