From 031ae09a4b22b22c7a2022bfb9e4e1b8b9c16578 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 14 Oct 2024 01:50:33 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                      | 9 ++++++++-
 src/Common/Passes/Pass.java                              | 9 ++++-----
 src/MainModule_/MainModule_.java                         | 3 +++
 src/Visual_DVM_2021/PassStats/PassStatsDBTable.java      | 9 ++++-----
 src/Visual_DVM_2021/Passes/All/DVMConvertProject.java    | 2 +-
 src/Visual_DVM_2021/Passes/All/PublishComponent.java     | 2 +-
 .../Passes/All/SPF_GetArrayDistribution.java             | 4 +++-
 .../Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java | 5 +++--
 .../Passes/All/SPF_StatisticAnalyzer.java                | 2 +-
 src/Visual_DVM_2021/Passes/SapforAnalysis.java           | 6 +++---
 src/Visual_DVM_2021/Passes/SapforTransformation.java     | 4 ++--
 src/Visual_DVM_2021/Passes/SilentSapforPass.java         | 2 +-
 src/Visual_DVM_2021/Passes/Transformation.java           | 2 +-
 13 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0b6e9f2d..0dd0f81e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.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/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/MainModule_/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/MainModule_/MainModule_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStatsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStatsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SilentSapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SilentSapforPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java
index b9027a35..7610eacc 100644
--- a/src/Common/Passes/Pass.java
+++ b/src/Common/Passes/Pass.java
@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
 import Common.Utils.Stopwatch;
 import Common.Utils.TextLog;
 import Common.Visual.UI_;
+import MainModule_.MainModule_;
 import Visual_DVM_2021.PassStats.PassStats;
 import Visual_DVM_2021.Passes.PassCode;
 import Visual_DVM_2021.Passes.UI.PassForm;
@@ -94,24 +95,22 @@ public class Pass<T> {
     public void UpdateStatsIfNeed() {
         if (hasStats()) {
             try {
-                Global.mainModule.getDb().passStats.IncPassStat(code());
+                MainModule_.object.getDb().passStats.IncPassStat(getName());
             } catch (Exception ex) {
                 Utils_.MainLog.PrintException(ex);
             }
             UI.fastAccessMenuBar.Refresh(); //todo все бары в мейн модуль. или уи.мейн модуль
         }
     }
-    public PassCode code() {
-        return PassCode.valueOf(getClass().getSimpleName());
-    }
     public boolean isDone() {
         return state.equals(PassState.Done);
     }
     public void setDone() {
         state.equals(PassState.Done);
     }
+    public String getName(){return getClass().getSimpleName();}
     public String getDescription() {
-        return code().getDescription();
+        return Global.mainModule.getPassDescription(getName());
     }
     public String getStartDescription() {
         return getDescription();
diff --git a/src/MainModule_/MainModule_.java b/src/MainModule_/MainModule_.java
index e8f4b4c9..d7242f7a 100644
--- a/src/MainModule_/MainModule_.java
+++ b/src/MainModule_/MainModule_.java
@@ -88,6 +88,9 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
     public Pass getPass(PassCode_ code){
         return passes.get(code);
     }
+    public String getPassDescription(String passName){
+        return ((PassCode_)Enum.valueOf(MainModule_.object.getPassCodesEnum(), passName)).getDescription();
+    }
     public Vector<Pass> getFirstAccessPasses(){
         Vector<PassStats> sortedStats = new Vector<>(getDb().passStats.Data.values());
         sortedStats.sort(new Comparator<PassStats>() {
diff --git a/src/Visual_DVM_2021/PassStats/PassStatsDBTable.java b/src/Visual_DVM_2021/PassStats/PassStatsDBTable.java
index e1352a21..4c687a60 100644
--- a/src/Visual_DVM_2021/PassStats/PassStatsDBTable.java
+++ b/src/Visual_DVM_2021/PassStats/PassStatsDBTable.java
@@ -11,15 +11,14 @@ public class PassStatsDBTable extends DBTable<String, PassStats> {
     public String getSingleDescription() {
         return "статистика выполнения прохода";
     }
-    public void IncPassStat(PassCode_ code) throws Exception {
-        String code_s = code.toString();
+    public void IncPassStat(String passName) throws Exception {
         PassStats passStats = null;
-        if (Data.containsKey(code_s)) {
-            passStats = Data.get(code_s);
+        if (Data.containsKey(passName)) {
+            passStats = Data.get(passName);
             passStats.Inc();
             getDb().Update(passStats);
         } else {
-            passStats = new PassStats(code_s);
+            passStats = new PassStats(passName);
             passStats.Inc();
             getDb().Insert(passStats);
         }
diff --git a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
index abd64eef..e0f220c2 100644
--- a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
+++ b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
@@ -81,7 +81,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
     //-
     @Override
     public String getIconPath() {
-        return "/icons/Transformations/" + code().toString() + ".png";
+        return "/icons/Transformations/" + getName() + ".png";
     }
     @Override
     public boolean hasStats() {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishComponent.java b/src/Visual_DVM_2021/Passes/All/PublishComponent.java
index 62c649cd..39d9456d 100644
--- a/src/Visual_DVM_2021/Passes/All/PublishComponent.java
+++ b/src/Visual_DVM_2021/Passes/All/PublishComponent.java
@@ -60,7 +60,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
                 f.fields.cbAssemblyOnServer.setVisible(false);
                 f.fields.cbAssemblyOnServer.setSelected(false);
             }
-            if (f.ShowDialog(code().getDescription())) {
+            if (f.ShowDialog(getDescription())) {
                 target.needs_update_minimal_version = f.fields.cbUpdateMinimalVersion.isSelected();
                 return true;
             }
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
index ade36e0c..d3277cf4 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
@@ -1,6 +1,8 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Passes.PassCode_;
 import Common.Utils.Utils_;
 import Common.Visual.UI_;
+import MainModule_.MainModule_;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.UI;
 import _VisualDVM.GlobalData.GlobalDatabase;
@@ -41,6 +43,6 @@ public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalys
     }
     @Override
     public String getDescription() {
-       return code().getDescription();
+       return Global.mainModule.getPassDescription(getName());
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
index 2b828e6a..27049c1a 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.Utils_;
+import Common.Utils.Vector_;
 import _VisualDVM.Global;
 import _VisualDVM.Visual.Controls.PassControl;
 import _VisualDVM.Visual.UI;
@@ -15,8 +16,8 @@ import java.util.Comparator;
 import java.util.Vector;
 public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis {
     @Override
-    protected Vector<PassCode> getForbiddenPhases() {
-        return new Vector<>(Collections.singletonList(PassCode.SPF_GetArrayDistributionOnlyRegions));
+    protected Vector<String> getForbiddenPhases() {
+        return new Vector_<>("SPF_GetArrayDistributionOnlyRegions");
     }
     @Override
     public String phase() {
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java b/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java
index c6d32833..6ae024cf 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java
@@ -19,7 +19,7 @@ public class SPF_StatisticAnalyzer extends SilentSapforPass {
     @Override
     protected void body() throws Exception {
         sapfor.RunAnalysis(
-                code().toString(),
+                getName(),
                 -Global.messagesServer.getPort(),
                 Global.packSapforSettings(),
                 Utils_.DQuotes(task.getLocalStsFile().getAbsolutePath()) +
diff --git a/src/Visual_DVM_2021/Passes/SapforAnalysis.java b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
index 5c433aae..2e9bf515 100644
--- a/src/Visual_DVM_2021/Passes/SapforAnalysis.java
+++ b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
@@ -12,7 +12,7 @@ import java.awt.event.ActionEvent;
 import java.util.Vector;
 public class SapforAnalysis extends SapforPass {
     boolean asDonePhase = false;
-    protected Vector<PassCode> getForbiddenPhases() {
+    protected Vector<String> getForbiddenPhases() {
         return new Vector<>();
     }
     @Override
@@ -106,8 +106,8 @@ public class SapforAnalysis extends SapforPass {
                     if (!p.isEmpty() && !phase().equals(p)) {
                         SapforAnalysis analysis =
                                 sapfor.getAnalysisByPhase(p);
-                        if ((analysis != null) && (analysis.code() != code()) && (analysis.alwaysCheck() || !analysis.isDone())) {
-                            if (getForbiddenPhases().contains(analysis.code())) {
+                        if ((analysis != null) && (!analysis.getName().equals(getName())) && (analysis.alwaysCheck() || !analysis.isDone())) {
+                            if (getForbiddenPhases().contains(analysis.getName())) {
                                 analysis.setDone();
                                 analysis.MarkAsDone();
                             } else
diff --git a/src/Visual_DVM_2021/Passes/SapforTransformation.java b/src/Visual_DVM_2021/Passes/SapforTransformation.java
index 9f869613..94a35553 100644
--- a/src/Visual_DVM_2021/Passes/SapforTransformation.java
+++ b/src/Visual_DVM_2021/Passes/SapforTransformation.java
@@ -15,7 +15,7 @@ public class SapforTransformation extends SapforPass {
     }
     @Override
     public String getIconPath() {
-        return "/icons/Transformations/" + code().toString() + ".png";
+        return "/icons/Transformations/" + getName() + ".png";
     }
     protected String getVersionLetter() {
         return "v";
@@ -46,7 +46,7 @@ public class SapforTransformation extends SapforPass {
     @Override
     protected void body() throws Exception {
         sapfor.RunTransformation(
-                code().toString(),
+                getName(),
                 -Global.messagesServer.getPort(),
                 Global.packSapforSettings(),
                 target.getProjFile().getAbsolutePath(),
diff --git a/src/Visual_DVM_2021/Passes/SilentSapforPass.java b/src/Visual_DVM_2021/Passes/SilentSapforPass.java
index 77a308cd..e02dd22a 100644
--- a/src/Visual_DVM_2021/Passes/SilentSapforPass.java
+++ b/src/Visual_DVM_2021/Passes/SilentSapforPass.java
@@ -13,7 +13,7 @@ public class SilentSapforPass extends CurrentProjectPass {
         return true;
     }
     protected String getSapforPassName() {
-        return code().toString();
+        return getName();
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/Transformation.java b/src/Visual_DVM_2021/Passes/Transformation.java
index f3da23d4..90980b8d 100644
--- a/src/Visual_DVM_2021/Passes/Transformation.java
+++ b/src/Visual_DVM_2021/Passes/Transformation.java
@@ -23,7 +23,7 @@ public class Transformation extends CurrentProjectPass {
     }
     @Override
     public String getIconPath() {
-        return "/icons/Transformations/" + code().toString() + ".png";
+        return "/icons/Transformations/" + getName() + ".png";
     }
     protected String getVersionLetter() {
         return "v";