no message
This commit is contained in:
5
.idea/workspace.xml
generated
5
.idea/workspace.xml
generated
@@ -8,9 +8,8 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<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/SapforTestingSystem/Json/SapforTasksResults_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksResults_json.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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.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" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
package Visual_DVM_2021.UI.Main;
|
|
||||||
import Common.Current;
|
|
||||||
import SapforTestingSystem.SapforTask.SapforTask;
|
|
||||||
//упразднить.
|
|
||||||
public class SapforTasksComparisonForm extends TasksComparisonForm<SapforTask> {
|
|
||||||
public SapforTasksComparisonForm(ComparisonForm<SapforTask> slave_in) {
|
|
||||||
super(SapforTask.class, slave_in);
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected Current getCurrentObjectName() {
|
|
||||||
return Current.SapforTask;
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected String getTextByTab() {
|
|
||||||
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
protected TasksComparisonState[] getForbiddenStates() {
|
|
||||||
return new TasksComparisonState[]{
|
|
||||||
TasksComparisonState.Sts
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -232,18 +232,28 @@
|
|||||||
</grid>
|
</grid>
|
||||||
<grid id="27fda" layout-manager="BorderLayout" hgap="0" vgap="0">
|
<grid id="27fda" layout-manager="BorderLayout" hgap="0" vgap="0">
|
||||||
<constraints>
|
<constraints>
|
||||||
<tabbedpane title="" icon="icons/VersionsTree.png">
|
<tabbedpane title="" icon="icons/Comparsion.png">
|
||||||
<tooltip value="Дерево версий"/>
|
<tooltip value="Сравнение пакетов"/>
|
||||||
</tabbedpane>
|
</tabbedpane>
|
||||||
</constraints>
|
</constraints>
|
||||||
<properties/>
|
<properties/>
|
||||||
<border type="none"/>
|
<border type="none"/>
|
||||||
<children>
|
<children>
|
||||||
<grid id="17ec9" binding="sapforPackageTreePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
|
<grid id="17ec9" layout-manager="BorderLayout" hgap="0" vgap="0">
|
||||||
<constraints border-constraint="Center"/>
|
<constraints border-constraint="Center"/>
|
||||||
<properties/>
|
<properties/>
|
||||||
<border type="none"/>
|
<border type="none"/>
|
||||||
|
<children>
|
||||||
|
<splitpane id="c2b4" binding="SC64">
|
||||||
|
<constraints border-constraint="Center"/>
|
||||||
|
<properties>
|
||||||
|
<dividerLocation value="350"/>
|
||||||
|
<dividerSize value="3"/>
|
||||||
|
</properties>
|
||||||
|
<border type="none"/>
|
||||||
<children/>
|
<children/>
|
||||||
|
</splitpane>
|
||||||
|
</children>
|
||||||
</grid>
|
</grid>
|
||||||
</children>
|
</children>
|
||||||
</grid>
|
</grid>
|
||||||
@@ -257,8 +267,8 @@
|
|||||||
<splitpane position="left"/>
|
<splitpane position="left"/>
|
||||||
</constraints>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<minimumSize width="24" height="200"/>
|
<minimumSize width="24" height="100"/>
|
||||||
<preferredSize width="204" height="200"/>
|
<preferredSize width="204" height="100"/>
|
||||||
</properties>
|
</properties>
|
||||||
<border type="none"/>
|
<border type="none"/>
|
||||||
<children>
|
<children>
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
package Visual_DVM_2021.UI.Main;
|
package Visual_DVM_2021.UI.Main;
|
||||||
import Common.Current;
|
|
||||||
import Common.Global;
|
import Common.Global;
|
||||||
import Common.UI.TextField.StyledTextField;
|
import Common.UI.TextField.StyledTextField;
|
||||||
import Common.UI.UI;
|
import Common.UI.UI;
|
||||||
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
|
|
||||||
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
|
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
|
||||||
import Visual_DVM_2021.UI.Interface.TestingWindow;
|
import Visual_DVM_2021.UI.Interface.TestingWindow;
|
||||||
|
|
||||||
@@ -23,6 +21,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
|||||||
public JSplitPane SC56;
|
public JSplitPane SC56;
|
||||||
public JSplitPane SC63;
|
public JSplitPane SC63;
|
||||||
public JSplitPane SC59;
|
public JSplitPane SC59;
|
||||||
|
public JSplitPane SC64;
|
||||||
//-
|
//-
|
||||||
//---
|
//---
|
||||||
private JTabbedPane testingTabs;
|
private JTabbedPane testingTabs;
|
||||||
@@ -45,7 +44,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
|||||||
private JPanel sapforTasksPackagesPanel;
|
private JPanel sapforTasksPackagesPanel;
|
||||||
private JTabbedPane sapforPackageTabs;
|
private JTabbedPane sapforPackageTabs;
|
||||||
private JPanel sapforTasksPanel;
|
private JPanel sapforTasksPanel;
|
||||||
private JPanel sapforPackageTreePanel;
|
|
||||||
private JPanel testsRunTasksBackground;
|
private JPanel testsRunTasksBackground;
|
||||||
private JCheckBox filterFinished;
|
private JCheckBox filterFinished;
|
||||||
private JButton bTest;
|
private JButton bTest;
|
||||||
@@ -145,6 +143,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void ShowCurrentSapforTasksPackage() {
|
public void ShowCurrentSapforTasksPackage() {
|
||||||
|
/*
|
||||||
UI.Clear(sapforPackageTreePanel);
|
UI.Clear(sapforPackageTreePanel);
|
||||||
if (SapforTasksPackageInterface.isLoaded(Current.getSapforTasksPackage())){
|
if (SapforTasksPackageInterface.isLoaded(Current.getSapforTasksPackage())){
|
||||||
sapforPackageTreePanel.add(
|
sapforPackageTreePanel.add(
|
||||||
@@ -153,9 +152,11 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
|||||||
// new JScrollPane(new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(Current.getSapforTasksPackage())))
|
// new JScrollPane(new SapforTasksPackageTree(SapforTasksPackageInterface.getTree(Current.getSapforTasksPackage())))
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void ShowNoCurrentSapforTasksPackage() {
|
public void ShowNoCurrentSapforTasksPackage() {
|
||||||
UI.Clear(sapforPackageTreePanel);
|
|
||||||
|
// UI.Clear(sapforPackageTreePanel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user