no message

This commit is contained in:
2023-10-04 22:01:09 +03:00
parent 2a0a5f38b1
commit 2f0d01b9f3
51 changed files with 146 additions and 94 deletions

View File

@@ -1,5 +1,5 @@
package GlobalData.Credentials;
import Common.Constants.Constants;
import Common.Constants;
import Common.Database.iDBObject;
import com.sun.org.glassfish.gmbal.Description;
public class Credentials extends iDBObject {

View File

@@ -1,5 +1,5 @@
package GlobalData.EnvironmentValue;
import Common.Constants.Constants;
import Common.Constants;
import Common.Current;
import Common.Database.iDBObject;
import Common.Utils.Utils;

View File

@@ -1,5 +1,5 @@
package GlobalData.Machine;
import Common.Constants.Constants;
import Common.Constants;
import Common.Database.iDBObject;
import Common.Global;
import Common.Utils.Utils;

View File

@@ -1,5 +1,5 @@
package GlobalData.Module;
import Common.Constants.Constants;
import Common.Constants;
import Common.Current;
import Common.Global;
import GlobalData.Makefile.Makefile;

View File

@@ -1,5 +1,5 @@
package GlobalData.Module;
import Common.Constants.Constants;
import Common.Constants;
import Common.Database.iDBObject;
import Common.Global;
import Common.Utils.Utils;

View File

@@ -1,5 +1,5 @@
package GlobalData.Module.UI;
import Common.Constants.Constants;
import Common.Constants;
import Common.Current;
import Common.UI.UI;
import Common.UI.Windows.Dialog.DBObjectDialog;

View File

@@ -1,5 +1,5 @@
package GlobalData.RunConfiguration;
import Common.Constants.Constants;
import Common.Constants;
import Common.Current;
import Common.Database.iDBObject;
import Common.Global;

View File

@@ -1,5 +1,5 @@
package GlobalData.RunConfiguration;
import Common.Constants.Constants;
import Common.Constants;
import Common.Current;
import Common.Database.*;
import Common.Global;

View File

@@ -1,5 +1,5 @@
package GlobalData.SapforProfileSetting;
import Common.Constants.Constants;
import Common.Constants;
import Common.Current;
import Common.Database.iDBObject;
import GlobalData.Settings.SettingName;

View File

@@ -1,5 +1,5 @@
package GlobalData.Splitter;
import Common.Constants.Constants;
import Common.Constants;
import Common.Database.DBObject;
import com.sun.org.glassfish.gmbal.Description;

View File

@@ -1,5 +1,5 @@
package GlobalData.Tasks.CompilationTask;
import Common.Constants.Constants;
import Common.Constants;
import Common.Current;
import Common.Global;
import Common.Utils.Utils;

View File

@@ -1,5 +1,5 @@
package GlobalData.Tasks.RunTask;
import Common.Constants.Constants;
import Common.Constants;
import Common.Current;
import Common.Global;
import Common.Utils.StringTemplate;

View File

@@ -1,10 +1,10 @@
package GlobalData.Tasks.Supervisor.Local.Linux;
import Common.Constants;
import Common.Utils.Utils;
import GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
import GlobalData.Tasks.Task;
import GlobalData.Tasks.TaskState;
import GlobalData.User.User;
import ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassException;
import java.io.File;
@@ -59,13 +59,13 @@ public abstract class LinuxLocalTaskSupervisor<T extends Task> extends LocalTask
}
}
protected File getProjectTime() {
return Paths.get(getProjectCopy().getAbsolutePath(), db_project_info.time_file).toFile();
return Paths.get(getProjectCopy().getAbsolutePath(), Constants.time_file).toFile();
}
protected File getDONE_file() {
return Paths.get(getProjectCopy().getAbsolutePath(), db_project_info.DONE).toFile();
return Paths.get(getProjectCopy().getAbsolutePath(), Constants.DONE).toFile();
}
protected File getTIMEOUT_file() {
return Paths.get(getProjectCopy().getAbsolutePath(), db_project_info.TIMEOUT).toFile();
return Paths.get(getProjectCopy().getAbsolutePath(), Constants.TIMEOUT).toFile();
}
@Override
protected void PrepareWorkspace() throws Exception {

View File

@@ -1,12 +1,11 @@
package GlobalData.Tasks.Supervisor.Local;
import Common.Constants.Constants;
import Common.Constants;
import Common.Global;
import Common.Utils.Utils;
import GlobalData.Tasks.RunTask.RunTask;
import GlobalData.Tasks.Supervisor.TaskSupervisor;
import GlobalData.Tasks.Task;
import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.Pass_2021;
import org.apache.commons.io.FileUtils;
@@ -47,10 +46,10 @@ public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor
return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (Global.isWindows ? ".exe" : "")).toFile();
}
protected File getProjectOutput() {
return Paths.get(getProjectCopy().getAbsolutePath(), db_project_info.out_file).toFile();
return Paths.get(getProjectCopy().getAbsolutePath(), Constants.out_file).toFile();
}
protected File getProjectErrors() {
return Paths.get(getProjectCopy().getAbsolutePath(), db_project_info.err_file).toFile();
return Paths.get(getProjectCopy().getAbsolutePath(), Constants.err_file).toFile();
}
@Override
protected void PrepareWorkspace() throws Exception {

View File

@@ -1,10 +1,10 @@
package GlobalData.Tasks.Supervisor.Remote;
import Common.Constants;
import Common.Utils.Utils;
import GlobalData.RemoteFile.RemoteFile;
import GlobalData.Tasks.Supervisor.TaskSupervisor;
import GlobalData.Tasks.Task;
import GlobalData.Tasks.TaskState;
import ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.SSH.ConnectionPass;
public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSupervisor<T, ConnectionPass> {
protected RemoteFile getRemoteProjectsPath() {
@@ -17,19 +17,19 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
return new RemoteFile(getRemoteProject().full_name, "0");
}
protected RemoteFile getRemoteTime() {
return new RemoteFile(getRemoteProject().full_name, db_project_info.time_file);
return new RemoteFile(getRemoteProject().full_name, Constants.time_file);
}
protected RemoteFile getRemoteOutput() {
return new RemoteFile(getRemoteProject().full_name, db_project_info.out_file);
return new RemoteFile(getRemoteProject().full_name, Constants.out_file);
}
protected RemoteFile getRemoteErrors() {
return new RemoteFile(getRemoteProject().full_name, db_project_info.err_file);
return new RemoteFile(getRemoteProject().full_name, Constants.err_file);
}
public RemoteFile getDONE_file() {
return new RemoteFile(getRemoteProject().full_name, db_project_info.DONE);
return new RemoteFile(getRemoteProject().full_name, Constants.DONE);
}
public RemoteFile getTIMEOUT_file() {
return new RemoteFile(getRemoteProject().full_name, db_project_info.TIMEOUT);
return new RemoteFile(getRemoteProject().full_name, Constants.TIMEOUT);
}
@Override
protected void PrepareWorkspace() throws Exception {
@@ -42,9 +42,9 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
}
@Override
protected void CheckTask() throws Exception {
if (pass.Exists(getRemoteProject().full_name, db_project_info.DONE))
if (pass.Exists(getRemoteProject().full_name, Constants.DONE))
task.state = TaskState.Finished;
else if (pass.Exists(getRemoteProject().full_name, db_project_info.TIMEOUT))
else if (pass.Exists(getRemoteProject().full_name, Constants.TIMEOUT))
task.state = TaskState.AbortedByTimeout;
}
@Override

View File

@@ -1,5 +1,5 @@
package GlobalData.Tasks;
import Common.Constants.Constants;
import Common.Constants;
import Common.Database.iDBObject;
import Common.Global;
import Common.Utils.Utils;
@@ -52,13 +52,13 @@ public abstract class Task extends iDBObject {
return Paths.get(getHome().getAbsolutePath(), String.valueOf(id)).toFile();
}
public File getOutputFile() {
return Paths.get(getLocalWorkspace().getAbsolutePath(), db_project_info.out_file).toFile();
return Paths.get(getLocalWorkspace().getAbsolutePath(), Constants.out_file).toFile();
}
public File getErrorsFile() {
return Paths.get(getLocalWorkspace().getAbsolutePath(), db_project_info.err_file).toFile();
return Paths.get(getLocalWorkspace().getAbsolutePath(), Constants.err_file).toFile();
}
public File getTimeFile() {
return Paths.get(getLocalWorkspace().getAbsolutePath(), db_project_info.time_file).toFile();
return Paths.get(getLocalWorkspace().getAbsolutePath(), Constants.time_file).toFile();
}
public abstract String getFullCommand();
public Date getEndDate() {

View File

@@ -1,5 +1,5 @@
package GlobalData.User;
import Common.Constants.Constants;
import Common.Constants;
import Common.Current;
import Common.Database.iDBObject;
import GlobalData.Machine.Machine;