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
2023-11-08 23:38:07 +03:00
parent f0a63d910f
commit 3bcf8861f2
10 changed files with 157 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
View File

@@ -5,7 +5,6 @@ import Common.Utils.Utils;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
import TestingSystem.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.TestingSystemPass;
@@ -44,7 +43,7 @@ public class DeleteSapforTasksPackage extends TestingSystemPass<SapforTasksPacka
@Override
protected void performDone() throws Exception {
super.performDone();
Utils.delete_with_check(SapforTasksPackageInterface.getLocalWorkspace(target));
Utils.delete_with_check(target.getLocalWorkspace());
passes.get(PassCode_2021.SynchronizeTestsTasks).Do();
}
}

3
src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
View File

@@ -4,7 +4,6 @@ import Common.Utils.Utils;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
import TestingSystem.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.TestingSystemPass;
@@ -34,7 +33,7 @@ public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPac
Log.Writeln_("Пакет не завершен.");
return false;
}
if (SapforTasksPackageInterface.isLoaded(target)) {
if (target.isLoaded()) {
System.out.println("Пакет уже загружен");
return false;
}

3
src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
View File

@@ -2,7 +2,6 @@ package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.UI.UI;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
import TestingSystem.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -23,7 +22,7 @@ public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
Log.Writeln_("Пакет не завершен!");
return false;
}
return SapforTasksPackageInterface.isLoaded(target) || passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(target);
return target.isLoaded() || passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(target);
}
return false;
}

5
src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java
View File

@@ -2,7 +2,6 @@ package Visual_DVM_2021.Passes.All;
import Common.Global;
import Common.Utils.Utils;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -21,12 +20,12 @@ public class UnpackSapforTasksPackage extends UnzipFolderPass<SapforTasksPackage
@Override
protected void performPreparation() throws Exception {
super.performPreparation();
File packageWorkspace = SapforTasksPackageInterface.getLocalWorkspace(target);
File packageWorkspace = target.getLocalWorkspace();
Utils.forceDeleteWithCheck(packageWorkspace);
}
@Override
protected void body() throws Exception {
super.body();
FileUtils.writeStringToFile(SapforTasksPackageInterface.getLoadedSign(target), new Date().toString());
FileUtils.writeStringToFile(target.getLoadedSign(), new Date().toString());
}
}

5
src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
View File

@@ -8,7 +8,6 @@ import Common.Utils.TextLog;
import SapforTestingSystem.SapforTask.MatchState;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
import SapforTestingSystem.SapforTasksPackage.UI.SapforTasksPackageTree;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -55,7 +54,7 @@ public class SapforPackagesComparisonForm {
TextLog log = new TextLog();
if (Current.Check(log, Current.SapforTasksPackage)) {
object = Current.getSapforTasksPackage();
if (SapforTasksPackageInterface.isLoaded(object) || (Pass_2021.passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(object)))
if (object.isLoaded() || (Pass_2021.passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(object)))
showObject();
else UI.Info("Пакет не закружен");
} else
@@ -76,7 +75,7 @@ public class SapforPackagesComparisonForm {
//---
public void showCommonTree() {
if (object.root == null) {
object.root = SapforTasksPackageInterface.buildTree(object);
object.buildTree();
}
treePanel.add(new JScrollPane(
new SapforTasksPackageTree(object.root,