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 18:49:55 +03:00
parent 281ec9bfc2
commit 7855ce62a4
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/workspace.xml generated
View File

@@ -7,8 +7,9 @@
</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 beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.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" />

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

@@ -4,22 +4,23 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User; import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD; import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
public class CheckRemoteWorkspace extends ComponentsRepositoryPass_OLD<SubscriberWorkspace> { public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
target = null; target = null;
return Global.mainModule.getAccount().CheckRegistered(Log); if (Global.mainModule.getAccount().CheckRegistered(Log)){
} String email = Global.mainModule.getAccount().email;
@Override String machineURL = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().getURL();
protected void ServerAction() throws Exception { String login = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent().login;
String email = Global.mainModule.getAccount().email; if (SendRequest(ServerCode.CheckURLRegistered, email + "\n" + machineURL + "\n" + login)) {
String machineURL = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().getURL(); target = (SubscriberWorkspace) request.server_response.object;
String login = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent().login; return true;
Command(new ServerExchangeUnit_2021(ServerCode.CheckURLRegistered, }
email + "\n" + machineURL + "\n" + login)); };
target = (SubscriberWorkspace) server_response.object; return false;
} }
} }

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

@@ -27,15 +27,6 @@ public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDV
Vector<RemoteFile> backups; //не забывать что файлы на СЕРВЕРЕ. Vector<RemoteFile> backups; //не забывать что файлы на СЕРВЕРЕ.
RemoteFile remoteFile; RemoteFile remoteFile;
File localFile; File localFile;
/*
@Override
public JMenuItem createMenuItem() {
if (menuItem == null)
menuItem = new PassMenuItem(this);
return menuItem;
}
*/
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
remoteFile = null; remoteFile = null;

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

@@ -109,6 +109,8 @@ public enum ServerCode {
return "Скачивание файла с сервера"; return "Скачивание файла с сервера";
case GetComponentChangesLog: case GetComponentChangesLog:
return "Получение журнала изменений компонента с сервера"; return "Получение журнала изменений компонента с сервера";
case CheckURLRegistered:
return "Проверка регистрации машины на сервере";
default: default:
return this.toString(); return this.toString();
} }