no message
This commit is contained in:
18
.idea/workspace.xml
generated
18
.idea/workspace.xml
generated
@@ -8,16 +8,18 @@
|
|||||||
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java" 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/DownloadComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadComponent.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/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.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/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.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/ClientPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.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/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/TestingClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/TestingClient.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" />
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
|
|||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class Constants {
|
public class Constants {
|
||||||
public static final int version = 1165;
|
public static final int version = 1167;
|
||||||
public static final int planner_version = 6;
|
public static final int planner_version = 6;
|
||||||
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
|
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
|
||||||
//--
|
//--
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ import _VisualDVM.Passes.Server.ComponentsServerPass;
|
|||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
import _VisualDVM.Repository.Subscribes.Subscriber;
|
import _VisualDVM.Repository.Subscribes.Subscriber;
|
||||||
public class CheckRegistrationOnServer extends ComponentsServerPass<Subscriber> {
|
public class CheckRegistrationOnServer extends ComponentsServerPass<Subscriber> {
|
||||||
|
@Override
|
||||||
|
protected boolean isSafe() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
return SendRequest(ServerCode.CheckSubscriberRole, "", Global.mainModule.getAccount());
|
return SendRequest(ServerCode.CheckSubscriberRole, "", Global.mainModule.getAccount());
|
||||||
|
|||||||
@@ -7,6 +7,10 @@ import _VisualDVM.Passes.Server.ComponentsServerPass;
|
|||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
|
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
|
||||||
public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
|
public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
|
||||||
|
@Override
|
||||||
|
protected boolean isSafe() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
target = null;
|
target = null;
|
||||||
|
|||||||
@@ -5,6 +5,10 @@ import _VisualDVM.Passes.Server.ComponentsServerPass;
|
|||||||
import _VisualDVM.Repository.Component.Component;
|
import _VisualDVM.Repository.Component.Component;
|
||||||
import _VisualDVM.Repository.Server.ServerCode;
|
import _VisualDVM.Repository.Server.ServerCode;
|
||||||
public class DownloadComponent extends ComponentsServerPass<Component> {
|
public class DownloadComponent extends ComponentsServerPass<Component> {
|
||||||
|
@Override
|
||||||
|
protected boolean isSafe() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
target = Global.components.getUI().getCurrent();
|
target = Global.components.getUI().getCurrent();
|
||||||
|
|||||||
@@ -14,6 +14,10 @@ public class GetComponentsActualVersions extends ComponentsServerPass<Object> {
|
|||||||
return "/icons/Components.png";
|
return "/icons/Components.png";
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
protected boolean isSafe() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
@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<>();
|
||||||
|
|||||||
@@ -6,6 +6,10 @@ import _VisualDVM.Repository.Server.ServerCode;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class GetComponentsBackupsFromServer extends ComponentsServerPass<Vector<File>> {
|
public class GetComponentsBackupsFromServer extends ComponentsServerPass<Vector<File>> {
|
||||||
|
@Override
|
||||||
|
protected boolean isSafe() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
target = new Vector<>();
|
target = new Vector<>();
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
package _VisualDVM.Passes.All;
|
package _VisualDVM.Passes.All;
|
||||||
|
import Common.Passes.Pass;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import _VisualDVM.Constants;
|
import _VisualDVM.Constants;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
@@ -22,6 +23,10 @@ public class PublishComponent extends ComponentsServerPass<Component> {
|
|||||||
return "/Common/icons/Publish.png";
|
return "/Common/icons/Publish.png";
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
protected boolean isSafe() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
@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");
|
||||||
@@ -88,7 +93,18 @@ public class PublishComponent extends ComponentsServerPass<Component> {
|
|||||||
if (f.fields.cbForceMail.isSelected())
|
if (f.fields.cbForceMail.isSelected())
|
||||||
message.addAttachement(target.getFile());
|
message.addAttachement(target.getFile());
|
||||||
//--
|
//--
|
||||||
Global.mainModule.getPass(PassCode.Email).Do(message, Global.componentsServer.db.subscribers.getActiveSubscribers());
|
//todo потом сделать красивее. на сторону сервера это безобразие
|
||||||
|
Pass unsafeEmail = new Email(){
|
||||||
|
@Override
|
||||||
|
public String getDescription() {
|
||||||
|
return "Рассылка по Email";
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected boolean isSafe() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
unsafeEmail.Do(message, Global.componentsServer.db.subscribers.getActiveSubscribers());
|
||||||
//---
|
//---
|
||||||
if (target.getComponentType().equals(ComponentType.Sapfor_F) && f.fields.cbAssemblyOnServer.isSelected()) {
|
if (target.getComponentType().equals(ComponentType.Sapfor_F) && f.fields.cbAssemblyOnServer.isSelected()) {
|
||||||
Global.mainModule.getUI().getMainWindow().FocusTesting();
|
Global.mainModule.getUI().getMainWindow().FocusTesting();
|
||||||
|
|||||||
@@ -22,6 +22,10 @@ public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDV
|
|||||||
RemoteFile remoteFile;
|
RemoteFile remoteFile;
|
||||||
File localFile;
|
File localFile;
|
||||||
@Override
|
@Override
|
||||||
|
protected boolean isSafe() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
remoteFile = null;
|
remoteFile = null;
|
||||||
localFile = null;
|
localFile = null;
|
||||||
|
|||||||
@@ -18,6 +18,10 @@ public class ShowComponentChangesLog extends ComponentsServerPass<Component> {
|
|||||||
return "/Common/icons/Log.png";
|
return "/Common/icons/Log.png";
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
protected boolean isSafe() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
if (Global.components.getUI().CheckCurrent(Log)) {
|
if (Global.components.getUI().CheckCurrent(Log)) {
|
||||||
target = Global.components.getUI().getCurrent();
|
target = Global.components.getUI().getCurrent();
|
||||||
|
|||||||
@@ -14,6 +14,10 @@ public class ShowTestingServerFile extends TestingServerPass<RemoteFile> {
|
|||||||
String title;
|
String title;
|
||||||
File localFile;
|
File localFile;
|
||||||
@Override
|
@Override
|
||||||
|
protected boolean isSafe(){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
title = (String) args[0];
|
title = (String) args[0];
|
||||||
target = (RemoteFile) args[1];
|
target = (RemoteFile) args[1];
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
|
|||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T> {
|
public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T> {
|
||||||
protected RepositoryPass request;
|
protected RepositoryPass request;
|
||||||
|
protected boolean isSafe(){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean needsAnimation() {
|
protected boolean needsAnimation() {
|
||||||
return false;
|
return false;
|
||||||
@@ -39,7 +42,10 @@ public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T>
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void ServerAction() throws Exception {
|
protected void ServerAction() throws Exception {
|
||||||
Command(new SafeServerExchangeUnit(code_in, arg_in,object_in));
|
if (isSafe())
|
||||||
|
Command(new SafeServerExchangeUnit(code_in, arg_in,object_in));
|
||||||
|
else
|
||||||
|
unsafe_command(new ServerExchangeUnit_2021(code_in,arg_in,object_in)); //только для отдельных команд.
|
||||||
target = server_response.object;
|
target = server_response.object;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -201,6 +201,9 @@ public abstract class RepositoryServer<D extends Database> {
|
|||||||
}
|
}
|
||||||
//БЕЗОПАСНАЯ СЕССИЯ
|
//БЕЗОПАСНАЯ СЕССИЯ
|
||||||
switch (code) {
|
switch (code) {
|
||||||
|
case Email:
|
||||||
|
Email();
|
||||||
|
break;
|
||||||
case EditObject:
|
case EditObject:
|
||||||
EditObject();
|
EditObject();
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user