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

5
src/Common/Database/Database.java
View File

@@ -13,11 +13,14 @@ import java.util.Vector;
//самый общий интерфейс базы данных, независимо от реализации.
public abstract class Database {
//------------------------------
public LinkedHashMap<Class<? extends DBObject>, DBTable> tables = new LinkedHashMap<>(); //таблицы
protected LinkedHashMap<Class<? extends DBObject>, DBTable> tables = new LinkedHashMap<>(); //таблицы
protected File file = null;
public Database(File file_in) {
file = file_in;
}
public <T extends DBObject> DBTable<?, T> getTable(Class<T> tableClass) {
return tables.get(tableClass);
}
public File getFile() {
return file;
}

12
src/Common/Database/Tables/DataSet.java
View File

@@ -42,7 +42,9 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
}
protected void createFilters() {
}
public boolean hasMenuBar(){return true;}
public boolean hasMenuBar() {
return true;
}
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription());
}
@@ -268,7 +270,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return MainModule_.instance.Check(log, CurrentName());
}
public boolean CheckSelectedOrCurrent(TextLog log) {
if ((getSelectedCount() == 0) && (CurrentName()==null || (getCurrent()==null))) {
if ((getSelectedCount() == 0) && (CurrentName() == null || (getCurrent() == null))) {
log.Writeln_(getPluralDescription() + ":");
log.Writeln_("Отсутствуют отмеченные объекты, или текущий объект!");
return false;
@@ -298,7 +300,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
}
return res;
}
public Vector<K> getSelectedOrCurrentKeys(){
public Vector<K> getSelectedOrCurrentKeys() {
Vector<K> res = new Vector<>();
if (getSelectedCount() > 0)
res = getSelectedKeys();
@@ -328,5 +330,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
}
}
//-------------------------------------------------------------------------------------
public PassCode_ getDeletePassCode(){return null;}
public PassCode_ getDeletePassCode() {
return null;
}
}

3
src/Common/MainModules/_MainModule.java Normal file
View File

@@ -0,0 +1,3 @@
package Common.MainModules;
public class _MainModule {
}

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

@@ -11,7 +11,7 @@ public abstract class AddObjectPass<D extends DBObject> extends ObjectPass<D> {
protected boolean canStart(Object... args) throws Exception {
target = d.newInstance();
return
((getOwner() == null) || (getDb().tables.get(getOwner()).CheckCurrent(Log))) &&
((getOwner() == null) || (getDb().getTable(getOwner()).CheckCurrent(Log))) &&
fillObjectFields();
}
protected boolean fillObjectFields() throws Exception {

4
src/Common/Passes/DeleteObjectPass.java
View File

@@ -23,7 +23,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
case DROP:
break;
case DELETE:
getDb().tables.get(dep).ClearUI();
getDb().getTable(dep).ClearUI();
break;
}
}
@@ -49,7 +49,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
protected void performFinish() throws Exception {
getTable().ShowUI();
for (Class dep : getTable().getFKDependencies().keySet()) {
getDb().tables.get(dep).RefreshUI();
getDb().getTable(dep).RefreshUI();
}
}
}

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

@@ -1,6 +1,6 @@
package Common.Passes;
import Common.Database.Objects.DBObject;
public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<D>{
public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<D> {
public DeleteObjectsPass(Class<D> d_in) {
super(d_in);
}
@@ -12,7 +12,7 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
protected boolean canStart(Object... args) throws Exception {
if (!getTable().CheckSelectedOrCurrent(Log))
return false;
target = getTable().getSelectedOrCurrent();
target = getTable().getSelectedOrCurrent();
return getTable().ShowDeleteObjectsDialog(target.size());
}
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@@ -25,14 +25,14 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
case DROP:
break;
case DELETE:
getDb().tables.get(dep).ClearUI();
getDb().getTable(dep).ClearUI();
break;
}
}
}
@Override
protected void body() throws Exception {
for (D d: target){
for (D d : target) {
getDb().Delete(d);
for (Class dep : getTable().getFKDependencies().keySet()) {
switch (getTable().getFKDependencies().get(dep).data) {
@@ -53,7 +53,7 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
protected void performFinish() throws Exception {
getTable().ShowUI();
for (Class dep : getTable().getFKDependencies().keySet()) {
getDb().tables.get(dep).RefreshUI();
getDb().getTable(dep).RefreshUI();
}
}
}

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

@@ -21,6 +21,6 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
protected void showFinish() throws Exception {
getTable().ShowUI(target.getPK());
for (Class dep : getTable().getFKDependencies().keySet())
getDb().tables.get(dep).RefreshUI();
getDb().getTable(dep).RefreshUI();
}
}

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

@@ -13,7 +13,7 @@ public abstract class ObjectPass<D extends DBObject> extends Pass<D> {
}
; //источник данных
public DBTable getTable() {
return getDb().tables.get(d);
return getDb().getTable(d);
} //таблица в источнике данных
@Override//sorted
public String getButtonText() {

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

@@ -15,7 +15,7 @@ public abstract class ObjectsPass<D extends DBObject> extends Pass<Vector<D>> {
return MainModule_.instance.getDb();
}
public DBTable getTable() {
return getDb().tables.get(d);
return getDb().getTable(d);
} //таблица в источнике данных
@Override//sorted
public String getButtonText() {

4
src/Common/Visual/DataSetControlForm.java
View File

@@ -309,7 +309,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
FKBehaviour behaviour = table.getFKDependencies().get(dep);
switch (behaviour.ui) {
case ACTIVE:
table.getDb().tables.get(dep).ShowUI();
table.getDb().getTable(dep).ShowUI();
break;
case PASSIVE:
break;
@@ -325,7 +325,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
FKBehaviour behaviour = table.getFKDependencies().get(dep);
switch (behaviour.ui) {
case ACTIVE:
table.getDb().tables.get(dep).ClearUI();
table.getDb().getTable(dep).ClearUI();
break;
case PASSIVE:
break;

2
src/Common/Visual/Menus/GraphMenu.java
View File

@@ -1,6 +1,4 @@
package Common.Visual.Menus;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.Trees.StyledTree;
import javax.swing.*;

2
src/Common/Visual/Trees/StyledTree.java
View File

@@ -1,8 +1,8 @@
package Common.Visual.Trees;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Themes.ThemeElement;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;

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

@@ -165,7 +165,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),PassCode.AddCompiler,
return new DataMenuBar(getPluralDescription(), PassCode.AddCompiler,
PassCode.EditCompiler,
PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion,

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

@@ -137,7 +137,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
return new DataMenuBar(getPluralDescription(),
PassCode.AddMachine,
PassCode.EditMachine,
PassCode.DeleteMachine){
PassCode.DeleteMachine) {
{
add(new MenuBarButton() {
{

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

@@ -82,7 +82,7 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
return new DataMenuBar(getPluralDescription(), PassCode.Compile,
PassCode.AddMakefile,
PassCode.EditMakefile,
PassCode.DeleteMakefile){
PassCode.DeleteMakefile) {
{
addSeparator();
addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);

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

@@ -175,7 +175,7 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
PassCode.Run,
PassCode.AddRunConfiguration,
PassCode.EditRunConfiguration,
PassCode.DeleteRunConfiguration){
PassCode.DeleteRunConfiguration) {
{
add(new JSeparator());
addPasses(PassCode.EditProjectRunMaxtime);

2
src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
View File

@@ -29,7 +29,7 @@ public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
public boolean hasCheckBox() {
return true;

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

@@ -14,7 +14,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
protected P pass; //проход отвечающий за задачу
protected int performanceTime; //сколько задача уже выполняется.
public void ShowTaskState() {
Global.mainModule.getDb().tables.get(task.getClass()).ShowUI(task.getPK());
Global.mainModule.getDb().getTable(task.getClass()).ShowUI(task.getPK());
}
public void Init(T task_in, P pass_in, db_project_info project_in) {
task = task_in;

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;

2
src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
View File

@@ -50,7 +50,7 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()){
return new DataMenuBar(getPluralDescription()) {
@Override
public void createSelectionButtons(DataSet dataSet) {
//не нужны.

2
src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.Trees.DataTree;
import _VisualDVM.Visual.Trees.GraphTreeCellRenderer;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import _VisualDVM.Visual.Trees.GraphTreeCellRenderer;
import javax.swing.tree.DefaultMutableTreeNode;
public class FileGraphTree extends DataTree {

2
src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.DragDrop.FileDrop;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Common.Visual.Menus.GraphMenu;
import _VisualDVM.Visual.Menus.ProjectFilesMenu;
import javax.swing.tree.DefaultMutableTreeNode;

1
src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
View File

@@ -21,7 +21,6 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
columns.get(1).setMinWidth(700);
columns.get(1).setRendererClass(RendererWrapText.class);
}
};
}
@Override

2
src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.ProjectData.Project.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Selectable;
import Common.Visual.Trees.DataTree;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import Common.Visual.Menus.GraphMenu;
import _VisualDVM.Visual.Menus.VersionsMenu;
import javax.swing.tree.TreePath;

1
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererHiddenList;
import _VisualDVM.Current;
import _VisualDVM.Global;

2
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import Common.Visual.Menus.GraphMenu;
import javax.swing.*;
public class DistributionMenu extends GraphMenu {

2
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import Common.Visual.Menus.GraphMenu;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;

2
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.SelectionTreeCellRenderer;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject;
import Common.Visual.Menus.GraphMenu;
public class InlineTree extends SelectableTree {
public InlineTree() {
super(Global.mainModule.getProject().inline_root);

2
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.SelectionTreeCellRenderer;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject;
import Common.Visual.Menus.GraphMenu;
public class InlineTree2 extends SelectableTree {
public InlineTree2() {
super(Global.mainModule.getProject().inline_root2);

2
src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.ProjectData.SapforData.Includes.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.SelectionTreeCellRenderer;
import _VisualDVM.Current;
import _VisualDVM.Global;
import Common.Visual.Menus.GraphMenu;
public class IncludesTree extends SelectableTree {
public IncludesTree() {
super(Global.mainModule.getProject().includes_root);

1
src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererTopLeft;
import _VisualDVM.Current;

2
src/_VisualDVM/Repository/Component/ComponentsSet.java
View File

@@ -95,7 +95,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
return new DataMenuBar(getPluralDescription(), PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog){
PassCode.ShowComponentChangesLog) {
{
addMenus(
new VisualiserMenu(

2
src/_VisualDVM/Repository/Server/ComponentsServer.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.Repository.Server;
import Common.Database.Objects.DBObject;
import Common.Database.RepositoryRefuseException;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.Account;
@@ -16,7 +17,6 @@ import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReportsDatabase;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Repository.EmailMessage;
import Common.Database.RepositoryRefuseException;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Subscribes.Subscriber;
import _VisualDVM.Utils;

2
src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -158,7 +158,7 @@ public class GroupsDBTable extends iDBTable<Group> {
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),
PassCode.SynchronizeTests,
PassCode.ConvertCorrectnessTests){
PassCode.ConvertCorrectnessTests) {
{
addMenus(new AddGroupMenu(), new EditGroupMenu());
addPasses(PassCode.DeleteGroup);

5
src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
View File

@@ -2,8 +2,11 @@ package _VisualDVM.TestingSystem.Common.MachineProcess;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Utils.Utils_;
import _VisualDVM.*;
import _VisualDVM.Global;
import _VisualDVM.GlobalProperties;
import _VisualDVM.Mode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;
import java.io.File;

2
src/_VisualDVM/TestingSystem/Common/Test/Test.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.Common.Test;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Database.RepositoryRefuseException;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.Current;
@@ -12,7 +13,6 @@ import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import Common.Database.RepositoryRefuseException;
import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils;

2
src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
View File

@@ -131,7 +131,7 @@ public class TestDBTable extends iDBTable<Test> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()){
return new DataMenuBar(getPluralDescription()) {
{
addMenus(new AddTestMenu(), new EditTestMenu());
addPasses(PassCode.DownloadTest, PassCode.DeleteTest);

2
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.TestingSystem.Common;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.RepositoryRefuseException;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
@@ -12,7 +13,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.EmailMessage;
import Common.Database.RepositoryRefuseException;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;

2
src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.TestingSystem.Common;
import Common.CommonConstants;
import Common.Database.RepositoryRefuseException;
import Common.Database.SQLITE.SQLiteDatabase;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
@@ -9,7 +10,6 @@ import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.Passes.All.ZipFolderPass;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import Common.Database.RepositoryRefuseException;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
import _VisualDVM.TestingSystem.Common.Test.Test;

2
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
View File

@@ -125,7 +125,7 @@ public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode.StartSelectedDVMConfigurations );
PassCode.StartSelectedDVMConfigurations);
}
@Override
public PassCode_ getDeletePassCode() {

2
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -129,7 +129,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()){
return new DataMenuBar(getPluralDescription()) {
{
addPasses(PassCode.SynchronizeTests);
addSeparator();

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -109,7 +109,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
}
@Override
public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription(),PassCode.SynchronizeTests){
return new DataMenuBar(getPluralDescription(), PassCode.SynchronizeTests) {
{
addSeparator();
addPasses(PassCode.AbortSapforPackage);