рефакторинг
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
package GlobalData.Tasks;
|
||||
import Common.Constants.Constants;
|
||||
import Common.Database.iDBObject;
|
||||
import Common.Global;
|
||||
import Common.Utils.Utils;
|
||||
@@ -15,8 +16,8 @@ public abstract class Task extends iDBObject {
|
||||
//</editor-fold>
|
||||
public TaskState state = TaskState.Inactive;
|
||||
//----------------------------------
|
||||
public int machine_id = Utils.Nan;
|
||||
public int user_id = Utils.Nan;
|
||||
public int machine_id = Constants.Nan;
|
||||
public int user_id = Constants.Nan;
|
||||
//-----------------------------------
|
||||
public String PID = "";
|
||||
public String project_path;// путь к проекту.
|
||||
@@ -28,9 +29,9 @@ public abstract class Task extends iDBObject {
|
||||
public long EndDate = 0;//дата окончания выполнения
|
||||
//---------------------------------
|
||||
@Description("IGNORE")
|
||||
public int progressStep = Utils.Nan;
|
||||
public int progressStep = Constants.Nan;
|
||||
@Description("IGNORE")
|
||||
public int progressAll = Utils.Nan;
|
||||
public int progressAll = Constants.Nan;
|
||||
public boolean belongsToProject(db_project_info project) {
|
||||
return this.project_path.equalsIgnoreCase(project.Home.getAbsolutePath());
|
||||
}
|
||||
@@ -107,11 +108,11 @@ public abstract class Task extends iDBObject {
|
||||
progressAll = progressAll_in;
|
||||
}
|
||||
public void dropProgress() {
|
||||
progressStep = Utils.Nan;
|
||||
progressAll = Utils.Nan;
|
||||
progressStep = Constants.Nan;
|
||||
progressAll = Constants.Nan;
|
||||
}
|
||||
public boolean hasProgress() {
|
||||
return (progressStep != Utils.Nan) && (progressAll != Utils.Nan);
|
||||
return (progressStep != Constants.Nan) && (progressAll != Constants.Nan);
|
||||
}
|
||||
//---------------------------------
|
||||
public void AnalyzeResultsTexts(db_project_info project) throws Exception {
|
||||
|
||||
Reference in New Issue
Block a user