рефакторинг массовых удалений объектов

This commit is contained in:
2024-10-16 18:58:23 +03:00
parent cf660d26ea
commit 788bd67201
21 changed files with 170 additions and 53 deletions

22
.idea/workspace.xml generated
View File

@@ -7,7 +7,27 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectsPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExcludeSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExcludeSelectedFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/IncludeSelectedFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/IncludeSelectedFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Project/FilesMassPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Project/FilesMassPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -29,8 +49,8 @@
<list>
<option value="FxmlFile" />
<option value="Enum" />
<option value="Class" />
<option value="Interface" />
<option value="Class" />
</list>
</option>
</component>

View File

@@ -151,6 +151,9 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public boolean ShowDeleteObjectDialog(DBObject object) {
return UI.Warning(getSingleDescription() + " " + object.getBDialogName() + " будет удален(а)");
}
public boolean ShowDeleteObjectsDialog(int toDeleteCount) {
return UI.Warning(getPluralDescription() + " в количестве " + toDeleteCount + " будут удалены)");
}
public String QName() {
return "\"" + Name + "\"";
}
@@ -205,13 +208,13 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
protected Comparator<D> getComparator() {
return null;
}
public int getCheckedCount() {
public int getSelectedCount() {
return (int) Data.values().stream().filter(d -> d.isVisible() && d.isSelected()).count();
}
public Vector<D> getCheckedItems() {
public Vector<D> getSelectedItems() {
return Data.values().stream().filter(d -> d.isVisible() && d.isSelected()).collect(Collectors.toCollection(Vector::new));
}
public Vector<K> getCheckedKeys() {
public Vector<K> getSelectedKeys() {
return Data.values().stream().filter(DBObject::isSelected).map(d -> (K) d.getPK()).collect(Collectors.toCollection(Vector::new));
}
//--
@@ -262,6 +265,14 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public boolean CheckCurrent(TextLog log) {
return MainModule_.instance.Check(log, CurrentName());
}
public boolean CheckSelectedOrCurrent(TextLog log) {
if ((getSelectedCount() == 0) && (CurrentName()==null || (getCurrent()==null))) {
log.Writeln_(getPluralDescription() + ":");
log.Writeln_("Отсутствуют отмеченные объекты, или текущий объект!");
return false;
}
return true;
}
public boolean hasCurrent() {
return MainModule_.instance.get(CurrentName()) != null;
}
@@ -274,16 +285,25 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public void setCurrent(D o) {
MainModule_.instance.set(CurrentName(), o);
}
public Vector<D> getCheckedOrCurrent() {
public Vector<D> getSelectedOrCurrent() {
Vector<D> res = new Vector<>();
if (getCheckedCount() > 0)
res = getCheckedItems();
if (getSelectedCount() > 0)
res = getSelectedItems();
else {
if (CurrentName() != null) {
if (getCurrent() != null) {
if ((CurrentName() != null) && (getCurrent() != null)) {
res.add(getCurrent());
}
}
return res;
}
public Vector<K> getSelectedOrCurrentKeys(){
Vector<K> res = new Vector<>();
if (getSelectedCount() > 0)
res = getSelectedKeys();
else {
if ((CurrentName() != null) && (getCurrent() != null)) {
res.add((K) getCurrent().getPK());
}
}
return res;
}

View File

@@ -0,0 +1,59 @@
package Common.Passes;
import Common.Database.Objects.DBObject;
public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<D>{
public DeleteObjectsPass(Class<D> d_in) {
super(d_in);
}
@Override
public String getIconPath() {
return "/Common/icons/Delete.png";
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = getTable().getSelectedOrCurrent();
return getTable().CheckCurrent(Log) && getTable().ShowDeleteObjectsDialog(target.size());
}
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override
protected void showPreparation() throws Exception {
getTable().ClearUI();
for (Class dep : getTable().getFKDependencies().keySet()) {
switch (getTable().getFKDependencies().get(dep).data) {
case NONE:
case DROP:
break;
case DELETE:
getDb().tables.get(dep).ClearUI();
break;
}
}
}
@Override
protected void body() throws Exception {
getDb().BeginTransaction();
for (D d: target){
getDb().Delete(d);
for (Class dep : getTable().getFKDependencies().keySet()) {
switch (getTable().getFKDependencies().get(dep).data) {
case NONE:
break;
case DROP:
getDb().DropByFK(d, dep);
break;
case DELETE:
getDb().DeleteByFK(d, dep);
break;
}
}
}
getDb().Commit();
}
//тут именно на финише, чтобы в любом случае вся таблица всегда была видна.
@Override
protected void performFinish() throws Exception {
getTable().ShowUI();
for (Class dep : getTable().getFKDependencies().keySet()) {
getDb().tables.get(dep).RefreshUI();
}
}
}

View File

@@ -0,0 +1,24 @@
package Common.Passes;
import Common.Database.Database;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable;
import Common.MainModule_;
import java.util.Vector;
//массовый проход с объектами. на данный момент удаление.
public abstract class ObjectsPass<D extends DBObject> extends Pass<Vector<D>> {
protected Class<D> d; //класс объектов.
public ObjectsPass(Class<D> d_in) {
d = d_in;
}
protected Database getDb() {
return MainModule_.instance.getDb();
}
public DBTable getTable() {
return getDb().tables.get(d);
} //таблица в источнике данных
@Override//sorted
public String getButtonText() {
return "";
}
}

View File

@@ -22,7 +22,7 @@ public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
master = null;
slave = null;
//--
target = Global.testingServer.db.dvmRunTasks.getCheckedItems();
target = Global.testingServer.db.dvmRunTasks.getSelectedItems();
if (target.size() == 2) {
if (UI.Question("Назначить задачу " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" +
"\n(в случае отказа, будет назначена задача " + Utils_.Brackets(target.get(1).getPK()) + ")")) {

View File

@@ -22,7 +22,7 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
master = null;
slave = null;
//--
target = Global.testingServer.db.sapforPackages.getCheckedItems();
target = Global.testingServer.db.sapforPackages.getSelectedItems();
if (target.size() == 2) {
if (UI.Question("Назначить пакет " + Utils_.Brackets(target.get(0).getPK()) + " эталоном" +
"\n(в случае отказа, будет назначен пакет " + Utils_.Brackets(target.get(1).getPK()) + ")")) {

View File

@@ -13,18 +13,18 @@ public class DeleteSelectedFiles extends Pass {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Global.mainModule.getProject().db.files.getCheckedCount() == 0) {
if (Global.mainModule.getProject().db.files.getSelectedCount() == 0) {
Log.Writeln_("Не отмечено ни одного файла.");
return false;
}
return UI.Warning("Удалить " + Global.mainModule.getProject().db.files.getCheckedCount() + " файлов.");
return UI.Warning("Удалить " + Global.mainModule.getProject().db.files.getSelectedCount() + " файлов.");
}
@Override
protected void performPreparation() throws Exception {
boolean hasCurrent = false;
boolean hasSelected = false;
if (Global.mainModule.HasFile()) {
for (DBProjectFile file : Global.mainModule.getProject().db.files.getCheckedItems()) {
for (DBProjectFile file : Global.mainModule.getProject().db.files.getSelectedItems()) {
if (Global.mainModule.getFile().file.equals(file.file))
hasCurrent = true;
if (Global.mainModule.getSelectedFile().file.equals(file.file))
@@ -44,7 +44,7 @@ public class DeleteSelectedFiles extends Pass {
}
@Override
protected void body() throws Exception {
for (DBProjectFile file : Global.mainModule.getProject().db.files.getCheckedItems()) {
for (DBProjectFile file : Global.mainModule.getProject().db.files.getSelectedItems()) {
ShowMessage1(file.name);
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RemoveNode(file.node);
Global.mainModule.getProject().db.Delete(file);

View File

@@ -16,7 +16,7 @@ public class ExcludeSelectedFiles extends Pass<Vector<DBProjectFile>> {
Log.Writeln_("Нажмите правую клавишу мыши, и перейдите в режим выбора файлов.");
return false;
}
target = Global.mainModule.getProject().db.files.getCheckedItems();
target = Global.mainModule.getProject().db.files.getSelectedItems();
if (target.isEmpty()) {
Log.Writeln_("Не отмечено ни одного файла.");
return false;

View File

@@ -58,8 +58,8 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
styles = null;
target = null;
//--
if (Global.testingServer.db.dvmPackages.getCheckedCount() > 0) {
target = Global.testingServer.db.dvmPackages.getCheckedItems();
if (Global.testingServer.db.dvmPackages.getSelectedCount() > 0) {
target = Global.testingServer.db.dvmPackages.getSelectedItems();
} else {
if (Global.mainModule.Check(Log, Current.DVMPackage)) {
target = new Vector<>();

View File

@@ -16,7 +16,7 @@ public class IncludeSelectedFiles extends Pass<Vector<DBProjectFile>> {
Log.Writeln_("Нажмите правую клавишу мыши, и перейдите в режим выбора файлов.");
return false;
}
target = Global.mainModule.getProject().db.files.getCheckedItems();
target = Global.mainModule.getProject().db.files.getSelectedItems();
if (target.isEmpty()) {
Log.Writeln_("Не отмечено ни одного файла.");
return false;

View File

@@ -43,11 +43,10 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
if (!Global.mainModule.getCompiler().versionLoaded)
Global.mainModule.getPass(PassCode.ShowCompilerVersion).Do(Global.mainModule.getCompiler(), false);
//-----
Vector<DVMConfiguration> configurations = Global.testingServer.db.dvm_configurations.getCheckedOrCurrent();
if (configurations.isEmpty()) {
Log.Writeln_("Не отмечено ни одной конфигурации, или отсутствует текущая конфигурация.");
if (!Global.testingServer.db.dvm_configurations.CheckSelectedOrCurrent(Log)){
return false;
}
Vector<DVMConfiguration> configurations = Global.testingServer.db.dvm_configurations.getSelectedOrCurrent();
//---
target = new DVMPackage(
Global.mainModule.getAccount(),

View File

@@ -35,11 +35,10 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
return false;
}
//--
configurations = Global.testingServer.db.sapforConfigurations.getCheckedOrCurrent();
if (configurations.isEmpty()) {
Log.Writeln_("Не отмечено ни одной конфигурации, или отсутствует текущая конфигурация.");
if (!Global.testingServer.db.sapforConfigurations.CheckSelectedOrCurrent(Log)){
return false;
}
configurations = Global.testingServer.db.sapforConfigurations.getSelectedOrCurrent();
target = new SapforPackage(Global.mainModule.getAccount(),
Global.mainModule.getServerSapfor(),
configurations,

View File

@@ -22,18 +22,18 @@ public class UpdateSelectedComponents extends Pass<Vector<Component>> {
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
//------------------------
if (Global.Components.getCheckedCount() == 0) {
if (Global.Components.getSelectedCount() == 0) {
Log.Writeln_("Не отмечено ни одного компонента!");
return false;
}
target = Global.Components.getCheckedItems();
target = Global.Components.getSelectedItems();
return true;
}
@Override
public String getStartDescription() {
Vector<String> question = new Vector<>();
question.add("Обновить компоненты");
for (Component component : Global.Components.getCheckedItems()) {
for (Component component : Global.Components.getSelectedItems()) {
question.add(component.getComponentType().getDescription());
}
return String.join("\n", question);

View File

@@ -5,7 +5,7 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
public abstract class FilesMassPass<T> extends Pass<T> {
@Override
protected boolean canStart(Object... args) throws Exception {
if (Global.mainModule.getProject().db.files.getCheckedCount() == 0) {
if (Global.mainModule.getProject().db.files.getSelectedCount() == 0) {
Log.Writeln_("Не отмечено ни одного файла.");
return false;
}
@@ -20,7 +20,7 @@ public abstract class FilesMassPass<T> extends Pass<T> {
@Override
protected void body() throws Exception {
Global.mainModule.getProject().db.BeginTransaction();
for (DBProjectFile file : Global.mainModule.getProject().db.files.getCheckedItems()) {
for (DBProjectFile file : Global.mainModule.getProject().db.files.getSelectedItems()) {
ShowMessage1(file.name);
operation(file);
}

View File

@@ -20,7 +20,7 @@ public abstract class VariantsMassPass extends CurrentProjectPass {
protected boolean canStart(Object... args) throws Exception {
count = 0;
if (super.canStart(args)) {
count = target.parallelVariants.getCheckedCount();
count = target.parallelVariants.getSelectedCount();
if (count == 0) {
Log.Writeln_("Не выбрано ни одного параллельного варианта");
return false;

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.Server;
import Common.Database.Database;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode;
@@ -37,17 +36,10 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
@Override
protected boolean canStart(Object... args) throws Exception {
DBTable table = getDb().tables.get(d);
if (table.getCheckedCount() > 0) {
target = table.getCheckedKeys();
return UI.Warning(table.getCheckedCount() + " объектов будет удален(о).");
} else {
if (Global.mainModule.Check(Log, table.CurrentName())) {
target = new Vector<>();
target.add(table.getCurrent().getPK());
return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowDeleteObjectDialog(table.getCurrent());
}
if (!table.CheckSelectedOrCurrent(Log))
return false;
}
target = table.getSelectedOrCurrentKeys();
return table.ShowDeleteObjectsDialog(target.size());
}
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override
@@ -63,7 +55,7 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
break;
}
}
}
}//DeleteTestingPackages
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.DeleteObjectsByPK, getEmail(), new Pair<>(d, target)));

View File

@@ -14,9 +14,9 @@ public abstract class DeleteTestingPackages<P extends TestingPackage> extends De
super(Global.testingServer, p);
}
public boolean checkActivity() {
/*
/* //todo
for (Object key : target) {
DVMPackage tasksPackage = server.db.dvmPackages.get(key);
TestingPackage tasksPackage = server.db.dvmPackages.get(key);
if (!tasksPackage.state.equals(TasksPackageState.Done) &&
!tasksPackage.state.equals(TasksPackageState.Aborted)
) {

View File

@@ -33,12 +33,12 @@ public abstract class SaveCurrentConfiguration<C extends Configuration, S extend
tests = new Vector<>();
settings = new Vector<>();
//---
for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
for (Group group : Global.testingServer.db.groups.getSelectedItems()) {
groups.add(group);
Vector<Test> groupTests = Global.testingServer.db.tests.getSelectedGroupTests(group);
tests.addAll(groupTests);
}
for (Object setting : Global.testingServer.db.tables.get(s).getCheckedItems()) {
for (Object setting : Global.testingServer.db.tables.get(s).getSelectedItems()) {
settings.add((Settings) setting);
}
return true;

View File

@@ -61,12 +61,12 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
return Current.Component;
}
@Override
public Vector<Component> getCheckedItems() {
public Vector<Component> getSelectedItems() {
Vector<Component> target = new Vector<>();
Component visualiser = null;
Component server = null;
//------------------------
for (Component component : super.getCheckedItems()) {
for (Component component : super.getSelectedItems()) {
switch (component.getComponentType()) {
case Visualizer_2:
server = component;

View File

@@ -70,4 +70,8 @@ public class Configuration extends riDBObject {
public boolean validate(TextLog log) {
return true;
}
@Override
public String getDialogName() {
return description;
}
}

View File

@@ -156,7 +156,7 @@ public class MainForm extends Form implements MainWindow {
@Override
public void ShowCheckedTestsCount() {
int res = 0;
for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
for (Group group : Global.testingServer.db.groups.getSelectedItems()) {
Vector<Test> selected_tests = new Vector<>();
Vector<Test> group_tests = new Vector<>();
for (Test test : Global.testingServer.db.tests.Data.values()) {