From 47d4b97131e5c948670c02a25927a1cee82fdb41 Mon Sep 17 00:00:00 2001
From: hmm <hmm@hmm-PC>
Date: Thu, 4 Sep 2014 13:44:22 +0800
Subject: [PATCH] change filter script to testplanscript from script

---
 .../master/domain/entity/RunningAgentDB.java     |  2 +-
 .../org/bench4q/master/domain/entity/Script.java |  9 ---------
 .../master/domain/entity/TestPlanScript.java     |  9 +++++++++
 .../master/domain/factory/TestPlanFactory.java   | 16 ++++++++--------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/RunningAgentDB.java b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/RunningAgentDB.java
index 1578271b..1d082a2a 100644
--- a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/RunningAgentDB.java
+++ b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/RunningAgentDB.java
@@ -180,7 +180,7 @@ public class RunningAgentDB implements RunningAgentInterface {
 		Script script2 = this.getTestPlanScript().getScript();
 		RunScenarioModel runScenarioModel = (RunScenarioModel) MarshalHelper
 				.tryUnmarshal(RunScenarioModel.class,
-						script2.getFilteredScriptCnt());
+						this.getTestPlanScript().getFilteredScriptCnt());
 		runScenarioModel.setPoolSize(getLoadInUse());
 		RunScenarioResultModel runScenarioResultModel = this
 				.getAgentMessenger().submitScenrioWithParams(this.getAgent(),
diff --git a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/Script.java b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/Script.java
index cfc34c43..096e0f73 100644
--- a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/Script.java
+++ b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/Script.java
@@ -27,7 +27,6 @@ public class Script {
 	private int id;
 	private String name;
 	private String scriptContent;
-	private String filteredScriptCnt;
 	private int behaviorCount;
 	private Date createDateTime;
 	private User user;
@@ -135,12 +134,4 @@ public class Script {
 		}
 		return Arrays.asList(folder.listFiles());
 	}
-
-	public String getFilteredScriptCnt() {
-		return filteredScriptCnt;
-	}
-
-	public void setFilteredScriptCnt(String filteredScriptCnt) {
-		this.filteredScriptCnt = filteredScriptCnt;
-	}
 }
diff --git a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
index fdc9f909..7745a4b5 100644
--- a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
+++ b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/entity/TestPlanScript.java
@@ -50,6 +50,7 @@ public class TestPlanScript implements RunningScriptInterface {
 	private RunningScriptSampler sampler;
 	private Logger logger = Logger.getLogger(TestPlanScript.class);
 	private static int SECOND_MILISECOND_UNIT_CONVERSION = 1000;
+	private String filteredScriptCnt;
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -301,4 +302,12 @@ public class TestPlanScript implements RunningScriptInterface {
 	public Date getStartTime() {
 		return this.getTestPlan().getCurrentStartTime();
 	}
+
+	public String getFilteredScriptCnt() {
+		return filteredScriptCnt;
+	}
+
+	public void setFilteredScriptCnt(String filteredScriptCnt) {
+		this.filteredScriptCnt = filteredScriptCnt;
+	}
 }
diff --git a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/factory/TestPlanFactory.java b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/factory/TestPlanFactory.java
index 725d1847..1fb137f1 100644
--- a/Bench4Q-Master/src/main/java/org/bench4q/master/domain/factory/TestPlanFactory.java
+++ b/Bench4Q-Master/src/main/java/org/bench4q/master/domain/factory/TestPlanFactory.java
@@ -156,18 +156,19 @@ public class TestPlanFactory {
 		TestPlanScript testPlanScript = new TestPlanScript();
 		testPlanScript.setRequireLoad(requireLoad);
 		// filter the script
-		testPlanScript.setScript(createAScriptWithFilter(
-				scriptFilterOptionsModel,
-				this.getScriptService().getScript(scriptId)));
+		Script script = this.getScriptService().getScript(scriptId);
+		testPlanScript.setFilteredScriptCnt(createAScriptWithFilter(
+				scriptFilterOptionsModel,script.getScriptContent()));
+		testPlanScript.setScript(script);
 		testPlanScript.setPlanedConfig(createAPlanedConfigWithoutId(config));
 		testPlanScript.setTestPlan(testPlanDB);
 		return testPlanScript;
 	}
 
-	private Script createAScriptWithFilter(
-			ScriptFilterOptionsModel scriptFilterOptionsModel, Script script) {
+	private String createAScriptWithFilter(
+			ScriptFilterOptionsModel scriptFilterOptionsModel, String scriptContent) {
 		RunScenarioModel runScenarioModel = (RunScenarioModel) MarshalHelper
-				.tryUnmarshal(RunScenarioModel.class, script.getScriptContent());
+				.tryUnmarshal(RunScenarioModel.class, scriptContent);
 		List<String> filterPluginId = new ArrayList<String>();
 		if (scriptFilterOptionsModel.isFilterTimer()) {
 			for (UsePluginModel pluginModel : runScenarioModel.getUsePlugins()) {
@@ -197,8 +198,7 @@ public class TestPlanFactory {
 		}
 		String contentString = MarshalHelper.tryMarshal(runScenarioModel);
 		System.out.println(contentString);
-		script.setFilteredScriptCnt(contentString);
-		return script;
+		return contentString;
 	}
 
 	private boolean isFilterType(String filterTypeMatch,