no message

This commit is contained in:
2025-03-13 00:32:20 +03:00
parent 91e40c4393
commit 1d97048de1
204 changed files with 984 additions and 889 deletions

View File

@@ -6,16 +6,16 @@ import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
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 boolean isSafe(){
protected boolean isSafe() {
return true;
}
@Override
protected boolean needsAnimation() {
return false;
}
protected boolean requestNeedsAnimation(){
protected boolean requestNeedsAnimation() {
return true;
}
@Override
@@ -23,9 +23,9 @@ public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T>
return "";
}
protected abstract S getServer();
protected boolean SendRequest(ServerCode code_in, String arg_in, Serializable object_in){
protected boolean SendRequest(ServerCode code_in, String arg_in, Serializable object_in) {
request = null;
request = new RepositoryPass(getServer()) {
request = new RepositoryPass(getServer()) {
@Override
protected boolean needsAnimation() {
return requestNeedsAnimation();
@@ -41,9 +41,9 @@ public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T>
@Override
protected void ServerAction() throws Exception {
if (isSafe())
Command(new SafeServerExchangeUnit(code_in, arg_in,object_in));
Command(new SafeServerExchangeUnit(code_in, arg_in, object_in));
else
unsafe_command(new ServerExchangeUnit_2021(code_in,arg_in,object_in)); //только для отдельных команд.
unsafe_command(new ServerExchangeUnit_2021(code_in, arg_in, object_in)); //только для отдельных команд.
target = server_response.object;
}
@Override
@@ -53,10 +53,10 @@ public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T>
};
return request.Do();
}
protected boolean SendRequest(ServerCode code_in, String arg_in){
return SendRequest(code_in,arg_in,null);
protected boolean SendRequest(ServerCode code_in, String arg_in) {
return SendRequest(code_in, arg_in, null);
}
protected boolean SendRequest(ServerCode code_in){
protected boolean SendRequest(ServerCode code_in) {
return SendRequest(code_in, "", null);
}
}

View File

@@ -26,13 +26,13 @@ public abstract class CloneServerObject<S extends RepositoryServer, D extends ri
return false;
//---------
pk = null;
src= (D) server.db.getTable(currentClass()).getUI().getCurrent();
src = (D) server.db.getTable(currentClass()).getUI().getCurrent();
return true;
}
@Override
protected void ServerAction() throws Exception {
Command(new SafeServerExchangeUnit(ServerCode.CloneObjectByPK,
Global.mainModule.getAccount().name+"\n"+Global.mainModule.getAccount().email,
Global.mainModule.getAccount().name + "\n" + Global.mainModule.getAccount().email,
new Pair<>(src.getClass(), src.getPK())));
pk = server_response.object;
}

View File

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

View File

@@ -46,17 +46,17 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
Vector<D> selected_or_current_objects = table.getUI().getSelectedOrCurrent();
Vector<Object> res = new Vector<>(); //ключи объектов после фильтрации.
Vector<Object> forbidden = new Vector<>();
for (D object: selected_or_current_objects){
if (object instanceof riDBObject){
for (D object : selected_or_current_objects) {
if (object instanceof riDBObject) {
riDBObject r = (riDBObject) object;
if (Global.mainModule.getAccount().CheckAuthorship(r.sender_address,null))
if (Global.mainModule.getAccount().CheckAuthorship(r.sender_address, null))
res.add(r.getPK());
else
forbidden.add(r.getPK());
}
}
if (!forbidden.isEmpty()){
Log.Writeln_("У вас нет прав на удаление "+forbidden.size()+" объектов!");
if (!forbidden.isEmpty()) {
Log.Writeln_("У вас нет прав на удаление " + forbidden.size() + " объектов!");
return false;
}
target = res;

View File

@@ -1,7 +1,6 @@
package _VisualDVM.Passes.Server;
import Common.Database.RepositoryRefuseException;
import Common.Passes.Pass;
import Common.Visual.UI;
import _VisualDVM.Constants;
import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
@@ -13,12 +12,12 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.*;
public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass<T> {
protected S server;
protected ObjectInputStream in = null; // поток чтения из сокета
protected ObjectOutputStream out = null; // поток записи в сокет
//-
public ServerExchangeUnit_2021 client_request;
public ServerExchangeUnit_2021 server_response;
protected S server;
protected ObjectInputStream in = null; // поток чтения из сокета
protected ObjectOutputStream out = null; // поток записи в сокет
//-
protected Socket clientSocket = null; //сокет для общения
protected ServerCode ExitCode = ServerCode.Undefined;

View File

@@ -16,6 +16,6 @@ public abstract class StartServerPass<S extends RepositoryServer> extends Reposi
}
@Override
protected void ServerAction() throws Exception {
StartServer();
StartServer();
}
}

View File

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