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
2024-03-04 22:27:49 +03:00
parent 121d91cf77
commit 70ad507313
6 changed files with 60 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -7,13 +7,11 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />

2
src/Repository/Component/Visualiser.java
View File

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override
public void GetVersionInfo() {
version = 1072;
version = 1073;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());

31
src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
View File

@@ -23,22 +23,31 @@ public class CompareDVMRunTasks extends Pass_2021<Vector<DVMRunTask>> {
slave = null;
//--
target = Global.testingServer.db.dvmRunTasks.getCheckedItems();
if (target.size() != 2) {
Log.Writeln_("Для сравнения требуется отметить две задачи.");
return false;
}
if (UI.Question("Назначить задачу " + Utils.Brackets(target.get(0).getPK()) + " эталоном" +
"\n(в случае отказа, будет назначена задача " + Utils.Brackets(target.get(1).getPK()) + ")")) {
if (target.size() == 2) {
if (UI.Question("Назначить задачу " + Utils.Brackets(target.get(0).getPK()) + " эталоном" +
"\n(в случае отказа, будет назначена задача " + Utils.Brackets(target.get(1).getPK()) + ")")) {
master = target.get(0);
slave = target.get(1);
} else {
master = target.get(1);
slave = target.get(0);
}
return true;
} else if (target.size() == 1) {
master = target.get(0);
slave = target.get(1);
} else {
master = target.get(1);
slave = target.get(0);
slave = null;
return UI.Question("Отобразить задачу " + Utils.Brackets(target.get(0).getPK()));
} else if (target.size() != 2) {
Log.Writeln_("Для сравнения требуется отметить две задачи.\nДля отображения требуется отметить одну задачу");
return false;
}
return true;
}
@Override
protected void body() throws Exception {
UI.getMainWindow().getTestingWindow().CompareDVMRunTasks(master, slave);
if (slave != null)
UI.getMainWindow().getTestingWindow().CompareDVMRunTasks(master, slave);
else
UI.getMainWindow().getTestingWindow().ShowDVMRunTask(master);
}
}

32
src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
View File

@@ -2,7 +2,6 @@ package Visual_DVM_2021.Passes.All;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import TestingSystem.DVM.DVMTasks.DVMRunTask;
import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -24,23 +23,32 @@ public class CompareSapforPackages extends Pass_2021<Vector<SapforPackage>> {
slave = null;
//--
target = Global.testingServer.db.sapforPackages.getCheckedItems();
if (target.size() != 2) {
Log.Writeln_("Для сравнения требуется отметить два пакета.");
return false;
}
if (UI.Question("Назначить пакет " + Utils.Brackets(target.get(0).getPK()) + " эталоном" +
"\n(в случае отказа, будет назначен пакет " + Utils.Brackets(target.get(1).getPK()) + ")")) {
if (target.size() == 2) {
if (UI.Question("Назначить пакет " + Utils.Brackets(target.get(0).getPK()) + " эталоном" +
"\n(в случае отказа, будет назначен пакет " + Utils.Brackets(target.get(1).getPK()) + ")")) {
master = target.get(0);
slave = target.get(1);
} else {
master = target.get(1);
slave = target.get(0);
}
return true;
} else if (target.size() == 1) {
master = target.get(0);
slave = target.get(1);
} else {
master = target.get(1);
slave = target.get(0);
slave = null;
return UI.Question("Отобразить пакет " + Utils.Brackets(target.get(0).getPK()));
} else if (target.size() != 2) {
Log.Writeln_("Для сравнения требуется отметить два пакета.\nДля отображения требуется отметить один пакет");
return false;
}
return true;
}
@Override
protected void body() throws Exception {
UI.getMainWindow().getTestingWindow().CompareSapforPackages(master, slave);
if (slave != null)
UI.getMainWindow().getTestingWindow().CompareSapforPackages(master, slave);
else
UI.getMainWindow().getTestingWindow().ShowSapforPackage(master);
}
}

4
src/Visual_DVM_2021/UI/Interface/TestingWindow.java
View File

@@ -23,6 +23,10 @@ public interface TestingWindow extends VisualizerForm {
void ShowNoServerSapfor();
void ShowCurrentDVMPackage();
void ShowNoCurrentDVMPackage();
//--
void ShowDVMRunTask(DVMRunTask master);
void ShowSapforPackage(SapforPackage master);
//-
void CompareDVMRunTasks(DVMRunTask master, DVMRunTask slave);
void CompareSapforPackages(SapforPackage master, SapforPackage slave);
}

12
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -184,15 +184,27 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public void ShowNoCurrentDVMPackage() {
}
@Override
public void ShowDVMRunTask(DVMRunTask master) {
dvmTestingRunMaster.ApplyObject(master);
testingTabs.setSelectedIndex(1);
}
@Override
public void ShowSapforPackage(SapforPackage master) {
sapforPackageTreeMaster.ApplyObject(master);
testingTabs.setSelectedIndex(3);
}
@Override
public void CompareDVMRunTasks(DVMRunTask master, DVMRunTask slave) {
dvmTestingRunMaster.ApplyObject(master);
dvmTestingRunSlave.ApplyObject(slave);
dvmTestingRunMaster.DoComparePass(true);
testingTabs.setSelectedIndex(1);
}
@Override
public void CompareSapforPackages(SapforPackage master, SapforPackage slave) {
sapforPackageTreeMaster.ApplyObject(master);
sapforPackageTreeSlave.ApplyObject(slave);
sapforPackageTreeMaster.DoComparePass();
testingTabs.setSelectedIndex(3);
}
}