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-14 02:17:56 +03:00
parent a86a5b1e6b
commit 209bb2455d
11 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/workspace.xml generated
View File

@@ -8,12 +8,16 @@
<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/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/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/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/TestingClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/TestingClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerRequestUnit.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/SafeServerExchangeUnit.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.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
src/_VisualDVM/Passes/Server/ClientPass.java
View File

@@ -3,6 +3,7 @@ import Common.Passes.Pass;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -38,7 +39,7 @@ 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 ServerExchangeUnit_2021(code_in, arg_in,object_in)); Command(new SafeServerExchangeUnit(code_in, arg_in,object_in));
target = server_response.object; target = server_response.object;
} }
@Override @Override

3
src/_VisualDVM/Passes/Server/CloneServerObject.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.Passes.Server;
import Common.Database.Objects.riDBObject; import Common.Database.Objects.riDBObject;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import javafx.util.Pair; import javafx.util.Pair;
@@ -31,7 +32,7 @@ public abstract class CloneServerObject<S extends RepositoryServer, D extends ri
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.CloneObjectByPK, 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()))); new Pair<>(src.getClass(), src.getPK())));
pk = server_response.object; pk = server_response.object;

3
src/_VisualDVM/Passes/Server/DeleteServerObject.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.Passes.Server; package _VisualDVM.Passes.Server;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
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;
@@ -38,7 +39,7 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.DeleteObjectByPK, "", Command(new SafeServerExchangeUnit(ServerCode.DeleteObjectByPK, "",
new Pair<>(target.getClass(), target.getPK()))); new Pair<>(target.getClass(), target.getPK())));
VisualCaches.DeleteCache(target); VisualCaches.DeleteCache(target);
} }

3
src/_VisualDVM/Passes/Server/DeleteServerObjects.java
View File

@@ -5,6 +5,7 @@ import Common.Database.Objects.riDBObject;
import Common.Database.Tables.DBTable; import Common.Database.Tables.DBTable;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
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;
@@ -79,7 +80,7 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.DeleteObjectsByPK, getEmail(), new Pair<>(d, target))); Command(new SafeServerExchangeUnit(ServerCode.DeleteObjectsByPK, getEmail(), new Pair<>(d, target)));
} }
@Override @Override
protected void performFinish() throws Exception { protected void performFinish() throws Exception {

3
src/_VisualDVM/Passes/Server/EditServerObject.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.Passes.Server; package _VisualDVM.Passes.Server;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
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;
@@ -30,7 +31,7 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
//-- //--
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target)); Command(new SafeServerExchangeUnit(ServerCode.EditObject, "", target));
} }
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {

3
src/_VisualDVM/Passes/Server/PublishServerObject.java
View File

@@ -3,6 +3,7 @@ import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject; import Common.Database.Objects.riDBObject;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class PublishServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> { public class PublishServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
@@ -38,7 +39,7 @@ public class PublishServerObject<S extends RepositoryServer, D extends DBObject>
//-- //--
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, getEmail(), target)); Command(new SafeServerExchangeUnit(ServerCode.PublishObject, getEmail(), target));
pk = server_response.object; pk = server_response.object;
} }
@Override @Override

8
src/_VisualDVM/Passes/Server/RepositoryPass.java
View File

@@ -1,10 +1,9 @@
package _VisualDVM.Passes.Server; package _VisualDVM.Passes.Server;
import Common.Database.RepositoryRefuseException; import Common.Database.RepositoryRefuseException;
import Common.Passes.Pass; import Common.Passes.Pass;
import Common.Passes.PassException;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils; import _VisualDVM.Utils;
@@ -54,7 +53,7 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
out = null; out = null;
} }
protected abstract void ServerAction() throws Exception; protected abstract void ServerAction() throws Exception;
protected void Command(ServerExchangeUnit_2021 request_in) throws Exception { protected void unsafe_command(ServerExchangeUnit_2021 request_in) throws Exception {
ExitCode = ServerCode.Undefined; ExitCode = ServerCode.Undefined;
client_request = request_in; client_request = request_in;
out.writeObject(client_request); out.writeObject(client_request);
@@ -66,6 +65,9 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
break; break;
} }
} }
protected void Command(SafeServerExchangeUnit request_in) throws Exception {
unsafe_command(request_in);
}
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
connect(); connect();

4
src/_VisualDVM/Repository/Component/Visualiser.java
View File

@@ -3,8 +3,6 @@ import Common.Utils.Utils_;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Server.SaveServerExchangeUnit;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@@ -63,7 +61,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override @Override
public void GetVersionInfo() { public void GetVersionInfo() {
version = SaveServerExchangeUnit.version; version = Constants.version;
String pattern = "MMM dd yyyy HH:mm:ss"; String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH); DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime()); date_text = df.format(getClassBuildTime());

2
src/_VisualDVM/Repository/RepositoryServer.java
View File

@@ -316,7 +316,7 @@ public abstract class RepositoryServer<D extends Database> {
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.Ping)); unsafe_command(new ServerExchangeUnit_2021(ServerCode.Ping));
} }
@Override @Override
protected boolean validate() { protected boolean validate() {

3
src/_VisualDVM/Repository/TestingClient.java
View File

@@ -3,6 +3,7 @@ import Common.Passes.PassException;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.Server.RepositoryPass; import _VisualDVM.Passes.Server.RepositoryPass;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.Common.TestingServer;
@@ -40,7 +41,7 @@ public abstract class TestingClient {
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(code_in, arg, object_in)); Command(new SafeServerExchangeUnit(code_in, arg, object_in));
target = server_response.object; target = server_response.object;
} }
@Override @Override