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

64
.idea/workspace.xml generated
View File

@@ -7,32 +7,70 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Common/MainModules/_MainModule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" 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/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" 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/Common/Passes/EditObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectsPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectsPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/GraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/GraphMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.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/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.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/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/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.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/Supervisor/TaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.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/Passes/All/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddFile.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/CreateEmptyDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteRunTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.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/Project/ChangeFilePass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Project/ChangeFilePass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.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/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ServerObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ServerObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.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/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.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/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

4
properties
View File

@@ -10,7 +10,7 @@
"SMTPHost": "smtp.mail.ru", "SMTPHost": "smtp.mail.ru",
"SMTPPort": 465, "SMTPPort": 465,
"MailSocketPort": 465, "MailSocketPort": 465,
"collapseCredentials": false, "collapseCredentials": true,
"collapseFileGraphs": false, "collapseFileGraphs": false,
"collapseFileMessages": false, "collapseFileMessages": false,
"collapseProjectTrees": false, "collapseProjectTrees": false,
@@ -33,7 +33,7 @@
"InstructionPath": "", "InstructionPath": "",
"PerformanceAnalyzerPath": "", "PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10, "ComponentsBackUpsCount": 10,
"AutoCheckTesting": false, "AutoCheckTesting": true,
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": true, "EmailOnTestingProgress": true,
"eraseTestingWorkspaces": true "eraseTestingWorkspaces": true

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

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

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

@@ -42,7 +42,9 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
} }
protected void createFilters() { protected void createFilters() {
} }
public boolean hasMenuBar(){return true;} public boolean hasMenuBar() {
return true;
}
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(getPluralDescription()); return new DataMenuBar(getPluralDescription());
} }
@@ -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 { protected boolean canStart(Object... args) throws Exception {
target = d.newInstance(); target = d.newInstance();
return return
((getOwner() == null) || (getDb().tables.get(getOwner()).CheckCurrent(Log))) && ((getOwner() == null) || (getDb().getTable(getOwner()).CheckCurrent(Log))) &&
fillObjectFields(); fillObjectFields();
} }
protected boolean fillObjectFields() throws Exception { 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: case DROP:
break; break;
case DELETE: case DELETE:
getDb().tables.get(dep).ClearUI(); getDb().getTable(dep).ClearUI();
break; break;
} }
} }
@@ -49,7 +49,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
protected void performFinish() throws Exception { protected void performFinish() throws Exception {
getTable().ShowUI(); getTable().ShowUI();
for (Class dep : getTable().getFKDependencies().keySet()) { for (Class dep : getTable().getFKDependencies().keySet()) {
getDb().tables.get(dep).RefreshUI(); getDb().getTable(dep).RefreshUI();
} }
} }
} }

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

@@ -25,7 +25,7 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
case DROP: case DROP:
break; break;
case DELETE: case DELETE:
getDb().tables.get(dep).ClearUI(); getDb().getTable(dep).ClearUI();
break; break;
} }
} }
@@ -53,7 +53,7 @@ public abstract class DeleteObjectsPass<D extends DBObject> extends ObjectsPass<
protected void performFinish() throws Exception { protected void performFinish() throws Exception {
getTable().ShowUI(); getTable().ShowUI();
for (Class dep : getTable().getFKDependencies().keySet()) { 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 { protected void showFinish() throws Exception {
getTable().ShowUI(target.getPK()); getTable().ShowUI(target.getPK());
for (Class dep : getTable().getFKDependencies().keySet()) 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() { public DBTable getTable() {
return getDb().tables.get(d); return getDb().getTable(d);
} //таблица в источнике данных } //таблица в источнике данных
@Override//sorted @Override//sorted
public String getButtonText() { 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(); return MainModule_.instance.getDb();
} }
public DBTable getTable() { public DBTable getTable() {
return getDb().tables.get(d); return getDb().getTable(d);
} //таблица в источнике данных } //таблица в источнике данных
@Override//sorted @Override//sorted
public String getButtonText() { 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); FKBehaviour behaviour = table.getFKDependencies().get(dep);
switch (behaviour.ui) { switch (behaviour.ui) {
case ACTIVE: case ACTIVE:
table.getDb().tables.get(dep).ShowUI(); table.getDb().getTable(dep).ShowUI();
break; break;
case PASSIVE: case PASSIVE:
break; break;
@@ -325,7 +325,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
FKBehaviour behaviour = table.getFKDependencies().get(dep); FKBehaviour behaviour = table.getFKDependencies().get(dep);
switch (behaviour.ui) { switch (behaviour.ui) {
case ACTIVE: case ACTIVE:
table.getDb().tables.get(dep).ClearUI(); table.getDb().getTable(dep).ClearUI();
break; break;
case PASSIVE: case PASSIVE:
break; break;

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

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

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

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

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 P pass; //проход отвечающий за задачу
protected int performanceTime; //сколько задача уже выполняется. protected int performanceTime; //сколько задача уже выполняется.
public void ShowTaskState() { 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) { public void Init(T task_in, P pass_in, db_project_info project_in) {
task = task_in; task = task_in;

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

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

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

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Passes.PassException; import Common.Passes.PassException;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Project.ChangeFilePass; import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.Visual.Windows.FileNameForm;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File; 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.Pass;
import Common.Passes.PassException; import Common.Passes.PassException;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Windows.FileNameForm;
import java.io.File; import java.io.File;
import java.nio.file.Paths; import java.nio.file.Paths;

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

@@ -1,11 +1,7 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Passes.DeleteObjectsPass; import Common.Passes.DeleteObjectsPass;
import Common.Passes.Pass;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import java.util.Vector;
public class DeleteRunTasks extends DeleteObjectsPass<RunTask> { public class DeleteRunTasks extends DeleteObjectsPass<RunTask> {
public DeleteRunTasks() { public DeleteRunTasks() {
super(RunTask.class); super(RunTask.class);

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.Project; package _VisualDVM.Passes.Project;
import Common.Passes.Pass; import Common.Passes.Pass;
import _VisualDVM.Visual.Windows.FileNameForm;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.Windows.FileNameForm;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File; 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 @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = (D) getDb().tables.get(d).getCurrent(); target = (D) getDb().getTable(d).getCurrent();
return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowDeleteObjectDialog(target); return getDb().getTable(d).CheckCurrent(Log) && getDb().getTable(d).ShowDeleteObjectDialog(target);
} }
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта. //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override @Override
protected void showPreparation() throws Exception { protected void showPreparation() throws Exception {
getDb().tables.get(d).ClearUI(); getDb().getTable(d).ClearUI();
for (Class dep : getDb().tables.get(d).getFKDependencies().keySet()) { for (Class dep : getDb().getTable(d).getFKDependencies().keySet()) {
switch (getDb().tables.get(d).getFKDependencies().get(dep).data) { switch (getDb().getTable(d).getFKDependencies().get(dep).data) {
case NONE: case NONE:
case DROP: case DROP:
break; break;
case DELETE: case DELETE:
getDb().tables.get(dep).ClearUI(); getDb().getTable(dep).ClearUI();
break; break;
} }
} }
@@ -37,6 +37,6 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
} }
@Override @Override
protected void showDone() throws Exception { 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 @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
DBTable table = getDb().tables.get(d); DBTable table = getDb().getTable(d);
if (!table.CheckSelectedOrCurrent(Log)) if (!table.CheckSelectedOrCurrent(Log))
return false; return false;
target = table.getSelectedOrCurrentKeys(); target = table.getSelectedOrCurrentKeys();
@@ -44,14 +44,14 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
//Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта. //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.
@Override @Override
protected void showPreparation() throws Exception { protected void showPreparation() throws Exception {
getDb().tables.get(d).ClearUI(); getDb().getTable(d).ClearUI();
for (Class dep : getDb().tables.get(d).getFKDependencies().keySet()) { for (Class dep : getDb().getTable(d).getFKDependencies().keySet()) {
switch (getDb().tables.get(d).getFKDependencies().get(dep).data) { switch (getDb().getTable(d).getFKDependencies().get(dep).data) {
case NONE: case NONE:
case DROP: case DROP:
break; break;
case DELETE: case DELETE:
getDb().tables.get(dep).ClearUI(); getDb().getTable(dep).ClearUI();
break; 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 @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = (D) getDb().tables.get(d).getCurrent(); target = (D) getDb().getTable(d).getCurrent();
return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowEditObjectDialog(target); return getDb().getTable(d).CheckCurrent(Log) && getDb().getTable(d).ShowEditObjectDialog(target);
} }
//-- //--
@Override @Override
@@ -26,6 +26,6 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
VisualCaches.RefreshCache(target); 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 @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
super.showDone(); 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; package _VisualDVM.Passes.Server;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.RepositoryRefuseException;
import Common.Passes.Pass; import Common.Passes.Pass;
import Common.Passes.PassException; import Common.Passes.PassException;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common.Database.RepositoryRefuseException;
import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; 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 { 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; p = p_in;
} }
iDBTable<P> getTable() { iDBTable<P> getTable() {
return (iDBTable<P>) Global.testingServer.db.tables.get(p); return (iDBTable<P>) Global.testingServer.db.getTable(p);
} }
protected abstract ServerCode getCheckCode(); protected abstract ServerCode getCheckCode();
@Override @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 { void DeleteDraftOnly() throws Exception {
showPreparation(); showPreparation();
getDb().tables.get(d).Data.remove(CommonConstants.Nan); getDb().getTable(d).Data.remove(CommonConstants.Nan);
getDb().tables.get(d).ShowUI(); getDb().getTable(d).ShowUI();
} }
@Override @Override
protected void performDone() throws Exception { 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); Vector<Test> groupTests = Global.testingServer.db.tests.getSelectedGroupTests(group);
tests.addAll(groupTests); 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); settings.add((Settings) setting);
} }
return true; return true;

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

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

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

@@ -1,11 +1,11 @@
package _VisualDVM.ProjectData.Files.UI; package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.DragDrop.FileDrop; import Common.Visual.DragDrop.FileDrop;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree; import Common.Visual.Trees.StyledTree;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.DBProjectFile;
import Common.Visual.Menus.GraphMenu;
import _VisualDVM.Visual.Menus.ProjectFilesMenu; import _VisualDVM.Visual.Menus.ProjectFilesMenu;
import javax.swing.tree.DefaultMutableTreeNode; 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).setMinWidth(700);
columns.get(1).setRendererClass(RendererWrapText.class); columns.get(1).setRendererClass(RendererWrapText.class);
} }
}; };
} }
@Override @Override

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

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

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

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

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

@@ -1,8 +1,8 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI; package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree; import Common.Visual.Trees.StyledTree;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import Common.Visual.Menus.GraphMenu;
import javax.swing.*; import javax.swing.*;
public class DistributionMenu extends GraphMenu { 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; package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree; import Common.Visual.Trees.StyledTree;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion; import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import Common.Visual.Menus.GraphMenu;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath; 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; package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree; import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.SelectionTreeCellRenderer; import Common.Visual.Trees.SelectionTreeCellRenderer;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject; import _VisualDVM.ProjectData.SapforData.FileObject;
import Common.Visual.Menus.GraphMenu;
public class InlineTree extends SelectableTree { public class InlineTree extends SelectableTree {
public InlineTree() { public InlineTree() {
super(Global.mainModule.getProject().inline_root); 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; package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree; import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.SelectionTreeCellRenderer; import Common.Visual.Trees.SelectionTreeCellRenderer;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.FileObject; import _VisualDVM.ProjectData.SapforData.FileObject;
import Common.Visual.Menus.GraphMenu;
public class InlineTree2 extends SelectableTree { public class InlineTree2 extends SelectableTree {
public InlineTree2() { public InlineTree2() {
super(Global.mainModule.getProject().inline_root2); 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; package _VisualDVM.ProjectData.SapforData.Includes.UI;
import Common.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree; import Common.Visual.Trees.SelectableTree;
import Common.Visual.Trees.SelectionTreeCellRenderer; import Common.Visual.Trees.SelectionTreeCellRenderer;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common.Visual.Menus.GraphMenu;
public class IncludesTree extends SelectableTree { public class IncludesTree extends SelectableTree {
public IncludesTree() { public IncludesTree() {
super(Global.mainModule.getProject().includes_root); 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; package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererTopLeft; import Common.Visual.Tables.RendererTopLeft;
import _VisualDVM.Current; import _VisualDVM.Current;

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

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

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

@@ -2,8 +2,11 @@ package _VisualDVM.TestingSystem.Common.MachineProcess;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.*; import _VisualDVM.Global;
import _VisualDVM.GlobalProperties;
import _VisualDVM.Mode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import java.io.File; 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.CommonConstants;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject; import Common.Database.Objects.riDBObject;
import Common.Database.RepositoryRefuseException;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.UI; import Common.Visual.UI;
import _VisualDVM.Current; import _VisualDVM.Current;
@@ -12,7 +13,6 @@ import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.FileType; import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.ProjectFile; import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.LanguageName;
import Common.Database.RepositoryRefuseException;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;

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

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

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

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