рефакторинг
This commit is contained in:
1
.idea/artifacts/VisualSapfor_jar.xml
generated
1
.idea/artifacts/VisualSapfor_jar.xml
generated
@@ -22,6 +22,7 @@
|
|||||||
<element id="extracted-dir" path="$PROJECT_DIR$/libs/junit-4.12.jar" path-in-jar="/" />
|
<element id="extracted-dir" path="$PROJECT_DIR$/libs/junit-4.12.jar" path-in-jar="/" />
|
||||||
<element id="extracted-dir" path="$PROJECT_DIR$/libs/log4j-1.2.17.jar" path-in-jar="/" />
|
<element id="extracted-dir" path="$PROJECT_DIR$/libs/log4j-1.2.17.jar" path-in-jar="/" />
|
||||||
<element id="extracted-dir" path="$PROJECT_DIR$/libs/xmlbeans-2.6.0.jar" path-in-jar="/" />
|
<element id="extracted-dir" path="$PROJECT_DIR$/libs/xmlbeans-2.6.0.jar" path-in-jar="/" />
|
||||||
|
<element id="extracted-dir" path="$PROJECT_DIR$/libs/commons-lang-2.6.0.jar" path-in-jar="/" />
|
||||||
</root>
|
</root>
|
||||||
</artifact>
|
</artifact>
|
||||||
</component>
|
</component>
|
||||||
9
.idea/libraries/commons_lang_2_6_0.xml
generated
Normal file
9
.idea/libraries/commons_lang_2_6_0.xml
generated
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
<component name="libraryTable">
|
||||||
|
<library name="commons-lang-2.6.0">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="jar://$PROJECT_DIR$/libs/commons-lang-2.6.0.jar!/" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES />
|
||||||
|
</library>
|
||||||
|
</component>
|
||||||
172
.idea/workspace.xml
generated
172
.idea/workspace.xml
generated
@@ -7,15 +7,169 @@
|
|||||||
</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$/.idea/libraries/commons_lang_2_6_0.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.form" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ConfirmEmail.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/.idea/artifacts/VisualSapfor_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/VisualSapfor_jar.xml" 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$/Visual_DVM_2020.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Visual_DVM_2020.iml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/PassControl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/PassControl.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowMakefilePreview.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowMakefilePreview.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Account/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Account/Account.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddSubscriber.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/BuildComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/BuildComponent.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloseBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CloseBugReport.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CombineFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CombineFiles.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromFile.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReport.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSubscriber.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSubscriberWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteSubscriberWorkspace.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditAccount.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditSubscriber.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InitialiseUser.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReport.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponentsServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishTestingServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.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/ShowInstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowInstruction.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShutdownTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShutdownTestingServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartComponentsServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartTestingServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateComponent.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/CurrentComponentPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/CurrentComponentPass.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SilentSapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SilentSapforPass.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/Transformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/Transformation.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ComponentsServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ComponentsServerPass.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/PublishServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerPass.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/Server/ShutdownServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ShutdownServerPass.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/StartServerPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/StartServerPass.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReportState.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/Json/BugReportAdditionJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/Json/RecipientJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/Json/RecipientsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/Json/VisualiserSettingJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/Json/VisualiserSettingsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingsJson.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Component.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/ComponentState.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/ComponentType.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/ComponentsSet.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Instruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Instruction.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Json/ComponentPublicationInfoJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Json/ComponentVersionsInfoJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/OSDComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/OSDComponent.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/MessagesServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor_F.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/TransformationPermission.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/TransformationPermission.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.form" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/PickUpComponentFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.form" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/PickUpComponentFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/PublishFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.form" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/PublishFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/PublishForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/UI/PublishForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualiser.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberRights/SubscriberRights.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/SubscriberRights/SubscriberRights.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspace.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspaceDBTable.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/Subscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Subscribes/Subscriber.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Subscribes/SubsribersDBTable.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberDialog.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.form" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubsribersForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/TestingClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingClient.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.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/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTestingChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTestingChecker.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/files/CompilationTask.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/CompilationTask.h" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/files/Utils.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Utils.h" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/files/version.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/version.h" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandFields.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComponentsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComponentsWindow.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" />
|
||||||
@@ -94,10 +248,10 @@
|
|||||||
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
|
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
|
||||||
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
|
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
|
||||||
<property name="extract.method.default.visibility" value="public" />
|
<property name="extract.method.default.visibility" value="public" />
|
||||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons" />
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/libs/commons-lang-2.6.0.jar" />
|
||||||
<property name="project.structure.last.edited" value="Modules" />
|
<property name="project.structure.last.edited" value="Libraries" />
|
||||||
<property name="project.structure.proportion" value="0.15" />
|
<property name="project.structure.proportion" value="0.15" />
|
||||||
<property name="project.structure.side.proportion" value="0.2" />
|
<property name="project.structure.side.proportion" value="0.27322906" />
|
||||||
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
|
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
|
||||||
<property name="settings.editor.selected.configurable" value="reference.settings.project.statistic.project.settings" />
|
<property name="settings.editor.selected.configurable" value="reference.settings.project.statistic.project.settings" />
|
||||||
</component>
|
</component>
|
||||||
@@ -107,11 +261,11 @@
|
|||||||
<recent name="controls.Trees" />
|
<recent name="controls.Trees" />
|
||||||
</key>
|
</key>
|
||||||
<key name="CopyFile.RECENT_KEYS">
|
<key name="CopyFile.RECENT_KEYS">
|
||||||
|
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
|
||||||
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
|
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
|
||||||
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
|
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
|
||||||
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" />
|
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" />
|
||||||
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
|
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
|
||||||
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
|
|
||||||
</key>
|
</key>
|
||||||
<key name="MoveMembersDialog.RECENTS_KEY">
|
<key name="MoveMembersDialog.RECENTS_KEY">
|
||||||
<recent name="_VisualDVM.Constants" />
|
<recent name="_VisualDVM.Constants" />
|
||||||
|
|||||||
@@ -94,5 +94,6 @@
|
|||||||
<SOURCES />
|
<SOURCES />
|
||||||
</library>
|
</library>
|
||||||
</orderEntry>
|
</orderEntry>
|
||||||
|
<orderEntry type="library" name="commons-lang-2.6.0" level="project" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
13
properties
13
properties
@@ -1,6 +1,9 @@
|
|||||||
{
|
{
|
||||||
|
"Email": "",
|
||||||
|
"Name": "",
|
||||||
|
"Role": "Undefined",
|
||||||
"Workspace": "E:\\Tests",
|
"Workspace": "E:\\Tests",
|
||||||
"ProjectsSearchDirectory": "E:\\Tests",
|
"ProjectsSearchDirectory": "E:\\BUG",
|
||||||
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
||||||
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
||||||
"Visualizer_2Path": "C:\\Users\\misha\\Documents",
|
"Visualizer_2Path": "C:\\Users\\misha\\Documents",
|
||||||
@@ -21,11 +24,11 @@
|
|||||||
"Kernels": 8,
|
"Kernels": 8,
|
||||||
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
||||||
"CheckTestingIntervalSeconds": 10,
|
"CheckTestingIntervalSeconds": 10,
|
||||||
"AutoCheckTesting": false,
|
"AutoCheckTesting": true,
|
||||||
"EmailOnTestingProgress": true,
|
"EmailOnTestingProgress": true,
|
||||||
"lastMachineId": 13,
|
"lastMachineId": 28,
|
||||||
"lastUserId": 24,
|
"lastUserId": 36,
|
||||||
"lastCompilerId": 52,
|
"lastCompilerId": 109,
|
||||||
"RegisterOn": false,
|
"RegisterOn": false,
|
||||||
"SpacesOn": false,
|
"SpacesOn": false,
|
||||||
"EmptyLinesOn": false,
|
"EmptyLinesOn": false,
|
||||||
|
|||||||
@@ -34,6 +34,12 @@ public abstract class Database {
|
|||||||
// UI.Print(DebugPrintLevel.Database, "соединение с базой данных " + file.getAbsolutePath());
|
// UI.Print(DebugPrintLevel.Database, "соединение с базой данных " + file.getAbsolutePath());
|
||||||
connect();
|
connect();
|
||||||
}
|
}
|
||||||
|
public void Activate() throws Exception{
|
||||||
|
Connect();
|
||||||
|
CreateAllTables();
|
||||||
|
prepareTablesStatements();
|
||||||
|
Synchronize();
|
||||||
|
}
|
||||||
public void prepareTablesStatements() throws Exception {
|
public void prepareTablesStatements() throws Exception {
|
||||||
}
|
}
|
||||||
public void Disconnect() throws Exception {
|
public void Disconnect() throws Exception {
|
||||||
|
|||||||
@@ -255,4 +255,5 @@ public abstract class SQLiteDatabase extends Database {
|
|||||||
}
|
}
|
||||||
//--
|
//--
|
||||||
//https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause
|
//https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
package Common.Visual.Controls;
|
package Common.Visual.Controls;
|
||||||
import Common.Passes.Pass;
|
|
||||||
public interface PassControl {
|
public interface PassControl {
|
||||||
void setIcon(String icon_path);
|
void setIcon(String icon_path);
|
||||||
void setEnabled(boolean flag);
|
void setEnabled(boolean flag);
|
||||||
|
|||||||
@@ -1,18 +1,18 @@
|
|||||||
package _VisualDVM.Repository.BugReport;
|
package _VisualDVM.ComponentsServer.BugReport;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
import Common.Database.Objects.rDBObject;
|
import Common.Database.Objects.rDBObject;
|
||||||
import Common.Utils.TextLog;
|
import Common.Utils.TextLog;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Utils.Vector_;
|
import Common.Utils.Vector_;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.Json.RecipientJson;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.Json.RecipientsJson;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.Json.VisualiserSettingsJson;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.ComponentType;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
import _VisualDVM.Constants;
|
import _VisualDVM.Constants;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Account.Account;
|
import _VisualDVM.GlobalData.Account.Account;
|
||||||
import _VisualDVM.ProjectData.SapforData.SapforProperties;
|
import _VisualDVM.ProjectData.SapforData.SapforProperties;
|
||||||
import _VisualDVM.Repository.BugReport.Json.RecipientJson;
|
|
||||||
import _VisualDVM.Repository.BugReport.Json.RecipientsJson;
|
|
||||||
import _VisualDVM.Repository.BugReport.Json.VisualiserSettingsJson;
|
|
||||||
import _VisualDVM.Repository.Component.ComponentType;
|
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
|
||||||
import com.sun.org.glassfish.gmbal.Description;
|
import com.sun.org.glassfish.gmbal.Description;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.BugReport;
|
package _VisualDVM.ComponentsServer.BugReport;
|
||||||
import Common.Visual.Fonts.VisualiserFonts;
|
import Common.Visual.Fonts.VisualiserFonts;
|
||||||
import Common.Visual.StatusEnum;
|
import Common.Visual.StatusEnum;
|
||||||
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
package _VisualDVM.Repository.BugReport;
|
package _VisualDVM.ComponentsServer.BugReport;
|
||||||
import Common.Database.Tables.DBTable;
|
import Common.Database.Tables.DBTable;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
import _VisualDVM.Repository.BugReport.UI.BugReportsForm;
|
import _VisualDVM.ComponentsServer.BugReport.UI.BugReportsForm;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
package _VisualDVM.Repository.BugReport.Json;
|
package _VisualDVM.ComponentsServer.BugReport.Json;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
import com.google.gson.annotations.Expose;
|
import com.google.gson.annotations.Expose;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.BugReport.Json;
|
package _VisualDVM.ComponentsServer.BugReport.Json;
|
||||||
import com.google.gson.annotations.Expose;
|
import com.google.gson.annotations.Expose;
|
||||||
public class RecipientJson {
|
public class RecipientJson {
|
||||||
@Expose
|
@Expose
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
package _VisualDVM.Repository.BugReport.Json;
|
package _VisualDVM.ComponentsServer.BugReport.Json;
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
import com.google.gson.annotations.Expose;
|
import com.google.gson.annotations.Expose;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.BugReport.Json;
|
package _VisualDVM.ComponentsServer.BugReport.Json;
|
||||||
import com.google.gson.annotations.Expose;
|
import com.google.gson.annotations.Expose;
|
||||||
public class VisualiserSettingJson {
|
public class VisualiserSettingJson {
|
||||||
@Expose
|
@Expose
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.BugReport.Json;
|
package _VisualDVM.ComponentsServer.BugReport.Json;
|
||||||
import _VisualDVM.ProjectData.SapforData.SapforProperties;
|
import _VisualDVM.ProjectData.SapforData.SapforProperties;
|
||||||
import com.google.gson.annotations.Expose;
|
import com.google.gson.annotations.Expose;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.BugReport.UI;
|
package _VisualDVM.ComponentsServer.BugReport.UI;
|
||||||
import Common.Database.Tables.DataSet;
|
import Common.Database.Tables.DataSet;
|
||||||
import Common.Passes.PassCode_;
|
import Common.Passes.PassCode_;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
@@ -7,10 +7,10 @@ import Common.Visual.Tables.ColumnInfo;
|
|||||||
import Common.Visual.Tables.RendererDate;
|
import Common.Visual.Tables.RendererDate;
|
||||||
import Common.Visual.Tables.RendererProgressBar;
|
import Common.Visual.Tables.RendererProgressBar;
|
||||||
import Common.Visual.Tables.RendererStatusEnum;
|
import Common.Visual.Tables.RendererStatusEnum;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
import _VisualDVM.Repository.BugReport.BugReportState;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
package _VisualDVM.Repository;
|
package _VisualDVM.ComponentsServer;
|
||||||
import Common.Database.SQLITE.SQLiteDatabase;
|
import Common.Database.SQLITE.SQLiteDatabase;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReportsDBTable;
|
||||||
|
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspaceDBTable;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.SubsribersDBTable;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
import _VisualDVM.Repository.BugReport.BugReportsDBTable;
|
|
||||||
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
|
|
||||||
import _VisualDVM.Repository.Subscribes.SubsribersDBTable;
|
|
||||||
|
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component;
|
package _VisualDVM.ComponentsServer.Component;
|
||||||
import Common.CommonConstants;
|
import Common.CommonConstants;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
import Common.Passes.PassException;
|
import Common.Passes.PassException;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component;
|
package _VisualDVM.ComponentsServer.Component;
|
||||||
import Common.Visual.Fonts.VisualiserFonts;
|
import Common.Visual.Fonts.VisualiserFonts;
|
||||||
import Common.Visual.StatusEnum;
|
import Common.Visual.StatusEnum;
|
||||||
public enum ComponentState implements StatusEnum {
|
public enum ComponentState implements StatusEnum {
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component;
|
package _VisualDVM.ComponentsServer.Component;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
public enum ComponentType implements Serializable {
|
public enum ComponentType implements Serializable {
|
||||||
Undefined,
|
Undefined,
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
package _VisualDVM.Repository.Component;
|
package _VisualDVM.ComponentsServer.Component;
|
||||||
import Common.Database.Tables.DataSet;
|
import Common.Database.Tables.DataSet;
|
||||||
import Common.MainModule_;
|
import Common.MainModule_;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.PerformanceAnalyzer.PerformanceAnalyzer;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor_F;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.UI.ComponentsForm;
|
||||||
import _VisualDVM.Current;
|
import _VisualDVM.Current;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
|
|
||||||
import _VisualDVM.Repository.Component.Sapfor.Sapfor_F;
|
|
||||||
import _VisualDVM.Repository.Component.UI.ComponentsForm;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
public class ComponentsSet extends DataSet<ComponentType, Component> {
|
public class ComponentsSet extends DataSet<ComponentType, Component> {
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component;
|
package _VisualDVM.ComponentsServer.Component;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import _VisualDVM.Utils;
|
import _VisualDVM.Utils;
|
||||||
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
package _VisualDVM.Repository.Component.Json;
|
package _VisualDVM.ComponentsServer.Component.Json;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import _VisualDVM.Repository.Component.Component;
|
import _VisualDVM.ComponentsServer.Component.Component;
|
||||||
import _VisualDVM.Repository.Component.ComponentType;
|
import _VisualDVM.ComponentsServer.Component.ComponentType;
|
||||||
import com.google.gson.annotations.Expose;
|
import com.google.gson.annotations.Expose;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
package _VisualDVM.Repository.Component.Json;
|
package _VisualDVM.ComponentsServer.Component.Json;
|
||||||
import _VisualDVM.Repository.Component.ComponentType;
|
import _VisualDVM.ComponentsServer.Component.ComponentType;
|
||||||
import com.google.gson.annotations.Expose;
|
import com.google.gson.annotations.Expose;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component;
|
package _VisualDVM.ComponentsServer.Component;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
public abstract class OSDComponent extends Component {
|
public abstract class OSDComponent extends Component {
|
||||||
@Override
|
@Override
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
package _VisualDVM.Repository.Component.PerformanceAnalyzer;
|
package _VisualDVM.ComponentsServer.Component.PerformanceAnalyzer;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.UI;
|
import Common.Visual.UI;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Component;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.ComponentType;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Repository.Component.Component;
|
|
||||||
import _VisualDVM.Repository.Component.ComponentType;
|
|
||||||
import _VisualDVM.Utils;
|
import _VisualDVM.Utils;
|
||||||
import analyzer.common.MessageJtoJ;
|
import analyzer.common.MessageJtoJ;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component.Sapfor;
|
package _VisualDVM.ComponentsServer.Component.Sapfor;
|
||||||
import Common.MainModule_;
|
import Common.MainModule_;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
|
|
||||||
@@ -1,16 +1,16 @@
|
|||||||
package _VisualDVM.Repository.Component.Sapfor;
|
package _VisualDVM.ComponentsServer.Component.Sapfor;
|
||||||
import Common.CommonConstants;
|
import Common.CommonConstants;
|
||||||
import Common.Passes.PassException;
|
import Common.Passes.PassException;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.UI;
|
import Common.Visual.UI;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.OSDComponent;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Visualizer_2;
|
||||||
import _VisualDVM.Constants;
|
import _VisualDVM.Constants;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
|
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
|
||||||
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
||||||
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
|
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
|
||||||
import _VisualDVM.Repository.Component.OSDComponent;
|
|
||||||
import _VisualDVM.Repository.Component.Visualizer_2;
|
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
import _VisualDVM.Utils;
|
import _VisualDVM.Utils;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package _VisualDVM.Repository.Component.Sapfor;
|
package _VisualDVM.ComponentsServer.Component.Sapfor;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.ComponentType;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Repository.Component.ComponentType;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component.Sapfor;
|
package _VisualDVM.ComponentsServer.Component.Sapfor;
|
||||||
public enum TransformationPermission {
|
public enum TransformationPermission {
|
||||||
None,
|
None,
|
||||||
All,
|
All,
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Repository.Component.UI.ComponentsFields">
|
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.ComponentsServer.Component.UI.ComponentsFields">
|
||||||
<grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
|
<grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
|
||||||
<constraints>
|
<constraints>
|
||||||
<xy x="20" y="20" width="802" height="400"/>
|
<xy x="20" y="20" width="802" height="400"/>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component.UI;
|
package _VisualDVM.ComponentsServer.Component.UI;
|
||||||
import Common.Visual.Windows.Dialog.DialogFields;
|
import Common.Visual.Windows.Dialog.DialogFields;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component.UI;
|
package _VisualDVM.ComponentsServer.Component.UI;
|
||||||
import Common.Database.Tables.DataSet;
|
import Common.Database.Tables.DataSet;
|
||||||
import Common.MainModule_;
|
import Common.MainModule_;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
@@ -8,9 +8,9 @@ import Common.Visual.Menus.VisualiserMenu;
|
|||||||
import Common.Visual.Tables.ColumnInfo;
|
import Common.Visual.Tables.ColumnInfo;
|
||||||
import Common.Visual.Tables.RendererMaskedNanInteger;
|
import Common.Visual.Tables.RendererMaskedNanInteger;
|
||||||
import Common.Visual.Tables.RendererStatusEnum;
|
import Common.Visual.Tables.RendererStatusEnum;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Component;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Repository.Component.Component;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Repository.Component.UI.PickUpComponentFields">
|
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.ComponentsServer.Component.UI.PickUpComponentFields">
|
||||||
<grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
|
<grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
|
||||||
<constraints>
|
<constraints>
|
||||||
<xy x="20" y="20" width="500" height="400"/>
|
<xy x="20" y="20" width="500" height="400"/>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component.UI;
|
package _VisualDVM.ComponentsServer.Component.UI;
|
||||||
import Common.Visual.Windows.Dialog.DialogFields;
|
import Common.Visual.Windows.Dialog.DialogFields;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Repository.Component.UI.PublishFields">
|
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.ComponentsServer.Component.UI.PublishFields">
|
||||||
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="8" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="8" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||||
<margin top="0" left="0" bottom="0" right="0"/>
|
<margin top="0" left="0" bottom="0" right="0"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component.UI;
|
package _VisualDVM.ComponentsServer.Component.UI;
|
||||||
import Common.Visual.Windows.Dialog.DialogFields;
|
import Common.Visual.Windows.Dialog.DialogFields;
|
||||||
import _VisualDVM.Visual.Editor.BaseEditor;
|
import _VisualDVM.Visual.Editor.BaseEditor;
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component.UI;
|
package _VisualDVM.ComponentsServer.Component.UI;
|
||||||
import Common.Visual.Windows.Dialog.Dialog;
|
import Common.Visual.Windows.Dialog.Dialog;
|
||||||
public class PublishForm extends Dialog<String, PublishFields> {
|
public class PublishForm extends Dialog<String, PublishFields> {
|
||||||
public PublishForm() {
|
public PublishForm() {
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
package _VisualDVM.Repository.Component;
|
package _VisualDVM.ComponentsServer.Component;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import _VisualDVM.Constants;
|
import _VisualDVM.Constants;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Component;
|
package _VisualDVM.ComponentsServer.Component;
|
||||||
import Common.Passes.PassException;
|
import Common.Passes.PassException;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.UI;
|
import Common.Visual.UI;
|
||||||
@@ -73,7 +73,9 @@ public class Visualizer_2 extends OSDComponent {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public String getAssemblyCommand() {
|
public String getAssemblyCommand() {
|
||||||
return "cd Repo/sapfor/experts/Sapfor_2017/_src/Server\n" +
|
File src_home= Paths.get(Global.RepoDirectory.getAbsolutePath(),"/sapfor/experts/Sapfor_2017/_src/Server").toFile();
|
||||||
|
return "cd " +Utils_.DQuotes(src_home)+
|
||||||
|
"\n" +
|
||||||
"g++ -O3 -std=c++17 checkUniq.cpp server.cpp -o Visualizer_2 -lpthread -lstdc++fs\n";
|
"g++ -O3 -std=c++17 checkUniq.cpp server.cpp -o Visualizer_2 -lpthread -lstdc++fs\n";
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
@@ -1,10 +1,18 @@
|
|||||||
package _VisualDVM.Repository.Server;
|
package _VisualDVM.ComponentsServer;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
import Common.Database.RepositoryRefuseException;
|
import Common.Database.RepositoryRefuseException;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.Json.BugReportAdditionJson;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.ComponentType;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Json.ComponentPublicationInfoJson;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Json.ComponentVersionsInfoJson;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
|
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
||||||
import _VisualDVM.Constants;
|
import _VisualDVM.Constants;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Account.Account;
|
import _VisualDVM.GlobalData.Account.Account;
|
||||||
|
import _VisualDVM.GlobalData.Account.AccountRole;
|
||||||
import _VisualDVM.GlobalData.Machine.Machine;
|
import _VisualDVM.GlobalData.Machine.Machine;
|
||||||
import _VisualDVM.GlobalData.Machine.MachineType;
|
import _VisualDVM.GlobalData.Machine.MachineType;
|
||||||
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
|
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
|
||||||
@@ -13,18 +21,12 @@ import _VisualDVM.Passes.All.ArchivesBackupPass;
|
|||||||
import _VisualDVM.Passes.All.UnzipFolderPass;
|
import _VisualDVM.Passes.All.UnzipFolderPass;
|
||||||
import _VisualDVM.Passes.All.ZipFolderPass;
|
import _VisualDVM.Passes.All.ZipFolderPass;
|
||||||
import _VisualDVM.ProjectData.LanguageName;
|
import _VisualDVM.ProjectData.LanguageName;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
import _VisualDVM.Repository.BugReport.Json.BugReportAdditionJson;
|
|
||||||
import _VisualDVM.Repository.BugReportsDatabase;
|
|
||||||
import _VisualDVM.Repository.Component.ComponentType;
|
|
||||||
import _VisualDVM.Repository.Component.Json.ComponentPublicationInfoJson;
|
|
||||||
import _VisualDVM.Repository.Component.Json.ComponentVersionsInfoJson;
|
|
||||||
import _VisualDVM.Repository.EmailMessage;
|
import _VisualDVM.Repository.EmailMessage;
|
||||||
import _VisualDVM.Repository.RepositoryServer;
|
import _VisualDVM.Repository.Server.RepositoryServer;
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
|
||||||
import _VisualDVM.Utils;
|
import _VisualDVM.Utils;
|
||||||
import javafx.util.Pair;
|
import javafx.util.Pair;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
|
import org.apache.commons.lang.RandomStringUtils;
|
||||||
|
|
||||||
import java.io.BufferedWriter;
|
import java.io.BufferedWriter;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -37,6 +39,8 @@ import java.util.Calendar;
|
|||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
||||||
|
public CredentialsDatabase credentials_db = null;
|
||||||
|
//--
|
||||||
public static ZipFolderPass zip = new ZipFolderPass();
|
public static ZipFolderPass zip = new ZipFolderPass();
|
||||||
public static UnzipFolderPass unzip = new UnzipFolderPass();
|
public static UnzipFolderPass unzip = new UnzipFolderPass();
|
||||||
public static ArchivesBackupPass backupSession = new ArchivesBackupPass();
|
public static ArchivesBackupPass backupSession = new ArchivesBackupPass();
|
||||||
@@ -138,6 +142,13 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
|||||||
Email(message, address);
|
Email(message, address);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//--
|
||||||
|
try {
|
||||||
|
credentials_db = new CredentialsDatabase();
|
||||||
|
credentials_db.Activate();
|
||||||
|
} catch (Exception ex) {
|
||||||
|
ex.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void startAdditionalThreads() {
|
protected void startAdditionalThreads() {
|
||||||
@@ -328,11 +339,32 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
|||||||
Print("Получить компонент " + packed1[0]);
|
Print("Получить компонент " + packed1[0]);
|
||||||
response.object = Utils_.fileToBytes(componentFile1);
|
response.object = Utils_.fileToBytes(componentFile1);
|
||||||
}
|
}
|
||||||
|
void GetUserAccountByKey() throws Exception {
|
||||||
|
UserAccount account = credentials_db.userAccounts.getByKey(request.arg);
|
||||||
|
response.object = account==null? null: account;
|
||||||
|
}
|
||||||
|
void GetUserAccountByEmail() throws Exception {
|
||||||
|
UserAccount account_info = (UserAccount) request.object;
|
||||||
|
UserAccount account = credentials_db.userAccounts.getByEmail(account_info.email);
|
||||||
|
if (account==null){
|
||||||
|
account = new UserAccount(account_info);
|
||||||
|
account.role = Constants.admins_mails.contains(account.email)? AccountRole.Admin: AccountRole.User;
|
||||||
|
account.security_key = RandomStringUtils.random(100, true, true);
|
||||||
|
credentials_db.Insert(account);
|
||||||
|
}
|
||||||
|
response.object = account;
|
||||||
|
}
|
||||||
//--
|
//--
|
||||||
@Override
|
@Override
|
||||||
protected void UnsafeSession() throws Exception {
|
protected void UnsafeSession() throws Exception {
|
||||||
switch (code) {
|
switch (code) {
|
||||||
case CheckSubscriberRole:
|
case GetUserAccountByKey:
|
||||||
|
GetUserAccountByKey();
|
||||||
|
break;
|
||||||
|
case GetUserAccountByEmail:
|
||||||
|
GetUserAccountByEmail();
|
||||||
|
break;
|
||||||
|
case CheckSubscriberRole: //todo устарело
|
||||||
CheckSubscriberRole();
|
CheckSubscriberRole();
|
||||||
break;
|
break;
|
||||||
case GetComponentsBackups:
|
case GetComponentsBackups:
|
||||||
20
src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
Normal file
20
src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
package _VisualDVM.ComponentsServer;
|
||||||
|
import Common.Database.SQLITE.SQLiteDatabase;
|
||||||
|
import Common.Passes.PassCode_;
|
||||||
|
import _VisualDVM.ComponentsServer.UserAccount.UserAccountsDBTable;
|
||||||
|
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
public class CredentialsDatabase extends SQLiteDatabase {
|
||||||
|
public UserAccountsDBTable userAccounts;
|
||||||
|
public CredentialsDatabase() {
|
||||||
|
super(Paths.get(System.getProperty("user.dir"), "Data", "credentials.sqlite").toFile());
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected void initAllTables() throws Exception {
|
||||||
|
addTable(userAccounts = new UserAccountsDBTable());
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public PassCode_ getSynchronizePassCode() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.SubscriberRights;
|
package _VisualDVM.ComponentsServer.SubscriberRights;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
public class SubscriberRights extends DBObject {
|
public class SubscriberRights extends DBObject {
|
||||||
public String email; //почта
|
public String email; //почта
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.SubscriberWorkspace;
|
package _VisualDVM.ComponentsServer.SubscriberWorkspace;
|
||||||
import Common.Database.Objects.iDBObject;
|
import Common.Database.Objects.iDBObject;
|
||||||
public class SubscriberWorkspace extends iDBObject {
|
public class SubscriberWorkspace extends iDBObject {
|
||||||
public String email; //почта
|
public String email; //почта
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
package _VisualDVM.Repository.SubscriberWorkspace;
|
package _VisualDVM.ComponentsServer.SubscriberWorkspace;
|
||||||
import Common.Database.Tables.iDBTable;
|
import Common.Database.Tables.iDBTable;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
import _VisualDVM.Repository.SubscriberWorkspace.UI.SubscriberWorkspacesForm;
|
import _VisualDVM.ComponentsServer.SubscriberWorkspace.UI.SubscriberWorkspacesForm;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
|
public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
package _VisualDVM.Repository.SubscriberWorkspace.UI;
|
package _VisualDVM.ComponentsServer.SubscriberWorkspace.UI;
|
||||||
import Common.Database.Tables.DataSet;
|
import Common.Database.Tables.DataSet;
|
||||||
import Common.Passes.PassCode_;
|
import Common.Passes.PassCode_;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
import Common.Visual.Menus.DataMenuBar;
|
import Common.Visual.Menus.DataMenuBar;
|
||||||
import Common.Visual.Tables.ColumnInfo;
|
import Common.Visual.Tables.ColumnInfo;
|
||||||
|
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
|
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {
|
public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
package _VisualDVM.Repository.Subscribes;
|
package _VisualDVM.ComponentsServer.Subscribes;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
import _VisualDVM.GlobalData.Account.AccountRole;
|
import _VisualDVM.GlobalData.Account.AccountRole;
|
||||||
import com.sun.org.glassfish.gmbal.Description;
|
import com.sun.org.glassfish.gmbal.Description;
|
||||||
public class Subscriber extends DBObject {
|
public class Subscriber extends DBObject {
|
||||||
|
//todo скорее всего вывести.ибо дублер UserAccount
|
||||||
@Description("PRIMARY KEY, UNIQUE")
|
@Description("PRIMARY KEY, UNIQUE")
|
||||||
public String address = "";
|
public String address = "";
|
||||||
@Description("DEFAULT ''")
|
@Description("DEFAULT ''")
|
||||||
@@ -1,14 +1,14 @@
|
|||||||
package _VisualDVM.Repository.Subscribes;
|
package _VisualDVM.ComponentsServer.Subscribes;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
import Common.Database.Tables.DBTable;
|
import Common.Database.Tables.DBTable;
|
||||||
import Common.Database.Tables.FKBehaviour;
|
import Common.Database.Tables.FKBehaviour;
|
||||||
import Common.Database.Tables.FKCurrentObjectBehaviuor;
|
import Common.Database.Tables.FKCurrentObjectBehaviuor;
|
||||||
import Common.Database.Tables.FKDataBehaviour;
|
import Common.Database.Tables.FKDataBehaviour;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
|
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.UI.SubsribersForm;
|
||||||
import _VisualDVM.Constants;
|
import _VisualDVM.Constants;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
|
|
||||||
import _VisualDVM.Repository.Subscribes.UI.SubsribersForm;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
package _VisualDVM.Repository.Subscribes.UI;
|
package _VisualDVM.ComponentsServer.Subscribes.UI;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.UI;
|
import Common.Visual.UI;
|
||||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Account.AccountRole;
|
import _VisualDVM.GlobalData.Account.AccountRole;
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
|
||||||
public class SubscriberDialog extends DBObjectDialog<Subscriber, SubscriberFields> {
|
public class SubscriberDialog extends DBObjectDialog<Subscriber, SubscriberFields> {
|
||||||
public SubscriberDialog() {
|
public SubscriberDialog() {
|
||||||
super(SubscriberFields.class);
|
super(SubscriberFields.class);
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Repository.Subscribes.UI.SubscriberFields">
|
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.ComponentsServer.Subscribes.UI.SubscriberFields">
|
||||||
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||||
<margin top="0" left="0" bottom="0" right="0"/>
|
<margin top="0" left="0" bottom="0" right="0"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Subscribes.UI;
|
package _VisualDVM.ComponentsServer.Subscribes.UI;
|
||||||
import Common.Visual.TextField.StyledTextField;
|
import Common.Visual.TextField.StyledTextField;
|
||||||
import Common.Visual.Windows.Dialog.DialogFields;
|
import Common.Visual.Windows.Dialog.DialogFields;
|
||||||
import _VisualDVM.GlobalData.Account.AccountRole;
|
import _VisualDVM.GlobalData.Account.AccountRole;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package _VisualDVM.Repository.Subscribes.UI;
|
package _VisualDVM.ComponentsServer.Subscribes.UI;
|
||||||
import Common.Database.Tables.DataSet;
|
import Common.Database.Tables.DataSet;
|
||||||
import Common.Passes.PassCode_;
|
import Common.Passes.PassCode_;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
@@ -6,10 +6,10 @@ import Common.Visual.Menus.DataMenuBar;
|
|||||||
import Common.Visual.Tables.ColumnInfo;
|
import Common.Visual.Tables.ColumnInfo;
|
||||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||||
import Common.Visual.Windows.Dialog.DialogFields;
|
import Common.Visual.Windows.Dialog.DialogFields;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Account.AccountRole;
|
import _VisualDVM.GlobalData.Account.AccountRole;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
public class SubsribersForm extends DataSetControlForm<Subscriber> {
|
public class SubsribersForm extends DataSetControlForm<Subscriber> {
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
package _VisualDVM.ComponentsServer.UserAccount.UI;
|
||||||
|
import Common.Utils.Utils_;
|
||||||
|
import Common.Visual.UI;
|
||||||
|
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||||
|
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
||||||
|
import _VisualDVM.Global;
|
||||||
|
import _VisualDVM.GlobalData.Account.AccountRole;
|
||||||
|
public class UserAccountDialog extends DBObjectDialog<UserAccount, UserAccountFields> {
|
||||||
|
public UserAccountDialog() {
|
||||||
|
super(UserAccountFields.class);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public int getDefaultHeight() {
|
||||||
|
return 250;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public int getDefaultWidth() {
|
||||||
|
return 450;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void validateFields() {
|
||||||
|
if (fields.tfName.getText().isEmpty())
|
||||||
|
Log.Writeln("Имя учётной записи не может быть пустым");
|
||||||
|
Utils_.validateEmail(fields.tfAddress.getText(), Log);
|
||||||
|
if (fields.tfAddress.getText().isEmpty())
|
||||||
|
Log.Writeln_("Адрес электронной почты не может быть пустым");
|
||||||
|
if (!title_text.equals("Регистрация") && (fields.tfAddress.isEditable() && Global.componentsServer.db.subscribers.Data.containsKey(fields.tfAddress.getText()))) {
|
||||||
|
Log.Writeln_("Адрес электронной почты " + Utils_.Brackets(fields.tfAddress.getText()) + " уже есть в списке.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void fillFields() {
|
||||||
|
fields.tfName.setText(Result.name);
|
||||||
|
fields.tfAddress.setText(Result.email);
|
||||||
|
fields.cbMail.setSelected(Result.subscribe_active != 0);
|
||||||
|
UI.TrySelect(fields.cbRole, Result.role);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void SetEditLimits() {
|
||||||
|
fields.tfAddress.setEditable(false);
|
||||||
|
}
|
||||||
|
private AccountRole getSelectedRole() {
|
||||||
|
return (AccountRole) fields.cbRole.getSelectedItem();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void ProcessResult() {
|
||||||
|
Result.name = fields.tfName.getText();
|
||||||
|
Result.email = fields.tfAddress.getText();
|
||||||
|
Result.subscribe_active = fields.cbMail.isSelected() ? 1 : 0;
|
||||||
|
Result.role = getSelectedRole();
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.ComponentsServer.UserAccount.UI.UserAccountFields">
|
||||||
|
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||||
|
<margin top="0" left="0" bottom="0" right="0"/>
|
||||||
|
<constraints>
|
||||||
|
<xy x="20" y="20" width="500" height="400"/>
|
||||||
|
</constraints>
|
||||||
|
<properties/>
|
||||||
|
<border type="none"/>
|
||||||
|
<children>
|
||||||
|
<component id="5e1da" class="javax.swing.JLabel">
|
||||||
|
<constraints>
|
||||||
|
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
|
||||||
|
</constraints>
|
||||||
|
<properties>
|
||||||
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
|
<text value="имя"/>
|
||||||
|
</properties>
|
||||||
|
</component>
|
||||||
|
<vspacer id="de3f0">
|
||||||
|
<constraints>
|
||||||
|
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
|
||||||
|
</constraints>
|
||||||
|
</vspacer>
|
||||||
|
<component id="e0e31" class="javax.swing.JTextField" binding="tfName" custom-create="true">
|
||||||
|
<constraints>
|
||||||
|
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||||
|
<preferred-size width="150" height="-1"/>
|
||||||
|
</grid>
|
||||||
|
</constraints>
|
||||||
|
<properties/>
|
||||||
|
</component>
|
||||||
|
<component id="c014a" class="javax.swing.JLabel">
|
||||||
|
<constraints>
|
||||||
|
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
|
||||||
|
</constraints>
|
||||||
|
<properties>
|
||||||
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
|
<text value="адрес"/>
|
||||||
|
</properties>
|
||||||
|
</component>
|
||||||
|
<component id="2761d" class="javax.swing.JTextField" binding="tfAddress" custom-create="true">
|
||||||
|
<constraints>
|
||||||
|
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||||
|
<preferred-size width="150" height="-1"/>
|
||||||
|
</grid>
|
||||||
|
</constraints>
|
||||||
|
<properties/>
|
||||||
|
</component>
|
||||||
|
<component id="15e49" class="javax.swing.JLabel">
|
||||||
|
<constraints>
|
||||||
|
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
|
||||||
|
</constraints>
|
||||||
|
<properties>
|
||||||
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
|
<text value="рассылка"/>
|
||||||
|
</properties>
|
||||||
|
</component>
|
||||||
|
<component id="4da2" class="javax.swing.JCheckBox" binding="cbMail">
|
||||||
|
<constraints>
|
||||||
|
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
|
||||||
|
</constraints>
|
||||||
|
<properties>
|
||||||
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
|
<horizontalAlignment value="0"/>
|
||||||
|
<icon value="Common/icons/NotPick.png"/>
|
||||||
|
<selectedIcon value="Common/icons/Pick.png"/>
|
||||||
|
<text value=""/>
|
||||||
|
<toolTipText value="Будет ли включена рассылка для этого пользователя"/>
|
||||||
|
</properties>
|
||||||
|
</component>
|
||||||
|
<component id="398ee" class="javax.swing.JLabel">
|
||||||
|
<constraints>
|
||||||
|
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
|
||||||
|
</constraints>
|
||||||
|
<properties>
|
||||||
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
|
<text value="роль"/>
|
||||||
|
</properties>
|
||||||
|
</component>
|
||||||
|
<component id="34bef" class="javax.swing.JComboBox" binding="cbRole" custom-create="true">
|
||||||
|
<constraints>
|
||||||
|
<grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
|
||||||
|
</constraints>
|
||||||
|
<properties/>
|
||||||
|
</component>
|
||||||
|
</children>
|
||||||
|
</grid>
|
||||||
|
</form>
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package _VisualDVM.ComponentsServer.UserAccount.UI;
|
||||||
|
import Common.Visual.TextField.StyledTextField;
|
||||||
|
import Common.Visual.Windows.Dialog.DialogFields;
|
||||||
|
import _VisualDVM.GlobalData.Account.AccountRole;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import java.awt.*;
|
||||||
|
public class UserAccountFields implements DialogFields {
|
||||||
|
private JPanel content;
|
||||||
|
public JTextField tfName;
|
||||||
|
public JTextField tfAddress;
|
||||||
|
public JCheckBox cbMail;
|
||||||
|
public JComboBox cbRole;
|
||||||
|
private void createUIComponents() {
|
||||||
|
// TODO: place custom component creation code here
|
||||||
|
tfName = new StyledTextField();
|
||||||
|
tfAddress = new StyledTextField();
|
||||||
|
cbRole = new JComboBox<>();
|
||||||
|
cbRole.addItem(AccountRole.User);
|
||||||
|
cbRole.addItem(AccountRole.Developer);
|
||||||
|
cbRole.addItem(AccountRole.Admin);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public Component getContent() {
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
}
|
||||||
30
src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java
Normal file
30
src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
package _VisualDVM.ComponentsServer.UserAccount;
|
||||||
|
import Common.Database.Objects.DBObject;
|
||||||
|
import Common.Database.Objects.iDBObject;
|
||||||
|
import _VisualDVM.GlobalData.Account.AccountRole;
|
||||||
|
import com.sun.org.glassfish.gmbal.Description;
|
||||||
|
public class UserAccount extends iDBObject {
|
||||||
|
public String name = "";
|
||||||
|
public String email = "";
|
||||||
|
@Description("DEFAULT 1")
|
||||||
|
public int subscribe_active = 1;
|
||||||
|
public String security_key = "";
|
||||||
|
@Description("DEFAULT 'User'")
|
||||||
|
public AccountRole role = AccountRole.User; //права доступа
|
||||||
|
public UserAccount(){
|
||||||
|
|
||||||
|
}
|
||||||
|
public UserAccount(UserAccount account_in) {
|
||||||
|
this.SynchronizeFields(account_in);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void SynchronizeFields(DBObject src) {
|
||||||
|
super.SynchronizeFields(src);
|
||||||
|
UserAccount src_ = (UserAccount) src;
|
||||||
|
name = src_.name;
|
||||||
|
email = src_.email;
|
||||||
|
subscribe_active=src_.subscribe_active;
|
||||||
|
security_key = src_.security_key;
|
||||||
|
role = src_.role;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package _VisualDVM.ComponentsServer.UserAccount;
|
||||||
|
import Common.Database.Tables.iDBTable;
|
||||||
|
public class UserAccountsDBTable extends iDBTable<UserAccount> {
|
||||||
|
public UserAccountsDBTable() {
|
||||||
|
super(UserAccount.class);
|
||||||
|
}
|
||||||
|
public UserAccount getByKey(String key_in){
|
||||||
|
for (UserAccount userAccount: Data.values()){
|
||||||
|
if (userAccount.security_key.equals(key_in))
|
||||||
|
return userAccount;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
public UserAccount getByEmail(String email_in){
|
||||||
|
for (UserAccount userAccount: Data.values()){
|
||||||
|
if (userAccount.email.equals(email_in))
|
||||||
|
return userAccount;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
|
|||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class Constants {
|
public class Constants {
|
||||||
public static final int version = 1173;
|
public static final int version = 1177;
|
||||||
public static final int planner_version = 10;
|
public static final int planner_version = 10;
|
||||||
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
|
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
|
||||||
//--
|
//--
|
||||||
@@ -22,6 +22,7 @@ public class Constants {
|
|||||||
public static final String TestsDirectoryName = "Tests";
|
public static final String TestsDirectoryName = "Tests";
|
||||||
public static final String DVMPackagesDirectoryName = "DVMPackages";
|
public static final String DVMPackagesDirectoryName = "DVMPackages";
|
||||||
public static final String PerformanceAnalyzerDirectoryName = "PerformanceAnalyzer";
|
public static final String PerformanceAnalyzerDirectoryName = "PerformanceAnalyzer";
|
||||||
|
public static final String KeyDirectoryName = "Key";
|
||||||
//--
|
//--
|
||||||
//SVN vmk-post@yandex.ru
|
//SVN vmk-post@yandex.ru
|
||||||
public static final String REPOSITORY_AUTHENTICATION = "--username dvmhuser --password dvmh2013 --non-interactive";
|
public static final String REPOSITORY_AUTHENTICATION = "--username dvmhuser --password dvmh2013 --non-interactive";
|
||||||
@@ -43,7 +44,7 @@ public class Constants {
|
|||||||
public static final String SMTPHost = "smtp.mail.ru";
|
public static final String SMTPHost = "smtp.mail.ru";
|
||||||
public static final int SMTPPort = 465;
|
public static final int SMTPPort = 465;
|
||||||
public static final int MailSocketPort = 465;
|
public static final int MailSocketPort = 465;
|
||||||
public static final int ComponentsServerPort = 7995;
|
public static final int ComponentsServerPort = 7996;// 7995;
|
||||||
public static final int TestingServerPort = 7998;
|
public static final int TestingServerPort = 7998;
|
||||||
public static final int SocketTimeout = 0;
|
public static final int SocketTimeout = 0;
|
||||||
//-
|
//-
|
||||||
|
|||||||
@@ -2,14 +2,14 @@ package _VisualDVM;
|
|||||||
import Common.Utils.Loggable;
|
import Common.Utils.Loggable;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.UI;
|
import Common.Visual.UI;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.ComponentsSet;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.PerformanceAnalyzer.PerformanceAnalyzer;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Sapfor.MessagesServer;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Visualiser;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Visualizer_2;
|
||||||
|
import _VisualDVM.ComponentsServer.ComponentsServer;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.ProjectData.ProjectView;
|
import _VisualDVM.ProjectData.ProjectView;
|
||||||
import _VisualDVM.Repository.Component.ComponentsSet;
|
|
||||||
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
|
|
||||||
import _VisualDVM.Repository.Component.Sapfor.MessagesServer;
|
|
||||||
import _VisualDVM.Repository.Component.Visualiser;
|
|
||||||
import _VisualDVM.Repository.Component.Visualizer_2;
|
|
||||||
import _VisualDVM.Repository.Server.ComponentsServer;
|
|
||||||
import _VisualDVM.TestingSystem.Common.TestingServer;
|
import _VisualDVM.TestingSystem.Common.TestingServer;
|
||||||
import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
|
import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
|
||||||
import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor;
|
import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor;
|
||||||
@@ -35,6 +35,7 @@ public class Global {
|
|||||||
public static ComponentsSet components = null;
|
public static ComponentsSet components = null;
|
||||||
public static MessagesServer messagesServer = null;
|
public static MessagesServer messagesServer = null;
|
||||||
public static File ComponentsDirectory;
|
public static File ComponentsDirectory;
|
||||||
|
public static File KeyDirectory;
|
||||||
public static File DataDirectory;
|
public static File DataDirectory;
|
||||||
public static File BugReportsDirectory;
|
public static File BugReportsDirectory;
|
||||||
public static File BackUpsDirectory;
|
public static File BackUpsDirectory;
|
||||||
@@ -73,9 +74,8 @@ public class Global {
|
|||||||
Utils_.CheckDirectory(TestsDirectory = new File(Utils_.getHomeDirectory(), Constants.TestsDirectoryName));
|
Utils_.CheckDirectory(TestsDirectory = new File(Utils_.getHomeDirectory(), Constants.TestsDirectoryName));
|
||||||
Utils_.CheckDirectory(PerformanceAnalyzerDirectory = new File(Utils_.getHomeDirectory(), Constants.PerformanceAnalyzerDirectoryName));
|
Utils_.CheckDirectory(PerformanceAnalyzerDirectory = new File(Utils_.getHomeDirectory(), Constants.PerformanceAnalyzerDirectoryName));
|
||||||
Utils_.CheckDirectory(DVMPackagesDirectory = new File(Utils_.getHomeDirectory(), Constants.DVMPackagesDirectoryName));
|
Utils_.CheckDirectory(DVMPackagesDirectory = new File(Utils_.getHomeDirectory(), Constants.DVMPackagesDirectoryName));
|
||||||
//через пару версий заменить на clean.
|
|
||||||
Utils_.CheckDirectory(SapforPackagesDirectory = new File(Utils_.getHomeDirectory(), "SapforPackages"));
|
Utils_.CheckDirectory(SapforPackagesDirectory = new File(Utils_.getHomeDirectory(), "SapforPackages"));
|
||||||
Utils_.CheckDirectory(MachinesDirectory = new File(Utils_.getHomeDirectory(), "Machines"));
|
Utils_.CheckDirectory(KeyDirectory = new File(Utils_.getHomeDirectory(), Constants.KeyDirectoryName));
|
||||||
}
|
}
|
||||||
public static void CheckServerDirectories() {
|
public static void CheckServerDirectories() {
|
||||||
Utils_.CheckDirectory(ComponentsDirectory = new File(Utils_.getHomeDirectory(), Constants.ComponentsDirectoryName));
|
Utils_.CheckDirectory(ComponentsDirectory = new File(Utils_.getHomeDirectory(), Constants.ComponentsDirectoryName));
|
||||||
@@ -84,7 +84,6 @@ public class Global {
|
|||||||
//-
|
//-
|
||||||
Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
|
Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
|
||||||
Utils_.CheckDirectory(DataBackUpsDirectory = new File(Utils_.getHomeDirectory(), Constants.DataBackUpsDirectoryName));
|
Utils_.CheckDirectory(DataBackUpsDirectory = new File(Utils_.getHomeDirectory(), Constants.DataBackUpsDirectoryName));
|
||||||
Utils_.CheckDirectory(MachinesDirectory = new File(Utils_.getHomeDirectory(), "Machines"));
|
|
||||||
}
|
}
|
||||||
public static void CheckTestingSystemDirectories() {
|
public static void CheckTestingSystemDirectories() {
|
||||||
Utils_.CheckDirectory(ComponentsDirectory = new File(Utils_.getHomeDirectory(), Constants.ComponentsDirectoryName));
|
Utils_.CheckDirectory(ComponentsDirectory = new File(Utils_.getHomeDirectory(), Constants.ComponentsDirectoryName));
|
||||||
@@ -196,8 +195,8 @@ public class Global {
|
|||||||
// FoldParserManager.get().addFoldParserMapping("text/FortranSPF", new FortranFolder()); блоки кода. todo
|
// FoldParserManager.get().addFoldParserMapping("text/FortranSPF", new FortranFolder()); блоки кода. todo
|
||||||
//light_editor.xml-------->>
|
//light_editor.xml-------->>
|
||||||
mainModule.ActivateDB();
|
mainModule.ActivateDB();
|
||||||
|
// https://habr.com/ru/articles/446888/ сертификат?
|
||||||
/*
|
/*
|
||||||
https://habr.com/ru/articles/446888/ сертификат?
|
|
||||||
mainModule.set(Current.Account, new Account() {
|
mainModule.set(Current.Account, new Account() {
|
||||||
{
|
{
|
||||||
name = "M";
|
name = "M";
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package _VisualDVM.GlobalData.Account;
|
package _VisualDVM.GlobalData.Account;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
import Common.Utils.TextLog;
|
import Common.Utils.TextLog;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
import com.sun.org.glassfish.gmbal.Description;
|
import com.sun.org.glassfish.gmbal.Description;
|
||||||
public class Account extends DBObject {
|
public class Account extends DBObject {
|
||||||
@Description("PRIMARY KEY,NOT NULL")
|
@Description("PRIMARY KEY,NOT NULL")
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package _VisualDVM.GlobalData.Machine.UI;
|
package _VisualDVM.GlobalData.Machine.UI;
|
||||||
import Common.Database.Tables.DataSet;
|
import Common.Database.Tables.DataSet;
|
||||||
import Common.Passes.PassCode_;
|
import Common.Passes.PassCode_;
|
||||||
import Common.Visual.Controls.MenuBarButton;
|
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
import Common.Visual.Menus.DataMenuBar;
|
import Common.Visual.Menus.DataMenuBar;
|
||||||
import Common.Visual.Tables.ColumnInfo;
|
import Common.Visual.Tables.ColumnInfo;
|
||||||
@@ -12,8 +11,6 @@ import _VisualDVM.GlobalData.Machine.Machine;
|
|||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.event.ActionEvent;
|
|
||||||
import java.awt.event.ActionListener;
|
|
||||||
public class MachinesForm extends DataSetControlForm<Machine> {
|
public class MachinesForm extends DataSetControlForm<Machine> {
|
||||||
public MachinesForm(DataSet<?, Machine> dataSource_in, JPanel mountPanel_in) {
|
public MachinesForm(DataSet<?, Machine> dataSource_in, JPanel mountPanel_in) {
|
||||||
super(dataSource_in, mountPanel_in);
|
super(dataSource_in, mountPanel_in);
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package _VisualDVM;
|
package _VisualDVM;
|
||||||
import Common.MainModule_;
|
import Common.MainModule_;
|
||||||
import Common.Utils.Vector_;
|
import Common.Utils.Vector_;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
|
||||||
import _VisualDVM.GlobalData.Account.Account;
|
import _VisualDVM.GlobalData.Account.Account;
|
||||||
import _VisualDVM.GlobalData.GlobalDatabase;
|
import _VisualDVM.GlobalData.GlobalDatabase;
|
||||||
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
|
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
|
||||||
@@ -9,7 +10,6 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
|
|||||||
import _VisualDVM.ProjectData.Project.db_project_info;
|
import _VisualDVM.ProjectData.Project.db_project_info;
|
||||||
import _VisualDVM.ProjectData.ProjectView;
|
import _VisualDVM.ProjectData.ProjectView;
|
||||||
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
|
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
|
||||||
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
|
|
||||||
import _VisualDVM.Visual.MainUI;
|
import _VisualDVM.Visual.MainUI;
|
||||||
|
|
||||||
import javax.swing.tree.DefaultMutableTreeNode;
|
import javax.swing.tree.DefaultMutableTreeNode;
|
||||||
@@ -52,7 +52,8 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
|
|||||||
//--
|
//--
|
||||||
public boolean HasAccount() {
|
public boolean HasAccount() {
|
||||||
return get(Current.Account) != null;
|
return get(Current.Account) != null;
|
||||||
} //Бессмысленно. аккаунт всегда подразумевается. вывести.
|
}
|
||||||
|
//todo Бессмысленно. аккаунт всегда подразумевается. вывести.
|
||||||
public Account getAccount() {
|
public Account getAccount() {
|
||||||
return (Account) get(Current.Account);
|
return (Account) get(Current.Account);
|
||||||
} //временно
|
} //временно
|
||||||
|
|||||||
@@ -1,12 +1,21 @@
|
|||||||
package _VisualDVM;
|
package _VisualDVM;
|
||||||
import Common.CommonConstants;
|
import Common.CommonConstants;
|
||||||
|
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
||||||
|
import _VisualDVM.GlobalData.Account.AccountRole;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import com.google.gson.annotations.Expose;
|
import com.google.gson.annotations.Expose;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
public class NormalProperties extends VisualDVMProperties {
|
public class NormalProperties extends VisualDVMProperties {
|
||||||
//---
|
//--->
|
||||||
|
@Expose
|
||||||
|
public String Email = "";
|
||||||
|
@Expose
|
||||||
|
public String Name = "";
|
||||||
|
@Expose
|
||||||
|
public AccountRole Role = AccountRole.Undefined;
|
||||||
|
//--->
|
||||||
@Expose
|
@Expose
|
||||||
public String Workspace = "";
|
public String Workspace = "";
|
||||||
@Expose
|
@Expose
|
||||||
@@ -103,6 +112,8 @@ public class NormalProperties extends VisualDVMProperties{
|
|||||||
@Override
|
@Override
|
||||||
public String getFieldDescription(String fieldName) {
|
public String getFieldDescription(String fieldName) {
|
||||||
switch (fieldName) {
|
switch (fieldName) {
|
||||||
|
case "Email":
|
||||||
|
return "Адрес электронной почты";
|
||||||
case "Kernels":
|
case "Kernels":
|
||||||
return "Число ядер при компиляции";
|
return "Число ядер при компиляции";
|
||||||
case "LocalMakePathWindows":
|
case "LocalMakePathWindows":
|
||||||
@@ -159,4 +170,10 @@ public class NormalProperties extends VisualDVMProperties{
|
|||||||
public boolean controlAction(String fieldName, JMenuItem control) {
|
public boolean controlAction(String fieldName, JMenuItem control) {
|
||||||
return (Global.mainModule.getPass(PassCode.UpdateProperty).Do(fieldName));
|
return (Global.mainModule.getPass(PassCode.UpdateProperty).Do(fieldName));
|
||||||
}
|
}
|
||||||
|
public void SynchronizeAccount(UserAccount account){
|
||||||
|
Name = account.name;
|
||||||
|
Email = account.email;
|
||||||
|
Role = account.role;
|
||||||
|
Update();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,12 +3,12 @@ import Common.Database.Database;
|
|||||||
import Common.Passes.AddObjectPass;
|
import Common.Passes.AddObjectPass;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.UI;
|
import Common.Visual.UI;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.ComponentType;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Account.AccountRole;
|
import _VisualDVM.GlobalData.Account.AccountRole;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
import _VisualDVM.Repository.BugReport.BugReportState;
|
|
||||||
import _VisualDVM.Repository.Component.ComponentType;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
|
import _VisualDVM.ComponentsServer.ComponentsServer;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.Server.PublishServerObject;
|
import _VisualDVM.Passes.Server.PublishServerObject;
|
||||||
import _VisualDVM.Repository.Server.ComponentsServer;
|
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
|
||||||
public class AddSubscriber extends PublishServerObject<ComponentsServer, Subscriber> {
|
public class AddSubscriber extends PublishServerObject<ComponentsServer, Subscriber> {
|
||||||
public AddSubscriber() {
|
public AddSubscriber() {
|
||||||
super(Global.componentsServer, Subscriber.class);
|
super(Global.componentsServer, Subscriber.class);
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.Json.BugReportAdditionJson;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
import _VisualDVM.Repository.BugReport.Json.BugReportAdditionJson;
|
|
||||||
import _VisualDVM.Repository.EmailMessage;
|
import _VisualDVM.Repository.EmailMessage;
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Passes.Pass;
|
import Common.Passes.Pass;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
public class ApplyBugReportSettings extends Pass<BugReport> {
|
public class ApplyBugReportSettings extends Pass<BugReport> {
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
|
|||||||
@@ -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.ComponentsServer.Component.Component;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Passes.ProcessPass;
|
import _VisualDVM.Passes.ProcessPass;
|
||||||
import _VisualDVM.Repository.Component.Component;
|
|
||||||
|
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.StandardCopyOption;
|
import java.nio.file.StandardCopyOption;
|
||||||
|
|||||||
@@ -1,56 +1,60 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Passes.Pass;
|
import Common.Utils.Utils_;
|
||||||
|
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
public class CheckAccount extends Pass<Boolean> {
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
@Override
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
import org.apache.commons.io.FileUtils;
|
||||||
target = false;
|
|
||||||
return true;
|
import java.io.File;
|
||||||
}
|
public class CheckAccount extends ComponentsServerPass<UserAccount> {
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
return "/icons/Registry.png";
|
return "/icons/Registry.png";
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public String getButtonText() {
|
protected boolean isSafe() {
|
||||||
return "";
|
return false;
|
||||||
|
}
|
||||||
|
File keyFile;
|
||||||
|
void confirmEmail() throws Exception{
|
||||||
|
ConfirmEmail confirmEmailPass = (ConfirmEmail) Global.mainModule.getPass(PassCode.ConfirmEmail);;
|
||||||
|
if (confirmEmailPass.Do()){
|
||||||
|
UserAccount userAccount = confirmEmailPass.target;
|
||||||
|
//подтвердили почту. теперь проверяем ее роль на сервере. если на сервере нет акка будет создан
|
||||||
|
if (SendRequest(ServerCode.GetUserAccountByEmail, null,userAccount)){
|
||||||
|
target = (UserAccount) request.server_response.object;
|
||||||
|
FileUtils.writeStringToFile(keyFile, target.security_key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
|
target =null;
|
||||||
|
keyFile = new File(Global.KeyDirectory, "key");
|
||||||
|
//--
|
||||||
|
//1. Ищем ключ.
|
||||||
|
if (keyFile.exists()) {
|
||||||
|
//ключ есть. проверить его актуальность.
|
||||||
|
if (SendRequest(ServerCode.GetUserAccountByKey, FileUtils.readFileToString(keyFile))){
|
||||||
|
if (request.server_response!=null){
|
||||||
|
//ключ актуальный.
|
||||||
|
target = (UserAccount) request.server_response.object;
|
||||||
|
}else {
|
||||||
|
//ключ неактуальный. регистрируемся по новой.
|
||||||
|
Utils_.forceDeleteWithCheck(keyFile);
|
||||||
|
confirmEmail();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
confirmEmail();
|
||||||
|
}
|
||||||
|
return target!=null;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void body() throws Exception {
|
protected void body() throws Exception {
|
||||||
/*
|
Global.normalProperties.SynchronizeAccount(target);
|
||||||
switch (Current.getAccount().email){
|
|
||||||
case "vmk-post@yandex.ru":
|
|
||||||
case "79854210702@ya.ru":
|
|
||||||
Current.getAccount().role = AccountRole.Admin;
|
|
||||||
target = true;
|
|
||||||
break;
|
|
||||||
case "npodderyugina@gmail.com":
|
|
||||||
case "savol@keldysh.ru":
|
|
||||||
case "mkocharmin@yandex.ru":
|
|
||||||
case "juk.06@list.ru":
|
|
||||||
Current.getAccount().role = AccountRole.Developer;
|
|
||||||
target = true;
|
|
||||||
break;
|
|
||||||
case "?":
|
|
||||||
Current.getAccount().role = AccountRole.Undefined;
|
|
||||||
target = false;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
Current.getAccount().role =AccountRole.User;
|
|
||||||
target = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
//временно. оффлайн проверка по почте
|
|
||||||
target = Global.mainModule.getAccount().email.equals("?") ?
|
|
||||||
(Global.mainModule.getPass(PassCode.EditAccount).Do() &&
|
|
||||||
Global.mainModule.getPass(PassCode.CheckRegistrationOnServer).Do()) :
|
|
||||||
(Global.mainModule.getPass(PassCode.CheckRegistrationOnServer).Do());
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected boolean validate() {
|
|
||||||
return target;
|
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void showDone() throws Exception {
|
protected void showDone() throws Exception {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
|
||||||
public class CheckRegistrationOnServer extends ComponentsServerPass<Subscriber> {
|
public class CheckRegistrationOnServer extends ComponentsServerPass<Subscriber> {
|
||||||
@Override
|
@Override
|
||||||
protected boolean isSafe() {
|
protected boolean isSafe() {
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.MainModule_;
|
import Common.MainModule_;
|
||||||
|
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Machine.Machine;
|
import _VisualDVM.GlobalData.Machine.Machine;
|
||||||
import _VisualDVM.GlobalData.User.User;
|
import _VisualDVM.GlobalData.User.User;
|
||||||
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
|
|
||||||
public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
|
public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
|
||||||
@Override
|
@Override
|
||||||
protected boolean isSafe() {
|
protected boolean isSafe() {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import _VisualDVM.Repository.BugReport.BugReportState;
|
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
|
||||||
public class CloseBugReport extends UpdateBugReportField {
|
public class CloseBugReport extends UpdateBugReportField {
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
|
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Passes.Sapfor.Transformation;
|
import _VisualDVM.Passes.Sapfor.Transformation;
|
||||||
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
||||||
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
|
|
||||||
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
|
|
||||||
import _VisualDVM.Utils;
|
import _VisualDVM.Utils;
|
||||||
import _VisualDVM.Visual.Windows.CombineFilesDialog;
|
import _VisualDVM.Visual.Windows.CombineFilesDialog;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
|
|||||||
64
src/_VisualDVM/Passes/All/ConfirmEmail.java
Normal file
64
src/_VisualDVM/Passes/All/ConfirmEmail.java
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
package _VisualDVM.Passes.All;
|
||||||
|
import Common.Utils.Utils_;
|
||||||
|
import Common.Visual.UI;
|
||||||
|
import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountDialog;
|
||||||
|
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
||||||
|
import _VisualDVM.Global;
|
||||||
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
|
import _VisualDVM.Repository.EmailMessage;
|
||||||
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
public class ConfirmEmail extends ComponentsServerPass<UserAccount> {
|
||||||
|
String password;
|
||||||
|
UserAccountDialog f = new UserAccountDialog() {
|
||||||
|
{
|
||||||
|
fields.tfName.setText(Global.normalProperties.Email);
|
||||||
|
fields.tfAddress.setText(Global.normalProperties.Email);
|
||||||
|
fields.cbRole.setEnabled(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
public static int getRandomIntegerBetweenRange(int min, int max) {
|
||||||
|
return (int) ((Math.random() * ((max - min) + 1)) + min);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected boolean isSafe() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
|
target = new UserAccount(); // объект для заполнения полей.не более.
|
||||||
|
password = null;
|
||||||
|
if (f.ShowDialog("Регистрация", target)) {
|
||||||
|
if (!Utils_.validateEmail(target.email, Log)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
password = String.valueOf(getRandomIntegerBetweenRange(1111, 9999));
|
||||||
|
return SendRequest(ServerCode.Email,
|
||||||
|
target.email,
|
||||||
|
new EmailMessage("Код подтверждения визуализатора для: " + Utils_.Brackets(target.name), password));
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected boolean validate() {
|
||||||
|
String attempt = null;
|
||||||
|
do {
|
||||||
|
attempt = JOptionPane.showInputDialog(null,
|
||||||
|
new String[]{"Введите код активации, полученный по почте"},
|
||||||
|
"Подтверждение адреса почты",
|
||||||
|
JOptionPane.INFORMATION_MESSAGE);
|
||||||
|
if (attempt != null) {
|
||||||
|
if (attempt.equals(password)) {
|
||||||
|
UI.Info("Почта успешно подтверждена!");
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
UI.Error("Неверный код активации.\nПовторите попытку.");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
UI.Info("Подтверждение почты отменено");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} while (true);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,12 +3,12 @@ import Common.Passes.Pass;
|
|||||||
import Common.Passes.PassException;
|
import Common.Passes.PassException;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.Windows.Dialog.VDirectoryChooser;
|
import Common.Visual.Windows.Dialog.VDirectoryChooser;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
|
||||||
import _VisualDVM.Constants;
|
import _VisualDVM.Constants;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.ProjectData.Files.ProjectFile;
|
import _VisualDVM.ProjectData.Files.ProjectFile;
|
||||||
import _VisualDVM.ProjectData.LanguageName;
|
import _VisualDVM.ProjectData.LanguageName;
|
||||||
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
|
|
||||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
import _VisualDVM.Utils;
|
import _VisualDVM.Utils;
|
||||||
|
|||||||
@@ -2,11 +2,11 @@ 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.ComponentsServer.Component.Sapfor.Sapfor;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
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 _VisualDVM.Repository.Component.Sapfor.Sapfor;
|
|
||||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
import _VisualDVM.Utils;
|
import _VisualDVM.Utils;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Database.Database;
|
import Common.Database.Database;
|
||||||
import Common.Passes.DeleteObjectPass;
|
import Common.Passes.DeleteObjectPass;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
public class DeleteBugReport extends DeleteObjectPass<BugReport> {
|
public class DeleteBugReport extends DeleteObjectPass<BugReport> {
|
||||||
public DeleteBugReport() {
|
public DeleteBugReport() {
|
||||||
super(BugReport.class);
|
super(BugReport.class);
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
|
||||||
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
import _VisualDVM.Repository.BugReport.BugReportState;
|
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
import javafx.util.Pair;
|
import javafx.util.Pair;
|
||||||
public class DeleteBugReportFromServer extends ComponentsServerPass<BugReport> {
|
public class DeleteBugReportFromServer extends ComponentsServerPass<BugReport> {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
|
import _VisualDVM.ComponentsServer.ComponentsServer;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.Server.DeleteServerObject;
|
import _VisualDVM.Passes.Server.DeleteServerObject;
|
||||||
import _VisualDVM.Repository.Server.ComponentsServer;
|
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
|
||||||
public class DeleteSubscriber extends DeleteServerObject<ComponentsServer, Subscriber> {
|
public class DeleteSubscriber extends DeleteServerObject<ComponentsServer, Subscriber> {
|
||||||
public DeleteSubscriber() {
|
public DeleteSubscriber() {
|
||||||
super(Global.componentsServer, Subscriber.class);
|
super(Global.componentsServer, Subscriber.class);
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
|
import _VisualDVM.ComponentsServer.ComponentsServer;
|
||||||
|
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.Server.DeleteServerObject;
|
import _VisualDVM.Passes.Server.DeleteServerObject;
|
||||||
import _VisualDVM.Repository.Server.ComponentsServer;
|
|
||||||
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
|
|
||||||
public class DeleteSubscriberWorkspace extends DeleteServerObject<ComponentsServer, SubscriberWorkspace> {
|
public class DeleteSubscriberWorkspace extends DeleteServerObject<ComponentsServer, SubscriberWorkspace> {
|
||||||
public DeleteSubscriberWorkspace() {
|
public DeleteSubscriberWorkspace() {
|
||||||
super(Global.componentsServer, SubscriberWorkspace.class);
|
super(Global.componentsServer, SubscriberWorkspace.class);
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import _VisualDVM.Global;
|
|||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Passes.Server.TestingServerPass;
|
import _VisualDVM.Passes.Server.TestingServerPass;
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class DetectSelectedTestsMinMaDim extends TestingServerPass<Vector<Object>> {
|
public class DetectSelectedTestsMinMaDim extends TestingServerPass<Vector<Object>> {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
public class DownloadBugReport extends ComponentsServerPass<BugReport> {
|
public class DownloadBugReport extends ComponentsServerPass<BugReport> {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Component;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
import _VisualDVM.Repository.Component.Component;
|
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
public class DownloadComponent extends ComponentsServerPass<Component> {
|
public class DownloadComponent extends ComponentsServerPass<Component> {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
|
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
|
||||||
public class DownloadTaskTest extends DownloadTest {
|
public class DownloadTaskTest extends DownloadTest {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.UI;
|
import Common.Visual.UI;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.UI.SubscriberDialog;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Repository.EmailMessage;
|
import _VisualDVM.Repository.EmailMessage;
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
|
||||||
import _VisualDVM.Repository.Subscribes.UI.SubscriberDialog;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
public class EditAccount extends Email {
|
public class EditAccount extends Email {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
|
import _VisualDVM.ComponentsServer.ComponentsServer;
|
||||||
|
import _VisualDVM.ComponentsServer.Subscribes.Subscriber;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.Server.EditServerObject;
|
import _VisualDVM.Passes.Server.EditServerObject;
|
||||||
import _VisualDVM.Repository.Server.ComponentsServer;
|
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
|
||||||
public class EditSubscriber extends EditServerObject<ComponentsServer, Subscriber> {
|
public class EditSubscriber extends EditServerObject<ComponentsServer, Subscriber> {
|
||||||
public EditSubscriber() {
|
public EditSubscriber() {
|
||||||
super(Global.componentsServer, Subscriber.class);
|
super(Global.componentsServer, Subscriber.class);
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
|
|||||||
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
import _VisualDVM.Repository.EmailMessage;
|
import _VisualDVM.Repository.EmailMessage;
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
|
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class Email extends ComponentsServerPass<EmailMessage> {
|
public class Email extends ComponentsServerPass<EmailMessage> {
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Component;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.ComponentType;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Json.ComponentVersionsInfoJson;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
import _VisualDVM.Repository.Component.Component;
|
|
||||||
import _VisualDVM.Repository.Component.ComponentType;
|
|
||||||
import _VisualDVM.Repository.Component.Json.ComponentVersionsInfoJson;
|
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|||||||
@@ -2,13 +2,13 @@ package _VisualDVM.Passes.All;
|
|||||||
import Common.MainModule_;
|
import Common.MainModule_;
|
||||||
import Common.Passes.Pass;
|
import Common.Passes.Pass;
|
||||||
import Common.Passes.PassException;
|
import Common.Passes.PassException;
|
||||||
|
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Machine.Machine;
|
import _VisualDVM.GlobalData.Machine.Machine;
|
||||||
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
|
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
|
||||||
import _VisualDVM.GlobalData.User.User;
|
import _VisualDVM.GlobalData.User.User;
|
||||||
import _VisualDVM.GlobalData.User.UserState;
|
import _VisualDVM.GlobalData.User.UserState;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
|
|
||||||
public class InitialiseUser extends Pass {
|
public class InitialiseUser extends Pass {
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Utils.Utils_;
|
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Passes.Server.TestingServerPass;
|
import _VisualDVM.Passes.Server.TestingServerPass;
|
||||||
@@ -7,8 +6,6 @@ import _VisualDVM.Repository.Server.ServerCode;
|
|||||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||||
import _VisualDVM.TestingSystem.Common.TasksPackageState;
|
import _VisualDVM.TestingSystem.Common.TasksPackageState;
|
||||||
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
|
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
|
||||||
|
|
||||||
import java.util.Vector;
|
|
||||||
public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
|
public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import _VisualDVM.Repository.BugReport.BugReportState;
|
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
|
||||||
public class OpenBugReport extends UpdateBugReportField {
|
public class OpenBugReport extends UpdateBugReportField {
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Passes.Pass;
|
import Common.Passes.Pass;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
import _VisualDVM.Current;
|
import _VisualDVM.Current;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
public class OpenBugReportTestProject extends Pass<BugReport> {
|
public class OpenBugReportTestProject extends Pass<BugReport> {
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Passes.Sapfor.Transformation;
|
import _VisualDVM.Passes.Sapfor.Transformation;
|
||||||
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
||||||
import _VisualDVM.ProjectData.Files.FileType;
|
import _VisualDVM.ProjectData.Files.FileType;
|
||||||
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
|
|
||||||
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
|
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|||||||
@@ -2,10 +2,10 @@ package _VisualDVM.Passes.All;
|
|||||||
import Common.Passes.Pass;
|
import Common.Passes.Pass;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.UI;
|
import Common.Visual.UI;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReport;
|
||||||
|
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Repository.BugReport.BugReport;
|
|
||||||
import _VisualDVM.Repository.BugReport.BugReportState;
|
|
||||||
import _VisualDVM.Repository.EmailMessage;
|
import _VisualDVM.Repository.EmailMessage;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Passes.Pass;
|
import Common.Passes.Pass;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Component;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.ComponentType;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.Json.ComponentPublicationInfoJson;
|
||||||
|
import _VisualDVM.ComponentsServer.Component.UI.PublishForm;
|
||||||
import _VisualDVM.Constants;
|
import _VisualDVM.Constants;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Account.AccountRole;
|
import _VisualDVM.GlobalData.Account.AccountRole;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
import _VisualDVM.Repository.Component.Component;
|
|
||||||
import _VisualDVM.Repository.Component.ComponentType;
|
|
||||||
import _VisualDVM.Repository.Component.Json.ComponentPublicationInfoJson;
|
|
||||||
import _VisualDVM.Repository.Component.UI.PublishForm;
|
|
||||||
import _VisualDVM.Repository.EmailMessage;
|
import _VisualDVM.Repository.EmailMessage;
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +1,7 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Passes.PassException;
|
import _VisualDVM.ComponentsServer.ComponentsServer;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
|
|
||||||
import _VisualDVM.Passes.PassCode;
|
|
||||||
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
|
|
||||||
import _VisualDVM.Passes.Server.PublishServerPass;
|
import _VisualDVM.Passes.Server.PublishServerPass;
|
||||||
import _VisualDVM.Repository.RepositoryServer;
|
|
||||||
import _VisualDVM.Repository.Server.ComponentsServer;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
public class PublishComponentsServer extends PublishServerPass<ComponentsServer> {
|
public class PublishComponentsServer extends PublishServerPass<ComponentsServer> {
|
||||||
@Override
|
@Override
|
||||||
protected ComponentsServer getServer() {
|
protected ComponentsServer getServer() {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
|
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
|
||||||
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
import _VisualDVM.Passes.Server.ComponentsServerPass;
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
|
|
||||||
public class PublishRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
|
public class PublishRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
|
||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
import Common.Passes.PassException;
|
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
|
|
||||||
import _VisualDVM.Passes.PassCode;
|
|
||||||
import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
|
|
||||||
import _VisualDVM.Passes.Server.PublishServerPass;
|
import _VisualDVM.Passes.Server.PublishServerPass;
|
||||||
import _VisualDVM.TestingSystem.Common.TestingServer;
|
import _VisualDVM.TestingSystem.Common.TestingServer;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
public class PublishTestingServer extends PublishServerPass<TestingServer> {
|
public class PublishTestingServer extends PublishServerPass<TestingServer> {
|
||||||
@Override
|
@Override
|
||||||
protected TestingServer getServer() {
|
protected TestingServer getServer() {
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import java.io.File;
|
|||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.StandardCopyOption;
|
import java.nio.file.StandardCopyOption;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDVM.Repository.Component.Component> {
|
public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDVM.ComponentsServer.Component.Component> {
|
||||||
Vector<RemoteFile> backups; //не забывать что файлы на СЕРВЕРЕ.
|
Vector<RemoteFile> backups; //не забывать что файлы на СЕРВЕРЕ.
|
||||||
RemoteFile remoteFile;
|
RemoteFile remoteFile;
|
||||||
File localFile;
|
File localFile;
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user