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

исправил внесенные баги, связанные с созданием тестов из версий проекта.

Browse Source
This commit is contained in:
02090095
2023-11-20 00:15:22 +03:00
parent 928705e018
commit b9132782eb
19 changed files with 114 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.Server;
import Common.Database.riDBObject;
import Common.Database.DBObject;
import Repository.RepositoryServer;
public class DeleteServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> {
public class DeleteServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
@Override
public String getIconPath() {
return "/icons/Delete.png";

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

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.Server;
import Common.Database.riDBObject;
import Common.Database.DBObject;
import Repository.RepositoryServer;
public class EditServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> {
public class EditServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
//--
@Override
public String getIconPath() {

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

@@ -1,12 +1,12 @@
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;
public class PublishServerAccountObject<D extends riDBObject> extends PublishServerObject<TestingServer, D> {
public class PublishServerAccountObject<D extends DBObject> extends PublishServerObject<TestingServer, D> {
public PublishServerAccountObject(Class<D> d_in) {
super(Global.testingServer, d_in);
}

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

@@ -1,9 +1,10 @@
package Visual_DVM_2021.Passes.Server;
import Common.Current;
import Common.Database.DBObject;
import Common.Database.riDBObject;
import Repository.RepositoryServer;
public class PublishServerObject<S extends RepositoryServer, D extends riDBObject> extends ServerObjectPass<S, D> {
protected Object pk = null;
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) {
super(server_in, d_in);
}
@@ -17,8 +18,11 @@ public class PublishServerObject<S extends RepositoryServer, D extends riDBObjec
pk = null;
if (Current.getAccount().CheckRegistered(Log)) {
target = d.newInstance();
target.sender_name = Current.getAccount().name;
target.sender_address = Current.getAccount().email;
if (target instanceof riDBObject) {
riDBObject rTarget = (riDBObject) target;
rTarget.sender_name = Current.getAccount().name;
rTarget.sender_address = Current.getAccount().email;
}
return fillObjectFields();
}
return false;