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-07 22:04:09 +03:00
parent 7fac84740d
commit 17c0bf7eb3
103 changed files with 560 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -78,7 +78,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
//самое опасное место. теоретически тут можно ввести любую команду ОС, в том числе rm -rf
if (call_command.contains(" "))
Log.Writeln("Прямая команда вызова не может содержать пробелы");
if (!call_command.contains("+")&&Utils.ContainsForbiddenName(call_command))
if (!call_command.contains("+")&& CommonUtils.ContainsForbiddenName(call_command))
Log.Writeln("Прямая команда вызова содержит запрещённые символы");
else {
if (Utils.isLinuxSystemCommand(call_command))

3
src/GlobalData/GlobalDatabase.java
View File

@@ -1,4 +1,5 @@
package GlobalData;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Database.SQLITE.SQLiteDatabase;
@@ -131,7 +132,7 @@ public class GlobalDatabase extends SQLiteDatabase {
try {
Global.db.Update((DBObject) Current.get(Current.Credentials));
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
}
}
//--

3
src/GlobalData/Module/Module.java
View File

@@ -1,5 +1,6 @@
package GlobalData.Module;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import GlobalData.Makefile.Makefile;
@@ -31,7 +32,7 @@ public class Module extends ModuleAnchestor {
try {
Global.db.Update(this);
} catch (Exception e) {
Global.Log.PrintException(e);
CommonUtils.MainLog.PrintException(e);
}
}
}

8
src/GlobalData/RemoteFile/UI/RemoteFileChooser.java
View File

@@ -1,6 +1,6 @@
package GlobalData.RemoteFile.UI;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.Dialog;
import GlobalData.RemoteFile.RemoteFile;
@@ -30,7 +30,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
try {
Refresh(session.user.connection.sftpChannel.pwd());
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
onCancel(); //закрываем окно.
}
}
@@ -68,7 +68,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
fields.treeForm.Show();
fields.lCurrentFolder.setText(path);
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
onCancel();
}
}
@@ -76,7 +76,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
try {
Refresh(session.user.connection.sftpChannel.getHome());
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
onCancel(); //закрываем окно.
}
}

2
src/GlobalData/RunConfiguration/RunConfiguration.java
View File

@@ -55,7 +55,7 @@ public class RunConfiguration extends iDBObject {
try {
dim = Integer.parseInt(dim_);
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
}
res.add(dim);
}

4
src/GlobalData/Settings/SettingsDBTable.java
View File

@@ -1,6 +1,6 @@
package GlobalData.Settings;
import Common.Database.Tables.DBTable;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.Utils.Utils;
import Repository.Component.ComponentType;
@@ -43,7 +43,7 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.AutoBugReportsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
AddSetting(new DBSetting(SettingName.AutoTestsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
if (Global.isWindows)
if (CommonUtils.isWindows)
AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.SmallScreen, 0, SettingType.SapforFlag, ComponentType.Visualiser));
//совместимость. указываем явно чтобы не были видны в меню.

6
src/GlobalData/Splitter/SplittersDBTable.java
View File

@@ -1,6 +1,6 @@
package GlobalData.Splitter;
import Common.Database.Tables.DBTable;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import javax.swing.*;
import java.lang.reflect.Field;
@@ -32,7 +32,7 @@ public class SplittersDBTable extends DBTable<String, Splitter> {
}
}
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
}
}
public void Save(Object form) {
@@ -44,7 +44,7 @@ public class SplittersDBTable extends DBTable<String, Splitter> {
getDb().Update(splitter);
}
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
}
}
}

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

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

5
src/GlobalData/Tasks/RunTask/RunTask.java
View File

@@ -1,5 +1,6 @@
package GlobalData.Tasks.RunTask;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common.Utils.StringTemplate;
@@ -70,7 +71,7 @@ public class RunTask extends Task {
try {
Global.db.Update(this);
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
}
}
}
@@ -89,7 +90,7 @@ public class RunTask extends Task {
try {
if (p != null) CleanTime = Double.parseDouble(p);
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
}
}
@Override

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

@@ -1,7 +1,7 @@
package GlobalData.Tasks.Supervisor.Local;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import _VisualDVM.Global;
import Common_old.Utils.Utils;
import GlobalData.Tasks.RunTask.RunTask;
import GlobalData.Tasks.Supervisor.TaskSupervisor;
@@ -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" + (Global.isWindows ? ".exe" : "")).toFile();
return Paths.get(getProjectCopy().getAbsolutePath(), "0" + (CommonUtils.isWindows ? ".exe" : "")).toFile();
}
protected File getProjectOutput() {
return Paths.get(getProjectCopy().getAbsolutePath(), Constants.out_file).toFile();

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

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

2
src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
View File

@@ -26,7 +26,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass_2021> {
try {
project.CleanInterruptFile();
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
}
}
protected void PrepareWorkspace() throws Exception {

3
src/GlobalData/Tasks/Task.java
View File

@@ -1,5 +1,6 @@
package GlobalData.Tasks;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
@@ -94,7 +95,7 @@ public abstract class Task extends iDBObject {
try {
Global.db.Update(this);
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
}
}
}