M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправление бага с ид пакетов. теперь они общий для всех пользователей, поэтому не будет пересечания в папках. v++

Browse Source
This commit is contained in:
02090095
2023-11-21 17:44:59 +03:00
parent 16b13cbc8c
commit 82a6f4b879
23 changed files with 132 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
View File

@@ -36,6 +36,6 @@ public class AbortSapforTaskPackage extends TestingSystemPass<SapforTasksPackage
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountAIObject, Current.getAccount().email, tasksPackageToKill));
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, Current.getAccount().email, tasksPackageToKill));
}
}

2
src/Visual_DVM_2021/Passes/All/AbortTaskPackage.java
View File

@@ -36,7 +36,7 @@ public class AbortTaskPackage extends TestingSystemPass<TasksPackage> {
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountAIObject, Current.getAccount().email, tasksPackageToKill));
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, Current.getAccount().email, tasksPackageToKill));
}
}

4
src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.java
View File

@@ -1,13 +1,13 @@
package Visual_DVM_2021.Passes.Server;
import Common.Current;
import Common.Database.DBObject;
import Common.Database.Database;
import Common.Database.riDBObject;
import Common.Global;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.TestingServer;
import javafx.util.Pair;
public class DeleteServerAccountObject<D extends riDBObject> extends DeleteServerObject<TestingServer, D> {
public class DeleteServerAccountObject<D extends DBObject> extends DeleteServerObject<TestingServer, D> {
public DeleteServerAccountObject(Class<D> d_in) {
super(Global.testingServer, d_in);
}

6
src/Visual_DVM_2021/Passes/Server/PublishServerAccountObject.java
View File

@@ -3,8 +3,6 @@ import Common.Current;
import Common.Database.DBObject;
import Common.Database.Database;
import Common.Global;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.TestingServer;
public class PublishServerAccountObject<D extends DBObject> extends PublishServerObject<TestingServer, D> {
public PublishServerAccountObject(Class<D> d_in) {
@@ -15,7 +13,7 @@ public class PublishServerAccountObject<D extends DBObject> extends PublishServe
return Global.testingServer.account_db;
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountAIObject, Current.getAccount().email, target));
protected String getEmail() {
return Current.getAccount().email;
}
}

5
src/Visual_DVM_2021/Passes/Server/PublishServerObject.java
View File

@@ -3,6 +3,8 @@ import Common.Current;
import Common.Database.DBObject;
import Common.Database.riDBObject;
import Repository.RepositoryServer;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
public class PublishServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
public Object pk = null;
public PublishServerObject(S server_in, Class<D> d_in) {
@@ -27,10 +29,11 @@ public class PublishServerObject<S extends RepositoryServer, D extends DBObject>
}
return false;
}
protected String getEmail(){return null;}
//--
@Override
protected void ServerAction() throws Exception {
PublishObject(target);
Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, getEmail(), target));
pk = response.object;
}
@Override

9
src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
View File

@@ -1,7 +1,6 @@
package Visual_DVM_2021.Passes.Server;
import Common.Constants;
import Common.Database.DBObject;
import Common.Database.iDBObject;
import Common.Global;
import Common.Utils.Utils;
import Repository.RepositoryRefuseException;
@@ -119,14 +118,6 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
} else
super.CheckException(ex);
}
///--- ОБЪЕКТЫ ГЛАВНОЙ БАЗЫ ----------------
public void PublishObject(DBObject object) throws Exception {
Command(new ServerExchangeUnit_2021(
((object instanceof iDBObject) ? ServerCode.PublishAIObject : ServerCode.PublishObject),
"",
object
));
}
public void EditObject(DBObject object) throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", object));
}