From f5538bc2209427550557c309f1d4875f47f1ef8f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 14 Oct 2024 12:34:36 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  5 ++--
 src/Common/MainModule_.java                   | 24 +++++++++++++------
 src/Common/Utils/Utils_.java                  |  3 ---
 src/_VisualDVM/MainModule.java                |  6 -----
 .../Component/Sapfor/MessagesServer.java      |  5 ++--
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 61117add..fcb55a7a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,8 @@
   <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/Common/Passes/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" 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/Common/MainModule_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils_.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Common/MainModule_.java b/src/Common/MainModule_.java
index 7b5a4a1d..e75aa1e3 100644
--- a/src/Common/MainModule_.java
+++ b/src/Common/MainModule_.java
@@ -5,6 +5,8 @@ import Common.Passes.Pass;
 import Common.Passes.PassCode_;
 import Common.Utils.TextLog;
 import Common.Database.Objects.PassStats.PassStats;
+import Common.Visual.Windows.PassForm;
+import _VisualDVM.Current;
 
 import java.util.Comparator;
 import java.util.LinkedHashMap;
@@ -22,7 +24,7 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
     public D getDb() {
         return db;
     }
-
+    //---
     private void createPasses(){
         passes= new LinkedHashMap<>();
         for (Object code: getPassCodesEnum().getEnumConstants()){
@@ -39,6 +41,19 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
         for (PassCode_ code_in : codes_in)
             getPass(code_in).setControlsVisible(flag);
     }
+    public boolean HasPassForm() {
+        return get(Current.PassForm) != null;
+    }
+    public PassForm getPassForm() {
+        return (PassForm) get(Current.PassForm);
+    }
+    public Pass getPass(PassCode_ code){
+        return passes.get(code);
+    }
+    public String getPassDescription(String passName){
+        return ((PassCode_)Enum.valueOf(MainModule_.object.getPassCodesEnum(), passName)).getDescription();
+    }
+    //---
     public MainModule_(Class<D> db_class_in) {
         objects = new LinkedHashMap<>();
         createPasses();
@@ -85,12 +100,7 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
     public boolean matchCurrentID(Current_ name, int id) {
         return (get(name) != null) && (((iDBObject) get(name)).id == id);
     }
-    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/Common/Utils/Utils_.java b/src/Common/Utils/Utils_.java
index cd4b2678..d92d609f 100644
--- a/src/Common/Utils/Utils_.java
+++ b/src/Common/Utils/Utils_.java
@@ -41,9 +41,6 @@ public class Utils_ {
     public static Semaphore date_semaphore = new Semaphore(1);
     public static long last_ticks = CommonConstants.Nan;
     //--------------------------------------------------
-    //главная база данных
-   // public static VisualiserDatabase db = null;
-    //------------------------------------------------------------------------
     public static Object requireNonNullElse(Object value, Object default_value) {
         return (value != null) ? value : default_value;
     }
diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java
index e858896f..55ff7989 100644
--- a/src/_VisualDVM/MainModule.java
+++ b/src/_VisualDVM/MainModule.java
@@ -89,9 +89,6 @@ public class MainModule extends MainModule_<GlobalDatabase> {
     public boolean HasRunTask() {
         return get(Current.RunTask) != null;
     }
-    public boolean HasPassForm() {
-        return get(Current.PassForm) != null;
-    }
     public boolean HasProjectView() {
         return get(Current.ProjectView) != null;
     }
@@ -210,9 +207,6 @@ public class MainModule extends MainModule_<GlobalDatabase> {
     public boolean HasBugReport() {
         return get(Current.BugReport) != null;
     }
-    public PassForm getPassForm() {
-        return (PassForm) get(Current.PassForm);
-    }
     public ParallelRegion getParallelRegion() {
         return (ParallelRegion) get(Current.ParallelRegion);
     }
diff --git a/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java b/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java
index 5d3f5721..e0e0992a 100644
--- a/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java
+++ b/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Repository.Component.Sapfor;
+import Common.MainModule_;
 import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
@@ -29,8 +30,8 @@ public class MessagesServer {
                             InputStreamReader(client.getInputStream()));
                     String line;
                     while ((line = in.readLine()) != null) {
-                        if (Global.mainModule.HasPassForm())
-                            Global.mainModule.getPassForm().Result.ShowSapforMessage(line);
+                        if (MainModule_.object.HasPassForm())
+                            MainModule_.object.getPassForm().Result.ShowSapforMessage(line);
                     }
                 } catch (Exception ex) {
                     //  UI.Print(DebugPrintLevel.MessagesServer, "соединение сброшено!");