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-16 19:40:55 +03:00
parent d01dab21b2
commit 9dc4922b89
21 changed files with 108 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.idea/workspace.xml generated
View File

@@ -7,7 +7,25 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteCompiler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteCompiler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteMachine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteMachine.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteMakefile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteMakefile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteCompilationTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteRunTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -33,7 +33,7 @@
"InstructionPath": "",
"PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10,
"AutoCheckTesting": true,
"AutoCheckTesting": false,
"CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": true,
"eraseTestingWorkspaces": true

2
src/Common/Passes/DeleteObjectsPass.java
View File

@@ -32,7 +32,6 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
}
@Override
protected void body() throws Exception {
getDb().BeginTransaction();
for (D d: target){
getDb().Delete(d);
for (Class dep : getTable().getFKDependencies().keySet()) {
@@ -48,7 +47,6 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
}
}
}
getDb().Commit();
}
//тут именно на финише, чтобы в любом случае вся таблица всегда была видна.
@Override

12
src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -132,6 +132,10 @@ public class CompilersDBTable extends iDBTable<Compiler> {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowCurrentCompiler();
}
@Override
public boolean hasCheckBox() {
return true;
}
};
}
@Override
@@ -141,13 +145,13 @@ public class CompilersDBTable extends iDBTable<Compiler> {
@Override
public Object getFieldAt(Compiler object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.description;
case 2:
return object.call_command;
return object.description;
case 3:
return object.version;
return object.call_command;
case 4:
return object.version;
case 5:
return object.revision;
}
return null;

6
src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
View File

@@ -100,6 +100,10 @@ public class MachinesDBTable extends iDBTable<Machine> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public boolean hasCheckBox() {
return true;
}
};
}
@Override
@@ -109,7 +113,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
@Override
public Object getFieldAt(Machine object, int columnIndex) {
switch (columnIndex) {
case 1:
case 2:
return object.getURL();
default:
return null;

10
src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
View File

@@ -43,6 +43,10 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public boolean hasCheckBox() {
return true;
}
};
}
@Override
@@ -56,11 +60,11 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
@Override
public Object getFieldAt(Makefile object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.getCompilerDescription();
case 2:
return object.command;
return object.getCompilerDescription();
case 3:
return object.command;
case 4:
return object.flags;
default:
return null;

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

@@ -108,4 +108,8 @@ public class CompilationTask extends Task {
FileUtils.writeStringToFile(getOutputFile(), output);
FileUtils.writeStringToFile(getErrorsFile(), errors);
}
@Override
public String getFKName() {
return "compilation_task_id";
}
}

7
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
View File

@@ -54,13 +54,6 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().DropRunTasksComparison();
}
@Override
public void CreateControl() {
super.CreateControl();
TableMenu dataTableMenu = new TableMenu(control);
dataTableMenu.add(Global.mainModule.getPass(PassCode.DeleteSelectedCompilationTasks).createMenuItem());
control.setComponentPopupMenu(dataTableMenu);
}
};
}
@Override

3
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksMenuBar.java
View File

@@ -1,7 +1,8 @@
package _VisualDVM.GlobalData.Tasks.CompilationTask;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class CompilationTasksMenuBar extends DataMenuBar {
public CompilationTasksMenuBar() {
super("задачи на компиляцию");
super("задачи на компиляцию", PassCode.DeleteCompilationTasks);
}
}

7
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
View File

@@ -41,13 +41,6 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getDebugWindow().ShowNoCurrentRunTask();
}
@Override
public void CreateControl() {
super.CreateControl();
TableMenu dataTableMenu = new TableMenu(control);
dataTableMenu.add(Global.mainModule.getPass(PassCode.DeleteSelectedRunTasks).createMenuItem());
control.setComponentPopupMenu(dataTableMenu);
}
};
}
@Override

3
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksMenuBar.java
View File

@@ -1,7 +1,8 @@
package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class RunTasksMenuBar extends DataMenuBar {
public RunTasksMenuBar() {
super("задачи на запуск");
super("задачи на запуск", PassCode.DeleteRunTasks);
}
}

10
src/_VisualDVM/GlobalData/User/UsersDBTable.java
View File

@@ -75,7 +75,7 @@ public class UsersDBTable extends iDBTable<User> {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(2).setRendererClass(RendererStatusEnum.class);
columns.get(3).setRendererClass(RendererStatusEnum.class);
}
@Override
public void ShowCurrentObject() throws Exception {
@@ -89,6 +89,10 @@ public class UsersDBTable extends iDBTable<User> {
// UI.getMainWindow().ShowCurrentCompiler();
Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
}
@Override
public boolean hasCheckBox() {
return true;
}
};
}
@Override
@@ -98,9 +102,9 @@ public class UsersDBTable extends iDBTable<User> {
@Override
public Object getFieldAt(User object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.login;
case 2:
return object.login;
case 3:
return object.state;
default:
return null;

20
src/_VisualDVM/Passes/All/DeleteCompilationTasks.java Normal file
View File

@@ -0,0 +1,20 @@
package _VisualDVM.Passes.All;
import Common.Passes.DeleteObjectsPass;
import Common.Utils.Utils_;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
public class DeleteCompilationTasks extends DeleteObjectsPass<CompilationTask> {
public DeleteCompilationTasks() {
super(CompilationTask.class);
}
@Override
protected void body() throws Exception {
super.body();
for (CompilationTask task : target) {
for (RunTask runTask : task.getRunTasks().values()) {
Utils_.forceDeleteWithCheck(runTask.getLocalWorkspace());
}
Utils_.forceDeleteWithCheck(task.getLocalWorkspace());
}
}
}

4
src/_VisualDVM/Passes/All/DeleteCompiler.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.DeleteObjectPass;
import Common.Passes.DeleteObjectsPass;
import _VisualDVM.GlobalData.Compiler.Compiler;
public class DeleteCompiler extends DeleteObjectPass<Compiler> {
public class DeleteCompiler extends DeleteObjectsPass<Compiler> {
public DeleteCompiler() {
super(Compiler.class);
}

4
src/_VisualDVM/Passes/All/DeleteMachine.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.DeleteObjectPass;
import Common.Passes.DeleteObjectsPass;
import _VisualDVM.GlobalData.Machine.Machine;
public class DeleteMachine extends DeleteObjectPass<Machine> {
public class DeleteMachine extends DeleteObjectsPass<Machine> {
public DeleteMachine() {
super(Machine.class);
}

4
src/_VisualDVM/Passes/All/DeleteMakefile.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.DeleteObjectPass;
import Common.Passes.DeleteObjectsPass;
import _VisualDVM.GlobalData.Makefile.Makefile;
public class DeleteMakefile extends DeleteObjectPass<Makefile> {
public class DeleteMakefile extends DeleteObjectsPass<Makefile> {
public DeleteMakefile() {
super(Makefile.class);
}

20
src/_VisualDVM/Passes/All/DeleteRunTasks.java Normal file
View File

@@ -0,0 +1,20 @@
package _VisualDVM.Passes.All;
import Common.Passes.DeleteObjectsPass;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import java.util.Vector;
public class DeleteRunTasks extends DeleteObjectsPass<RunTask> {
public DeleteRunTasks() {
super(RunTask.class);
}
@Override
protected void body() throws Exception {
super.body();
for (RunTask task : target) {
Utils_.forceDeleteWithCheck(task.getLocalWorkspace());
}
}
}

46
src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java
View File

@@ -1,46 +0,0 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import java.util.Vector;
public class DeleteSelectedCompilationTasks extends Pass<Vector<CompilationTask>> {
@Override
public String getIconPath() {
return "/Common/icons/Delete.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
Global.mainModule.getDb().compilationTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
if (target.isEmpty()) {
Log.Writeln_("Не отмечено ни одной задачи для удаления.");
return false;
} else return true;
}
@Override
protected void showPreparation() throws Exception {
Global.mainModule.getDb().compilationTasks.ClearUI();
}
@Override
protected void body() throws Exception {
for (CompilationTask task : target) {
for (RunTask runTask : task.getRunTasks().values()) {
Global.mainModule.getDb().Delete(runTask);
Utils_.forceDeleteWithCheck(runTask.getLocalWorkspace());
}
Global.mainModule.getDb().Delete(task);
Utils_.forceDeleteWithCheck(task.getLocalWorkspace());
}
}
@Override
protected void showFinish() throws Exception {
Global.mainModule.getDb().compilationTasks.ShowUI();
}
}

41
src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java
View File

@@ -1,41 +0,0 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import java.util.Vector;
public class DeleteSelectedRunTasks extends Pass<Vector<RunTask>> {
@Override
public String getIconPath() {
return "/Common/icons/Delete.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
(Global.mainModule.getDb()).runTasks.Data.values().stream().filter(task -> task.isVisible() && task.isSelected() && task.isPassive()).forEach(task -> target.add(task));
if (target.isEmpty()) {
Log.Writeln_("Не отмечено ни одной задачи для удаления.");
return false;
} else return true;
}
@Override
protected void showPreparation() throws Exception {
Global.mainModule.getDb().runTasks.ClearUI();
}
@Override
protected void body() throws Exception {
for (RunTask task : target) {
Global.mainModule.getDb().Delete(task);
Utils_.forceDeleteWithCheck(task.getLocalWorkspace());
}
}
@Override
protected void showFinish() throws Exception {
Global.mainModule.getDb().runTasks.ShowUI();
}
}

4
src/_VisualDVM/Passes/All/DeleteUser.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.DeleteObjectPass;
import Common.Passes.DeleteObjectsPass;
import _VisualDVM.GlobalData.User.User;
public class DeleteUser extends DeleteObjectPass<User> {
public class DeleteUser extends DeleteObjectsPass<User> {
public DeleteUser() {
super(User.class);
}

12
src/_VisualDVM/Passes/PassCode.java
View File

@@ -224,8 +224,8 @@ public enum PassCode implements PassCode_ {
PickCompilerOptions,
PickCompilerEnvironments,
//-
DeleteSelectedCompilationTasks,
DeleteSelectedRunTasks,
DeleteCompilationTasks,
DeleteRunTasks,
AddDVMParameter,
EditDVMParameter,
DeleteDVMParameter,
@@ -635,10 +635,10 @@ public enum PassCode implements PassCode_ {
return "Редактирование группы";
case PublishGroup:
return "Создать пустую группу тестов";
case DeleteSelectedCompilationTasks:
return "Удалить отмеченные задачи на компиляцию";
case DeleteSelectedRunTasks:
return "Удалить отмеченные задачи на запуск";
case DeleteCompilationTasks:
return "Удалить задачи на компиляцию";
case DeleteRunTasks:
return "Удалить задачи на запуск";
case PickCompilerEnvironments:
return "Выбор переменных окружения DVM компилятора";
case PickCompilerOptions: