M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-11 00:00:30 +03:00
parent a11b7711f7
commit f317ab1aa1
341 changed files with 1866 additions and 1688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.Tasks.CompilationTask;
import Common.CommonConstants;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
@@ -64,7 +64,7 @@ public class CompilationTask extends Task {
break;
}
}
CommonUtils.db.Update(this);
Utils_.db.Update(this);
}
//---------------------------------------------------
@Override
@@ -80,7 +80,7 @@ public class CompilationTask extends Task {
belongsToProject(Current.getProject());
}
public Makefile getMakefile() {
return CommonUtils.db.getById(Makefile.class, makefile_id);
return Utils_.db.getById(Makefile.class, makefile_id);
}
@Override
public String getFullCommand() {
@@ -90,7 +90,7 @@ public class CompilationTask extends Task {
LinkedHashMap<Integer, RunTask> res = new LinkedHashMap<>();
//так не получится. не правильно назвал ключевое поле. F...
// return Global.db.getMapByFKi(this, RunTask.class);
for (RunTask runTask : ((GlobalDatabase)CommonUtils.db).runTasks.Data.values()) {
for (RunTask runTask : ((GlobalDatabase) Utils_.db).runTasks.Data.values()) {
if (runTask.compilation_task_id == id)
res.put(runTask.id, runTask);
}
@@ -102,7 +102,7 @@ public class CompilationTask extends Task {
String errors = getErrors();
for (DBProjectFile file : project.db.files.Data.values()) {
if (!file.last_assembly_name.isEmpty()) {
String replacement = file.last_assembly_name + " " + CommonUtils.RBrackets(file.name);
String replacement = file.last_assembly_name + " " + Utils_.RBrackets(file.name);
output = output.replace(file.last_assembly_name, replacement);
errors = errors.replace(file.last_assembly_name, replacement);
}

4
src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Passes;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.Supervisor.TaskSupervisor;
import Visual_DVM_2021.Passes.ProcessPass;
@@ -9,7 +9,7 @@ public abstract class TaskLocalPass<S extends TaskSupervisor> extends ProcessPas
try {
supervisor = s_class.newInstance();
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
@Override

6
src/_VisualDVM/GlobalData/Tasks/QueueSystem/QueueSystem.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.Tasks.QueueSystem;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
public class QueueSystem {
@@ -28,9 +28,9 @@ public class QueueSystem {
}
}
public String getCheckTaskCommand(Task task) {
return check_command + " " + CommonUtils.DQuotes(task.PID);
return check_command + " " + Utils_.DQuotes(task.PID);
}
public String getCancelTaskCommand(Task task) {
return cancel_command + " " + CommonUtils.DQuotes(task.PID);
return cancel_command + " " + Utils_.DQuotes(task.PID);
}
}

14
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.CommonConstants;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
@@ -39,7 +39,7 @@ public class RunTask extends Task {
super.DropResults();
Utils.forceDeleteWithCheck(getLocalStsFile());
CleanTime = 0;
CommonUtils.db.Update(this);
Utils_.db.Update(this);
}
@Override
public File getHome() {
@@ -62,18 +62,18 @@ public class RunTask extends Task {
compilation_task_id == Current.getCompilationTask().id;
}
public RunConfiguration getRunConfiguration() {
return ((GlobalDatabase)CommonUtils.db).runConfigurations.Data.get(run_configuration_id);
return ((GlobalDatabase) Utils_.db).runConfigurations.Data.get(run_configuration_id);
}
public CompilationTask getCompilationTask() {
return ((GlobalDatabase)CommonUtils.db).compilationTasks.Data.get(compilation_task_id);
return ((GlobalDatabase) Utils_.db).compilationTasks.Data.get(compilation_task_id);
}
public void UpdateLastStsName(String file_name) {
if (!last_sts_name.equals(file_name)) {
last_sts_name = file_name;
try {
CommonUtils.db.Update(this);
Utils_.db.Update(this);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
}
@@ -92,7 +92,7 @@ public class RunTask extends Task {
try {
if (p != null) CleanTime = Double.parseDouble(p);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
@Override

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalCompilationSupervisor.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
@@ -33,7 +33,7 @@ public class LinuxLocalCompilationSupervisor extends LinuxLocalTaskSupervisor<Co
protected void ValidateTaskResults() throws Exception {
if (getBinary().exists()) {
File renamed_binary = Paths.get(getProjectCopy().getAbsolutePath(),
CommonUtils.getDateName("spf")).toFile();
Utils_.getDateName("spf")).toFile();
task.binary_name = renamed_binary.getName();
Files.move(getBinary().toPath(), renamed_binary.toPath(), StandardCopyOption.REPLACE_EXISTING);
task.state = TaskState.Done;

10
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
@@ -24,10 +24,10 @@ public abstract class LinuxLocalTaskSupervisor<T extends Task> extends LocalTask
User user = task.getUser();
return
String.join(" ",
CommonUtils.DQuotes(user.getStarterFile()),
CommonUtils.DQuotes(user.getLauncherFile()),
Utils_.DQuotes(user.getStarterFile()),
Utils_.DQuotes(user.getLauncherFile()),
String.valueOf(task.maxtime),
CommonUtils.DQuotes(getCoupDeGrace()),
Utils_.DQuotes(getCoupDeGrace()),
task.getFullCommand()
);
}
@@ -48,7 +48,7 @@ public abstract class LinuxLocalTaskSupervisor<T extends Task> extends LocalTask
if (task.PID.isEmpty())
throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
task.StartDate = (new Date()).getTime();
pass.ShowMessage1("Задача активна, идентификатор " + CommonUtils.Brackets(task.PID));
pass.ShowMessage1("Задача активна, идентификатор " + Utils_.Brackets(task.PID));
RefreshProgress();
do {
Thread.sleep(getTaskCheckPeriod() * 1000L);

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
@@ -44,7 +44,7 @@ public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor
return Paths.get(task.getUser().getLocalProjectsDir().getAbsolutePath(), project.getUniqKey()).toFile();
}
protected File getBinary() {
return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (CommonUtils.isWindows() ? ".exe" : "")).toFile();
return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (Utils_.isWindows() ? ".exe" : "")).toFile();
}
protected File getProjectOutput() {
return Paths.get(getProjectCopy().getAbsolutePath(), Constants.out_file).toFile();

6
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Makefile.Makefile;
@@ -19,7 +19,7 @@ public class WindowsLocalCompilationSupervisor extends WindowsLocalTaskSuperviso
}
@Override
protected String getScriptText() {
return CommonUtils.DQuotes(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt";
return Utils_.DQuotes(((GlobalDatabase) Utils_.db).settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt";
}
//скорее всего как то выделить подготовку к компиляции как метод предка.
@Override
@@ -45,7 +45,7 @@ public class WindowsLocalCompilationSupervisor extends WindowsLocalTaskSuperviso
protected void ValidateTaskResults() throws Exception {
if (getBinary().exists()) {
File renamed_binary = Paths.get(getProjectCopy().getAbsolutePath(),
CommonUtils.getDateName("spf") + ".exe").toFile();
Utils_.getDateName("spf") + ".exe").toFile();
task.binary_name = renamed_binary.getName();
Files.move(getBinary().toPath(), renamed_binary.toPath(), StandardCopyOption.REPLACE_EXISTING);
task.state = TaskState.Done;

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalTaskSupervisor.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -21,7 +21,7 @@ public abstract class WindowsLocalTaskSupervisor<T extends Task> extends LocalTa
try {
AbortTask();
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
task.state = TaskState.AbortedByTimeout;
}

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.Tasks.QueueSystem.MVS;
@@ -32,7 +32,7 @@ public class MVSRunSupervisor extends ServerRunSupervisor {
String env = String.join(" ", Current.getRunConfiguration().getEnvList());
mvs_time = (task.maxtime / 60); //в минутах
if (task.maxtime % 60 > 0) mvs_time += 1;
String res = "maxtime=" + CommonUtils.DQuotes(mvs_time) + " ./run";
String res = "maxtime=" + Utils_.DQuotes(mvs_time) + " ./run";
if (!env.isEmpty())
res = env + " " + res;
/*

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
@@ -36,7 +36,7 @@ public class RemoteCompilationSupervisor extends RemoteTaskSupervisor<Compilatio
@Override
protected void ValidateTaskResults() throws Exception {
if (pass.user.connection.Exists(getBinary())) {
RemoteFile renamed_binary = new RemoteFile(getRemoteProject().full_name, CommonUtils.getDateName("spf_" + getBinary().name));
RemoteFile renamed_binary = new RemoteFile(getRemoteProject().full_name, Utils_.getDateName("spf_" + getBinary().name));
pass.user.connection.sftpChannel.rename(getBinary().full_name, renamed_binary.full_name);
task.binary_name = renamed_binary.name;
task.state = TaskState.Done;

8
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.Tasks.Supervisor.TaskSupervisor;
@@ -77,10 +77,10 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
protected String getStartCommand() {
String res =
String.join(" ",
CommonUtils.DQuotes(getStarter()),
CommonUtils.DQuotes(getLauncher()),
Utils_.DQuotes(getStarter()),
Utils_.DQuotes(getLauncher()),
String.valueOf(task.maxtime),
CommonUtils.DQuotes(getCoupDeGrace()),
Utils_.DQuotes(getCoupDeGrace()),
task.getFullCommand()
);
return res;

12
src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -16,7 +16,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
public void ShowTaskState(){
CommonUtils.db.tables.get(task.getClass()).ShowUI(task.getPK());
Utils_.db.tables.get(task.getClass()).ShowUI(task.getPK());
}
public void Init(T task_in, P pass_in, db_project_info project_in) {
task = task_in;
@@ -25,7 +25,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
try {
project.CleanInterruptFile();
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
protected void PrepareWorkspace() throws Exception {
@@ -96,7 +96,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
task.state = TaskState.AbortedByUser;
ShowTaskState();
}
pass.ShowMessage1("Задача " + CommonUtils.Brackets(task.state.getDescription()));
pass.ShowMessage1("Задача " + Utils_.Brackets(task.state.getDescription()));
task.EndDate = (new Date()).getTime();
pass.ShowMessage2("Получение результатов");
AchieveResults();
@@ -119,7 +119,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
if (task.PID.isEmpty())
throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
task.StartDate = (new Date()).getTime();
pass.ShowMessage1("Задача активна, идентификатор " + CommonUtils.Brackets(task.PID));
pass.ShowMessage1("Задача активна, идентификатор " + Utils_.Brackets(task.PID));
RefreshProgress();
do {
Thread.sleep(getTaskCheckPeriod() * 1000);
@@ -132,6 +132,6 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
}
}
public void UpdateTask() throws Exception {
CommonUtils.db.Update(task);
Utils_.db.Update(task);
}
}

12
src/_VisualDVM/GlobalData/Tasks/Task.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Tasks;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Utils;
@@ -44,7 +44,7 @@ public abstract class Task extends iDBObject {
EndDate = 0;
Time = 0;
state = TaskState.Inactive;
CommonUtils.db.Update(this);
Utils_.db.Update(this);
}
//</editor-fold>
//<editor-fold desc="локальные файлы">
@@ -66,10 +66,10 @@ public abstract class Task extends iDBObject {
return new Date(EndDate);
}
public Machine getMachine() {
return CommonUtils.db.getById(Machine.class, machine_id);
return Utils_.db.getById(Machine.class, machine_id);
}
public User getUser() {
return CommonUtils.db.getById(User.class, user_id);
return Utils_.db.getById(User.class, user_id);
}
protected String getTextResult(File file) {
return (file.exists()) ? Utils.ReadAllText(file) : "файл не найден. Задача еще не выполнялась или была завершена некорректно";
@@ -92,9 +92,9 @@ public abstract class Task extends iDBObject {
if (state != state_in) {
state = state_in;
try {
CommonUtils.db.Update(this);
Utils_.db.Update(this);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
}