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-10-27 22:48:09 +03:00
parent 90fb80f087
commit 7177d02a5e
6 changed files with 76 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -8,9 +8,11 @@
<component name="ChangeListManager">
<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$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.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/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" 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" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

14
src/SapforTestingSystem/SapforTask/SapforTasksDBTable.java
View File

@@ -25,16 +25,18 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(5).setRenderer(RendererStatusEnum);
columns.get(4).setRenderer(RendererStatusEnum);
}
@Override
public void MouseAction2() throws Exception {
// Pass_2021.passes.get(PassCode_2021.OpenSapforTest).Do();
}
/*
@Override
public boolean hasCheckBox() {
return true;
}
*/
};
}
@Override
@@ -50,15 +52,15 @@ public class SapforTasksDBTable extends DBTable<Long, SapforTask> {
@Override
public Object getFieldAt(SapforTask object, int columnIndex) {
switch (columnIndex) {
case 2:
case 1:
return object.group_description;
case 3:
case 2:
return object.test_description;
case 4:
case 3:
return object.flags;
case 5:
case 4:
return object.state;
case 6:
case 5:
return object.versionsDescription;
default:
return null;

3
src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
View File

@@ -2,6 +2,7 @@ package SapforTestingSystem.SapforTasksPackage;
import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
import Common.UI.UI;
import SapforTestingSystem.SapforTask.SapforTask;
import java.util.Date;
@@ -38,11 +39,13 @@ public class SapforTasksPackagesDBTable extends DBTable<String, SapforTasksPacka
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
// UI.getNewMainWindow().getTestingWindow().DropTestRunTasksComparison();
UI.getMainWindow().getTestingWindow().ShowCurrentSapforTasksPackage();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
// UI.getNewMainWindow().getTestingWindow().DropTestRunTasksComparison();
UI.getMainWindow().getTestingWindow().ShowNoCurrentSapforTasksPackage();
}
};
}

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

@@ -13,4 +13,6 @@ public interface TestingWindow extends VisualizerForm {
void RemountTestTable();
//-
void FocusTestingTasks();
void ShowCurrentSapforTasksPackage();
void ShowNoCurrentSapforTasksPackage();
}

39
src/Visual_DVM_2021/UI/Main/TestingForm.form
View File

@@ -206,7 +206,23 @@
<properties/>
<border type="none"/>
<children>
<grid id="8a833" binding="sapforTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<tabbedpane id="30729" binding="sapforPackageTabs">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children>
<grid id="68338" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/MassFiles.png">
<tooltip value="Список задач"/>
</tabbedpane>
</constraints>
<properties>
<enabled value="true"/>
</properties>
<border type="none"/>
<children>
<grid id="1beb4" binding="sapforTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
@@ -214,6 +230,27 @@
</grid>
</children>
</grid>
<grid id="27fda" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/VersionsTree.png">
<tooltip value="Дерево версий"/>
</tabbedpane>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="17ec9" binding="sapforPackageTreePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
</children>
</tabbedpane>
</children>
</grid>
<grid id="7718" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>

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

@@ -1,7 +1,10 @@
package Visual_DVM_2021.UI.Main;
import Common.Current;
import Common.Global;
import Common.UI.TextField.StyledTextField;
import Common.UI.UI;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree;
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
import Visual_DVM_2021.UI.Interface.TestingWindow;
@@ -41,7 +44,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private JPanel sapforScenariosPanel;
private JPanel serverSapforsPanel;
private JPanel sapforTasksPackagesPanel;
private JTabbedPane sapforPackageTabs;
private JPanel sapforTasksPanel;
private JPanel sapforPackageTreePanel;
private JPanel testsRunTasksBackground;
private JCheckBox filterFinished;
private JButton bTest;
@@ -139,4 +144,17 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
Global.testingServer.account_db.sapforTasks.mountUI(sapforTasksPanel);
}
@Override
public void ShowCurrentSapforTasksPackage() {
UI.Clear(sapforPackageTreePanel);
if (SapforTasksPackageInterface.isLoaded(Current.getSapforTasksPackage())){
sapforPackageTreePanel.add(
new JScrollPane(
new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(Current.getSapforTasksPackage()))));
}
}
@Override
public void ShowNoCurrentSapforTasksPackage() {
UI.Clear(sapforPackageTreePanel);
}
}