From b8f1ad56ed7e69ffb5d8652e0812e8fbad93e2f6 Mon Sep 17 00:00:00 2001 From: 02090095 Date: Sat, 8 Feb 2025 19:19:26 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=BE=D1=80=D1=82=D0=BE=D0=B2=20=D0=B2=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D1=8B=20=D0=B2=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D1=80=D0=B8=20=D0=BA=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- properties | 15 ++++++--------- src/_VisualDVM/Constants.java | 4 ++++ .../GlobalData/Machine/UI/MachinesForm.java | 17 +---------------- src/_VisualDVM/Passes/Server/ClientPass.java | 3 ++- .../Passes/Server/RepositoryPass.java | 2 +- .../Repository/Server/ComponentsServer.java | 2 +- .../TestingSystem/Common/TestingServer.java | 2 +- src/_VisualDVM/VisualDVMProperties.java | 10 ---------- 8 files changed, 16 insertions(+), 39 deletions(-) diff --git a/properties b/properties index 10008da7..71b3b2f1 100644 --- a/properties +++ b/properties @@ -12,7 +12,7 @@ "ConfirmPassesStart": true, "ShowPassesDone": true, "FocusPassesResult": true, - "collapseCredentials": false, + "collapseCredentials": true, "collapseFileGraphs": false, "collapseFileMessages": false, "collapseProjectTrees": false, @@ -22,11 +22,11 @@ "Kernels": 8, "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe", "CheckTestingIntervalSeconds": 10, - "AutoCheckTesting": true, + "AutoCheckTesting": false, "EmailOnTestingProgress": true, - "lastMachineId": 11, - "lastUserId": -1, - "lastCompilerId": -1, + "lastMachineId": 13, + "lastUserId": 24, + "lastCompilerId": 52, "RegisterOn": false, "SpacesOn": false, "EmptyLinesOn": false, @@ -39,8 +39,5 @@ "BugReportsAgeLimit": 1, "FastAccessPassesCount": 10, "LastOpenedProjectsCount": 25, - "Mode": "Normal", - "ComponentsServerPort": 7995, - "TestingServerPort": 7998, - "SocketTimeout": 5000 + "Mode": "Normal" } \ No newline at end of file diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java index c49b1f74..08445548 100644 --- a/src/_VisualDVM/Constants.java +++ b/src/_VisualDVM/Constants.java @@ -1,5 +1,6 @@ package _VisualDVM; import Common.Utils.Vector_; +import com.google.gson.annotations.Expose; import java.util.Vector; public class Constants { @@ -42,6 +43,9 @@ 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 TestingServerPort = 7998; + public static final int SocketTimeout = 5000; //- public static final String ServerAddress = "alex-freenas.ddns.net"; public static final String ServerUserName = "testuser"; diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java index e4b2ef3f..6142fbe3 100644 --- a/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java +++ b/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java @@ -56,22 +56,7 @@ public class MachinesForm extends DataSetControlForm { return new DataMenuBar(dataSource.getPluralDescription(), PassCode.AddMachine, PassCode.EditMachine, - PassCode.DeleteMachine) { - { - add(new MenuBarButton() { - { - setIcon("/Common/icons/SilverArrowUp.png"); - setToolTipText("Свернуть"); - addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - Global.mainModule.getPass(PassCode.UpdateProperty).Do("collapseCredentials", true); - } - }); - } - }, 0); - } - }; + PassCode.DeleteMachine); } @Override protected DBObjectDialog getDialog() { diff --git a/src/_VisualDVM/Passes/Server/ClientPass.java b/src/_VisualDVM/Passes/Server/ClientPass.java index 4594be03..3d754398 100644 --- a/src/_VisualDVM/Passes/Server/ClientPass.java +++ b/src/_VisualDVM/Passes/Server/ClientPass.java @@ -1,5 +1,6 @@ package _VisualDVM.Passes.Server; import Common.Passes.Pass; +import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.Server.ServerCode; @@ -48,7 +49,7 @@ public abstract class ClientPass extends Pass return request.Do(); } protected boolean SendRequest(ServerCode code_in,String arg_in, Serializable object_in){ - return SendRequest(code_in,arg_in, object_in, Global.properties.SocketTimeout); + return SendRequest(code_in,arg_in, object_in, Constants.SocketTimeout); } protected boolean SendRequest(ServerCode code_in, String arg_in){ return SendRequest(code_in,arg_in,null); diff --git a/src/_VisualDVM/Passes/Server/RepositoryPass.java b/src/_VisualDVM/Passes/Server/RepositoryPass.java index e418056b..9098eeeb 100644 --- a/src/_VisualDVM/Passes/Server/RepositoryPass.java +++ b/src/_VisualDVM/Passes/Server/RepositoryPass.java @@ -30,7 +30,7 @@ public abstract class RepositoryPass extends Pass return true; } protected int getTimeout() { - return Global.properties.SocketTimeout; + return Constants.SocketTimeout; } //- protected void connect() throws Exception { diff --git a/src/_VisualDVM/Repository/Server/ComponentsServer.java b/src/_VisualDVM/Repository/Server/ComponentsServer.java index f66de39f..ce3b9404 100644 --- a/src/_VisualDVM/Repository/Server/ComponentsServer.java +++ b/src/_VisualDVM/Repository/Server/ComponentsServer.java @@ -112,7 +112,7 @@ public class ComponentsServer extends RepositoryServer { } @Override public int getPort() { - return Global.properties.ComponentsServerPort; + return Constants.ComponentsServerPort; } @Override protected void beforePublishAction(DBObject object) throws Exception { diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java index 0f0a11fd..8968fec1 100644 --- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java +++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java @@ -257,7 +257,7 @@ public class TestingServer extends RepositoryServer { //основа @Override public int getPort() { - return Global.properties.TestingServerPort; + return Constants.TestingServerPort; } @Override protected void startAdditionalThreads() { diff --git a/src/_VisualDVM/VisualDVMProperties.java b/src/_VisualDVM/VisualDVMProperties.java index 541c3522..99ca1e91 100644 --- a/src/_VisualDVM/VisualDVMProperties.java +++ b/src/_VisualDVM/VisualDVMProperties.java @@ -7,13 +7,6 @@ public class VisualDVMProperties extends Properties { @Expose public _VisualDVM.Mode Mode = _VisualDVM.Mode.Normal; //--- - @Expose - public int ComponentsServerPort = 7995; - @Expose - public int TestingServerPort = 7998; - @Expose - public int SocketTimeout = 5000; - //-- public VisualDVMProperties() { } public VisualDVMProperties(_VisualDVM.Mode mode_in, File file_in) { @@ -23,8 +16,5 @@ public class VisualDVMProperties extends Properties { //--- public VisualDVMProperties(VisualDVMProperties src) { Mode = src.Mode; - ComponentsServerPort = src.ComponentsServerPort; - TestingServerPort = src.TestingServerPort; - SocketTimeout = src.SocketTimeout; } }