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:22:42 +03:00
parent 8696c7e66f
commit c2256a247b
19 changed files with 66 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -8,11 +8,9 @@
<component name="ChangeListManager">
<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 beforePath="$PROJECT_DIR$/src/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/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/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

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

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.Subscribes.Subscriber;
public class CheckRegistrationOnServer extends ComponentsRepositoryPass<Subscriber> {
public class CheckRegistrationOnServer extends ComponentsRepositoryPass_OLD<Subscriber> {
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.CheckSubscriberRole, "", Global.mainModule.getAccount()));

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

@@ -3,11 +3,11 @@ import Common.MainModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
public class CheckRemoteWorkspace extends ComponentsRepositoryPass<SubscriberWorkspace> {
public class CheckRemoteWorkspace extends ComponentsRepositoryPass_OLD<SubscriberWorkspace> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = null;

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

@@ -5,7 +5,7 @@ import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Repository.Server.ServerCode;
@@ -18,7 +18,7 @@ import java.io.File;
import java.nio.file.Paths;
import java.util.Date;
import java.util.Vector;
public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info> {
public class DVMConvertProject extends ComponentsRepositoryPass_OLD<db_project_info> {
File workspace = null;
File archive = null;
Vector<DBProjectFile> programsToConvert = null;

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

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class DeleteBugReportFromServer extends ComponentsRepositoryPass<BugReport> {
public class DeleteBugReportFromServer extends ComponentsRepositoryPass_OLD<BugReport> {
@Override
protected boolean canStart(Object... args) {
target = (BugReport) args[0];

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

@@ -2,7 +2,7 @@ package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
@@ -10,7 +10,7 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.file.Paths;
public class DownloadAllBugReportsArchives extends ComponentsRepositoryPass<File> {
public class DownloadAllBugReportsArchives extends ComponentsRepositoryPass_OLD<File> {
@Override
public String getIconPath() {
return "/icons/DownloadAll.png";

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

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class DownloadBugReport extends ComponentsRepositoryPass<BugReport> {
public class DownloadBugReport extends ComponentsRepositoryPass_OLD<BugReport> {
@Override
protected boolean canStart(Object... args) {
target = (BugReport) args[0];

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

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class DownloadComponent extends ComponentsRepositoryPass<Component> {
public class DownloadComponent extends ComponentsRepositoryPass_OLD<Component> {
@Override
protected void ServerAction() throws Exception {
target = Global.components.getUI().getCurrent();

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

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.util.Vector;
public class Email extends ComponentsRepositoryPass<EmailMessage> {
public class Email extends ComponentsRepositoryPass_OLD<EmailMessage> {
Vector<String> recipients;
@Override
protected boolean canStart(Object... args) throws Exception {

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

@@ -1,12 +1,12 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.io.File;
import java.util.Vector;
public class GetComponentsBackupsFromServer extends ComponentsRepositoryPass<Vector<File>> {
public class GetComponentsBackupsFromServer extends ComponentsRepositoryPass_OLD<Vector<File>> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();

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

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.net.ConnectException;
public class PingComponentsServer extends ComponentsRepositoryPass {
public class PingComponentsServer extends ComponentsRepositoryPass_OLD {
boolean flag;
boolean silent;
@Override

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

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
public class PublishRemoteWorkspace extends ComponentsRepositoryPass<SubscriberWorkspace> {
public class PublishRemoteWorkspace extends ComponentsRepositoryPass_OLD<SubscriberWorkspace> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (SubscriberWorkspace) args[0];

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

@@ -9,7 +9,7 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.CurrentComponentPass;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
@@ -90,7 +90,7 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
@Override
protected void body() throws Exception {
//1. Скачать файл.
Pass receivePass = new ComponentsRepositoryPass() {
Pass receivePass = new ComponentsRepositoryPass_OLD() {
@Override
public String getDescription() {
return "Скачивание файла с сервера";

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

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -12,7 +12,7 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.util.List;
import java.util.Vector;
public class ShowComponentChangesLog extends ComponentsRepositoryPass<Component> {
public class ShowComponentChangesLog extends ComponentsRepositoryPass_OLD<Component> {
File res;
@Override
public String getIconPath() {

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

@@ -1,57 +1,43 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.Server.ClientPass;
import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;
import java.io.File;
public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
public class SynchronizeBugReports extends ClientPass<ComponentsServer, Object> {
File new_db_file;
@Override
protected ComponentsServer getServer() {
return Global.componentsServer;
}
@Override
public String getIconPath() {
return "/icons/ComponentsActual.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
return Global.mainModule.getAccount().CheckRegistered(Log);
return Global.mainModule.getAccount().CheckRegistered(Log) && SendRequest(ServerCode.ReceiveBugReportsDatabase);
}
@Override
protected void showPreparation() throws Exception {
if (server.db.bugReports.getUI()!=null)
server.db.bugReports.getUI().SaveLastCurrent();
server.db.bugReports.ClearUI();
server.db.subscribers.ClearUI();
server.db.workspaces.ClearUI();
getServer().db.DropUI();
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.ReceiveBugReportsDatabase));
server_response.Unpack(new_db_file = Utils.getTempFileName("bdb"));
protected void body() throws Exception {
request.server_response.Unpack(new_db_file = Utils.getTempFileName("bdb"));
}
@Override
protected void performDone() throws Exception {
super.performDone();
server.db.Disconnect();
Utils_.forceDeleteWithCheck(server.db.getFile());
FileUtils.moveFile(new_db_file, server.db.getFile());
server.db.Connect();
server.db.prepareTablesStatements();
server.db.Synchronize();
getServer().db.ReplaceFileAndReconnect(new_db_file);
}
@Override
protected void showDone() throws Exception {
if (Global.mainModule.getUI().hasMainWindow()) {
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowBugReports();
server.db.bugReports.getUI().RestoreLastCurrent();
server.db.subscribers.getUI().RestoreLastCurrent();
server.db.workspaces.getUI().RestoreLastCurrent();
}
if (Global.mainModule.getUI().hasMainWindow())
getServer().db.ResetUI();
}
}

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

@@ -3,13 +3,11 @@ import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ClientPass;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import javafx.util.Pair;

4
src/_VisualDVM/Passes/Server/ComponentsRepositoryPass.java → src/_VisualDVM/Passes/Server/ComponentsRepositoryPass_OLD.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.Server;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.ComponentsServer;
public abstract class ComponentsRepositoryPass<T> extends RepositoryPass<ComponentsServer, T> {
public ComponentsRepositoryPass() {
public abstract class ComponentsRepositoryPass_OLD<T> extends RepositoryPass<ComponentsServer, T> {
public ComponentsRepositoryPass_OLD() {
super(Global.componentsServer);
}
}

11
src/_VisualDVM/Repository/BugReportsDatabase.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Repository;
import Common.Database.SQLITE.SQLiteDatabase;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportsDBTable;
@@ -35,4 +34,14 @@ public class BugReportsDatabase extends SQLiteDatabase {
for (BugReport draft : drafts)
Delete(draft);
}
public void DropUI() {
SaveLastSelections();
bugReports.ClearUI();
subscribers.ClearUI();
workspaces.ClearUI();
}
public void ResetUI() {
bugReports.ShowUI();
RestoreLastSelections();
}
}

26
src/_VisualDVM/Repository/Server/ServerCode.java
View File

@@ -54,9 +54,6 @@ public enum ServerCode {
//--
CheckURLRegistered,
DVMConvertProject,
SetRole,
Patch,
EmailSapforAssembly,
//-
DeleteObjectByPK,
//-
@@ -71,7 +68,7 @@ public enum ServerCode {
ActualizeSAPFORPackages,
ActualizeDVMPackages,
GetFirstActiveDVMPackage,
DVMPackageNeedsKill, // не доделано.
DVMPackageNeedsKill,
UpdateActiveDVMPackages,
GetFirstActiveSapforPackages,
SapforPackageNeedsKill,
@@ -90,25 +87,24 @@ public enum ServerCode {
StartNecessaryMachines,
GetSapforForCompilation,
GetMaxSapforVersion,
PerformAutoSapforTesting,
Email_new;
PerformAutoSapforTesting;
public String getDescription(){
switch (this){
case GetComponentsVersionsInfo:
return "Получить версии компонент";
return "Получение версий компонент c сервера";
case UpdateComponent:
return "Опубликовать компонент";
case UpdateComponentMinimalVersion:
return "Поднять минимальную версию компонента";
return "Публикация компонента на сервере";
case PublishObject:
return "Публикация объекта";
return "Публикация объекта на сервере";
case SendBugReport:
return "Отправка отчета об ошибке";
case UpdateBugReportField:
return "Обновить поле отчета об ошибке";
return "Отправка отчета об ошибке на сервер";
case AppendBugReportTextField:
return "Дополнить описание или комментария отчета об ошибке";
return "Дополнение описание или комментария отчета об ошибке на сервере";
case ReceiveBugReportsDatabase:
return "Скачивание базы данных отчетов об ошибках с сервера";
case ReceiveTestsDatabase:
return "Скачивание базы тестирования с сервера";
default:
return this.toString();
}