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-30 22:37:03 +03:00
parent 9d491999a3
commit 2ec1303c88
13 changed files with 156 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Visual_DVM_2021/UI/Main/ComparisonForm.java
View File

@@ -18,7 +18,7 @@ import org.fife.ui.rtextarea.RTextScrollPane;
import javax.swing.*;
import java.util.LinkedHashMap;
import java.util.Vector;
public abstract class ComparisonForm<T extends DBObject> {
public abstract class ComparisonForm<T> {
public Class<T> t; //класс объектов.
//-->>
private JPanel content;
@@ -289,8 +289,11 @@ public abstract class ComparisonForm<T extends DBObject> {
lObjectName.setToolTipText("Объект не назначен.");
}
protected void showObject() {
lObjectName.setText(object.getPK().toString());
lObjectName.setToolTipText(object.getPK().toString());
if (object instanceof DBObject) {
DBObject dbObject = (DBObject) object;
lObjectName.setText(dbObject.toString());
lObjectName.setToolTipText(dbObject.toString());
}
}
protected void removeObject() {
}

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

@@ -1,8 +1,6 @@
package Visual_DVM_2021.UI.Main;
import Common.UI.Windows.Dialog.DialogFields;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree;
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
import javax.swing.*;
@@ -29,8 +27,11 @@ public class SapforPackageFields implements DialogFields, FormWithSplitters {
object = object_in;
//--
lObjectName.setText(object.id);
/*
treePanel.add(
new JScrollPane(
new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(object))));
*/
}
}

7
src/Visual_DVM_2021/UI/Main/SapforPackageForm.java
View File

@@ -4,10 +4,6 @@ import Common.UI.Windows.Dialog.Dialog;
import Common.UI.Windows.FormType;
import GlobalData.FormsParams.DBForm;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageTree;
import javax.swing.*;
public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageFields> {
SapforTasksPackage sapforTasksPackage = null;
private DBForm info = null;
@@ -25,9 +21,12 @@ public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageF
public void Init(Object... params) {
sapforTasksPackage = (SapforTasksPackage) params[0];
fields.lObjectName.setText(sapforTasksPackage.id);
/*
fields.getTreePanel().add(
new JScrollPane(
new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(sapforTasksPackage))));
*/
/*
if (Global.db.sapforProfiles.size() > 0) {
for (Object key : Global.db.sapforProfiles.Data.keySet()) {

36
src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.form
View File

@@ -98,40 +98,12 @@
<properties/>
<border type="none"/>
<children>
<splitpane id="3287b" binding="SCZ">
<grid id="24e20" binding="treePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="250"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<properties/>
<border type="none"/>
<children>
<grid id="4163a" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
<grid id="fd8a7" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="5b6cf" binding="treePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
</children>
</splitpane>
<children/>
</grid>
</children>
</grid>
</children>

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

@@ -24,7 +24,6 @@ public class SapforPackagesComparisonForm {
private JButton bNext;
private JButton bCompare;
private JButton bClose;
private JSplitPane SCZ;
private JPanel treePanel;
//-->>
SapforPackagesComparisonForm this_ = null; //?
@@ -82,7 +81,9 @@ public class SapforPackagesComparisonForm {
protected void showObject() {
lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : ""));
lObjectName.setToolTipText(object.getPK().toString());
treePanel.add(new JScrollPane(new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(object))));
treePanel.add(new JScrollPane(new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(object),
isMaster()? Current.SapforEtalonVersion: Current.SapforVersion
)));
}
protected String getText() {
return "";

16
src/Visual_DVM_2021/UI/Main/SapforVersionComparisonForm.java Normal file
View File

@@ -0,0 +1,16 @@
package Visual_DVM_2021.UI.Main;
import Common.Current;
import SapforTestingSystem.Json.SapforVersion_json;
public class SapforVersionComparisonForm extends ComparisonForm<SapforVersion_json> {
public SapforVersionComparisonForm(SapforVersionComparisonForm slave_in) {
super(SapforVersion_json.class, slave_in);
}
@Override
protected Current getCurrentObjectName() {
return null;
}
@Override
protected String getText() {
return null;
}
}

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

@@ -193,7 +193,7 @@
<splitpane id="760d4" binding="SC56">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="250"/>
<dividerLocation value="100"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
@@ -247,11 +247,54 @@
<splitpane id="c2b4" binding="SC64">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="350"/>
<dividerLocation value="400"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children/>
<children>
<splitpane id="8e1d0" binding="SC65">
<constraints>
<splitpane position="left"/>
</constraints>
<properties>
<dividerLocation value="300"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="10a70" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</splitpane>
<splitpane id="e0ceb" binding="SC66">
<constraints>
<splitpane position="right"/>
</constraints>
<properties>
<dividerLocation value="300"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="490c4" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</splitpane>
</children>
</splitpane>
</children>
</grid>

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

@@ -22,6 +22,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public JSplitPane SC63;
public JSplitPane SC59;
public JSplitPane SC64;
public JSplitPane SC65;
public JSplitPane SC66;
//-
//---
private JTabbedPane testingTabs;
@@ -66,8 +68,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
SC50.setLeftComponent(dvmTestingRunMaster.getContent());
SC50.setRightComponent(dvmTestingRunSlave.getContent());
//-
SC64.setLeftComponent(sapforTestingMaster.getContent());
SC64.setRightComponent(sapforTestingSlave.getContent());
SC65.setLeftComponent(sapforTestingMaster.getContent());
SC66.setLeftComponent(sapforTestingSlave.getContent());
//-
Global.testingServer.db.configurations.mountUI(configurationsPanel);
Global.testingServer.account_db.packages.mountUI(packagesPanel);