отображение задач из json

.idea/workspace.xml

@@ -7,63 +7,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Packages/31/LOADED" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasksSet/DVMRunTasksSet.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/package_json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/0/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/0/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/1/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/1/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/1/statistic.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/10/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/10/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/11/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/11/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/11/statistic.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/12/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/12/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/13/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/13/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/13/statistic.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/14/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/14/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/15/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/15/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/15/statistic.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/16/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/16/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/17/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/17/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/17/statistic.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/2/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/2/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/3/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/3/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/3/statistic.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/4/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/4/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/5/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/5/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/5/statistic.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/6/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/6/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/7/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/7/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/7/statistic.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/8/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/8/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/9/err.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/9/out.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/9/statistic.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/CompilationInfo.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Packages/31/results/RunningInfo.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.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/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ComponentsMenuBar/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.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" />

src/Common/Current.java

@@ -113,7 +113,8 @@ public enum Current {
     SapforProfileSetting,
     //--
     ProjectView,
-    SubscriberWorkspace;
+    SubscriberWorkspace,
+    DVMRunTask;
     //-
     //---
     private static final LinkedHashMap<Current, Object> objects = new LinkedHashMap<>();
@@ -404,9 +405,17 @@ public enum Current {
     public static TestingSystem.SAPFOR.SapforPackage.SapforPackage  getSapforPackage() {
         return (TestingSystem.SAPFOR.SapforPackage.SapforPackage) get(Current.SapforPackage);
     }
+    public static boolean HasDVMRunTask() {
+        return get(Current.DVMRunTask) != null;
+    }
+    public static Current getDVMRunTask() {
+        return (Current.DVMRunTask);
+    }
     //--------------------------------------------
     public String getDescription() {
         switch (this) {
+            case DVMRunTask:
+                return "Задача DVM тестирования";
             case SapforPackage:
                 return "Пакет тестирования SAPFOR";
             case DVMPackage:

src/TestingSystem/Common/TestingPackage/TestingPackage.java

@@ -1,9 +1,8 @@
 package TestingSystem.Common.TestingPackage;
+import Common.Constants;
 import Common.Database.DBObject;
 import Common.Database.riDBObject;
-import Common.Global;
 import Common.Utils.Utils;
-import TestingSystem.DVM.DVMPackage.DVMPackage_json;
 import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import com.sun.org.glassfish.gmbal.Description;
 
@@ -55,6 +54,9 @@ public abstract class TestingPackage<J> extends riDBObject {
     public File getJsonFile() {
         return new File(getLocalWorkspace(), "package_json");
     }
+    public File getLoadedFile() {
+        return new File(getLocalWorkspace(), Constants.LOADED);
+    }
     public void saveJson() throws Exception {
         Utils.jsonToFile(package_json, getJsonFile());
     }

src/TestingSystem/Common/TestsDatabase.java

@@ -10,12 +10,12 @@ import TestingSystem.Common.TestingPackageToKill.TestingPackagesToKillDBTable;
 import TestingSystem.DVM.Configuration.ConfigurationDBTable;
 import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
+import TestingSystem.DVM.DVMTasksSet.DVMRunTasksSet;
 import TestingSystem.DVM.TasksPackage.TasksPackageState;
 import TestingSystem.SAPFOR.SapforConfiguration.SapforConfigurationDBTable;
 import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
-import TestingSystem.SAPFOR.SapforTasksPackage.SapforTasksPackage;
 import TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
@@ -35,6 +35,9 @@ public class TestsDatabase extends SQLiteDatabase {
     public SapforConfigurationCommandsDBTable sapforConfigurationCommands;
     //----
     public ServerSapforsDBTable serverSapfors;
+    //---
+    public DVMRunTasksSet dvmRunTasks = new DVMRunTasksSet(); //задачи текущего пакета тестирования DVM
+    //--
     public TestsDatabase() {
         super(Paths.get(System.getProperty("user.dir"), "Data", Constants.tests_db_name + ".sqlite").toFile());
     }

src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java

@@ -1,13 +1,11 @@
 package TestingSystem.DVM.DVMPackage;
 import Common.Current;
 import Common.Database.*;
+import Common.Global;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
-import TestingSystem.DVM.Tasks.TestRunTask;
-import TestingSystem.DVM.TasksPackage.TasksPackage;
 
 import java.util.Date;
-import java.util.LinkedHashMap;
 
 import static Common.UI.Tables.TableRenderers.*;
 public class DVMPackageDBTable extends iDBTable<DVMPackage> {
@@ -43,14 +41,15 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
             @Override
             public void ShowCurrentObject() throws Exception {
                 super.ShowCurrentObject();
-              //  UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
+             //   Global.testingServer.db.dvmRunTasks.ShowDVMPackage(getCurrent());
+                UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
             }
             @Override
             public void ShowNoCurrentObject() throws Exception {
                 super.ShowNoCurrentObject();
-             //   UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
+              //  Global.testingServer.db.dvmRunTasks.ShowNoPackage();
+                UI.getMainWindow().getTestingWindow().DropTestRunTasksComparison();
             }
-
         };
     }
     @Override

src/TestingSystem/DVM/DVMTasksSet/DVMRunTasksSet.java

@@ -0,0 +1,115 @@
+package TestingSystem.DVM.DVMTasksSet;
+import Common.Current;
+import Common.Database.DataSet;
+import Common.UI.DataSetControlForm;
+import TestingSystem.DVM.DVMPackage.DVMPackage;
+import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
+import TestingSystem.DVM.DVMTasks.DVMRunTask;
+
+import static Common.UI.Tables.TableRenderers.RendererProgress;
+import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
+public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
+    public DVMRunTasksSet() {
+        super(Integer.class, DVMRunTask.class);
+    }
+    @Override
+    public String getSingleDescription() {
+        return "задача";
+    }
+    @Override
+    public String getPluralDescription() {
+        return "задачи";
+    }
+    @Override
+    protected DataSetControlForm createUI() {
+        return new DataSetControlForm(this) {
+            @Override
+            public boolean hasCheckBox() {
+                return true;
+            }
+            @Override
+            protected void AdditionalInitColumns() {
+                columns.get(5).setRenderer(RendererStatusEnum);
+                columns.get(6).setRenderer(RendererStatusEnum);
+                columns.get(13).setRenderer(RendererProgress);
+            }
+        };
+    }
+    @Override
+    public String[] getUIColumnNames() {
+        return new String[]{
+                "Тест",
+                "Язык",
+                "Флаги",
+                "Компиляция",
+                "Запуск",
+                "Матрица",
+                "Окружение",
+                "usr.par",
+                "Время компиляции (с)",
+                "Время запуска (с)",
+                "Чистое время (с)",
+                "Прогресс",
+        };
+    }
+    @Override
+    public Object getFieldAt(DVMRunTask object, int columnIndex) {
+        switch (columnIndex) {
+            case 2:
+                return object.test_description;
+            case 3:
+                return object.language;
+            case 4:
+                return object.flags;
+            case 5:
+                return object.compilation_state;
+            case 6:
+                return object.state;
+            case 7:
+                return object.matrix;
+            case 8:
+                return object.getEnvironments();
+            case 9:
+                return object.getUsrPar();
+            case 10:
+                return object.compilation_time;
+            case 11:
+                return object.Time;
+            case 12:
+                return object.CleanTime;
+            case 13:
+                return object.progress;
+            default:
+                return null;
+        }
+    }
+    @Override
+    public Current CurrentName() {
+        return Current.DVMRunTask;
+    }
+    public void ShowDVMPackage(DVMPackage dvmPackage) {
+        ClearUI();
+        Data.clear();
+        if (dvmPackage.package_json == null) {
+            if (dvmPackage.getJsonFile().exists()) {
+                try {
+                    dvmPackage.readJson();
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+        if (dvmPackage.package_json != null) {
+            for (DVMCompilationTask compilationTask : dvmPackage.package_json.compilationTasks) {
+                for (DVMRunTask runTask : compilationTask.runTasks) {
+                    Data.put(runTask.id, runTask);
+                }
+            }
+            ShowUI();
+        }
+    }
+    public void ShowNoPackage() {
+        ClearUI();
+        Data.clear();
+    }
+}

src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java

@@ -1,6 +1,7 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Constants;
 import Common.Current;
+import Common.Global;
 import Common.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
@@ -16,7 +17,7 @@ import java.util.Date;
 public class DownloadDVMPackage extends TestingSystemPass<DVMPackage> {
     @Override
     public String getIconPath() {
-        return "/icons/Apply.png";
+        return "/icons/ComponentsActual.png";
     }
     @Override
     public String getButtonText() {
@@ -37,11 +38,12 @@ public class DownloadDVMPackage extends TestingSystemPass<DVMPackage> {
             loaded = new File(workspace, Constants.LOADED);
             //--
             if (!target.state.equals(TasksPackageState.Done)){
-                Log.Writeln_("Возможно скачать только завершённый пакет!");
+                Log.Writeln_("Возможно скачать и отобразить задачи только завершённого пакета!");
                 return false;
             }
             if (loaded.exists()){
-                Log.Writeln_("Пакет уже загружен");
+              ///  Log.Writeln_("Пакет уже загружен");
+                Global.testingServer.db.dvmRunTasks.ShowDVMPackage(target);
                 return false;
             }
             return true;
@@ -65,4 +67,8 @@ public class DownloadDVMPackage extends TestingSystemPass<DVMPackage> {
         passes.get(PassCode_2021.UnzipFolderPass).Do(results_zip.getAbsolutePath(), workspace.getAbsolutePath());
         FileUtils.writeStringToFile(loaded, new Date().toString());
     }
+    @Override
+    protected void showDone() throws Exception {
+        Global.testingServer.db.dvmRunTasks.ShowDVMPackage(target);
+    }
 }

src/Visual_DVM_2021/UI/Interface/TestingWindow.java

@@ -20,4 +20,6 @@ public interface TestingWindow extends VisualizerForm {
     void ShowCurrentCompiler();
     void ShowCurrentServerSapfor();
     void ShowNoServerSapfor();
+    void ShowCurrentDVMPackage();
+    void ShowNoCurrentDVMPackage();
 }

src/Visual_DVM_2021/UI/Main/TestingForm.form

@@ -116,7 +116,7 @@
                                     <properties/>
                                     <border type="none"/>
                                     <children>
-                                      <grid id="242a7" binding="testsRunTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+                                      <grid id="242a7" binding="dvmRunTasksPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                                         <constraints border-constraint="Center"/>
                                         <properties>
                                           <minimumSize width="0" height="150"/>

src/Visual_DVM_2021/UI/Main/TestingForm.java

@@ -30,7 +30,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     //-
     //---
     private JTabbedPane testingTabs;
-    private JPanel testsRunTasksPanel;
+    private JPanel dvmRunTasksPanel;
     private JToolBar testsResultsTools;
     private JButton bChangeKernels;
     private JTextField filterName;
@@ -87,6 +87,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         //-
         Global.testingServer.db.configurations.mountUI(configurationsPanel);
         Global.testingServer.db.dvmPackages.mountUI(dvmPackagesPanel);
+        Global.testingServer.db.dvmRunTasks.mountUI(dvmRunTasksPanel);
 
         Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel);
         Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
@@ -102,6 +103,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
         //--
         Global.testingServer.db.serverSapfors.ShowUI();
         Global.testingServer.db.sapforConfigurations.ShowUI();
+        Global.testingServer.db.dvmRunTasks.ShowUI();
         //---
         if (Global.properties.AutoCheckTesting)
             TestingServer.TimerOn();
@@ -162,13 +164,13 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     @Override
     public void RemountTestTable() {
         UI.Clear(dvmPackagesPanel);
-        UI.Clear(testsRunTasksPanel);
+        UI.Clear(dvmRunTasksPanel);
         UI.Clear(sapforPackagesPanel);
         UI.Clear(sapforTasksPanel);
         DropSapforComparison();
         //-->>
         Global.testingServer.account_db.packages.mountUI(dvmPackagesPanel);
-        Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
+        Global.testingServer.account_db.testRunTasks.mountUI(dvmRunTasksPanel);
         Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforPackagesPanel);
         Global.testingServer.account_db.sapforTasks.mountUI(sapforTasksPanel);
     }
@@ -190,4 +192,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
     public void ShowNoServerSapfor() {
         testingTabs.setTitleAt(1,  "SAPFOR: ?");
     }
+    @Override
+    public void ShowCurrentDVMPackage() {
+    }
+    @Override
+    public void ShowNoCurrentDVMPackage() {
+    }
 }