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

---
 .idea/workspace.xml               | 12 +-----------
 src/Common/Passes/ObjectPass.java |  5 +++--
 src/Common/Passes/Pass.java       |  6 +++---
 src/MainModule_/MainModule_.java  |  9 ++++-----
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7bb7c1ae..0b6e9f2d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,19 +7,9 @@
   </component>
   <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/Database/VisualiserDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.java" 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/Common/Passes/SortPassesByStats.java" beforeDir="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/PassStats.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStats.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/DropFastAccess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropFastAccess.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/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.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/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Passes/ObjectPass.java b/src/Common/Passes/ObjectPass.java
index c91e87e4..ddeca088 100644
--- a/src/Common/Passes/ObjectPass.java
+++ b/src/Common/Passes/ObjectPass.java
@@ -3,17 +3,18 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Database;
 import Common.Passes.Pass;
+import MainModule_.MainModule_;
 import _VisualDVM.Global;
 public abstract class ObjectPass<D extends DBObject> extends Pass<D> {
     protected Class<D> d; //класс объектов.
     public ObjectPass(Class<D> d_in) {
         d = d_in;
     }
-    protected Database getDb(){ return Global.mainModule.getDb();}; //источник данных
+    protected Database getDb(){ return MainModule_.object.getDb();}; //источник данных
     public DBTable getTable() {
         return getDb().tables.get(d);
     } //таблица в источнике данных
-    @Override
+    @Override//sorted
     public String getButtonText() {
         return "";
     }
diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java
index 20051050..b9027a35 100644
--- a/src/Common/Passes/Pass.java
+++ b/src/Common/Passes/Pass.java
@@ -98,17 +98,17 @@ public class Pass<T> {
             } catch (Exception ex) {
                 Utils_.MainLog.PrintException(ex);
             }
-            UI.fastAccessMenuBar.Refresh();
+            UI.fastAccessMenuBar.Refresh(); //todo все бары в мейн модуль. или уи.мейн модуль
         }
     }
     public PassCode code() {
         return PassCode.valueOf(getClass().getSimpleName());
     }
     public boolean isDone() {
-        return state == PassState.Done;
+        return state.equals(PassState.Done);
     }
     public void setDone() {
-        state = PassState.Done;
+        state.equals(PassState.Done);
     }
     public String getDescription() {
         return code().getDescription();
diff --git a/src/MainModule_/MainModule_.java b/src/MainModule_/MainModule_.java
index 32bc4290..e8f4b4c9 100644
--- a/src/MainModule_/MainModule_.java
+++ b/src/MainModule_/MainModule_.java
@@ -5,17 +5,15 @@ import Common.Database.VisualiserDatabase;
 import Common.Passes.Pass;
 import Common.Passes.PassCode_;
 import Common.Utils.TextLog;
-import Common.Utils.Utils_;
-import Common.Utils.Vector_;
 import Visual_DVM_2021.PassStats.PassStats;
-import Visual_DVM_2021.Passes.PassCode;
-import _VisualDVM.Global;
 
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 //Основной объект визуализатора.
 public abstract class MainModule_<D extends VisualiserDatabase> {
+    public static MainModule_ object =null;
+    //--
     D db;
     Class<D> db_class;
     //--
@@ -51,6 +49,8 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
             ex.printStackTrace();
         }
         //---
+        object = this;
+        System.out.println("main module created");
     }
     public abstract Class getPassCodesEnum();
     public void ActivateDB() throws Exception {
@@ -90,7 +90,6 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
     }
     public Vector<Pass> getFirstAccessPasses(){
         Vector<PassStats> sortedStats = new Vector<>(getDb().passStats.Data.values());
-        System.out.println("sorted passes size= "+sortedStats.size());
         sortedStats.sort(new Comparator<PassStats>() {
             @Override
             public int compare(PassStats o1, PassStats o2) {