From 57baa6c9c16976ac753343f158bc6a13e9163b23 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 12 Feb 2025 23:02:46 +0300
Subject: [PATCH] v++

---
 .idea/workspace.xml                               |  6 ++----
 src/_VisualDVM/Global.java                        |  2 +-
 src/_VisualDVM/MainModule.java                    |  3 ++-
 .../Passes/All/RefreshDVMPackageResults.java      | 15 +++++++++------
 .../Repository/Component/Visualiser.java          |  2 +-
 .../DVM/DVMPackage/UI/DVMPackagesForm.java        |  2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7499622b..803893da 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,13 +8,11 @@
   <component name="ChangeListManager">
     <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$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 05faf7ca..2945ebe8 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -23,7 +23,7 @@ public class Global {
     public static MainModule mainModule = null;
     //Режим
     public static Mode mode = Mode.Undefined;
-    //--------------------------------------------------
+    //setAdminRights-------------
     public static VisualDVMProperties properties= null;
     public static NormalProperties normalProperties = null;
     public static ComponentsServerProperties componentsServerProperties = null;
diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java
index 14dd9d54..779d7798 100644
--- a/src/_VisualDVM/MainModule.java
+++ b/src/_VisualDVM/MainModule.java
@@ -35,7 +35,8 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
             PassCode.ShutdownTestingServer,
             PassCode.StartTestingServer,
             PassCode.PublishTestingServer,
-            PassCode.CreateTestsGroupFromSelectedVersions
+            PassCode.CreateTestsGroupFromSelectedVersions,
+            PassCode.RefreshDVMPackageResults
     );
     public MainModule() throws Exception {
         super(GlobalDatabase.class, MainUI.class);
diff --git a/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java b/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
index 8ad4b219..ddbeb21b 100644
--- a/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
+++ b/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
@@ -25,6 +25,10 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
         return "/icons/Menu/Undo.png";
     }
     @Override
+    protected boolean needsAnimation() {
+        return true;
+    }
+    @Override
     protected boolean canStart(Object... args) throws Exception {
         if (!Global.testingServer.db.dvmPackages.getUI().CheckCurrent(Log))
             return false;
@@ -47,8 +51,10 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
         int rt_count = 0;
         int good = 0;
         //--
+        int i = 0;
         for (DVMCompilationTask compilationTask : target.package_json.compilationTasks)
             for (DVMRunTask runTask : compilationTask.runTasks) {
+                ShowProgress(runTasks.size(), i, true);
                 rt_count++;
                 if (compilationTask.state != TaskState.Done) {
                     runTask.state = TaskState.Canceled;
@@ -100,12 +106,9 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
         target.description = "Выполнено на " + ((int) percent) + "%\n" +
                 "Всего задач: " + target.tasksCount + ", из них с ошибками " + (target.tasksCount - good);
         //--
-        //Global.testingServer.db.Update(target);
-       // RemoteFile remoteJson = new RemoteFile(target.get)
-        /*
-        SendRequest(ServerCode.EditObject, "", target);
-        SendRequest(ServerCode.SendFile)
-         */
+    }
+    @Override
+    protected void performDone() throws Exception {
         SendRequest(ServerCode.ReplaceDVMPackageResults,"",
                 new Pair<>(
                         target,
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index 225b60ad..5c9ab09c 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1159;
+        version = 1160;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index 13d273ca..f7fac004 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -141,7 +141,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
                 addPasses(PassCode.PauseDVMPackage,PassCode.ResumeDVMPackage,PassCode.AbortDVMPackage);
                 addSeparator();
                 addPasses(PassCode.DownloadDVMPackage,
-                     //   PassCode.RefreshDVMPackageResults,
+                        PassCode.RefreshDVMPackageResults,
                         PassCode.ExportDVMPackageToExcel,
                         PassCode.DeleteDVMPackage);
             }