no message

.idea/workspace.xml

@@ -7,12 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTaskToEthalon.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksComparisonForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/TaskState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/TaskState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/TestingWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -91,7 +94,7 @@
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
     <property name="extract.method.default.visibility" value="public" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/_VisualDVM/Passes/All" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI" />
     <property name="project.structure.last.edited" value="Libraries" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.27322906" />
@@ -104,11 +107,11 @@
       <recent name="controls.Trees" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\TestingSystem\DVM\DVMTasks\UI" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Passes\All" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
-      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
       <recent name="_VisualDVM.ComponentsServer.Component.Sapfor.Sapfor" />

src/_VisualDVM/Constants.java

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1214;
+    public static final int version = 1215;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--

src/_VisualDVM/Passes/All/CompareDVMRunTaskToEthalon.java

@@ -0,0 +1,39 @@
+package _VisualDVM.Passes.All;
+import Common.CommonConstants;
+import Common.Passes.Pass;
+import Common.Utils.Utils_;
+import _VisualDVM.Global;
+import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
+public class CompareDVMRunTaskToEthalon extends Pass<DVMRunTask> {
+    DVMRunTask ethalon = null;
+    @Override
+    public String getIconPath() {
+        return "/icons/Comparsion.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        target = null;
+        ethalon = null;
+        if (Global.testingServer.db.dvmRunTasks.getUI().CheckCurrent(Log)) {
+            //есть ли эталон у этой задачи.
+            target = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
+            if (target.ethalon_id != CommonConstants.Nan && Global.testingServer.db.dvmRunTasks.containsKey(target.ethalon_id)) {
+                ethalon= Global.testingServer.db.dvmRunTasks.get(target.ethalon_id);
+                return true;
+            }else Log.Writeln_("Не найдено эталона для задачи "+ Utils_.Brackets(target.id+" !"));
+        }
+        return false;
+    }
+    @Override
+    protected void body() throws Exception {
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().CompareCurrentDVMTaskToEthalon(ethalon,target);
+    }
+    @Override
+    protected void showFinish() throws Exception {
+        Global.mainModule.getUI().getMainWindow().getTestingWindow().FocusTestingTasksComparison();
+    }
+}

src/_VisualDVM/Passes/PassCode.java

@@ -356,11 +356,14 @@ public enum PassCode implements PassCode_ {
     DeleteUserAccount,
     GetDVMPackageCredetials,
     ComponentsServerBackUp,
-    TestingServerBackUp;
+    TestingServerBackUp,
+    CompareDVMRunTaskToEthalon;
     //--
     @Override
     public String getDescription() {
         switch (this) {
+            case CompareDVMRunTaskToEthalon:
+                return "Сравнить с эталоном";
             case ComponentsServerBackUp:
                 return "Создание резервной копии данных сервера компонент";
             case TestingServerBackUp:

src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksComparisonForm.java

@@ -0,0 +1,31 @@
+package _VisualDVM.TestingSystem.DVM.DVMTasks.UI;
+import _VisualDVM.Global;
+import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
+import _VisualDVM.Visual.Windows.ComparisonForm;
+import _VisualDVM.Visual.Windows.TasksComparisonForm;
+public class DVMRunTasksComparisonForm extends TasksComparisonForm<DVMRunTask> {
+    public DVMRunTasksComparisonForm(ComparisonForm<DVMRunTask> slave_in) {
+        super(DVMRunTask.class, slave_in);
+    }
+    @Override
+    public Object getDefaultCurrentObject() {
+        return Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
+    }
+    @Override
+    protected String getTextByTab() {
+        switch (status) {
+            case CompilationOutput:
+                return object.getCompilationOutput();
+            case CompilationErrors:
+                return object.getCompilationErrors();
+            case RunOutput:
+                return object.getOutput();
+            case RunErrors:
+                return object.getErrors();
+            case Sts:
+                return object.getStatistic();
+            default:
+                return "";
+        }
+    }
+}

src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java

@@ -125,7 +125,7 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
     }
     @Override
     public DataMenuBar createMenuBar() {
-        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DownloadTaskTest);
+        return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DownloadTaskTest, PassCode.CompareDVMRunTaskToEthalon);
     }
     @Override
     protected void createFilters() {

src/_VisualDVM/Visual/Interface/TestingWindow.java

@@ -11,6 +11,7 @@ public interface TestingWindow extends VisualizerForm {
     void DropSapforComparison();
     void ShowCurrentTestRunTask();
     void ShowNoTestRunTask();
+    void CompareCurrentDVMTaskToEthalon(DVMRunTask ethalon, DVMRunTask task)throws Exception;
     //-
     void RefreshTabsNames();
     //-
@@ -32,4 +33,5 @@ public interface TestingWindow extends VisualizerForm {
     void ShowDVMPackage(DVMPackage master);
     void ShowCurrentDVMTask();
     void ShowNoCurrentDVMTask();
+    void FocusTestingTasksComparison();
 }

src/_VisualDVM/Visual/Windows/TestingForm.form

@@ -156,98 +156,132 @@
                         <properties/>
                         <border type="none"/>
                         <children>
-                          <splitpane id="ba9b7" binding="SC50">
+                          <tabbedpane id="51db9" binding="taskResultsTabs">
                             <constraints border-constraint="Center"/>
-                            <properties>
+                            <properties/>
-                              <dividerLocation value="300"/>
-                              <dividerSize value="3"/>
-                            </properties>
                             <border type="none"/>
                             <children>
-                              <grid id="49659" layout-manager="BorderLayout" hgap="0" vgap="0">
+                              <grid id="bd851" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints>
-                                  <splitpane position="left"/>
+                                  <tabbedpane title="Результаты"/>
                                 </constraints>
                                 <properties/>
                                 <border type="none"/>
                                 <children>
-                                  <tabbedpane id="665df" binding="compilationTabs">
+                                  <splitpane id="6065f" binding="SC50">
                                     <constraints border-constraint="Center"/>
-                                    <properties/>
+                                    <properties>
+                                      <dividerLocation value="300"/>
+                                      <dividerSize value="3"/>
+                                    </properties>
                                     <border type="none"/>
                                     <children>
-                                      <grid id="97d0" binding="compilationOutPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                      <grid id="cb911" layout-manager="BorderLayout" hgap="0" vgap="0">
                                         <constraints>
-                                          <tabbedpane title="" icon="icons/CompilationOutput.png">
+                                          <splitpane position="left"/>
-                                            <tooltip value="Поток вывода компиляции"/>
-                                          </tabbedpane>
                                         </constraints>
                                         <properties/>
                                         <border type="none"/>
-                                        <children/>
+                                        <children>
+                                          <tabbedpane id="a9e1d" binding="compilationTabs">
+                                            <constraints border-constraint="Center"/>
+                                            <properties/>
+                                            <border type="none"/>
+                                            <children>
+                                              <grid id="22660" binding="compilationOutPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                                <constraints>
+                                                  <tabbedpane title="" icon="icons/CompilationOutput.png">
+                                                    <tooltip value="Поток вывода компиляции"/>
+                                                  </tabbedpane>
+                                                </constraints>
+                                                <properties/>
+                                                <border type="none"/>
+                                                <children/>
+                                              </grid>
+                                              <grid id="a4d26" binding="compilationErrPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                                <constraints>
+                                                  <tabbedpane title="" icon="icons/CompilationErrors.png">
+                                                    <tooltip value="Поток ошибок компиляции"/>
+                                                  </tabbedpane>
+                                                </constraints>
+                                                <properties/>
+                                                <border type="none"/>
+                                                <children/>
+                                              </grid>
+                                            </children>
+                                          </tabbedpane>
+                                        </children>
                                       </grid>
-                                      <grid id="953c0" binding="compilationErrPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                      <grid id="8e77b" layout-manager="BorderLayout" hgap="0" vgap="0">
                                         <constraints>
-                                          <tabbedpane title="" icon="icons/CompilationErrors.png">
+                                          <splitpane position="right"/>
-                                            <tooltip value="Поток ошибок компиляции"/>
-                                          </tabbedpane>
                                         </constraints>
                                         <properties/>
                                         <border type="none"/>
-                                        <children/>
+                                        <children>
+                                          <tabbedpane id="8ce6" binding="runTabs">
+                                            <constraints border-constraint="Center"/>
+                                            <properties/>
+                                            <border type="none"/>
+                                            <children>
+                                              <grid id="c0686" binding="runOutPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                                <constraints>
+                                                  <tabbedpane title="" icon="icons/RunOutput.png">
+                                                    <tooltip value="Поток вывода запуска"/>
+                                                  </tabbedpane>
+                                                </constraints>
+                                                <properties/>
+                                                <border type="none"/>
+                                                <children/>
+                                              </grid>
+                                              <grid id="15c72" binding="runErrPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                                <constraints>
+                                                  <tabbedpane title="" icon="icons/RunErrors.png">
+                                                    <tooltip value="Поток ошибок запуска"/>
+                                                  </tabbedpane>
+                                                </constraints>
+                                                <properties/>
+                                                <border type="none"/>
+                                                <children/>
+                                              </grid>
+                                              <grid id="d9373" binding="runStsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                                <constraints>
+                                                  <tabbedpane title="" icon="icons/Sts.png">
+                                                    <tooltip value="DVM статистика запуска"/>
+                                                  </tabbedpane>
+                                                </constraints>
+                                                <properties/>
+                                                <border type="none"/>
+                                                <children/>
+                                              </grid>
+                                            </children>
+                                          </tabbedpane>
+                                        </children>
                                       </grid>
                                     </children>
-                                  </tabbedpane>
+                                  </splitpane>
                                 </children>
                               </grid>
-                              <grid id="d5bb4" layout-manager="BorderLayout" hgap="0" vgap="0">
+                              <grid id="bd361" layout-manager="BorderLayout" hgap="0" vgap="0">
                                 <constraints>
-                                  <splitpane position="right"/>
+                                  <tabbedpane title="Сравнение"/>
                                 </constraints>
                                 <properties/>
                                 <border type="none"/>
                                 <children>
-                                  <tabbedpane id="e06c2" binding="runTabs">
+                                  <splitpane id="e992c" binding="SC90">
                                     <constraints border-constraint="Center"/>
-                                    <properties/>
+                                    <properties>
+                                      <dividerLocation value="400"/>
+                                      <dividerSize value="3"/>
+                                    </properties>
                                     <border type="none"/>
-                                    <children>
+                                    <children/>
-                                      <grid id="5f83b" binding="runOutPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                  </splitpane>
-                                        <constraints>
-                                          <tabbedpane title="" icon="icons/RunOutput.png">
-                                            <tooltip value="Поток вывода запуска"/>
-                                          </tabbedpane>
-                                        </constraints>
-                                        <properties/>
-                                        <border type="none"/>
-                                        <children/>
-                                      </grid>
-                                      <grid id="b85ac" binding="runErrPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                        <constraints>
-                                          <tabbedpane title="" icon="icons/RunErrors.png">
-                                            <tooltip value="Поток ошибок запуска"/>
-                                          </tabbedpane>
-                                        </constraints>
-                                        <properties/>
-                                        <border type="none"/>
-                                        <children/>
-                                      </grid>
-                                      <grid id="d35c7" binding="runStsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-                                        <constraints>
-                                          <tabbedpane title="" icon="icons/Sts.png">
-                                            <tooltip value="DVM статистика запуска"/>
-                                          </tabbedpane>
-                                        </constraints>
-                                        <properties/>
-                                        <border type="none"/>
-                                        <children/>
-                                      </grid>
-                                    </children>
-                                  </tabbedpane>
                                 </children>
                               </grid>
                             </children>
-                          </splitpane>
+                          </tabbedpane>
                         </children>
                       </grid>
                     </children>

src/_VisualDVM/Visual/Windows/TestingForm.java

@@ -10,6 +10,7 @@ import _VisualDVM.GlobalData.Compiler.CompilerType;
 import _VisualDVM.TestingSystem.Common.TestingServer;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
+import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksComparisonForm;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.Visual.Interface.TestingWindow;
 
@@ -24,15 +25,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private final BaseEditor roText;
     private final BaseEditor reText;
     private final BaseEditor stsText;
-    //private final DVMRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
+    private final DVMRunTasksComparisonForm dvmTestingRunMaster; //сравнение тестов двм системы.
-    //private final DVMRunTasksComparisonForm dvmTestingRunSlave;
+    private final DVMRunTasksComparisonForm dvmTestingRunSlave;
     //-
     private final SapforPackagesComparisonForm sapforPackageTreeMaster; //сравнение деревьев пакетов SAPFOR.
     private final SapforPackagesComparisonForm sapforPackageTreeSlave;
     //--
     private final SapforVersionsComparisonForm sapforVersionMaster; //сравнение версий тестов SAPFOR.
     private final SapforVersionsComparisonForm sapforVersionSlave;
-    public JSplitPane SC50;
     public JSplitPane SC65;
     public JSplitPane SC66;
     public JSplitPane SC64;
@@ -43,6 +43,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public JSplitPane SC83;
     public JSplitPane SC72;
     public JSplitPane SC85;
+    public JSplitPane SC50;
+    public JSplitPane SC90;
     private JPanel content;
     //---
     private JTabbedPane testingTabs;
@@ -71,13 +73,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     private JPanel sapforSettingsPanel;
     private JPanel sapforSettingsCommandsPanel;
     private JPanel dvmSettingsPanel;
-    private JTabbedPane compilationTabs;
+    private JTabbedPane taskResultsTabs;
-    private JTabbedPane runTabs;
     private JPanel compilationOutPanel;
     private JPanel compilationErrPanel;
     private JPanel runOutPanel;
     private JPanel runErrPanel;
     private JPanel runStsPanel;
+    private JTabbedPane compilationTabs;
+    private JTabbedPane runTabs;
     private JPanel testsRunTasksBackground;
     private JCheckBox filterFinished;
     private JButton bTest;
@@ -108,7 +111,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         content.add(Global.mainModule.getUI().getTestingMenuBar(), BorderLayout.NORTH);
         LoadSplitters();
         //-
-        // dvmTestingRunMaster = new DVMRunTasksComparisonForm(dvmTestingRunSlave = new DVMRunTasksComparisonForm(null));
+        dvmTestingRunMaster = new DVMRunTasksComparisonForm(dvmTestingRunSlave = new DVMRunTasksComparisonForm(null));
         sapforPackageTreeMaster = new SapforPackagesComparisonForm(sapforPackageTreeSlave = new SapforPackagesComparisonForm(null));
         sapforVersionMaster = new SapforVersionsComparisonForm(
                 sapforVersionSlave = new SapforVersionsComparisonForm(null, Current.SapforVersion),
@@ -116,6 +119,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         );
         //--->>>
         RefreshTabsNames();
+        SC90.setLeftComponent(dvmTestingRunMaster.getContent());
+        SC90.setRightComponent(dvmTestingRunSlave.getContent());
         //-
         compilationOutPanel.add(new JScrollPane(coText = new BaseEditor()));
         compilationErrPanel.add(new JScrollPane(ceText = new BaseEditor()));
@@ -172,8 +177,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     }
     @Override
     public void DropTestRunTasksComparison() {
-        //   dvmTestingRunMaster.RemoveObject();
+        dvmTestingRunMaster.RemoveObject();
-        //  dvmTestingRunSlave.RemoveObject();
+        dvmTestingRunSlave.RemoveObject();
     }
     @Override
     public void DropSapforComparison() {
@@ -184,13 +189,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     }
     @Override
     public void ShowCurrentTestRunTask() {
-        // if (dvmTestingRunMaster.isActive()) dvmTestingRunMaster.ShowTask();
-        //  else dvmTestingRunSlave.ShowTask();
     }
     @Override
     public void ShowNoTestRunTask() {
-        //  dvmTestingRunMaster.Clear();
-        // dvmTestingRunSlave.Clear();
     }
     @Override
     public void RefreshTabsNames() {
@@ -277,4 +278,16 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         reText.setText("");
         stsText.setText("");
     }
+    @Override
+    public void FocusTestingTasksComparison() {
+        taskResultsTabs.setSelectedIndex(1);
+    }
+    @Override
+    public void CompareCurrentDVMTaskToEthalon(DVMRunTask ethalon, DVMRunTask task) throws Exception {
+        dvmTestingRunMaster.ApplyObject(ethalon);
+        dvmTestingRunSlave.ApplyObject(task);
+        dvmTestingRunMaster.Compare();
+       // dvmTestingRunMaster.ChangeState(TasksComparisonState.RunOutput);
+       // dvmTestingRunSlave.ChangeState(TasksComparisonState.RunOutput);
+    }
 }