M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2025-02-04 16:33:06 +03:00
parent 353c0b2dbe
commit 87a761f5a6
11 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/workspace.xml generated
View File

@@ -7,10 +7,16 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ComponentsServerClientPass.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/TestingServerClientPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SendBugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReportsDatabase.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

11
src/_VisualDVM/Passes/All/AppendBugReportField.java
View File

@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ClientPass; import _VisualDVM.Passes.Server.ClientPass;
import _VisualDVM.Passes.Server.ComponentsServerClientPass;
import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.Json.BugReportAdditionJson; import _VisualDVM.Repository.BugReport.Json.BugReportAdditionJson;
import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.EmailMessage;
@@ -10,7 +11,7 @@ import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import java.util.Date; import java.util.Date;
public class AppendBugReportField extends ClientPass<ComponentsServer, BugReport> { public class AppendBugReportField extends ComponentsServerClientPass<BugReport> {
String fieldName; String fieldName;
String oldValue; String oldValue;
String addition; String addition;
@@ -21,14 +22,6 @@ public class AppendBugReportField extends ClientPass<ComponentsServer, BugReport
return "/icons/Append.png"; return "/icons/Append.png";
} }
@Override @Override
public String getButtonText() {
return "";
}
@Override
protected ComponentsServer getServer() {
return Global.componentsServer;
}
@Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
actual = null; actual = null;
if (getServer().db.getTable(BugReport.class).getUI().CheckCurrent(Log)) { if (getServer().db.getTable(BugReport.class).getUI().CheckCurrent(Log)) {

7
src/_VisualDVM/Passes/All/GetComponentsActualVersions.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ClientPass; import _VisualDVM.Passes.Server.ClientPass;
import _VisualDVM.Passes.Server.ComponentsServerClientPass;
import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Component.ComponentType; import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Repository.Component.Json.ComponentVersionsInfoJson; import _VisualDVM.Repository.Component.Json.ComponentVersionsInfoJson;
@@ -8,17 +9,13 @@ import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import java.util.Vector; import java.util.Vector;
public class GetComponentsActualVersions extends ClientPass<ComponentsServer, Object> { public class GetComponentsActualVersions extends ComponentsServerClientPass<Object> {
Vector<ComponentVersionsInfoJson> versions; Vector<ComponentVersionsInfoJson> versions;
@Override @Override
public String getIconPath() { public String getIconPath() {
return "/icons/Components.png"; return "/icons/Components.png";
} }
@Override @Override
protected ComponentsServer getServer() {
return Global.componentsServer;
}
@Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
versions = null; versions = null;
Vector<String> types = new Vector<>(); Vector<String> types = new Vector<>();

7
src/_VisualDVM/Passes/All/PublishComponent.java
View File

@@ -4,6 +4,7 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ClientPass; import _VisualDVM.Passes.Server.ClientPass;
import _VisualDVM.Passes.Server.ComponentsServerClientPass;
import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Component.ComponentType; import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Repository.Component.Json.ComponentPublicationInfoJson; import _VisualDVM.Repository.Component.Json.ComponentPublicationInfoJson;
@@ -14,7 +15,7 @@ import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import java.util.Date; import java.util.Date;
public class PublishComponent extends ClientPass<ComponentsServer, Component> { public class PublishComponent extends ComponentsServerClientPass<Component> {
String version_mail_header = ""; String version_mail_header = "";
String version_text = ""; String version_text = "";
PublishForm f = new PublishForm(); PublishForm f = new PublishForm();
@@ -23,10 +24,6 @@ public class PublishComponent extends ClientPass<ComponentsServer, Component> {
return "/Common/icons/Publish.png"; return "/Common/icons/Publish.png";
} }
@Override @Override
protected ComponentsServer getServer() {
return Global.componentsServer;
}
@Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
if (!Utils_.isWindows()) { if (!Utils_.isWindows()) {
Log.Writeln_("Публикация компонент разрешена только для Windows"); Log.Writeln_("Публикация компонент разрешена только для Windows");

7
src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
View File

@@ -7,6 +7,7 @@ import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ClientPass; import _VisualDVM.Passes.Server.ClientPass;
import _VisualDVM.Passes.Server.TestingServerClientPass;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -16,7 +17,7 @@ import _VisualDVM.Utils;
import java.io.File; import java.io.File;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Vector; import java.util.Vector;
public class ReplaceTestsFromFiles extends ClientPass<TestingServer,Vector<Test>> { public class ReplaceTestsFromFiles extends TestingServerClientPass<Vector<Test>> {
VFileChooser fileChooser = new VFileChooser("Выберите файлы для замены тестов"); VFileChooser fileChooser = new VFileChooser("Выберите файлы для замены тестов");
//-- //--
Group group; Group group;
@@ -28,10 +29,6 @@ public class ReplaceTestsFromFiles extends ClientPass<TestingServer,Vector<Test>
public String getIconPath() { public String getIconPath() {
return "/icons/Menu/Undo.png"; return "/icons/Menu/Undo.png";
} }
@Override
protected TestingServer getServer() {
return Global.testingServer;
}
//- //-
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {

8
src/_VisualDVM/Passes/All/SendBugReport.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ClientPass; import _VisualDVM.Passes.Server.ComponentsServerClientPass;
import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
public class SendBugReport extends ClientPass<ComponentsServer,BugReport> { public class SendBugReport extends ComponentsServerClientPass<BugReport> {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = Global.componentsServer.db.bugReports.getUI().getCurrent(); target = Global.componentsServer.db.bugReports.getUI().getCurrent();
@@ -18,8 +18,4 @@ public class SendBugReport extends ClientPass<ComponentsServer,BugReport> {
protected void performFail() throws Exception { protected void performFail() throws Exception {
target.state = BugReportState.draft; target.state = BugReportState.draft;
} }
@Override
protected ComponentsServer getServer() {
return Global.componentsServer;
}
} }

7
src/_VisualDVM/Passes/All/SynchronizeBugReports.java
View File

@@ -2,19 +2,16 @@ package _VisualDVM.Passes.All;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ClientPass; import _VisualDVM.Passes.Server.ClientPass;
import _VisualDVM.Passes.Server.ComponentsServerClientPass;
import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Utils; import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import java.io.File; import java.io.File;
public class SynchronizeBugReports extends ClientPass<ComponentsServer, Object> { public class SynchronizeBugReports extends ComponentsServerClientPass<Object> {
File new_db_file; File new_db_file;
@Override @Override
protected ComponentsServer getServer() {
return Global.componentsServer;
}
@Override
public String getIconPath() { public String getIconPath() {
return "/icons/ComponentsActual.png"; return "/icons/ComponentsActual.png";
} }

7
src/_VisualDVM/Passes/All/SynchronizeTests.java
View File

@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
import Common.Visual.Controls.PassButton; import Common.Visual.Controls.PassButton;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ClientPass; import _VisualDVM.Passes.Server.ClientPass;
import _VisualDVM.Passes.Server.TestingServerClientPass;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.ServerObjectsCache.VisualCaches;
@@ -16,7 +17,7 @@ import org.apache.commons.io.FileUtils;
import javax.swing.*; import javax.swing.*;
import java.io.File; import java.io.File;
public class SynchronizeTests extends ClientPass<TestingServer,Object> { public class SynchronizeTests extends TestingServerClientPass<Object> {
File new_db_file; File new_db_file;
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
@@ -27,10 +28,6 @@ public class SynchronizeTests extends ClientPass<TestingServer,Object> {
return "/icons/ComponentsActual.png"; return "/icons/ComponentsActual.png";
} }
@Override @Override
protected TestingServer getServer() {
return Global.testingServer;
}
@Override
public JButton createButton() { public JButton createButton() {
return new PassButton(this); return new PassButton(this);
} }

7
src/_VisualDVM/Passes/All/UpdateBugReportField.java
View File

@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ClientPass; import _VisualDVM.Passes.Server.ClientPass;
import _VisualDVM.Passes.Server.ComponentsServerClientPass;
import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.EmailMessage;
@@ -14,16 +15,12 @@ import javafx.util.Pair;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.Vector; import java.util.Vector;
public class UpdateBugReportField extends ClientPass<ComponentsServer,BugReport> { public class UpdateBugReportField extends ComponentsServerClientPass<BugReport> {
Vector<String> fieldNames = new Vector<>(); Vector<String> fieldNames = new Vector<>();
Vector<Serializable> fieldValues = new Vector<>(); Vector<Serializable> fieldValues = new Vector<>();
String old_description = ""; String old_description = "";
String old_comment = ""; String old_comment = "";
BugReport actual; BugReport actual;
@Override
protected ComponentsServer getServer() {
return Global.componentsServer;
}
protected boolean canUpdate() { protected boolean canUpdate() {
return target.canModify(Global.mainModule.getAccount(),Log); return target.canModify(Global.mainModule.getAccount(),Log);
} }

9
src/_VisualDVM/Passes/Server/ComponentsServerClientPass.java Normal file
View File

@@ -0,0 +1,9 @@
package _VisualDVM.Passes.Server;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.ComponentsServer;
public class ComponentsServerClientPass<T> extends ClientPass<ComponentsServer,T> {
@Override
protected ComponentsServer getServer() {
return Global.componentsServer;
}
}

9
src/_VisualDVM/Passes/Server/TestingServerClientPass.java Normal file
View File

@@ -0,0 +1,9 @@
package _VisualDVM.Passes.Server;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.Common.TestingServer;
public class TestingServerClientPass<T> extends ClientPass<TestingServer,T> {
@Override
protected TestingServer getServer() {
return Global.testingServer;
}
}