fix.убрал из общей(в перспективе библиотечной) части ссылки на частные объекты визуализатора
This commit is contained in:
@@ -61,10 +61,10 @@ public class MachineProcess extends DBObject {
|
||||
return new File(Global.MachinesDirectory, id);
|
||||
}
|
||||
public File getStartedFile() {
|
||||
return new File(getWorkspace(), Constants.STARTED);
|
||||
return new File(getWorkspace(), CommonConstants.STARTED);
|
||||
}
|
||||
public File getAbortedFile() {
|
||||
return new File(getWorkspace(), Constants.ABORTED);
|
||||
return new File(getWorkspace(), CommonConstants.ABORTED);
|
||||
}
|
||||
//---
|
||||
public boolean isAborted() {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package _VisualDVM.TestingSystem.Common.TestingPackage;
|
||||
import Common.CommonConstants;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Objects.riDBObject;
|
||||
import Common.Utils.Utils_;
|
||||
import _VisualDVM.Constants;
|
||||
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
||||
import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationsJson;
|
||||
import _VisualDVM.TestingSystem.Common.TasksPackageState;
|
||||
@@ -60,7 +60,7 @@ public abstract class TestingPackage<J> extends riDBObject {
|
||||
return new File(getHomeDirectory(), String.valueOf(id));
|
||||
}
|
||||
public boolean isLoaded() {
|
||||
return new File(getLocalWorkspace(), Constants.LOADED).exists();
|
||||
return new File(getLocalWorkspace(), CommonConstants.LOADED).exists();
|
||||
}
|
||||
public abstract Class getJsonClass();
|
||||
public abstract File getHomeDirectory();
|
||||
@@ -68,7 +68,7 @@ public abstract class TestingPackage<J> extends riDBObject {
|
||||
return new File(getLocalWorkspace(), "package_json");
|
||||
}
|
||||
public File getLoadedFile() {
|
||||
return new File(getLocalWorkspace(), Constants.LOADED);
|
||||
return new File(getLocalWorkspace(), CommonConstants.LOADED);
|
||||
}
|
||||
public void saveJson() throws Exception {
|
||||
Utils_.jsonToFile(package_json, getJsonFile());
|
||||
|
||||
@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.Common;
|
||||
import Common.CommonConstants;
|
||||
import Common.Utils.Loggable;
|
||||
import Common.Utils.Utils_;
|
||||
import _VisualDVM.Constants;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.GlobalData.Machine.Machine;
|
||||
import _VisualDVM.GlobalData.Machine.MachineType;
|
||||
@@ -67,7 +66,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
|
||||
Print("serverName=" + serverName);
|
||||
Print("=====");
|
||||
//----
|
||||
Utils.createEmptyFile(Constants.STARTED);
|
||||
Utils.createEmptyFile(CommonConstants.STARTED);
|
||||
}
|
||||
//----
|
||||
protected void UpdatePackageState(TasksPackageState state_in) throws Exception {
|
||||
@@ -216,7 +215,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
|
||||
}
|
||||
protected void Finalize(String reason) {
|
||||
Print(reason);
|
||||
File stateFile = new File(supervisorHome, Constants.ABORTED);
|
||||
File stateFile = new File(supervisorHome, CommonConstants.ABORTED);
|
||||
try {
|
||||
FileUtils.writeStringToFile(stateFile, reason);
|
||||
} catch (Exception ex) {
|
||||
|
||||
Reference in New Issue
Block a user