M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

лишний код.

Browse Source
This commit is contained in:
02090095
2023-11-18 02:47:30 +03:00
parent 022ece9c49
commit dae90b6c5e
8 changed files with 5 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/workspace.xml generated
View File

@@ -7,9 +7,10 @@
</component> </component>
<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 afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/DeleteServerAccountObject.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/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/FormType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Windows/FormType.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="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" />

4
src/Common/UI/UI.java
View File

@@ -254,7 +254,6 @@ public class UI {
windows.put(FormType.SearchReplace, new SearchReplaceForm()); windows.put(FormType.SearchReplace, new SearchReplaceForm());
windows.put(FormType.RemoteFileChooser, new RemoteFileChooser()); windows.put(FormType.RemoteFileChooser, new RemoteFileChooser());
windows.put(FormType.Profiles, new ProfilesForm()); windows.put(FormType.Profiles, new ProfilesForm());
windows.put(FormType.SapforPackage, new SapforPackageForm());
windows.put(FormType.Main, new MainForm()); windows.put(FormType.Main, new MainForm());
//--------------------------------------- //---------------------------------------
getMainWindow().Show(); getMainWindow().Show();
@@ -365,9 +364,6 @@ public class UI {
public static ProfilesForm getProfilesWindow() { public static ProfilesForm getProfilesWindow() {
return (ProfilesForm) windows.get(FormType.Profiles); return (ProfilesForm) windows.get(FormType.Profiles);
} }
public static SapforPackageForm getSapforPackageWindow() {
return (SapforPackageForm) windows.get(FormType.SapforPackage);
}
public static Component getFrontWindow() { public static Component getFrontWindow() {
Component res = null; Component res = null;
try { try {

3
src/Common/UI/Windows/FormType.java
View File

@@ -5,6 +5,5 @@ public enum FormType {
Main, Main,
SearchReplace, SearchReplace,
Components, Components,
RemoteFileChooser, RemoteFileChooser, Profiles
SapforPackage, Profiles
} }

33
src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
View File

@@ -1,33 +0,0 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.UI.UI;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import TestingSystem.DVM.TasksPackage.TasksPackageState;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
@Override
public String getIconPath() {
return "/icons/VariantsCoverage.png";
}
@Override
public String getButtonText() {
return "";
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.Check(Log, Current.SapforTasksPackage)) {
target = Current.getSapforTasksPackage();
if (!target.state.equals(TasksPackageState.Done)) {
Log.Writeln_("Пакет не завершен!");
return false;
}
return target.isLoaded() || passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(target);
}
return false;
}
@Override
protected void body() throws Exception {
UI.getSapforPackageWindow().ShowDialog("Отображение пакета задач SAPFOR", target);
}
}

3
src/Visual_DVM_2021/Passes/PassCode_2021.java
View File

@@ -296,7 +296,6 @@ public enum PassCode_2021 {
DeleteSapforConfigurationCommand, DeleteSapforConfigurationCommand,
//-> //->
DownloadSapforTasksPackage, DownloadSapforTasksPackage,
ShowSapforTaskPackage, //временный проход на демонстрацию дерева файлов и версий пакета.
OpenSapforEtalonVersion, OpenSapforEtalonVersion,
OpenSapforVersion, OpenSapforVersion,
PublishServerSapfor, PublishServerSapfor,
@@ -324,8 +323,6 @@ public enum PassCode_2021 {
return "Открыть текущую версию SAPFOR как проект"; return "Открыть текущую версию SAPFOR как проект";
case UnpackSapforTasksPackage: case UnpackSapforTasksPackage:
return "Распаковка пакета задач SAPFOR"; return "Распаковка пакета задач SAPFOR";
case ShowSapforTaskPackage:
return "Отобразить пакет задач SAPFOR";
case DownloadSapforTasksPackage: case DownloadSapforTasksPackage:
return "Загрузить пакет задач SAPFOR"; return "Загрузить пакет задач SAPFOR";
case AbortSapforTaskPackage: case AbortSapforTaskPackage:

127
src/Visual_DVM_2021/UI/Main/SapforPackageFields.form
View File

@@ -1,127 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Visual_DVM_2021.UI.Main.SapforPackageFields">
<grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<xy x="20" y="20" width="500" height="400"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<splitpane id="67d95" binding="SCY">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="250"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children>
<grid id="dd84a" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<toolbar id="f0668" binding="tools">
<constraints border-constraint="North"/>
<properties>
<floatable value="false"/>
<maximumSize width="32929" height="30"/>
</properties>
<border type="none"/>
<children>
<component id="d7cbc" class="javax.swing.JLabel" binding="lObjectName">
<constraints/>
<properties>
<font name="Times New Roman" size="16" style="1"/>
<foreground color="-16777216"/>
<text value="? "/>
</properties>
</component>
<component id="3b87b" class="javax.swing.JButton" binding="bApplyObject">
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Apply.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
<text value=""/>
<toolTipText value="Назначить объект для сравнения"/>
</properties>
</component>
<component id="5cdc4" class="javax.swing.JButton" binding="bClose">
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Close.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
<text value=""/>
<toolTipText value="Открепить объект"/>
</properties>
</component>
<component id="e2e53" class="javax.swing.JSeparator">
<constraints/>
<properties/>
</component>
<component id="b6737" class="javax.swing.JButton" binding="bPrevious">
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Prev.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
<text value=""/>
<toolTipText value="Перейти к предыдущему различию "/>
</properties>
</component>
<component id="6d986" class="javax.swing.JButton" binding="bNext">
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Next.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
<text value=""/>
<toolTipText value="Перейти к следующему различию"/>
</properties>
</component>
<component id="a9913" class="javax.swing.JButton" binding="bCompare">
<constraints/>
<properties>
<icon value="icons/Menu/Undo.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
<text value=""/>
<toolTipText value="Сравнить объекты"/>
</properties>
</component>
</children>
</toolbar>
<grid id="a1b9a" binding="treePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
<grid id="98e2e" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</splitpane>
</children>
</grid>
</form>

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

@@ -1,37 +0,0 @@
package Visual_DVM_2021.UI.Main;
import Common.UI.Windows.Dialog.DialogFields;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
import javax.swing.*;
public class SapforPackageFields implements DialogFields, FormWithSplitters {
SapforTasksPackage object = null;
private JPanel content;
public JSplitPane SCY;
private JToolBar tools;
public JLabel lObjectName;
private JButton bApplyObject;
private JButton bClose;
private JButton bPrevious;
private JButton bNext;
private JButton bCompare;
private JPanel treePanel;
public JPanel getContent() {
return content;
}
public JPanel getTreePanel(){return treePanel;}
public SapforPackageFields(){}
public SapforPackageFields(SapforTasksPackage object_in){
LoadSplitters();
object = object_in;
//--
lObjectName.setText(String.valueOf(object.id));
/*
treePanel.add(
new JScrollPane(
new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(object))));
*/
}
}

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

@@ -1,83 +0,0 @@
package Visual_DVM_2021.UI.Main;
import Common.Global;
import Common.UI.Windows.Dialog.Dialog;
import Common.UI.Windows.FormType;
import GlobalData.FormsParams.DBForm;
import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
public class SapforPackageForm extends Dialog<SapforTasksPackage, SapforPackageFields> {
SapforTasksPackage sapforTasksPackage = null;
private DBForm info = null;
public SapforPackageForm() {
super(SapforPackageFields.class);
}
@Override
public boolean NeedsScroll() {
return false;
}
@Override
public void CreateButtons() {
}
@Override
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()) {
Global.db.sapforProfiles.ShowUI(key);
return;
}
} else {
Global.db.sapforProfiles.ShowUI();
}
*/
}
@Override
public int getDefaultWidth() {
return 400;
}
@Override
public int getDefaultHeight() {
return 300;
}
@Override
public void CreateContent() {
super.CreateContent();
fields.LoadSplitters();
try {
LoadWindowParameters();
} catch (Exception ex) {
ex.printStackTrace();
}
}
@Override
public void onClose() {
fields.SaveSplitters();
try {
SaveWindowParameters();
} catch (Exception ex) {
ex.printStackTrace();
}
}
public void LoadWindowParameters() throws Exception {
if (Global.db.forms.Data.containsKey(FormType.SapforPackage)) {
info = Global.db.forms.Data.get(FormType.SapforPackage);
info.Apply(this);
return;
}
setSize(getDefaultWidth(), getDefaultHeight());
}
public void SaveWindowParameters() throws Exception {
if (info != null) {
info.Init(this);
Global.db.Update(info);
} else
Global.db.Insert(new DBForm(FormType.SapforPackage, this));
}
}