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

рефакторинг. инкапсуляция таблиц бд

Browse Source
This commit is contained in:
02090095
2024-10-17 17:22:33 +03:00
parent 17c2644766
commit e34778d6be
65 changed files with 145 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/Passes/All/AddFile.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Global;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.FileNameForm;
import org.apache.commons.io.FileUtils;
import javax.swing.tree.DefaultMutableTreeNode;

2
src/_VisualDVM/Passes/All/CreateEmptyDirectory.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.Visual.Windows.FileNameForm;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;

2
src/_VisualDVM/Passes/All/CreateEmptyProject.java
View File

@@ -2,10 +2,10 @@ package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Windows.FileNameForm;
import java.io.File;
import java.nio.file.Paths;

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

@@ -1,11 +1,7 @@
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);

2
src/_VisualDVM/Passes/All/RenameDirectory.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.FileNameForm;
import org.apache.commons.io.FileUtils;
import javax.swing.tree.DefaultMutableTreeNode;

2
src/_VisualDVM/Passes/All/RenameFile.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.Visual.Windows.FileNameForm;
import java.io.File;
import java.nio.file.Paths;

2
src/_VisualDVM/Passes/All/ShowCompilerHelp.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
public class ShowCompilerHelp extends Pass<String> {
Pass<String> subpass;
Compiler compiler;

2
src/_VisualDVM/Passes/All/ShowCompilerVersion.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
public class ShowCompilerVersion extends Pass<String> {
Pass<String> subpass;
boolean needsShow = true;

2
src/_VisualDVM/Passes/All/ShowComponentChangesLog.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
@@ -8,6 +7,7 @@ import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import org.apache.commons.io.FileUtils;
import java.io.File;

2
src/_VisualDVM/Passes/All/ShowTestingServerFile.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.Server.TestingSystemPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import org.apache.commons.io.FileUtils;
import java.io.File;

2
src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
View File

@@ -43,7 +43,7 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
if (!Global.mainModule.getCompiler().versionLoaded)
Global.mainModule.getPass(PassCode.ShowCompilerVersion).Do(Global.mainModule.getCompiler(), false);
//-----
if (!Global.testingServer.db.dvm_configurations.CheckSelectedOrCurrent(Log)){
if (!Global.testingServer.db.dvm_configurations.CheckSelectedOrCurrent(Log)) {
return false;
}
Vector<DVMConfiguration> configurations = Global.testingServer.db.dvm_configurations.getSelectedOrCurrent();

2
src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java
View File

@@ -35,7 +35,7 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
return false;
}
//--
if (!Global.testingServer.db.sapforConfigurations.CheckSelectedOrCurrent(Log)){
if (!Global.testingServer.db.sapforConfigurations.CheckSelectedOrCurrent(Log)) {
return false;
}
configurations = Global.testingServer.db.sapforConfigurations.getSelectedOrCurrent();

2
src/_VisualDVM/Passes/Project/ChangeFilePass.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.Project;
import Common.Passes.Pass;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.Windows.FileNameForm;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;

14
src/_VisualDVM/Passes/Server/DeleteServerObject.java
View File

@@ -12,20 +12,20 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = (D) getDb().tables.get(d).getCurrent();
return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowDeleteObjectDialog(target);
target = (D) getDb().getTable(d).getCurrent();
return getDb().getTable(d).CheckCurrent(Log) && getDb().getTable(d).ShowDeleteObjectDialog(target);
}
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override
protected void showPreparation() throws Exception {
getDb().tables.get(d).ClearUI();
for (Class dep : getDb().tables.get(d).getFKDependencies().keySet()) {
switch (getDb().tables.get(d).getFKDependencies().get(dep).data) {
getDb().getTable(d).ClearUI();
for (Class dep : getDb().getTable(d).getFKDependencies().keySet()) {
switch (getDb().getTable(d).getFKDependencies().get(dep).data) {
case NONE:
case DROP:
break;
case DELETE:
getDb().tables.get(dep).ClearUI();
getDb().getTable(dep).ClearUI();
break;
}
}
@@ -37,6 +37,6 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
}
@Override
protected void showDone() throws Exception {
getDb().tables.get(d).ui_.Show();
getDb().getTable(d).ui_.Show();
}
}

10
src/_VisualDVM/Passes/Server/DeleteServerObjects.java
View File

@@ -35,7 +35,7 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
}
@Override
protected boolean canStart(Object... args) throws Exception {
DBTable table = getDb().tables.get(d);
DBTable table = getDb().getTable(d);
if (!table.CheckSelectedOrCurrent(Log))
return false;
target = table.getSelectedOrCurrentKeys();
@@ -44,14 +44,14 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override
protected void showPreparation() throws Exception {
getDb().tables.get(d).ClearUI();
for (Class dep : getDb().tables.get(d).getFKDependencies().keySet()) {
switch (getDb().tables.get(d).getFKDependencies().get(dep).data) {
getDb().getTable(d).ClearUI();
for (Class dep : getDb().getTable(d).getFKDependencies().keySet()) {
switch (getDb().getTable(d).getFKDependencies().get(dep).data) {
case NONE:
case DROP:
break;
case DELETE:
getDb().tables.get(dep).ClearUI();
getDb().getTable(dep).ClearUI();
break;
}
}

6
src/_VisualDVM/Passes/Server/EditServerObject.java
View File

@@ -15,8 +15,8 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
//--
@Override
protected boolean canStart(Object... args) throws Exception {
target = (D) getDb().tables.get(d).getCurrent();
return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowEditObjectDialog(target);
target = (D) getDb().getTable(d).getCurrent();
return getDb().getTable(d).CheckCurrent(Log) && getDb().getTable(d).ShowEditObjectDialog(target);
}
//--
@Override
@@ -26,6 +26,6 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
@Override
protected void showDone() throws Exception {
VisualCaches.RefreshCache(target);
getDb().tables.get(d).ui_.Show(target.getPK());
getDb().getTable(d).ui_.Show(target.getPK());
}
}

2
src/_VisualDVM/Passes/Server/PublishServerObject.java
View File

@@ -41,6 +41,6 @@ public class PublishServerObject<S extends RepositoryServer, D extends DBObject>
@Override
protected void showDone() throws Exception {
super.showDone();
getDb().tables.get(d).ui_.Show(pk);
getDb().getTable(d).ui_.Show(pk);
}
}

2
src/_VisualDVM/Passes/Server/RepositoryPass.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.Server;
import Common.Database.Objects.DBObject;
import Common.Database.RepositoryRefuseException;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import Common.Database.RepositoryRefuseException;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;

2
src/_VisualDVM/Passes/Server/ServerObjectPass.java
View File

@@ -26,6 +26,6 @@ public abstract class ServerObjectPass<S extends RepositoryServer, D extends DBO
}
//-
public boolean fillObjectFields() throws Exception {
return getDb().tables.get(d).ShowAddObjectDialog(target);
return getDb().getTable(d).ShowAddObjectDialog(target);
}
}

2
src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
View File

@@ -14,7 +14,7 @@ public abstract class ActualizeTestingPackages<P extends TestingPackage> extends
p = p_in;
}
iDBTable<P> getTable() {
return (iDBTable<P>) Global.testingServer.db.tables.get(p);
return (iDBTable<P>) Global.testingServer.db.getTable(p);
}
protected abstract ServerCode getCheckCode();
@Override

4
src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java
View File

@@ -57,8 +57,8 @@ public abstract class DeleteTestingPackages<P extends TestingPackage> extends De
}
void DeleteDraftOnly() throws Exception {
showPreparation();
getDb().tables.get(d).Data.remove(CommonConstants.Nan);
getDb().tables.get(d).ShowUI();
getDb().getTable(d).Data.remove(CommonConstants.Nan);
getDb().getTable(d).ShowUI();
}
@Override
protected void performDone() throws Exception {

2
src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java
View File

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