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

при удалении пакета все ссылки на то где он был эталоном обнуляются

Browse Source
This commit is contained in:
02090095
2024-11-16 22:03:10 +03:00
parent de960b6a9b
commit 910901f940
3 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/workspace.xml generated
View File

@@ -9,7 +9,6 @@
<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/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.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" /> <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" />

25
src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
View File

@@ -87,7 +87,6 @@ public class Configuration extends riDBObject {
public String getDialogName() { public String getDialogName() {
return description; return description;
} }
//--
//работает со стороны сервера. //работает со стороны сервера.
public boolean tryUpdateGroup(Group group) { public boolean tryUpdateGroup(Group group) {
ConfigurationCache unpacked = new ConfigurationCache(this); ConfigurationCache unpacked = new ConfigurationCache(this);
@@ -157,7 +156,6 @@ public class Configuration extends riDBObject {
} }
return flag; return flag;
} }
public boolean tryDeleteTests(LinkedHashMap<Integer, Test> tests) { public boolean tryDeleteTests(LinkedHashMap<Integer, Test> tests) {
boolean flag = false; boolean flag = false;
ConfigurationCache unpacked = new ConfigurationCache(this); ConfigurationCache unpacked = new ConfigurationCache(this);
@@ -173,27 +171,4 @@ public class Configuration extends riDBObject {
} }
return flag; return flag;
} }
/*
public void updateTest(Test test){
ConfigurationCache unpacked = new ConfigurationCache(this);
for (TestJson testJson : unpacked.testsJson.array) {
if (testJson.id == test.id) {
testJson.description = test.description;
testJson.language = String.valueOf(group.language);
}
}
packedGroupsJson = Utils_.gson.toJson(unpacked);
}
public boolean containsTest(int test_id) {
ConfigurationCache unpacked = new ConfigurationCache(this);
for (TestJson testJson : unpacked.testsJson.array) {
if (testJson.id == test_id) {
return true;
}
}
return false;
}
*/
} }

8
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -192,6 +192,14 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
Utils_.forceDeleteWithCheck(workspace); Utils_.forceDeleteWithCheck(workspace);
} else if (object instanceof SapforPackage) { } else if (object instanceof SapforPackage) {
SapforPackage sapforPackage = (SapforPackage) object; SapforPackage sapforPackage = (SapforPackage) object;
//--
for (SapforConfiguration sapforConfiguration: db.sapforConfigurations.Data.values()){
if (sapforConfiguration.ethalon_id==sapforPackage.id){
sapforConfiguration.ethalon_id= CommonConstants.Nan;
db.Update(sapforConfiguration);
}
}
//--
File workspace = sapforPackage.getLocalWorkspace(); File workspace = sapforPackage.getLocalWorkspace();
Utils_.forceDeleteWithCheck(workspace); Utils_.forceDeleteWithCheck(workspace);
} else if (object instanceof DVMSettings) { } else if (object instanceof DVMSettings) {