no message
This commit is contained in:
@@ -16,4 +16,6 @@ public interface TestingWindow extends VisualizerForm {
|
|||||||
void FocusTestingTasks();
|
void FocusTestingTasks();
|
||||||
void ShowCurrentSapforPackageVersionEtalon();
|
void ShowCurrentSapforPackageVersionEtalon();
|
||||||
void ShowCurrentSapforPackageVersion();
|
void ShowCurrentSapforPackageVersion();
|
||||||
|
void ShowNoSapforPackageVersionEtalon();
|
||||||
|
void ShowNoSapforPackageVersion();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,11 +28,11 @@ public abstract class ComparisonForm<T> {
|
|||||||
protected JToolBar tools;
|
protected JToolBar tools;
|
||||||
private JPanel editorPanel;
|
private JPanel editorPanel;
|
||||||
protected JLabel lObjectName;
|
protected JLabel lObjectName;
|
||||||
private JButton bApplyObject;
|
protected JButton bApplyObject;
|
||||||
private JButton bPrevious;
|
private JButton bPrevious;
|
||||||
private JButton bNext;
|
private JButton bNext;
|
||||||
private JButton bCompare;
|
private JButton bCompare;
|
||||||
private JButton bClose;
|
protected JButton bClose;
|
||||||
//-->>
|
//-->>
|
||||||
ComparisonForm<T> this_ = null; //?
|
ComparisonForm<T> this_ = null; //?
|
||||||
ComparisonForm<T> slave = null;
|
ComparisonForm<T> slave = null;
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package Visual_DVM_2021.UI.Main;
|
||||||
|
import Common.Current;
|
||||||
|
import SapforTestingSystem.Json.SapforVersion_json;
|
||||||
|
public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_json> {
|
||||||
|
Current current;
|
||||||
|
public SapforVersionsComparisonForm(SapforVersionsComparisonForm slave_in, Current current_in) {
|
||||||
|
super(SapforVersion_json.class, slave_in);
|
||||||
|
current = current_in;
|
||||||
|
bApplyObject.setVisible(false);
|
||||||
|
bClose.setVisible(false);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected Current getCurrentObjectName() {
|
||||||
|
return current;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected String getText() {
|
||||||
|
return current.getDescription();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected void showObject() {
|
||||||
|
lObjectName.setText(object.toString());
|
||||||
|
lObjectName.setToolTipText(object.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -55,22 +55,33 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
|||||||
private final TestRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
|
private final TestRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
|
||||||
private final TestRunTasksComparisonForm dvmTestingRunSlave;
|
private final TestRunTasksComparisonForm dvmTestingRunSlave;
|
||||||
//-
|
//-
|
||||||
private SapforPackagesComparisonForm sapforTestingMaster; //сравнение тестов SAPFOR.
|
private final SapforPackagesComparisonForm sapforPackageTreeMaster; //сравнение деревьев пакетов SAPFOR.
|
||||||
private SapforPackagesComparisonForm sapforTestingSlave;
|
private final SapforPackagesComparisonForm sapforPackageTreeSlave;
|
||||||
|
//--
|
||||||
|
private SapforVersionsComparisonForm sapforVersionMaster; //сравнение версий тестов SAPFOR.
|
||||||
|
private SapforVersionsComparisonForm sapforVersionSlave;
|
||||||
|
//--
|
||||||
public TestingForm() {
|
public TestingForm() {
|
||||||
content.add(UI.testingBar, BorderLayout.NORTH);
|
content.add(UI.testingBar, BorderLayout.NORTH);
|
||||||
LoadSplitters();
|
LoadSplitters();
|
||||||
//-
|
//-
|
||||||
dvmTestingRunMaster = new TestRunTasksComparisonForm(dvmTestingRunSlave = new TestRunTasksComparisonForm(null));
|
dvmTestingRunMaster = new TestRunTasksComparisonForm(dvmTestingRunSlave = new TestRunTasksComparisonForm(null));
|
||||||
sapforTestingMaster = new SapforPackagesComparisonForm(sapforTestingSlave = new SapforPackagesComparisonForm(null));
|
sapforPackageTreeMaster = new SapforPackagesComparisonForm(sapforPackageTreeSlave = new SapforPackagesComparisonForm(null));
|
||||||
|
sapforVersionMaster = new SapforVersionsComparisonForm(
|
||||||
|
sapforVersionSlave = new SapforVersionsComparisonForm(null, Current.SapforVersion),
|
||||||
|
Current.SapforEtalonVersion
|
||||||
|
);
|
||||||
//--->>>
|
//--->>>
|
||||||
RefreshTabsNames();
|
RefreshTabsNames();
|
||||||
//-
|
//-
|
||||||
SC50.setLeftComponent(dvmTestingRunMaster.getContent());
|
SC50.setLeftComponent(dvmTestingRunMaster.getContent());
|
||||||
SC50.setRightComponent(dvmTestingRunSlave.getContent());
|
SC50.setRightComponent(dvmTestingRunSlave.getContent());
|
||||||
//-
|
//-
|
||||||
SC65.setLeftComponent(sapforTestingMaster.getContent());
|
SC65.setLeftComponent(sapforPackageTreeMaster.getContent());
|
||||||
SC66.setLeftComponent(sapforTestingSlave.getContent());
|
SC66.setLeftComponent(sapforPackageTreeSlave.getContent());
|
||||||
|
//-
|
||||||
|
SC65.setRightComponent(sapforVersionMaster.getContent());
|
||||||
|
SC66.setRightComponent(sapforVersionSlave.getContent());
|
||||||
//-
|
//-
|
||||||
Global.testingServer.db.configurations.mountUI(configurationsPanel);
|
Global.testingServer.db.configurations.mountUI(configurationsPanel);
|
||||||
Global.testingServer.account_db.packages.mountUI(packagesPanel);
|
Global.testingServer.account_db.packages.mountUI(packagesPanel);
|
||||||
@@ -105,8 +116,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void DropSapforComparison() {
|
public void DropSapforComparison() {
|
||||||
sapforTestingMaster.RemoveObject();
|
sapforPackageTreeMaster.RemoveObject();
|
||||||
sapforTestingSlave.RemoveObject();
|
sapforPackageTreeSlave.RemoveObject();
|
||||||
|
sapforVersionMaster.RemoveObject();
|
||||||
|
sapforVersionSlave.RemoveObject();
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void ShowCurrentTestRunTask() {
|
public void ShowCurrentTestRunTask() {
|
||||||
@@ -138,11 +151,19 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void ShowCurrentSapforPackageVersionEtalon() {
|
public void ShowCurrentSapforPackageVersionEtalon() {
|
||||||
System.out.println("Эталон "+ Current.get(Current.SapforEtalonVersion));
|
sapforVersionMaster.ApplyObject();
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void ShowCurrentSapforPackageVersion() {
|
public void ShowCurrentSapforPackageVersion() {
|
||||||
System.out.println("Не эталон "+ Current.get(Current.SapforVersion));
|
sapforVersionSlave.ApplyObject();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void ShowNoSapforPackageVersionEtalon() {
|
||||||
|
sapforVersionMaster.RemoveObject();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void ShowNoSapforPackageVersion() {
|
||||||
|
sapforVersionSlave.RemoveObject();
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void RemountTestTable() {
|
public void RemountTestTable() {
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
|
|||||||
for (int i = 0; i < cbFile.getItemCount(); ++i) {
|
for (int i = 0; i < cbFile.getItemCount(); ++i) {
|
||||||
DBProjectFile dbProjectFile = cbFile.getItemAt(i);
|
DBProjectFile dbProjectFile = cbFile.getItemAt(i);
|
||||||
if (Global.db.settings.get(SettingName.ExtensionsOn).toBoolean()) {
|
if (Global.db.settings.get(SettingName.ExtensionsOn).toBoolean()) {
|
||||||
//если учитываем исключения, ищем полное совпадение
|
//если учитываем расширения, ищем полное совпадение
|
||||||
if (dbProjectFile.name.equals(file_in.name)) {
|
if (dbProjectFile.name.equals(file_in.name)) {
|
||||||
cbFile.setSelectedIndex(i);
|
cbFile.setSelectedIndex(i);
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user