diff --git a/.idea/artifacts/VisualSapfor_jar.xml b/.idea/artifacts/VisualSapfor_jar.xml index 025d3822..4cb563a3 100644 --- a/.idea/artifacts/VisualSapfor_jar.xml +++ b/.idea/artifacts/VisualSapfor_jar.xml @@ -22,6 +22,7 @@ + \ No newline at end of file diff --git a/.idea/libraries/commons_lang_2_6_0.xml b/.idea/libraries/commons_lang_2_6_0.xml new file mode 100644 index 00000000..80c945da --- /dev/null +++ b/.idea/libraries/commons_lang_2_6_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1340fa72..17a7fadf 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,15 +7,169 @@ + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + @@ -107,11 +261,11 @@ + - diff --git a/Visual_DVM_2020.iml b/Visual_DVM_2020.iml index 9812c1d1..40d47d96 100644 --- a/Visual_DVM_2020.iml +++ b/Visual_DVM_2020.iml @@ -94,5 +94,6 @@ + \ No newline at end of file diff --git a/properties b/properties index 792c3549..97eff979 100644 --- a/properties +++ b/properties @@ -1,6 +1,9 @@ { + "Email": "", + "Name": "", + "Role": "Undefined", "Workspace": "E:\\Tests", - "ProjectsSearchDirectory": "E:\\Tests", + "ProjectsSearchDirectory": "E:\\BUG", "VisualiserPath": "C:\\Users\\misha\\Downloads", "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F", "Visualizer_2Path": "C:\\Users\\misha\\Documents", @@ -21,11 +24,11 @@ "Kernels": 8, "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe", "CheckTestingIntervalSeconds": 10, - "AutoCheckTesting": false, + "AutoCheckTesting": true, "EmailOnTestingProgress": true, - "lastMachineId": 13, - "lastUserId": 24, - "lastCompilerId": 52, + "lastMachineId": 28, + "lastUserId": 36, + "lastCompilerId": 109, "RegisterOn": false, "SpacesOn": false, "EmptyLinesOn": false, diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java index dbbf2434..dce27e2e 100644 --- a/src/Common/Database/Database.java +++ b/src/Common/Database/Database.java @@ -34,6 +34,12 @@ public abstract class Database { // UI.Print(DebugPrintLevel.Database, "соединение с базой данных " + file.getAbsolutePath()); connect(); } + public void Activate() throws Exception{ + Connect(); + CreateAllTables(); + prepareTablesStatements(); + Synchronize(); + } public void prepareTablesStatements() throws Exception { } public void Disconnect() throws Exception { diff --git a/src/Common/Database/SQLITE/SQLiteDatabase.java b/src/Common/Database/SQLITE/SQLiteDatabase.java index e19c550f..2be7ebef 100644 --- a/src/Common/Database/SQLITE/SQLiteDatabase.java +++ b/src/Common/Database/SQLITE/SQLiteDatabase.java @@ -255,4 +255,5 @@ public abstract class SQLiteDatabase extends Database { } //-- //https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause + } \ No newline at end of file diff --git a/src/Common/Visual/Controls/PassControl.java b/src/Common/Visual/Controls/PassControl.java index 4dda2e29..4332146f 100644 --- a/src/Common/Visual/Controls/PassControl.java +++ b/src/Common/Visual/Controls/PassControl.java @@ -1,5 +1,4 @@ package Common.Visual.Controls; -import Common.Passes.Pass; public interface PassControl { void setIcon(String icon_path); void setEnabled(boolean flag); diff --git a/src/_VisualDVM/Repository/BugReport/BugReport.java b/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java similarity index 95% rename from src/_VisualDVM/Repository/BugReport/BugReport.java rename to src/_VisualDVM/ComponentsServer/BugReport/BugReport.java index c7cc686c..f8fe0903 100644 --- a/src/_VisualDVM/Repository/BugReport/BugReport.java +++ b/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java @@ -1,18 +1,18 @@ -package _VisualDVM.Repository.BugReport; +package _VisualDVM.ComponentsServer.BugReport; import Common.Database.Objects.DBObject; import Common.Database.Objects.rDBObject; import Common.Utils.TextLog; import Common.Utils.Utils_; 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.Global; import _VisualDVM.GlobalData.Account.Account; 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 java.io.File; diff --git a/src/_VisualDVM/Repository/BugReport/BugReportState.java b/src/_VisualDVM/ComponentsServer/BugReport/BugReportState.java similarity index 94% rename from src/_VisualDVM/Repository/BugReport/BugReportState.java rename to src/_VisualDVM/ComponentsServer/BugReport/BugReportState.java index 867ecb41..3a2a0b74 100644 --- a/src/_VisualDVM/Repository/BugReport/BugReportState.java +++ b/src/_VisualDVM/ComponentsServer/BugReport/BugReportState.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.BugReport; +package _VisualDVM.ComponentsServer.BugReport; import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.StatusEnum; diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java b/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java similarity index 89% rename from src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java rename to src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java index 8d03354f..498da405 100644 --- a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java +++ b/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java @@ -1,7 +1,7 @@ -package _VisualDVM.Repository.BugReport; +package _VisualDVM.ComponentsServer.BugReport; import Common.Database.Tables.DBTable; import Common.Visual.DataSetControlForm; -import _VisualDVM.Repository.BugReport.UI.BugReportsForm; +import _VisualDVM.ComponentsServer.BugReport.UI.BugReportsForm; import javax.swing.*; import java.util.Vector; diff --git a/src/_VisualDVM/Repository/BugReport/Json/BugReportAdditionJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java similarity index 81% rename from src/_VisualDVM/Repository/BugReport/Json/BugReportAdditionJson.java rename to src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java index a1a7fa03..a74ca7e2 100644 --- a/src/_VisualDVM/Repository/BugReport/Json/BugReportAdditionJson.java +++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java @@ -1,5 +1,5 @@ -package _VisualDVM.Repository.BugReport.Json; -import _VisualDVM.Repository.BugReport.BugReport; +package _VisualDVM.ComponentsServer.BugReport.Json; +import _VisualDVM.ComponentsServer.BugReport.BugReport; import com.google.gson.annotations.Expose; import java.io.Serializable; diff --git a/src/_VisualDVM/Repository/BugReport/Json/RecipientJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java similarity index 81% rename from src/_VisualDVM/Repository/BugReport/Json/RecipientJson.java rename to src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java index 719fc38d..e033b07b 100644 --- a/src/_VisualDVM/Repository/BugReport/Json/RecipientJson.java +++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.BugReport.Json; +package _VisualDVM.ComponentsServer.BugReport.Json; import com.google.gson.annotations.Expose; public class RecipientJson { @Expose diff --git a/src/_VisualDVM/Repository/BugReport/Json/RecipientsJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java similarity index 81% rename from src/_VisualDVM/Repository/BugReport/Json/RecipientsJson.java rename to src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java index 027eb5cf..7f687b4d 100644 --- a/src/_VisualDVM/Repository/BugReport/Json/RecipientsJson.java +++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java @@ -1,5 +1,5 @@ -package _VisualDVM.Repository.BugReport.Json; -import _VisualDVM.Repository.Subscribes.Subscriber; +package _VisualDVM.ComponentsServer.BugReport.Json; +import _VisualDVM.ComponentsServer.Subscribes.Subscriber; import com.google.gson.annotations.Expose; import java.util.List; diff --git a/src/_VisualDVM/Repository/BugReport/Json/VisualiserSettingJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java similarity index 79% rename from src/_VisualDVM/Repository/BugReport/Json/VisualiserSettingJson.java rename to src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java index 706e7caa..811555f2 100644 --- a/src/_VisualDVM/Repository/BugReport/Json/VisualiserSettingJson.java +++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.BugReport.Json; +package _VisualDVM.ComponentsServer.BugReport.Json; import com.google.gson.annotations.Expose; public class VisualiserSettingJson { @Expose diff --git a/src/_VisualDVM/Repository/BugReport/Json/VisualiserSettingsJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingsJson.java similarity index 93% rename from src/_VisualDVM/Repository/BugReport/Json/VisualiserSettingsJson.java rename to src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingsJson.java index 21de5c39..acabe845 100644 --- a/src/_VisualDVM/Repository/BugReport/Json/VisualiserSettingsJson.java +++ b/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingsJson.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.BugReport.Json; +package _VisualDVM.ComponentsServer.BugReport.Json; import _VisualDVM.ProjectData.SapforData.SapforProperties; import com.google.gson.annotations.Expose; diff --git a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java b/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java similarity index 97% rename from src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java rename to src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java index 05c87ec1..508b8c06 100644 --- a/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java +++ b/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.BugReport.UI; +package _VisualDVM.ComponentsServer.BugReport.UI; import Common.Database.Tables.DataSet; import Common.Passes.PassCode_; import Common.Visual.DataSetControlForm; @@ -7,10 +7,10 @@ import Common.Visual.Tables.ColumnInfo; import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererProgressBar; import Common.Visual.Tables.RendererStatusEnum; +import _VisualDVM.ComponentsServer.BugReport.BugReport; +import _VisualDVM.ComponentsServer.BugReport.BugReportState; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.BugReport.BugReport; -import _VisualDVM.Repository.BugReport.BugReportState; import javax.swing.*; import java.awt.event.ActionEvent; diff --git a/src/_VisualDVM/Repository/BugReportsDatabase.java b/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java similarity index 82% rename from src/_VisualDVM/Repository/BugReportsDatabase.java rename to src/_VisualDVM/ComponentsServer/BugReportsDatabase.java index bce0913b..4bbd1b73 100644 --- a/src/_VisualDVM/Repository/BugReportsDatabase.java +++ b/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java @@ -1,10 +1,10 @@ -package _VisualDVM.Repository; +package _VisualDVM.ComponentsServer; 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.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.util.Vector; diff --git a/src/_VisualDVM/Repository/Component/Component.java b/src/_VisualDVM/ComponentsServer/Component/Component.java similarity index 99% rename from src/_VisualDVM/Repository/Component/Component.java rename to src/_VisualDVM/ComponentsServer/Component/Component.java index bdeec724..68ca2390 100644 --- a/src/_VisualDVM/Repository/Component/Component.java +++ b/src/_VisualDVM/ComponentsServer/Component/Component.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component; +package _VisualDVM.ComponentsServer.Component; import Common.CommonConstants; import Common.Database.Objects.DBObject; import Common.Passes.PassException; diff --git a/src/_VisualDVM/Repository/Component/ComponentState.java b/src/_VisualDVM/ComponentsServer/Component/ComponentState.java similarity index 96% rename from src/_VisualDVM/Repository/Component/ComponentState.java rename to src/_VisualDVM/ComponentsServer/Component/ComponentState.java index 147593b0..8e0359c9 100644 --- a/src/_VisualDVM/Repository/Component/ComponentState.java +++ b/src/_VisualDVM/ComponentsServer/Component/ComponentState.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component; +package _VisualDVM.ComponentsServer.Component; import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.StatusEnum; public enum ComponentState implements StatusEnum { diff --git a/src/_VisualDVM/Repository/Component/ComponentType.java b/src/_VisualDVM/ComponentsServer/Component/ComponentType.java similarity index 95% rename from src/_VisualDVM/Repository/Component/ComponentType.java rename to src/_VisualDVM/ComponentsServer/Component/ComponentType.java index 771f77a8..49f1836d 100644 --- a/src/_VisualDVM/Repository/Component/ComponentType.java +++ b/src/_VisualDVM/ComponentsServer/Component/ComponentType.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component; +package _VisualDVM.ComponentsServer.Component; import java.io.Serializable; public enum ComponentType implements Serializable { Undefined, diff --git a/src/_VisualDVM/Repository/Component/ComponentsSet.java b/src/_VisualDVM/ComponentsServer/Component/ComponentsSet.java similarity index 91% rename from src/_VisualDVM/Repository/Component/ComponentsSet.java rename to src/_VisualDVM/ComponentsServer/Component/ComponentsSet.java index bf91e0ea..880a7da9 100644 --- a/src/_VisualDVM/Repository/Component/ComponentsSet.java +++ b/src/_VisualDVM/ComponentsServer/Component/ComponentsSet.java @@ -1,12 +1,12 @@ -package _VisualDVM.Repository.Component; +package _VisualDVM.ComponentsServer.Component; import Common.Database.Tables.DataSet; import Common.MainModule_; 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.Global; -import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer; -import _VisualDVM.Repository.Component.Sapfor.Sapfor_F; -import _VisualDVM.Repository.Component.UI.ComponentsForm; import javax.swing.*; public class ComponentsSet extends DataSet { diff --git a/src/_VisualDVM/Repository/Component/Instruction.java b/src/_VisualDVM/ComponentsServer/Component/Instruction.java similarity index 97% rename from src/_VisualDVM/Repository/Component/Instruction.java rename to src/_VisualDVM/ComponentsServer/Component/Instruction.java index f59e83a2..86085cfe 100644 --- a/src/_VisualDVM/Repository/Component/Instruction.java +++ b/src/_VisualDVM/ComponentsServer/Component/Instruction.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component; +package _VisualDVM.ComponentsServer.Component; import Common.Utils.Utils_; import _VisualDVM.Utils; diff --git a/src/_VisualDVM/Repository/Component/Json/ComponentPublicationInfoJson.java b/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java similarity index 82% rename from src/_VisualDVM/Repository/Component/Json/ComponentPublicationInfoJson.java rename to src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java index 810b187d..a9109bb9 100644 --- a/src/_VisualDVM/Repository/Component/Json/ComponentPublicationInfoJson.java +++ b/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java @@ -1,7 +1,7 @@ -package _VisualDVM.Repository.Component.Json; +package _VisualDVM.ComponentsServer.Component.Json; import Common.Utils.Utils_; -import _VisualDVM.Repository.Component.Component; -import _VisualDVM.Repository.Component.ComponentType; +import _VisualDVM.ComponentsServer.Component.Component; +import _VisualDVM.ComponentsServer.Component.ComponentType; import com.google.gson.annotations.Expose; import java.io.Serializable; diff --git a/src/_VisualDVM/Repository/Component/Json/ComponentVersionsInfoJson.java b/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java similarity index 79% rename from src/_VisualDVM/Repository/Component/Json/ComponentVersionsInfoJson.java rename to src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java index 006bcc48..a2264c11 100644 --- a/src/_VisualDVM/Repository/Component/Json/ComponentVersionsInfoJson.java +++ b/src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java @@ -1,5 +1,5 @@ -package _VisualDVM.Repository.Component.Json; -import _VisualDVM.Repository.Component.ComponentType; +package _VisualDVM.ComponentsServer.Component.Json; +import _VisualDVM.ComponentsServer.Component.ComponentType; import com.google.gson.annotations.Expose; import java.io.Serializable; diff --git a/src/_VisualDVM/Repository/Component/OSDComponent.java b/src/_VisualDVM/ComponentsServer/Component/OSDComponent.java similarity index 88% rename from src/_VisualDVM/Repository/Component/OSDComponent.java rename to src/_VisualDVM/ComponentsServer/Component/OSDComponent.java index 52e71c83..82c5afae 100644 --- a/src/_VisualDVM/Repository/Component/OSDComponent.java +++ b/src/_VisualDVM/ComponentsServer/Component/OSDComponent.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component; +package _VisualDVM.ComponentsServer.Component; import Common.Utils.Utils_; public abstract class OSDComponent extends Component { @Override diff --git a/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java b/src/_VisualDVM/ComponentsServer/Component/PerformanceAnalyzer/PerformanceAnalyzer.java similarity index 96% rename from src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java rename to src/_VisualDVM/ComponentsServer/Component/PerformanceAnalyzer/PerformanceAnalyzer.java index 891cd118..a746f2fd 100644 --- a/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java +++ b/src/_VisualDVM/ComponentsServer/Component/PerformanceAnalyzer/PerformanceAnalyzer.java @@ -1,9 +1,9 @@ -package _VisualDVM.Repository.Component.PerformanceAnalyzer; +package _VisualDVM.ComponentsServer.Component.PerformanceAnalyzer; import Common.Utils.Utils_; import Common.Visual.UI; +import _VisualDVM.ComponentsServer.Component.Component; +import _VisualDVM.ComponentsServer.Component.ComponentType; import _VisualDVM.Global; -import _VisualDVM.Repository.Component.Component; -import _VisualDVM.Repository.Component.ComponentType; import _VisualDVM.Utils; import analyzer.common.MessageJtoJ; diff --git a/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/MessagesServer.java similarity index 97% rename from src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java rename to src/_VisualDVM/ComponentsServer/Component/Sapfor/MessagesServer.java index a8bfb26a..9f71c7f8 100644 --- a/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java +++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/MessagesServer.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component.Sapfor; +package _VisualDVM.ComponentsServer.Component.Sapfor; import Common.MainModule_; import Common.Utils.Utils_; diff --git a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java similarity index 99% rename from src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java rename to src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java index 9143036a..b8bccebc 100644 --- a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java +++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java @@ -1,16 +1,16 @@ -package _VisualDVM.Repository.Component.Sapfor; +package _VisualDVM.ComponentsServer.Component.Sapfor; import Common.CommonConstants; import Common.Passes.PassException; import Common.Utils.Utils_; import Common.Visual.UI; +import _VisualDVM.ComponentsServer.Component.OSDComponent; +import _VisualDVM.ComponentsServer.Component.Visualizer_2; import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Sapfor.SapforAnalysis; import _VisualDVM.ProjectData.Files.DBProjectFile; 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.Utils; import org.apache.commons.io.FileUtils; diff --git a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor_F.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java similarity index 87% rename from src/_VisualDVM/Repository/Component/Sapfor/Sapfor_F.java rename to src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java index 39fcfd3e..47f5ec7c 100644 --- a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor_F.java +++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java @@ -1,6 +1,6 @@ -package _VisualDVM.Repository.Component.Sapfor; +package _VisualDVM.ComponentsServer.Component.Sapfor; +import _VisualDVM.ComponentsServer.Component.ComponentType; import _VisualDVM.Global; -import _VisualDVM.Repository.Component.ComponentType; import java.io.File; import java.nio.file.Paths; diff --git a/src/_VisualDVM/Repository/Component/Sapfor/TransformationPermission.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/TransformationPermission.java similarity index 58% rename from src/_VisualDVM/Repository/Component/Sapfor/TransformationPermission.java rename to src/_VisualDVM/ComponentsServer/Component/Sapfor/TransformationPermission.java index dea62aa2..45c39e6a 100644 --- a/src/_VisualDVM/Repository/Component/Sapfor/TransformationPermission.java +++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/TransformationPermission.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component.Sapfor; +package _VisualDVM.ComponentsServer.Component.Sapfor; public enum TransformationPermission { None, All, diff --git a/src/_VisualDVM/Repository/Component/UI/ComponentsFields.form b/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.form similarity index 88% rename from src/_VisualDVM/Repository/Component/UI/ComponentsFields.form rename to src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.form index e331bd89..02a94e4b 100644 --- a/src/_VisualDVM/Repository/Component/UI/ComponentsFields.form +++ b/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.form @@ -1,5 +1,5 @@ -
+ diff --git a/src/_VisualDVM/Repository/Component/UI/ComponentsFields.java b/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.java similarity index 89% rename from src/_VisualDVM/Repository/Component/UI/ComponentsFields.java rename to src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.java index e9d99445..d9953486 100644 --- a/src/_VisualDVM/Repository/Component/UI/ComponentsFields.java +++ b/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsFields.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component.UI; +package _VisualDVM.ComponentsServer.Component.UI; import Common.Visual.Windows.Dialog.DialogFields; import _VisualDVM.Global; diff --git a/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java b/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsForm.java similarity index 97% rename from src/_VisualDVM/Repository/Component/UI/ComponentsForm.java rename to src/_VisualDVM/ComponentsServer/Component/UI/ComponentsForm.java index 566f78c4..aa6dfd3c 100644 --- a/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java +++ b/src/_VisualDVM/ComponentsServer/Component/UI/ComponentsForm.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component.UI; +package _VisualDVM.ComponentsServer.Component.UI; import Common.Database.Tables.DataSet; import Common.MainModule_; import Common.Visual.DataSetControlForm; @@ -8,9 +8,9 @@ import Common.Visual.Menus.VisualiserMenu; import Common.Visual.Tables.ColumnInfo; import Common.Visual.Tables.RendererMaskedNanInteger; import Common.Visual.Tables.RendererStatusEnum; +import _VisualDVM.ComponentsServer.Component.Component; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.Component.Component; import javax.swing.*; import java.util.Vector; diff --git a/src/_VisualDVM/Repository/Component/UI/PickUpComponentFields.form b/src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.form similarity index 81% rename from src/_VisualDVM/Repository/Component/UI/PickUpComponentFields.form rename to src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.form index 3374dc3a..d8c1649a 100644 --- a/src/_VisualDVM/Repository/Component/UI/PickUpComponentFields.form +++ b/src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.form @@ -1,5 +1,5 @@ - + diff --git a/src/_VisualDVM/Repository/Component/UI/PickUpComponentFields.java b/src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.java similarity index 84% rename from src/_VisualDVM/Repository/Component/UI/PickUpComponentFields.java rename to src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.java index f36099ae..40970df6 100644 --- a/src/_VisualDVM/Repository/Component/UI/PickUpComponentFields.java +++ b/src/_VisualDVM/ComponentsServer/Component/UI/PickUpComponentFields.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component.UI; +package _VisualDVM.ComponentsServer.Component.UI; import Common.Visual.Windows.Dialog.DialogFields; import javax.swing.*; diff --git a/src/_VisualDVM/Repository/Component/UI/PublishFields.form b/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.form similarity index 98% rename from src/_VisualDVM/Repository/Component/UI/PublishFields.form rename to src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.form index 600e20e4..857954c3 100644 --- a/src/_VisualDVM/Repository/Component/UI/PublishFields.form +++ b/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.form @@ -1,5 +1,5 @@ - + diff --git a/src/_VisualDVM/Repository/Component/UI/PublishFields.java b/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java similarity index 95% rename from src/_VisualDVM/Repository/Component/UI/PublishFields.java rename to src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java index 1cdc006d..2bae0795 100644 --- a/src/_VisualDVM/Repository/Component/UI/PublishFields.java +++ b/src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component.UI; +package _VisualDVM.ComponentsServer.Component.UI; import Common.Visual.Windows.Dialog.DialogFields; import _VisualDVM.Visual.Editor.BaseEditor; diff --git a/src/_VisualDVM/Repository/Component/UI/PublishForm.java b/src/_VisualDVM/ComponentsServer/Component/UI/PublishForm.java similarity index 88% rename from src/_VisualDVM/Repository/Component/UI/PublishForm.java rename to src/_VisualDVM/ComponentsServer/Component/UI/PublishForm.java index 65481d45..885ccf4e 100644 --- a/src/_VisualDVM/Repository/Component/UI/PublishForm.java +++ b/src/_VisualDVM/ComponentsServer/Component/UI/PublishForm.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component.UI; +package _VisualDVM.ComponentsServer.Component.UI; import Common.Visual.Windows.Dialog.Dialog; public class PublishForm extends Dialog { public PublishForm() { diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/ComponentsServer/Component/Visualiser.java similarity index 98% rename from src/_VisualDVM/Repository/Component/Visualiser.java rename to src/_VisualDVM/ComponentsServer/Component/Visualiser.java index 029b4b52..513e020b 100644 --- a/src/_VisualDVM/Repository/Component/Visualiser.java +++ b/src/_VisualDVM/ComponentsServer/Component/Visualiser.java @@ -1,8 +1,9 @@ -package _VisualDVM.Repository.Component; +package _VisualDVM.ComponentsServer.Component; import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; + import java.io.File; import java.io.IOException; import java.net.URISyntaxException; diff --git a/src/_VisualDVM/Repository/Component/Visualizer_2.java b/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java similarity index 94% rename from src/_VisualDVM/Repository/Component/Visualizer_2.java rename to src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java index 992dc9f4..83fd8a0d 100644 --- a/src/_VisualDVM/Repository/Component/Visualizer_2.java +++ b/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Component; +package _VisualDVM.ComponentsServer.Component; import Common.Passes.PassException; import Common.Utils.Utils_; import Common.Visual.UI; @@ -73,7 +73,9 @@ public class Visualizer_2 extends OSDComponent { } @Override 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"; } @Override diff --git a/src/_VisualDVM/Repository/Server/ComponentsServer.java b/src/_VisualDVM/ComponentsServer/ComponentsServer.java similarity index 90% rename from src/_VisualDVM/Repository/Server/ComponentsServer.java rename to src/_VisualDVM/ComponentsServer/ComponentsServer.java index 1e61c5d1..299985b7 100644 --- a/src/_VisualDVM/Repository/Server/ComponentsServer.java +++ b/src/_VisualDVM/ComponentsServer/ComponentsServer.java @@ -1,10 +1,18 @@ -package _VisualDVM.Repository.Server; +package _VisualDVM.ComponentsServer; import Common.Database.Objects.DBObject; import Common.Database.RepositoryRefuseException; 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.Global; import _VisualDVM.GlobalData.Account.Account; +import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.MachineType; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; @@ -13,18 +21,12 @@ import _VisualDVM.Passes.All.ArchivesBackupPass; import _VisualDVM.Passes.All.UnzipFolderPass; import _VisualDVM.Passes.All.ZipFolderPass; 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.RepositoryServer; -import _VisualDVM.Repository.Subscribes.Subscriber; +import _VisualDVM.Repository.Server.RepositoryServer; import _VisualDVM.Utils; import javafx.util.Pair; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.RandomStringUtils; import java.io.BufferedWriter; import java.io.File; @@ -37,6 +39,8 @@ import java.util.Calendar; import java.util.Date; import java.util.Vector; public class ComponentsServer extends RepositoryServer { + public CredentialsDatabase credentials_db = null; + //-- public static ZipFolderPass zip = new ZipFolderPass(); public static UnzipFolderPass unzip = new UnzipFolderPass(); public static ArchivesBackupPass backupSession = new ArchivesBackupPass(); @@ -138,6 +142,13 @@ public class ComponentsServer extends RepositoryServer { Email(message, address); } } + //-- + try { + credentials_db = new CredentialsDatabase(); + credentials_db.Activate(); + } catch (Exception ex) { + ex.printStackTrace(); + } } @Override protected void startAdditionalThreads() { @@ -328,11 +339,32 @@ public class ComponentsServer extends RepositoryServer { Print("Получить компонент " + packed1[0]); 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 protected void UnsafeSession() throws Exception { switch (code) { - case CheckSubscriberRole: + case GetUserAccountByKey: + GetUserAccountByKey(); + break; + case GetUserAccountByEmail: + GetUserAccountByEmail(); + break; + case CheckSubscriberRole: //todo устарело CheckSubscriberRole(); break; case GetComponentsBackups: diff --git a/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java b/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java new file mode 100644 index 00000000..c424cb8d --- /dev/null +++ b/src/_VisualDVM/ComponentsServer/CredentialsDatabase.java @@ -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; + } +} diff --git a/src/_VisualDVM/Repository/SubscriberRights/SubscriberRights.java b/src/_VisualDVM/ComponentsServer/SubscriberRights/SubscriberRights.java similarity index 78% rename from src/_VisualDVM/Repository/SubscriberRights/SubscriberRights.java rename to src/_VisualDVM/ComponentsServer/SubscriberRights/SubscriberRights.java index 75fe2172..cfc348f5 100644 --- a/src/_VisualDVM/Repository/SubscriberRights/SubscriberRights.java +++ b/src/_VisualDVM/ComponentsServer/SubscriberRights/SubscriberRights.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.SubscriberRights; +package _VisualDVM.ComponentsServer.SubscriberRights; import Common.Database.Objects.DBObject; public class SubscriberRights extends DBObject { public String email; //почта diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java b/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspace.java similarity index 85% rename from src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java rename to src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspace.java index cc01da7f..500db611 100644 --- a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java +++ b/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspace.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.SubscriberWorkspace; +package _VisualDVM.ComponentsServer.SubscriberWorkspace; import Common.Database.Objects.iDBObject; public class SubscriberWorkspace extends iDBObject { public String email; //почта diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java b/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspaceDBTable.java similarity index 88% rename from src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java rename to src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspaceDBTable.java index 35991b3d..4f1843f1 100644 --- a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java +++ b/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/SubscriberWorkspaceDBTable.java @@ -1,7 +1,7 @@ -package _VisualDVM.Repository.SubscriberWorkspace; +package _VisualDVM.ComponentsServer.SubscriberWorkspace; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; -import _VisualDVM.Repository.SubscriberWorkspace.UI.SubscriberWorkspacesForm; +import _VisualDVM.ComponentsServer.SubscriberWorkspace.UI.SubscriberWorkspacesForm; import javax.swing.*; public class SubscriberWorkspaceDBTable extends iDBTable { diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java b/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java similarity index 92% rename from src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java rename to src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java index 66edb2ac..f62b9d3a 100644 --- a/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java +++ b/src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java @@ -1,13 +1,13 @@ -package _VisualDVM.Repository.SubscriberWorkspace.UI; +package _VisualDVM.ComponentsServer.SubscriberWorkspace.UI; import Common.Database.Tables.DataSet; import Common.Passes.PassCode_; import Common.Visual.DataSetControlForm; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; +import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace; +import _VisualDVM.ComponentsServer.Subscribes.Subscriber; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; -import _VisualDVM.Repository.Subscribes.Subscriber; import javax.swing.*; public class SubscriberWorkspacesForm extends DataSetControlForm { diff --git a/src/_VisualDVM/Repository/Subscribes/Subscriber.java b/src/_VisualDVM/ComponentsServer/Subscribes/Subscriber.java similarity index 89% rename from src/_VisualDVM/Repository/Subscribes/Subscriber.java rename to src/_VisualDVM/ComponentsServer/Subscribes/Subscriber.java index cdbcc85d..5bd8de2e 100644 --- a/src/_VisualDVM/Repository/Subscribes/Subscriber.java +++ b/src/_VisualDVM/ComponentsServer/Subscribes/Subscriber.java @@ -1,8 +1,9 @@ -package _VisualDVM.Repository.Subscribes; +package _VisualDVM.ComponentsServer.Subscribes; import Common.Database.Objects.DBObject; import _VisualDVM.GlobalData.Account.AccountRole; import com.sun.org.glassfish.gmbal.Description; public class Subscriber extends DBObject { + //todo скорее всего вывести.ибо дублер UserAccount @Description("PRIMARY KEY, UNIQUE") public String address = ""; @Description("DEFAULT ''") diff --git a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java b/src/_VisualDVM/ComponentsServer/Subscribes/SubsribersDBTable.java similarity index 92% rename from src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java rename to src/_VisualDVM/ComponentsServer/Subscribes/SubsribersDBTable.java index 6b991b9e..99878492 100644 --- a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java +++ b/src/_VisualDVM/ComponentsServer/Subscribes/SubsribersDBTable.java @@ -1,14 +1,14 @@ -package _VisualDVM.Repository.Subscribes; +package _VisualDVM.ComponentsServer.Subscribes; import Common.Database.Objects.DBObject; import Common.Database.Tables.DBTable; import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKDataBehaviour; import Common.Visual.DataSetControlForm; +import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace; +import _VisualDVM.ComponentsServer.Subscribes.UI.SubsribersForm; import _VisualDVM.Constants; import _VisualDVM.Global; -import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; -import _VisualDVM.Repository.Subscribes.UI.SubsribersForm; import javax.swing.*; import java.util.LinkedHashMap; diff --git a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberDialog.java b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberDialog.java similarity index 94% rename from src/_VisualDVM/Repository/Subscribes/UI/SubscriberDialog.java rename to src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberDialog.java index 5aac66ab..908fc75a 100644 --- a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberDialog.java +++ b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberDialog.java @@ -1,10 +1,10 @@ -package _VisualDVM.Repository.Subscribes.UI; +package _VisualDVM.ComponentsServer.Subscribes.UI; import Common.Utils.Utils_; import Common.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; +import _VisualDVM.ComponentsServer.Subscribes.Subscriber; import _VisualDVM.Global; import _VisualDVM.GlobalData.Account.AccountRole; -import _VisualDVM.Repository.Subscribes.Subscriber; public class SubscriberDialog extends DBObjectDialog { public SubscriberDialog() { super(SubscriberFields.class); diff --git a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.form b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.form similarity index 98% rename from src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.form rename to src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.form index 9880eb58..9b08aaf7 100644 --- a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.form +++ b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.form @@ -1,5 +1,5 @@ - + diff --git a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.java b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.java similarity index 94% rename from src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.java rename to src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.java index c980ff88..179c47a9 100644 --- a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.java +++ b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubscriberFields.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Subscribes.UI; +package _VisualDVM.ComponentsServer.Subscribes.UI; import Common.Visual.TextField.StyledTextField; import Common.Visual.Windows.Dialog.DialogFields; import _VisualDVM.GlobalData.Account.AccountRole; diff --git a/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubsribersForm.java similarity index 96% rename from src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java rename to src/_VisualDVM/ComponentsServer/Subscribes/UI/SubsribersForm.java index 7dcae3d5..74f9ae5b 100644 --- a/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java +++ b/src/_VisualDVM/ComponentsServer/Subscribes/UI/SubsribersForm.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository.Subscribes.UI; +package _VisualDVM.ComponentsServer.Subscribes.UI; import Common.Database.Tables.DataSet; import Common.Passes.PassCode_; import Common.Visual.DataSetControlForm; @@ -6,10 +6,10 @@ import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DialogFields; +import _VisualDVM.ComponentsServer.Subscribes.Subscriber; import _VisualDVM.Global; import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.Subscribes.Subscriber; import javax.swing.*; public class SubsribersForm extends DataSetControlForm { diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java new file mode 100644 index 00000000..02a720cd --- /dev/null +++ b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java @@ -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 { + 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(); + } +}; diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.form b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.form new file mode 100644 index 00000000..acc921f9 --- /dev/null +++ b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.form @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java new file mode 100644 index 00000000..9b940afb --- /dev/null +++ b/src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java @@ -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; + } +} diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java b/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java new file mode 100644 index 00000000..01de5577 --- /dev/null +++ b/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java @@ -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; + } +} diff --git a/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java b/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java new file mode 100644 index 00000000..dc6e6fa8 --- /dev/null +++ b/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java @@ -0,0 +1,21 @@ +package _VisualDVM.ComponentsServer.UserAccount; +import Common.Database.Tables.iDBTable; +public class UserAccountsDBTable extends iDBTable { + 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; + } +} diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java index ac60801c..8cb63b25 100644 --- a/src/_VisualDVM/Constants.java +++ b/src/_VisualDVM/Constants.java @@ -3,7 +3,7 @@ import Common.Utils.Vector_; import java.util.Vector; 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 testingMaxKernels = 64; //вообще говоря, это параметр машины. //-- @@ -22,6 +22,7 @@ public class Constants { public static final String TestsDirectoryName = "Tests"; public static final String DVMPackagesDirectoryName = "DVMPackages"; public static final String PerformanceAnalyzerDirectoryName = "PerformanceAnalyzer"; + public static final String KeyDirectoryName = "Key"; //-- //SVN vmk-post@yandex.ru 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 int SMTPPort = 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 SocketTimeout = 0; //- diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java index a0e3586a..e953a689 100644 --- a/src/_VisualDVM/Global.java +++ b/src/_VisualDVM/Global.java @@ -2,14 +2,14 @@ package _VisualDVM; import Common.Utils.Loggable; import Common.Utils.Utils_; 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.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.DVM.RemoteDVMTestingPlanner; import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor; @@ -35,6 +35,7 @@ public class Global { public static ComponentsSet components = null; public static MessagesServer messagesServer = null; public static File ComponentsDirectory; + public static File KeyDirectory; public static File DataDirectory; public static File BugReportsDirectory; public static File BackUpsDirectory; @@ -73,9 +74,8 @@ public class Global { Utils_.CheckDirectory(TestsDirectory = new File(Utils_.getHomeDirectory(), Constants.TestsDirectoryName)); Utils_.CheckDirectory(PerformanceAnalyzerDirectory = new File(Utils_.getHomeDirectory(), Constants.PerformanceAnalyzerDirectoryName)); Utils_.CheckDirectory(DVMPackagesDirectory = new File(Utils_.getHomeDirectory(), Constants.DVMPackagesDirectoryName)); - //через пару версий заменить на clean. 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() { 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(DataBackUpsDirectory = new File(Utils_.getHomeDirectory(), Constants.DataBackUpsDirectoryName)); - Utils_.CheckDirectory(MachinesDirectory = new File(Utils_.getHomeDirectory(), "Machines")); } public static void CheckTestingSystemDirectories() { Utils_.CheckDirectory(ComponentsDirectory = new File(Utils_.getHomeDirectory(), Constants.ComponentsDirectoryName)); @@ -196,8 +195,8 @@ public class Global { // FoldParserManager.get().addFoldParserMapping("text/FortranSPF", new FortranFolder()); блоки кода. todo //light_editor.xml-------->> mainModule.ActivateDB(); - /* - https://habr.com/ru/articles/446888/ сертификат? + // https://habr.com/ru/articles/446888/ сертификат? +/* mainModule.set(Current.Account, new Account() { { name = "M"; @@ -205,7 +204,7 @@ public class Global { role = AccountRole.Admin; } }); - */ + */ mainModule.getPass(PassCode.CheckAccount).Do(); //--------------- componentsServer.ActivateDB(); diff --git a/src/_VisualDVM/GlobalData/Account/Account.java b/src/_VisualDVM/GlobalData/Account/Account.java index f1596614..70a5de4c 100644 --- a/src/_VisualDVM/GlobalData/Account/Account.java +++ b/src/_VisualDVM/GlobalData/Account/Account.java @@ -1,8 +1,8 @@ package _VisualDVM.GlobalData.Account; import Common.Database.Objects.DBObject; import Common.Utils.TextLog; +import _VisualDVM.ComponentsServer.BugReport.BugReport; import _VisualDVM.Global; -import _VisualDVM.Repository.BugReport.BugReport; import com.sun.org.glassfish.gmbal.Description; public class Account extends DBObject { @Description("PRIMARY KEY,NOT NULL") diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java index 6142fbe3..c8ed6e35 100644 --- a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java +++ b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java @@ -1,7 +1,6 @@ package _VisualDVM.GlobalData.Machine.UI; import Common.Database.Tables.DataSet; import Common.Passes.PassCode_; -import Common.Visual.Controls.MenuBarButton; import Common.Visual.DataSetControlForm; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; @@ -12,8 +11,6 @@ import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.Passes.PassCode; import javax.swing.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; public class MachinesForm extends DataSetControlForm { public MachinesForm(DataSet dataSource_in, JPanel mountPanel_in) { super(dataSource_in, mountPanel_in); diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java index d6b19d9d..a08baab8 100644 --- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java +++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java @@ -59,7 +59,7 @@ public class ModuleAnchestorFields implements DialogFields { ((Module) target).language; cbCompilers.addActionListener(e -> { if (cbCompilers.getSelectedItem() instanceof Compiler) { - Compiler compiler = ((Compiler) cbCompilers.getSelectedItem()); + Compiler compiler = ((Compiler) cbCompilers.getSelectedItem()); UI.TrySelect(cbCommands, linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName)); } diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java index 779d7798..d8ed116e 100644 --- a/src/_VisualDVM/MainModule.java +++ b/src/_VisualDVM/MainModule.java @@ -1,6 +1,7 @@ package _VisualDVM; import Common.MainModule_; import Common.Utils.Vector_; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.GlobalData.Account.Account; import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; @@ -9,7 +10,6 @@ import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.ProjectData.ProjectView; import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.Visual.MainUI; import javax.swing.tree.DefaultMutableTreeNode; @@ -52,7 +52,8 @@ public class MainModule extends MainModule_ { //-- public boolean HasAccount() { return get(Current.Account) != null; - } //Бессмысленно. аккаунт всегда подразумевается. вывести. + } + //todo Бессмысленно. аккаунт всегда подразумевается. вывести. public Account getAccount() { return (Account) get(Current.Account); } //временно diff --git a/src/_VisualDVM/NormalProperties.java b/src/_VisualDVM/NormalProperties.java index 6873a6e6..390a1367 100644 --- a/src/_VisualDVM/NormalProperties.java +++ b/src/_VisualDVM/NormalProperties.java @@ -1,16 +1,25 @@ package _VisualDVM; import Common.CommonConstants; +import _VisualDVM.ComponentsServer.UserAccount.UserAccount; +import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.Passes.PassCode; import com.google.gson.annotations.Expose; import javax.swing.*; import java.io.File; -public class NormalProperties extends VisualDVMProperties{ - //--- +public class NormalProperties extends VisualDVMProperties { + //---> @Expose - public String Workspace =""; + public String Email = ""; @Expose - public String ProjectsSearchDirectory=""; + public String Name = ""; + @Expose + public AccountRole Role = AccountRole.Undefined; + //---> + @Expose + public String Workspace = ""; + @Expose + public String ProjectsSearchDirectory = ""; @Expose public String VisualiserPath = ""; @Expose @@ -43,16 +52,16 @@ public class NormalProperties extends VisualDVMProperties{ public boolean collapseProjectTrees = false; //-- @Expose - public int EditorFontSize=14; + public int EditorFontSize = 14; @Expose public int ComponentsWindowWidth = 650; @Expose public int ComponentsWindowHeight = 250; //-- @Expose - public int Kernels= Utils.getHalfKernels(); + public int Kernels = Utils.getHalfKernels(); @Expose - public String LocalMakePathWindows= "C:\\MinGW\\msys\\1.0\\bin\\make.exe"; + public String LocalMakePathWindows = "C:\\MinGW\\msys\\1.0\\bin\\make.exe"; //-- @Expose public int CheckTestingIntervalSeconds = 10; //интервал автопроверки тестирования @@ -82,27 +91,29 @@ public class NormalProperties extends VisualDVMProperties{ public boolean ComparsionDiffMergeOn = false; //компактность-- @Expose - public boolean ShowFullArraysDeclarations =false; + public boolean ShowFullArraysDeclarations = false; @Expose - public boolean ShowFullTabsNames=true; + public boolean ShowFullTabsNames = true; @Expose public boolean SmallScreen = false; @Expose public int BugReportsAgeLimit = 2; @Expose - public int FastAccessPassesCount=10; + public int FastAccessPassesCount = 10; @Expose - public int LastOpenedProjectsCount=10; + public int LastOpenedProjectsCount = 10; //-- - public NormalProperties(){ + public NormalProperties() { Mode = _VisualDVM.Mode.Normal; } - public NormalProperties(File file_in){ + public NormalProperties(File file_in) { super(_VisualDVM.Mode.Normal, file_in); } @Override public String getFieldDescription(String fieldName) { switch (fieldName) { + case "Email": + return "Адрес электронной почты"; case "Kernels": return "Число ядер при компиляции"; case "LocalMakePathWindows": @@ -159,4 +170,10 @@ public class NormalProperties extends VisualDVMProperties{ public boolean controlAction(String fieldName, JMenuItem control) { return (Global.mainModule.getPass(PassCode.UpdateProperty).Do(fieldName)); } + public void SynchronizeAccount(UserAccount account){ + Name = account.name; + Email = account.email; + Role = account.role; + Update(); + } } diff --git a/src/_VisualDVM/Passes/All/AddBugReport.java b/src/_VisualDVM/Passes/All/AddBugReport.java index c2e53105..8e71a17a 100644 --- a/src/_VisualDVM/Passes/All/AddBugReport.java +++ b/src/_VisualDVM/Passes/All/AddBugReport.java @@ -3,12 +3,12 @@ import Common.Database.Database; import Common.Passes.AddObjectPass; import Common.Utils.Utils_; import Common.Visual.UI; +import _VisualDVM.ComponentsServer.BugReport.BugReport; +import _VisualDVM.ComponentsServer.BugReport.BugReportState; +import _VisualDVM.ComponentsServer.Component.ComponentType; import _VisualDVM.Global; import _VisualDVM.GlobalData.Account.AccountRole; 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.nio.file.Files; diff --git a/src/_VisualDVM/Passes/All/AddSubscriber.java b/src/_VisualDVM/Passes/All/AddSubscriber.java index 7df7ceda..fc1f47ff 100644 --- a/src/_VisualDVM/Passes/All/AddSubscriber.java +++ b/src/_VisualDVM/Passes/All/AddSubscriber.java @@ -1,8 +1,8 @@ package _VisualDVM.Passes.All; +import _VisualDVM.ComponentsServer.ComponentsServer; +import _VisualDVM.ComponentsServer.Subscribes.Subscriber; import _VisualDVM.Global; import _VisualDVM.Passes.Server.PublishServerObject; -import _VisualDVM.Repository.Server.ComponentsServer; -import _VisualDVM.Repository.Subscribes.Subscriber; public class AddSubscriber extends PublishServerObject { public AddSubscriber() { super(Global.componentsServer, Subscriber.class); diff --git a/src/_VisualDVM/Passes/All/AppendBugReportField.java b/src/_VisualDVM/Passes/All/AppendBugReportField.java index 8baa927b..4fbbef33 100644 --- a/src/_VisualDVM/Passes/All/AppendBugReportField.java +++ b/src/_VisualDVM/Passes/All/AppendBugReportField.java @@ -1,10 +1,10 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.BugReport.BugReport; +import _VisualDVM.ComponentsServer.BugReport.Json.BugReportAdditionJson; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Server.ComponentsServerPass; -import _VisualDVM.Repository.BugReport.BugReport; -import _VisualDVM.Repository.BugReport.Json.BugReportAdditionJson; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.Server.ServerCode; diff --git a/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java b/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java index 4beb23a6..fcc33780 100644 --- a/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java +++ b/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; +import _VisualDVM.ComponentsServer.BugReport.BugReport; import _VisualDVM.Global; -import _VisualDVM.Repository.BugReport.BugReport; public class ApplyBugReportSettings extends Pass { @Override public String getIconPath() { diff --git a/src/_VisualDVM/Passes/All/BuildComponent.java b/src/_VisualDVM/Passes/All/BuildComponent.java index 3a77fe37..40df4864 100644 --- a/src/_VisualDVM/Passes/All/BuildComponent.java +++ b/src/_VisualDVM/Passes/All/BuildComponent.java @@ -1,10 +1,10 @@ package _VisualDVM.Passes.All; import Common.Passes.PassException; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.Component.Component; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.ProcessPass; -import _VisualDVM.Repository.Component.Component; import java.nio.file.Files; import java.nio.file.StandardCopyOption; diff --git a/src/_VisualDVM/Passes/All/CheckAccount.java b/src/_VisualDVM/Passes/All/CheckAccount.java index 9d6586ec..7feb2ff2 100644 --- a/src/_VisualDVM/Passes/All/CheckAccount.java +++ b/src/_VisualDVM/Passes/All/CheckAccount.java @@ -1,56 +1,60 @@ package _VisualDVM.Passes.All; -import Common.Passes.Pass; +import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.UserAccount.UserAccount; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -public class CheckAccount extends Pass { - @Override - protected boolean canStart(Object... args) throws Exception { - target = false; - return true; - } +import _VisualDVM.Passes.Server.ComponentsServerPass; +import _VisualDVM.Repository.Server.ServerCode; +import org.apache.commons.io.FileUtils; + +import java.io.File; +public class CheckAccount extends ComponentsServerPass { @Override public String getIconPath() { return "/icons/Registry.png"; } @Override - public String getButtonText() { - return ""; + protected boolean isSafe() { + 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 protected void body() throws Exception { - /* - 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; + Global.normalProperties.SynchronizeAccount(target); } @Override protected void showDone() throws Exception { diff --git a/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java b/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java index 8c35d822..988e16be 100644 --- a/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java +++ b/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java @@ -1,8 +1,8 @@ package _VisualDVM.Passes.All; +import _VisualDVM.ComponentsServer.Subscribes.Subscriber; import _VisualDVM.Global; import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Subscribes.Subscriber; public class CheckRegistrationOnServer extends ComponentsServerPass { @Override protected boolean isSafe() { diff --git a/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java b/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java index 25539828..4c214072 100644 --- a/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java +++ b/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java @@ -1,11 +1,11 @@ package _VisualDVM.Passes.All; import Common.MainModule_; +import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace; import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.User.User; import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; public class CheckRemoteWorkspace extends ComponentsServerPass { @Override protected boolean isSafe() { diff --git a/src/_VisualDVM/Passes/All/CloseBugReport.java b/src/_VisualDVM/Passes/All/CloseBugReport.java index b148e0cd..efd8feff 100644 --- a/src/_VisualDVM/Passes/All/CloseBugReport.java +++ b/src/_VisualDVM/Passes/All/CloseBugReport.java @@ -1,5 +1,5 @@ package _VisualDVM.Passes.All; -import _VisualDVM.Repository.BugReport.BugReportState; +import _VisualDVM.ComponentsServer.BugReport.BugReportState; public class CloseBugReport extends UpdateBugReportField { @Override public String getIconPath() { diff --git a/src/_VisualDVM/Passes/All/CombineFiles.java b/src/_VisualDVM/Passes/All/CombineFiles.java index 8eb4fff8..a7fdb814 100644 --- a/src/_VisualDVM/Passes/All/CombineFiles.java +++ b/src/_VisualDVM/Passes/All/CombineFiles.java @@ -1,11 +1,11 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; 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.Sapfor.Transformation; import _VisualDVM.ProjectData.Files.DBProjectFile; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; -import _VisualDVM.Repository.Component.Sapfor.TransformationPermission; import _VisualDVM.Utils; import _VisualDVM.Visual.Windows.CombineFilesDialog; import org.apache.commons.io.FileUtils; diff --git a/src/_VisualDVM/Passes/All/ConfirmEmail.java b/src/_VisualDVM/Passes/All/ConfirmEmail.java new file mode 100644 index 00000000..4169642a --- /dev/null +++ b/src/_VisualDVM/Passes/All/ConfirmEmail.java @@ -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 { + 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); + } +} diff --git a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java index 92244136..2c55e76d 100644 --- a/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java +++ b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java @@ -3,12 +3,12 @@ import Common.Passes.Pass; import Common.Passes.PassException; import Common.Utils.Utils_; import Common.Visual.Windows.Dialog.VDirectoryChooser; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.ProjectData.Files.ProjectFile; import _VisualDVM.ProjectData.LanguageName; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.Utils; diff --git a/src/_VisualDVM/Passes/All/CreateTestFromFile.java b/src/_VisualDVM/Passes/All/CreateTestFromFile.java index 80a0c22a..2680827d 100644 --- a/src/_VisualDVM/Passes/All/CreateTestFromFile.java +++ b/src/_VisualDVM/Passes/All/CreateTestFromFile.java @@ -2,11 +2,11 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Passes.PassException; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.FileType; import _VisualDVM.ProjectData.Files.ProjectFile; import _VisualDVM.ProjectData.LanguageName; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.Utils; diff --git a/src/_VisualDVM/Passes/All/DeleteBugReport.java b/src/_VisualDVM/Passes/All/DeleteBugReport.java index 2639895a..ff84e2d1 100644 --- a/src/_VisualDVM/Passes/All/DeleteBugReport.java +++ b/src/_VisualDVM/Passes/All/DeleteBugReport.java @@ -1,9 +1,9 @@ package _VisualDVM.Passes.All; import Common.Database.Database; import Common.Passes.DeleteObjectPass; +import _VisualDVM.ComponentsServer.BugReport.BugReport; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.BugReport.BugReport; public class DeleteBugReport extends DeleteObjectPass { public DeleteBugReport() { super(BugReport.class); diff --git a/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java b/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java index 3abc7468..59dfd1e6 100644 --- a/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java +++ b/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; +import _VisualDVM.ComponentsServer.BugReport.BugReport; +import _VisualDVM.ComponentsServer.BugReport.BugReportState; import _VisualDVM.Passes.Server.ComponentsServerPass; -import _VisualDVM.Repository.BugReport.BugReport; -import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.Server.ServerCode; import javafx.util.Pair; public class DeleteBugReportFromServer extends ComponentsServerPass { diff --git a/src/_VisualDVM/Passes/All/DeleteSubscriber.java b/src/_VisualDVM/Passes/All/DeleteSubscriber.java index cb05e61f..b460769f 100644 --- a/src/_VisualDVM/Passes/All/DeleteSubscriber.java +++ b/src/_VisualDVM/Passes/All/DeleteSubscriber.java @@ -1,8 +1,8 @@ package _VisualDVM.Passes.All; +import _VisualDVM.ComponentsServer.ComponentsServer; +import _VisualDVM.ComponentsServer.Subscribes.Subscriber; import _VisualDVM.Global; import _VisualDVM.Passes.Server.DeleteServerObject; -import _VisualDVM.Repository.Server.ComponentsServer; -import _VisualDVM.Repository.Subscribes.Subscriber; public class DeleteSubscriber extends DeleteServerObject { public DeleteSubscriber() { super(Global.componentsServer, Subscriber.class); diff --git a/src/_VisualDVM/Passes/All/DeleteSubscriberWorkspace.java b/src/_VisualDVM/Passes/All/DeleteSubscriberWorkspace.java index 92c220f5..fdd6e113 100644 --- a/src/_VisualDVM/Passes/All/DeleteSubscriberWorkspace.java +++ b/src/_VisualDVM/Passes/All/DeleteSubscriberWorkspace.java @@ -1,8 +1,8 @@ package _VisualDVM.Passes.All; +import _VisualDVM.ComponentsServer.ComponentsServer; +import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace; import _VisualDVM.Global; import _VisualDVM.Passes.Server.DeleteServerObject; -import _VisualDVM.Repository.Server.ComponentsServer; -import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; public class DeleteSubscriberWorkspace extends DeleteServerObject { public DeleteSubscriberWorkspace() { super(Global.componentsServer, SubscriberWorkspace.class); diff --git a/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java b/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java index bc32c93a..89a5717a 100644 --- a/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java +++ b/src/_VisualDVM/Passes/All/DetectSelectedTestsMinMaDim.java @@ -3,7 +3,6 @@ import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Server.TestingServerPass; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.TestingSystem.Common.Test.Test; import java.util.Vector; public class DetectSelectedTestsMinMaDim extends TestingServerPass> { diff --git a/src/_VisualDVM/Passes/All/DownloadBugReport.java b/src/_VisualDVM/Passes/All/DownloadBugReport.java index ca1c71e1..6bfe82e3 100644 --- a/src/_VisualDVM/Passes/All/DownloadBugReport.java +++ b/src/_VisualDVM/Passes/All/DownloadBugReport.java @@ -1,8 +1,8 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.BugReport.BugReport; import _VisualDVM.Global; import _VisualDVM.Passes.Server.ComponentsServerPass; -import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.Server.ServerCode; public class DownloadBugReport extends ComponentsServerPass { @Override diff --git a/src/_VisualDVM/Passes/All/DownloadComponent.java b/src/_VisualDVM/Passes/All/DownloadComponent.java index 554dd37b..3051c9a9 100644 --- a/src/_VisualDVM/Passes/All/DownloadComponent.java +++ b/src/_VisualDVM/Passes/All/DownloadComponent.java @@ -1,8 +1,8 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.Component.Component; import _VisualDVM.Global; import _VisualDVM.Passes.Server.ComponentsServerPass; -import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Server.ServerCode; public class DownloadComponent extends ComponentsServerPass { @Override diff --git a/src/_VisualDVM/Passes/All/DownloadTaskTest.java b/src/_VisualDVM/Passes/All/DownloadTaskTest.java index bbb055dc..7aac3fc4 100644 --- a/src/_VisualDVM/Passes/All/DownloadTaskTest.java +++ b/src/_VisualDVM/Passes/All/DownloadTaskTest.java @@ -1,7 +1,6 @@ package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask; public class DownloadTaskTest extends DownloadTest { @Override diff --git a/src/_VisualDVM/Passes/All/EditAccount.java b/src/_VisualDVM/Passes/All/EditAccount.java index 9c85f438..75644042 100644 --- a/src/_VisualDVM/Passes/All/EditAccount.java +++ b/src/_VisualDVM/Passes/All/EditAccount.java @@ -1,10 +1,10 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI; +import _VisualDVM.ComponentsServer.Subscribes.Subscriber; +import _VisualDVM.ComponentsServer.Subscribes.UI.SubscriberDialog; import _VisualDVM.Global; import _VisualDVM.Repository.EmailMessage; -import _VisualDVM.Repository.Subscribes.Subscriber; -import _VisualDVM.Repository.Subscribes.UI.SubscriberDialog; import javax.swing.*; public class EditAccount extends Email { diff --git a/src/_VisualDVM/Passes/All/EditSubscriber.java b/src/_VisualDVM/Passes/All/EditSubscriber.java index f1f81a5c..1535674f 100644 --- a/src/_VisualDVM/Passes/All/EditSubscriber.java +++ b/src/_VisualDVM/Passes/All/EditSubscriber.java @@ -1,8 +1,8 @@ package _VisualDVM.Passes.All; +import _VisualDVM.ComponentsServer.ComponentsServer; +import _VisualDVM.ComponentsServer.Subscribes.Subscriber; import _VisualDVM.Global; import _VisualDVM.Passes.Server.EditServerObject; -import _VisualDVM.Repository.Server.ComponentsServer; -import _VisualDVM.Repository.Subscribes.Subscriber; public class EditSubscriber extends EditServerObject { public EditSubscriber() { super(Global.componentsServer, Subscriber.class); diff --git a/src/_VisualDVM/Passes/All/Email.java b/src/_VisualDVM/Passes/All/Email.java index a7601e5b..27be0567 100644 --- a/src/_VisualDVM/Passes/All/Email.java +++ b/src/_VisualDVM/Passes/All/Email.java @@ -2,7 +2,6 @@ package _VisualDVM.Passes.All; import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import java.util.Vector; public class Email extends ComponentsServerPass { diff --git a/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java b/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java index e59bcdec..ff4d8543 100644 --- a/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java +++ b/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java @@ -1,9 +1,9 @@ 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.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 java.util.Vector; diff --git a/src/_VisualDVM/Passes/All/InitialiseUser.java b/src/_VisualDVM/Passes/All/InitialiseUser.java index 99390b64..088b5e63 100644 --- a/src/_VisualDVM/Passes/All/InitialiseUser.java +++ b/src/_VisualDVM/Passes/All/InitialiseUser.java @@ -2,13 +2,13 @@ package _VisualDVM.Passes.All; import Common.MainModule_; import Common.Passes.Pass; import Common.Passes.PassException; +import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace; import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.User.User; import _VisualDVM.GlobalData.User.UserState; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; public class InitialiseUser extends Pass { @Override public String getIconPath() { diff --git a/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java b/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java index d3fc869a..76c9aeb0 100644 --- a/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java +++ b/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java @@ -1,5 +1,4 @@ package _VisualDVM.Passes.All; -import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Server.TestingServerPass; @@ -7,8 +6,6 @@ import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.TasksPackageState; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; - -import java.util.Vector; public class JoinSapforTestingVersionsToGroup extends TestingServerPass { @Override public String getIconPath() { diff --git a/src/_VisualDVM/Passes/All/OpenBugReport.java b/src/_VisualDVM/Passes/All/OpenBugReport.java index 90083677..fe220fa5 100644 --- a/src/_VisualDVM/Passes/All/OpenBugReport.java +++ b/src/_VisualDVM/Passes/All/OpenBugReport.java @@ -1,5 +1,5 @@ package _VisualDVM.Passes.All; -import _VisualDVM.Repository.BugReport.BugReportState; +import _VisualDVM.ComponentsServer.BugReport.BugReportState; public class OpenBugReport extends UpdateBugReportField { @Override public String getIconPath() { diff --git a/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java b/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java index 7000b88a..6e9226a4 100644 --- a/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java +++ b/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java @@ -1,10 +1,10 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.BugReport.BugReport; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.BugReport.BugReport; import java.io.File; public class OpenBugReportTestProject extends Pass { diff --git a/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java b/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java index 5ba749f8..ed19fdf0 100644 --- a/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java +++ b/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java @@ -1,11 +1,11 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; +import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Sapfor.Transformation; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.FileType; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; -import _VisualDVM.Repository.Component.Sapfor.TransformationPermission; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/src/_VisualDVM/Passes/All/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java index 398b761f..7972cfb7 100644 --- a/src/_VisualDVM/Passes/All/PublishBugReport.java +++ b/src/_VisualDVM/Passes/All/PublishBugReport.java @@ -2,10 +2,10 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Utils_; import Common.Visual.UI; +import _VisualDVM.ComponentsServer.BugReport.BugReport; +import _VisualDVM.ComponentsServer.BugReport.BugReportState; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.BugReport.BugReport; -import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.EmailMessage; import java.io.File; diff --git a/src/_VisualDVM/Passes/All/PublishComponent.java b/src/_VisualDVM/Passes/All/PublishComponent.java index b9b10c6e..f2915324 100644 --- a/src/_VisualDVM/Passes/All/PublishComponent.java +++ b/src/_VisualDVM/Passes/All/PublishComponent.java @@ -1,15 +1,15 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; 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.Global; import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.Passes.PassCode; 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.Server.ServerCode; diff --git a/src/_VisualDVM/Passes/All/PublishComponentsServer.java b/src/_VisualDVM/Passes/All/PublishComponentsServer.java index 6464068e..e921dac1 100644 --- a/src/_VisualDVM/Passes/All/PublishComponentsServer.java +++ b/src/_VisualDVM/Passes/All/PublishComponentsServer.java @@ -1,14 +1,7 @@ package _VisualDVM.Passes.All; -import Common.Passes.PassException; +import _VisualDVM.ComponentsServer.ComponentsServer; import _VisualDVM.Global; -import _VisualDVM.GlobalData.RemoteFile.RemoteFile; -import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import _VisualDVM.Passes.Server.PublishServerPass; -import _VisualDVM.Repository.RepositoryServer; -import _VisualDVM.Repository.Server.ComponentsServer; - -import java.io.File; public class PublishComponentsServer extends PublishServerPass { @Override protected ComponentsServer getServer() { diff --git a/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java b/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java index 98b50563..12a33fbb 100644 --- a/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java +++ b/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; +import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace; import _VisualDVM.Passes.Server.ComponentsServerPass; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; public class PublishRemoteWorkspace extends ComponentsServerPass { @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/_VisualDVM/Passes/All/PublishTestingServer.java b/src/_VisualDVM/Passes/All/PublishTestingServer.java index 2fb0fc86..bebf3f71 100644 --- a/src/_VisualDVM/Passes/All/PublishTestingServer.java +++ b/src/_VisualDVM/Passes/All/PublishTestingServer.java @@ -1,13 +1,7 @@ package _VisualDVM.Passes.All; -import Common.Passes.PassException; import _VisualDVM.Global; -import _VisualDVM.GlobalData.RemoteFile.RemoteFile; -import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import _VisualDVM.Passes.Server.PublishServerPass; import _VisualDVM.TestingSystem.Common.TestingServer; - -import java.io.File; public class PublishTestingServer extends PublishServerPass { @Override protected TestingServer getServer() { diff --git a/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java index e121d7b9..24da9329 100644 --- a/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java +++ b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java @@ -17,7 +17,7 @@ import java.io.File; import java.nio.file.Files; import java.nio.file.StandardCopyOption; import java.util.Vector; -public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDVM.Repository.Component.Component> { +public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDVM.ComponentsServer.Component.Component> { Vector backups; //не забывать что файлы на СЕРВЕРЕ. RemoteFile remoteFile; File localFile; diff --git a/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java b/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java index c620a5ef..6771bac8 100644 --- a/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java +++ b/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java @@ -1,10 +1,10 @@ package _VisualDVM.Passes.All; import Common.Visual.UI; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; +import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Sapfor.SapforTransformation; import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; -import _VisualDVM.Repository.Component.Sapfor.TransformationPermission; public class SPF_CreateParallelVariant extends SapforTransformation { ParallelVariant variant = null; @Override diff --git a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java index 271acc4f..87fd8751 100644 --- a/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java +++ b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java @@ -1,14 +1,14 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; +import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Sapfor.SapforAnalysis; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.FileState; import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; -import _VisualDVM.Repository.Component.Sapfor.TransformationPermission; import org.apache.commons.io.FileUtils; import java.util.Vector; diff --git a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java index d95ce01b..0456ab9f 100644 --- a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java +++ b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.BugReport.Json.RecipientsJson; import _VisualDVM.Global; -import _VisualDVM.Repository.BugReport.Json.RecipientsJson; public class SaveBugReportRecipients extends UpdateBugReportField { @Override public String getIconPath() { diff --git a/src/_VisualDVM/Passes/All/SendBugReport.java b/src/_VisualDVM/Passes/All/SendBugReport.java index 4dc1468a..ceb04be6 100644 --- a/src/_VisualDVM/Passes/All/SendBugReport.java +++ b/src/_VisualDVM/Passes/All/SendBugReport.java @@ -1,9 +1,9 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.BugReport.BugReport; +import _VisualDVM.ComponentsServer.BugReport.BugReportState; import _VisualDVM.Global; import _VisualDVM.Passes.Server.ComponentsServerPass; -import _VisualDVM.Repository.BugReport.BugReport; -import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.Server.ServerCode; public class SendBugReport extends ComponentsServerPass { @Override diff --git a/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java index 293899b7..cfc96221 100644 --- a/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java +++ b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java @@ -1,8 +1,8 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.Component.Component; import _VisualDVM.Global; import _VisualDVM.Passes.Server.ComponentsServerPass; -import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Utils; import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm; diff --git a/src/_VisualDVM/Passes/All/ShowInstruction.java b/src/_VisualDVM/Passes/All/ShowInstruction.java index 3005ef21..86e24334 100644 --- a/src/_VisualDVM/Passes/All/ShowInstruction.java +++ b/src/_VisualDVM/Passes/All/ShowInstruction.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; +import _VisualDVM.ComponentsServer.Component.ComponentType; import _VisualDVM.Global; -import _VisualDVM.Repository.Component.ComponentType; import java.awt.*; import java.io.File; diff --git a/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java b/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java index 94874ec1..48155bfd 100644 --- a/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java +++ b/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java @@ -1,9 +1,7 @@ package _VisualDVM.Passes.All; +import _VisualDVM.ComponentsServer.ComponentsServer; import _VisualDVM.Global; -import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import _VisualDVM.Passes.Server.ShutdownServerPass; -import _VisualDVM.Repository.Server.ComponentsServer; public class ShutdownComponentsServer extends ShutdownServerPass { @Override protected ComponentsServer getServer() { diff --git a/src/_VisualDVM/Passes/All/ShutdownTestingServer.java b/src/_VisualDVM/Passes/All/ShutdownTestingServer.java index 732aa5a9..dc410b16 100644 --- a/src/_VisualDVM/Passes/All/ShutdownTestingServer.java +++ b/src/_VisualDVM/Passes/All/ShutdownTestingServer.java @@ -1,7 +1,5 @@ package _VisualDVM.Passes.All; import _VisualDVM.Global; -import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import _VisualDVM.Passes.Server.ShutdownServerPass; import _VisualDVM.TestingSystem.Common.TestingServer; public class ShutdownTestingServer extends ShutdownServerPass { diff --git a/src/_VisualDVM/Passes/All/StartComponentsServer.java b/src/_VisualDVM/Passes/All/StartComponentsServer.java index d4a3a29f..ceefec20 100644 --- a/src/_VisualDVM/Passes/All/StartComponentsServer.java +++ b/src/_VisualDVM/Passes/All/StartComponentsServer.java @@ -1,9 +1,7 @@ package _VisualDVM.Passes.All; +import _VisualDVM.ComponentsServer.ComponentsServer; import _VisualDVM.Global; -import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import _VisualDVM.Passes.Server.StartServerPass; -import _VisualDVM.Repository.Server.ComponentsServer; public class StartComponentsServer extends StartServerPass { @Override protected ComponentsServer getServer() { diff --git a/src/_VisualDVM/Passes/All/StartTestingServer.java b/src/_VisualDVM/Passes/All/StartTestingServer.java index b970eda1..67c81752 100644 --- a/src/_VisualDVM/Passes/All/StartTestingServer.java +++ b/src/_VisualDVM/Passes/All/StartTestingServer.java @@ -1,7 +1,5 @@ package _VisualDVM.Passes.All; import _VisualDVM.Global; -import _VisualDVM.Passes.PassCode; -import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import _VisualDVM.Passes.Server.StartServerPass; import _VisualDVM.TestingSystem.Common.TestingServer; public class StartTestingServer extends StartServerPass { diff --git a/src/_VisualDVM/Passes/All/TestPass.java b/src/_VisualDVM/Passes/All/TestPass.java index 449bfc6e..250d9a59 100644 --- a/src/_VisualDVM/Passes/All/TestPass.java +++ b/src/_VisualDVM/Passes/All/TestPass.java @@ -1,9 +1,83 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; -import _VisualDVM.Global; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileWriter; +import java.io.InputStreamReader; public class TestPass extends Pass { + public static String getMotherboardSN() { + String result = ""; + try { + File file = File.createTempFile("realhowto",".vbs"); + file.deleteOnExit(); + FileWriter fw = new java.io.FileWriter(file); + String vbs = + "Set objWMIService = GetObject(\"winmgmts:\\\\.\\root\\cimv2\")\n" + + "Set colItems = objWMIService.ExecQuery _ \n" + + " (\"Select * from Win32_BaseBoard\") \n" + + "For Each objItem in colItems \n" + + " Wscript.Echo objItem.SerialNumber \n" + + " exit for ' do the first cpu only! \n" + + "Next \n"; + + fw.write(vbs); + fw.close(); + Process p = Runtime.getRuntime().exec("cscript //NoLogo " + file.getPath()); + BufferedReader input = + new BufferedReader + (new InputStreamReader(p.getInputStream())); + String line; + while ((line = input.readLine()) != null) { + result += line; + } + input.close(); + } + catch(Exception e){ + e.printStackTrace(); + } + return result.trim(); + } @Override protected void body() throws Exception { - Global.testingServer.PingFromClient(); + // String cpuId = getMotherboardSN(); + // UI.Info(cpuId); + /* + SystemInfo systemInfo = new SystemInfo(); + HardwareAbstractionLayer hardware = systemInfo.getHardware(); + CentralProcessor processor = hardware.getProcessor(); + CentralProcessor.ProcessorIdentifier processorIdentifier = processor.getProcessorIdentifier(); + System.out.println("Processor Vendor: " + processorIdentifier.getVendor()); + System.out.println("Processor Name: " + processorIdentifier.getName()); + System.out.println("Processor ID: " + processorIdentifier.getProcessorID()); + System.out.println("Identifier: " + processorIdentifier.getIdentifier()); + System.out.println("Microarchitecture: " + processorIdentifier.getMicroarchitecture()); + System.out.println("Frequency (Hz): " + processorIdentifier.getVendorFreq()); + System.out.println("Frequency (GHz): " + processorIdentifier.getVendorFreq() / 1000000000.0); + */ +/* + String serial = ""; + Scanner sc = null; + Process process = null; + try { + process = Runtime.getRuntime().exec(new String[] { "wmic", "cpu", "get", "ProcessorId" }); + process.getOutputStream().close(); + sc = new Scanner(process.getInputStream()); + sc.next(); + serial = sc.next(); + } catch (IOException e) { + } dummy + UI.Info(Utils_.Brackets(serial)); + */ + /* + KeyGenerator keyGenerator = KeyGenerator.getInstance("AES"); + SecureRandom secureRandom = new SecureRandom(); + int keyBitSize = 256; + keyGenerator.init(keyBitSize, secureRandom); + SecretKey secretKey = keyGenerator.generateKey(); + System.out.println("===="); + System.out.println(secretKey.getEncoded()); + System.out.println("===="); + */ } } diff --git a/src/_VisualDVM/Passes/All/UpdateBugReportField.java b/src/_VisualDVM/Passes/All/UpdateBugReportField.java index 56f4b0e9..8e8b4bb5 100644 --- a/src/_VisualDVM/Passes/All/UpdateBugReportField.java +++ b/src/_VisualDVM/Passes/All/UpdateBugReportField.java @@ -1,10 +1,10 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.BugReport.BugReport; +import _VisualDVM.ComponentsServer.BugReport.BugReportState; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Server.ComponentsServerPass; -import _VisualDVM.Repository.BugReport.BugReport; -import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Utils; diff --git a/src/_VisualDVM/Passes/All/UpdateComponent.java b/src/_VisualDVM/Passes/All/UpdateComponent.java index 415162cf..0f0f79cd 100644 --- a/src/_VisualDVM/Passes/All/UpdateComponent.java +++ b/src/_VisualDVM/Passes/All/UpdateComponent.java @@ -2,9 +2,9 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Passes.PassException; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.Component.Component; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.Component.Component; public class UpdateComponent extends Pass { @Override protected PassCode necessary() { diff --git a/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java b/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java index 0d697275..11a1f5e9 100644 --- a/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java +++ b/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java @@ -1,8 +1,8 @@ package _VisualDVM.Passes.All; import Common.Passes.Pass; +import _VisualDVM.ComponentsServer.Component.Component; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.Component.Component; import java.util.Vector; public class UpdateSelectedComponents extends Pass> { diff --git a/src/_VisualDVM/Passes/CurrentComponentPass.java b/src/_VisualDVM/Passes/CurrentComponentPass.java index 277609e7..63a5a786 100644 --- a/src/_VisualDVM/Passes/CurrentComponentPass.java +++ b/src/_VisualDVM/Passes/CurrentComponentPass.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes; import Common.Passes.Pass; +import _VisualDVM.ComponentsServer.Component.Component; import _VisualDVM.Global; -import _VisualDVM.Repository.Component.Component; public abstract class CurrentComponentPass extends Pass { @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java index 78cdb274..da15272c 100644 --- a/src/_VisualDVM/Passes/PassCode.java +++ b/src/_VisualDVM/Passes/PassCode.java @@ -354,11 +354,15 @@ public enum PassCode implements PassCode_ { ResumeDVMPackage, JoinSapforTestingVersionsToGroup, RefreshDVMPackageResults, - DetectSelectedTestsMinMaDim; + DetectSelectedTestsMinMaDim, + ConfirmEmail + ; //-- @Override public String getDescription() { switch (this) { + case ConfirmEmail: + return "Подтверждение почты"; case DetectSelectedTestsMinMaDim: return "Определить размерность тестов"; case RefreshDVMPackageResults: diff --git a/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java b/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java index 28758e5b..27d4930c 100644 --- a/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java +++ b/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java @@ -7,7 +7,7 @@ import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.MachineType; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.User.User; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; import java.util.Date; public abstract class RepositoryServerSSHPass extends ConnectionPass { diff --git a/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java b/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java index 881d883e..afdbd203 100644 --- a/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java +++ b/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java @@ -1,12 +1,12 @@ package _VisualDVM.Passes.Sapfor; import Common.Visual.Controls.PassMenuItem; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; +import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.ProjectData.ProjectView; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; -import _VisualDVM.Repository.Component.Sapfor.TransformationPermission; import javax.swing.*; public class SapforTransformation extends SapforPass { diff --git a/src/_VisualDVM/Passes/Sapfor/SilentSapforPass.java b/src/_VisualDVM/Passes/Sapfor/SilentSapforPass.java index ca359b31..d866d6b6 100644 --- a/src/_VisualDVM/Passes/Sapfor/SilentSapforPass.java +++ b/src/_VisualDVM/Passes/Sapfor/SilentSapforPass.java @@ -1,7 +1,7 @@ package _VisualDVM.Passes.Sapfor; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.Global; import _VisualDVM.Passes.Project.CurrentProjectPass; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; public class SilentSapforPass extends CurrentProjectPass { protected Sapfor sapfor; @Override diff --git a/src/_VisualDVM/Passes/Sapfor/Transformation.java b/src/_VisualDVM/Passes/Sapfor/Transformation.java index 86f6d069..461d4ef4 100644 --- a/src/_VisualDVM/Passes/Sapfor/Transformation.java +++ b/src/_VisualDVM/Passes/Sapfor/Transformation.java @@ -1,11 +1,11 @@ package _VisualDVM.Passes.Sapfor; import Common.Visual.Controls.PassMenuItem; +import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Passes.Project.CurrentProjectPass; import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.ProjectData.ProjectView; -import _VisualDVM.Repository.Component.Sapfor.TransformationPermission; import javax.swing.*; public class Transformation extends CurrentProjectPass { diff --git a/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java b/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java index 8be85611..241b466a 100644 --- a/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java +++ b/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java @@ -1,10 +1,10 @@ package _VisualDVM.Passes.Sapfor; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.Project.CurrentProjectPass; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; public abstract class VariantsMassPass extends CurrentProjectPass { int count; public abstract PassCode getSubPassCode(); diff --git a/src/_VisualDVM/Passes/Server/ClientPass.java b/src/_VisualDVM/Passes/Server/ClientPass.java index 66e9cbc3..0893b0e3 100644 --- a/src/_VisualDVM/Passes/Server/ClientPass.java +++ b/src/_VisualDVM/Passes/Server/ClientPass.java @@ -1,8 +1,6 @@ package _VisualDVM.Passes.Server; import Common.Passes.Pass; -import _VisualDVM.Constants; -import _VisualDVM.Global; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; import _VisualDVM.Repository.Server.SafeServerExchangeUnit; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; diff --git a/src/_VisualDVM/Passes/Server/CloneServerObject.java b/src/_VisualDVM/Passes/Server/CloneServerObject.java index cdcc24d3..1692a1c5 100644 --- a/src/_VisualDVM/Passes/Server/CloneServerObject.java +++ b/src/_VisualDVM/Passes/Server/CloneServerObject.java @@ -1,10 +1,9 @@ package _VisualDVM.Passes.Server; import Common.Database.Objects.riDBObject; import _VisualDVM.Global; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; import _VisualDVM.Repository.Server.SafeServerExchangeUnit; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import javafx.util.Pair; public abstract class CloneServerObject extends PublishServerObject { public D src; diff --git a/src/_VisualDVM/Passes/Server/ComponentsServerPass.java b/src/_VisualDVM/Passes/Server/ComponentsServerPass.java index 5e0b9e90..d5a1b208 100644 --- a/src/_VisualDVM/Passes/Server/ComponentsServerPass.java +++ b/src/_VisualDVM/Passes/Server/ComponentsServerPass.java @@ -1,6 +1,6 @@ package _VisualDVM.Passes.Server; +import _VisualDVM.ComponentsServer.ComponentsServer; import _VisualDVM.Global; -import _VisualDVM.Repository.Server.ComponentsServer; public class ComponentsServerPass extends ClientPass { @Override protected ComponentsServer getServer() { diff --git a/src/_VisualDVM/Passes/Server/DeleteServerObject.java b/src/_VisualDVM/Passes/Server/DeleteServerObject.java index 8232ce89..6ed55fab 100644 --- a/src/_VisualDVM/Passes/Server/DeleteServerObject.java +++ b/src/_VisualDVM/Passes/Server/DeleteServerObject.java @@ -1,9 +1,8 @@ package _VisualDVM.Passes.Server; import Common.Database.Objects.DBObject; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; import _VisualDVM.Repository.Server.SafeServerExchangeUnit; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.ServerObjectsCache.VisualCaches; import javafx.util.Pair; public class DeleteServerObject extends ServerObjectPass { diff --git a/src/_VisualDVM/Passes/Server/DeleteServerObjects.java b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java index f61a2ab2..a69255e8 100644 --- a/src/_VisualDVM/Passes/Server/DeleteServerObjects.java +++ b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java @@ -4,10 +4,9 @@ import Common.Database.Objects.DBObject; import Common.Database.Objects.riDBObject; import Common.Database.Tables.DBTable; import _VisualDVM.Global; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; import _VisualDVM.Repository.Server.SafeServerExchangeUnit; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.ServerObjectsCache.VisualCaches; import javafx.util.Pair; diff --git a/src/_VisualDVM/Passes/Server/EditServerObject.java b/src/_VisualDVM/Passes/Server/EditServerObject.java index 573a4632..ef4d584d 100644 --- a/src/_VisualDVM/Passes/Server/EditServerObject.java +++ b/src/_VisualDVM/Passes/Server/EditServerObject.java @@ -1,9 +1,8 @@ package _VisualDVM.Passes.Server; import Common.Database.Objects.DBObject; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; import _VisualDVM.Repository.Server.SafeServerExchangeUnit; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.ServerObjectsCache.VisualCaches; public class EditServerObject extends ServerObjectPass { //-- diff --git a/src/_VisualDVM/Passes/Server/PublishServerObject.java b/src/_VisualDVM/Passes/Server/PublishServerObject.java index 525986d1..98d071d1 100644 --- a/src/_VisualDVM/Passes/Server/PublishServerObject.java +++ b/src/_VisualDVM/Passes/Server/PublishServerObject.java @@ -2,10 +2,9 @@ package _VisualDVM.Passes.Server; import Common.Database.Objects.DBObject; import Common.Database.Objects.riDBObject; import _VisualDVM.Global; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; import _VisualDVM.Repository.Server.SafeServerExchangeUnit; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; public class PublishServerObject extends ServerObjectPass { public Object pk = null; public PublishServerObject(S server_in, Class d_in) { diff --git a/src/_VisualDVM/Passes/Server/PublishServerPass.java b/src/_VisualDVM/Passes/Server/PublishServerPass.java index b5ce6bbe..34296eff 100644 --- a/src/_VisualDVM/Passes/Server/PublishServerPass.java +++ b/src/_VisualDVM/Passes/Server/PublishServerPass.java @@ -2,7 +2,8 @@ package _VisualDVM.Passes.Server; import _VisualDVM.Global; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; + import java.io.File; public abstract class PublishServerPass extends RepositoryServerSSHPass { @Override diff --git a/src/_VisualDVM/Passes/Server/RepositoryPass.java b/src/_VisualDVM/Passes/Server/RepositoryPass.java index a6a4cac3..9d6b0ee5 100644 --- a/src/_VisualDVM/Passes/Server/RepositoryPass.java +++ b/src/_VisualDVM/Passes/Server/RepositoryPass.java @@ -2,7 +2,7 @@ package _VisualDVM.Passes.Server; import Common.Database.RepositoryRefuseException; import Common.Passes.Pass; import _VisualDVM.Constants; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; import _VisualDVM.Repository.Server.SafeServerExchangeUnit; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; diff --git a/src/_VisualDVM/Passes/Server/ServerObjectPass.java b/src/_VisualDVM/Passes/Server/ServerObjectPass.java index 12f42a1d..7652432b 100644 --- a/src/_VisualDVM/Passes/Server/ServerObjectPass.java +++ b/src/_VisualDVM/Passes/Server/ServerObjectPass.java @@ -2,7 +2,7 @@ package _VisualDVM.Passes.Server; import Common.Database.Database; import Common.Database.Objects.DBObject; import _VisualDVM.Global; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; public abstract class ServerObjectPass extends RepositoryPass { protected Class d; //класс объектов. //--- diff --git a/src/_VisualDVM/Passes/Server/ShutdownServerPass.java b/src/_VisualDVM/Passes/Server/ShutdownServerPass.java index a280157a..4eee9092 100644 --- a/src/_VisualDVM/Passes/Server/ShutdownServerPass.java +++ b/src/_VisualDVM/Passes/Server/ShutdownServerPass.java @@ -1,7 +1,6 @@ package _VisualDVM.Passes.Server; -import _VisualDVM.Global; import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; public abstract class ShutdownServerPass extends RepositoryServerSSHPass { @Override public String getIconPath() { diff --git a/src/_VisualDVM/Passes/Server/StartServerPass.java b/src/_VisualDVM/Passes/Server/StartServerPass.java index f8f1e41a..71e72932 100644 --- a/src/_VisualDVM/Passes/Server/StartServerPass.java +++ b/src/_VisualDVM/Passes/Server/StartServerPass.java @@ -1,13 +1,6 @@ package _VisualDVM.Passes.Server; -import Common.CommonConstants; -import _VisualDVM.Constants; -import _VisualDVM.Global; -import _VisualDVM.GlobalData.RemoteFile.RemoteFile; -import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; -import _VisualDVM.Repository.RepositoryServer; - -import java.util.Date; +import _VisualDVM.Repository.Server.RepositoryServer; public abstract class StartServerPass extends RepositoryServerSSHPass { @Override public String getIconPath() { diff --git a/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java b/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java index 2d9c9ec3..b8ca5e1d 100644 --- a/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java +++ b/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java @@ -1,11 +1,11 @@ package _VisualDVM.ProjectData.SapforData; import Common.Properties; import Common.Utils.Vector_; +import _VisualDVM.ComponentsServer.BugReport.Json.VisualiserSettingJson; +import _VisualDVM.ComponentsServer.BugReport.Json.VisualiserSettingsJson; import _VisualDVM.Global; import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.BugReport.Json.VisualiserSettingJson; -import _VisualDVM.Repository.BugReport.Json.VisualiserSettingsJson; import com.google.gson.annotations.Expose; import javax.swing.*; diff --git a/src/_VisualDVM/Repository/RepositoryServer.java b/src/_VisualDVM/Repository/Server/RepositoryServer.java similarity index 97% rename from src/_VisualDVM/Repository/RepositoryServer.java rename to src/_VisualDVM/Repository/Server/RepositoryServer.java index c638f7c7..7a60c7f2 100644 --- a/src/_VisualDVM/Repository/RepositoryServer.java +++ b/src/_VisualDVM/Repository/Server/RepositoryServer.java @@ -1,4 +1,4 @@ -package _VisualDVM.Repository; +package _VisualDVM.Repository.Server; import Common.Database.Database; import Common.Database.Objects.DBObject; import Common.Database.Objects.riDBObject; @@ -7,10 +7,7 @@ import Common.Utils.InterruptThread; import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Passes.Server.RepositoryPass; -import _VisualDVM.Repository.Server.DiagnosticSignalHandler; -import _VisualDVM.Repository.Server.SafeServerExchangeUnit; -import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; +import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Utils; import javafx.util.Pair; import sun.misc.SignalHandler; @@ -90,10 +87,7 @@ public abstract class RepositoryServer { public void ActivateDB() { try { db = d_class.newInstance(); - db.Connect(); - db.CreateAllTables(); - db.prepareTablesStatements(); - db.Synchronize(); + db.Activate(); } catch (Exception ex) { ex.printStackTrace(); } diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java index 1775f5f5..c8607fbe 100644 --- a/src/_VisualDVM/Repository/Server/ServerCode.java +++ b/src/_VisualDVM/Repository/Server/ServerCode.java @@ -63,9 +63,16 @@ public enum ServerCode { PerformAutoSapforTesting, JoinSapforVersionsToGroup, ReplaceDVMPackageResults, - DetectTestsMinMaxDim; + DetectTestsMinMaxDim, + GetUserAccountByKey, + GetUserAccountByEmail, + ; public String getDescription(){ switch (this){ + case GetUserAccountByEmail: + return "Получение информации об аккаунте по адресу почты"; + case GetUserAccountByKey: + return "Получение информации об аккаунте по ключу"; case DetectTestsMinMaxDim: return "Определить размерность тестов на сервере"; case ReplaceDVMPackageResults: diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java index 4ad4760c..0b90e3c0 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java @@ -4,8 +4,6 @@ import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.TestType; - -import javax.swing.*; public class GroupDialog extends DBObjectDialog { public GroupDialog() { super(GroupFields.class); diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java index e6ec06f0..429a6565 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java @@ -16,7 +16,6 @@ import _VisualDVM.Passes.PassCode; import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.TestType; -import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import javax.swing.*; public class GroupsForm extends DataSetControlForm { diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java index e53bfb23..3df1c4d1 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java @@ -3,8 +3,6 @@ import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.Test; - -import javax.swing.*; public class TestDialog extends DBObjectDialog { public TestDialog() { super(TestFields.class); diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java index 1d2990ac..7b0f5312 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java @@ -1,21 +1,16 @@ package _VisualDVM.TestingSystem.Common.Test.UI; -import Common.CommonConstants; import Common.Database.Tables.DataSet; import Common.Passes.PassCode_; -import Common.Utils.Utils_; import Common.Visual.DataSetControlForm; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; import Common.Visual.Tables.HeaderTextFilter; -import Common.Visual.Tables.RendererHiddenList; import Common.Visual.Tables.RendererLongCell; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.Test; -import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; -import _VisualDVM.Visual.Tables.RendererHyperlinks; import javax.swing.*; public class TestsForm extends DataSetControlForm { diff --git a/src/_VisualDVM/Repository/TestingClient.java b/src/_VisualDVM/TestingSystem/Common/TestingClient.java similarity index 94% rename from src/_VisualDVM/Repository/TestingClient.java rename to src/_VisualDVM/TestingSystem/Common/TestingClient.java index a6ba219f..18e767ea 100644 --- a/src/_VisualDVM/Repository/TestingClient.java +++ b/src/_VisualDVM/TestingSystem/Common/TestingClient.java @@ -1,12 +1,10 @@ -package _VisualDVM.Repository; +package _VisualDVM.TestingSystem.Common; import Common.Passes.PassException; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.Passes.Server.RepositoryPass; import _VisualDVM.Repository.Server.SafeServerExchangeUnit; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import _VisualDVM.TestingSystem.Common.TestingServer; import java.io.FileWriter; import java.io.Serializable; diff --git a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java index 6e769fe5..5319369b 100644 --- a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java +++ b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java @@ -6,11 +6,9 @@ import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.MachineType; -import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.User.User; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.TestingClient; import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage; import _VisualDVM.TestingSystem.Common.TestingPackageToKill.TestingPackageToKill; import _VisualDVM.Utils; diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java index 8413f67d..6ab8657d 100644 --- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java +++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java @@ -6,6 +6,7 @@ import Common.Database.RepositoryRefuseException; import Common.Utils.TextLog; import Common.Utils.Utils_; import Common.Utils.Vector_; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.GlobalData.Account.Account; @@ -14,9 +15,8 @@ import _VisualDVM.Passes.All.DownloadRepository; import _VisualDVM.Passes.All.ZipFolderPass; import _VisualDVM.Passes.PassCode; import _VisualDVM.ProjectData.LanguageName; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.Repository.EmailMessage; -import _VisualDVM.Repository.RepositoryServer; +import _VisualDVM.Repository.Server.RepositoryServer; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.Group.Group; diff --git a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java index 7ce5cd70..f7adf894 100644 --- a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java +++ b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java @@ -4,12 +4,12 @@ import Common.Database.RepositoryRefuseException; import Common.Database.SQLITE.SQLiteDatabase; import Common.Utils.TextLog; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.GlobalData.Account.Account; import _VisualDVM.Passes.All.ZipFolderPass; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable; diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java index e5afd55f..2719d760 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java @@ -2,11 +2,8 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI; import Common.Database.Tables.DataSet; import Common.Passes.PassCode_; import Common.Visual.Controls.MenuBarButton; -import Common.Visual.Controls.StableMenuItem; import Common.Visual.DataSetControlForm; -import Common.Visual.DataSetFiltersMenu; import Common.Visual.FilterFlag; -import Common.Visual.FilterMenuFlag; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Tables.ColumnInfo; import Common.Visual.Tables.HeaderTextFilter; @@ -14,11 +11,8 @@ import Common.Visual.Tables.RendererMultiline; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.VisualCaches; -import _VisualDVM.TestingSystem.Common.Group.Group; -import _VisualDVM.TestingSystem.Common.Test.TestType; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; import javax.swing.*; diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java index ceaac948..55250b0a 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java @@ -5,7 +5,10 @@ import Common.Visual.Controls.MenuBarButton; import Common.Visual.DataSetControlForm; import Common.Visual.FilterFlag; import Common.Visual.Menus.DataMenuBar; -import Common.Visual.Tables.*; +import Common.Visual.Tables.ColumnInfo; +import Common.Visual.Tables.RendererDate; +import Common.Visual.Tables.RendererProgressBar; +import Common.Visual.Tables.RendererStatusEnum; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.ServerObjectsCache.PackageCache; diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java index 95d750f4..83c13d2f 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java @@ -11,7 +11,6 @@ import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; -import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import javax.swing.*; public class DVMSettingsForm extends DataSetControlForm { diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTestingChecker.java b/src/_VisualDVM/TestingSystem/DVM/DVMTestingChecker.java index 9f8ddb56..2f866d92 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMTestingChecker.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMTestingChecker.java @@ -1,6 +1,6 @@ package _VisualDVM.TestingSystem.DVM; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.TestingClient; +import _VisualDVM.TestingSystem.Common.TestingClient; public class DVMTestingChecker extends TestingClient { @Override public void perform() throws Exception { diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java index ada65bd2..7ccf37f3 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforVersion_json.java @@ -1,6 +1,7 @@ package _VisualDVM.TestingSystem.SAPFOR.Json; import Common.CommonConstants; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.Constants; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.FileType; @@ -8,7 +9,6 @@ import _VisualDVM.ProjectData.Files.ProjectFile; import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.Messages.Errors.MessageError; import _VisualDVM.ProjectData.Project.db_project_info; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask; import _VisualDVM.Utils; import com.google.gson.annotations.Expose; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java b/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java index 42f08f7a..0cfd320a 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java @@ -1,10 +1,10 @@ package _VisualDVM.TestingSystem.SAPFOR; import Common.Passes.Pass; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.Constants; import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json; import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask; import _VisualDVM.Utils; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java index a696b50c..2e6a34ab 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java @@ -14,9 +14,7 @@ import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.VisualCaches; -import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; -import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.Visual.Tables.RendererConfigurationAuto; import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java index 809df74f..09d5cda5 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java @@ -6,10 +6,7 @@ import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.GlobalData.Account.Account; import _VisualDVM.GlobalData.Tasks.TaskState; -import _VisualDVM.ServerObjectsCache.ConfigurationCache; -import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.TestingSystem.Common.TasksPackageState; -import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage; import _VisualDVM.TestingSystem.SAPFOR.Json.SapforPackage_json; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; @@ -18,7 +15,6 @@ import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor; import com.sun.org.glassfish.gmbal.Description; import java.io.File; -import java.util.LinkedHashMap; import java.util.Vector; public class SapforPackage extends TestingPackage { public int sapforId = CommonConstants.Nan; // так как сапфор на машине. diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java index 7395f441..451a5f95 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java @@ -5,7 +5,10 @@ import Common.Visual.Controls.MenuBarButton; import Common.Visual.DataSetControlForm; import Common.Visual.FilterFlag; import Common.Visual.Menus.DataMenuBar; -import Common.Visual.Tables.*; +import Common.Visual.Tables.ColumnInfo; +import Common.Visual.Tables.RendererDate; +import Common.Visual.Tables.RendererProgressBar; +import Common.Visual.Tables.RendererStatusEnum; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; import _VisualDVM.ServerObjectsCache.PackageCache; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java index 3b864fce..098c9c6b 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java @@ -2,8 +2,6 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI; import Common.Utils.Utils_; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; - -import javax.swing.*; public class SapforSettingsDialog extends DBObjectDialog { public SapforSettingsDialog() { super(SapforSettingsFields.class); diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java index 3ce72ba3..0c9b2860 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java @@ -10,8 +10,6 @@ import Common.Visual.Tables.HeaderTextFilter; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; -import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import javax.swing.*; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandFields.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandFields.java index dc61eb98..a4cf7e19 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandFields.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandFields.java @@ -2,8 +2,8 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI; import Common.MainModule_; import Common.Visual.Tables.StyledCellLabel; import Common.Visual.Windows.Dialog.DialogFields; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; import javax.swing.*; import java.awt.*; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java index cd54bb45..58b38b2b 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java @@ -2,9 +2,9 @@ package _VisualDVM.TestingSystem.SAPFOR; import Common.CommonConstants; import Common.Utils.TextLog; import Common.Utils.Utils_; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.*; import _VisualDVM.ProjectData.LanguageName; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.TestingSystem.Common.TasksPackageState; diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java index 49891bcb..c9d4a84b 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java @@ -1,8 +1,8 @@ package _VisualDVM.Visual.Menus.MainMenuBar; import Common.Visual.Menus.VisualiserMenu; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; public class AnalysesMenu extends VisualiserMenu { public AnalysesMenu() { super("Анализаторы", "/icons/Analyses.png"); diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java index 03013aec..2925c2a1 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java @@ -4,12 +4,12 @@ import Common.Visual.Controls.MenuBarButton; import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Menus.VisualiserMenuBar; import Common.Visual.UI; +import _VisualDVM.ComponentsServer.Component.PerformanceAnalyzer.PerformanceAnalyzer; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.User.User; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer; import _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu; import javax.swing.*; @@ -47,7 +47,6 @@ public class MainMenuBar extends VisualiserMenuBar { }); } }); - add(new MenuBarButton() { { setIcon("/icons/Comparsion.png"); @@ -61,7 +60,7 @@ public class MainMenuBar extends VisualiserMenuBar { //- setPreferredSize(new Dimension(0, 30)); //-- - /* +/* add(new MenuBarButton() { { setIcon("/Common/icons/Apply.png"); @@ -71,7 +70,7 @@ public class MainMenuBar extends VisualiserMenuBar { }); } }); - */ + */ //-- add(new JSeparator()); add(MachineButton = new MenuBarButton() { diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java index dab6b7bc..3c0635e0 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java @@ -1,8 +1,8 @@ package _VisualDVM.Visual.Menus.MainMenuBar; import Common.Visual.Menus.VisualiserMenu; +import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.Visual.Menus.PassesSubMenu; public class TransformationsMenu extends VisualiserMenu { public TransformationsMenu() { diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java index 177bf32c..54c29406 100644 --- a/src/_VisualDVM/Visual/Windows/CallbackForm.java +++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java @@ -4,11 +4,11 @@ import Common.Visual.FormWithSplitters; import Common.Visual.Menus.VisualiserMenuBar; import Common.Visual.TextField.StyledTextField; import Common.Visual.UI; +import _VisualDVM.ComponentsServer.BugReport.BugReport; +import _VisualDVM.ComponentsServer.BugReport.BugReportState; +import _VisualDVM.ComponentsServer.BugReport.UI.BugReportsForm; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; -import _VisualDVM.Repository.BugReport.BugReport; -import _VisualDVM.Repository.BugReport.BugReportState; -import _VisualDVM.Repository.BugReport.UI.BugReportsForm; import _VisualDVM.Visual.Editor.BaseEditor; import _VisualDVM.Visual.Editor.Viewer; import _VisualDVM.Visual.Interface.CallbackWindow; @@ -398,6 +398,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { } @Override public void ShowAccount() { + /* lAccountName.setText(Utils_.Brackets(Global.mainModule.getAccount().name)); lAccountMail.setText(Utils_.Brackets(Global.mainModule.getAccount().email)); lAccountRole.setText(Utils_.Brackets(Global.mainModule.getAccount().role.getDescription())); @@ -423,6 +424,32 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { EnableBugreports(); break; } + */ + lAccountName.setText(Utils_.Brackets(Global.normalProperties.Name)); + lAccountMail.setText(Utils_.Brackets(Global.normalProperties.Email)); + lAccountRole.setText(Utils_.Brackets(Global.normalProperties.Role.getDescription())); + System.out.println("ROLE IS "+Global.normalProperties.Role.getDescription()); + switch (Global.normalProperties.Role) { + case Undefined: + setUdefinedRights(); + break; + case User: + //видит только свои баги. + EnableBugreports(); + setUserRights(); + break; + case Developer: + EnableBugreports(); + setDeveloperRights(); + break; + case Admin: + EnableBugreports(); + setAdminRights(); + break; + default: + EnableBugreports(); + break; + } } @Override public void ShowBugReports() { diff --git a/src/_VisualDVM/Visual/Windows/ComponentsWindow.java b/src/_VisualDVM/Visual/Windows/ComponentsWindow.java index 54896d26..b5794fe7 100644 --- a/src/_VisualDVM/Visual/Windows/ComponentsWindow.java +++ b/src/_VisualDVM/Visual/Windows/ComponentsWindow.java @@ -1,7 +1,7 @@ package _VisualDVM.Visual.Windows; import Common.Visual.Windows.Dialog.Dialog; +import _VisualDVM.ComponentsServer.Component.UI.ComponentsFields; import _VisualDVM.Global; -import _VisualDVM.Repository.Component.UI.ComponentsFields; import java.awt.*; public class ComponentsWindow extends Dialog {