From 07436988cf2338b17db081b63034cca321a86e08 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 8 Oct 2024 23:33:00 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 23 +++++++------------
 src/Common/Utils/Loggable.java                |  5 ----
 src/Common_old/UI/DebugPrintLevel.java        | 17 --------------
 src/Common_old/UI/UI.java                     |  2 +-
 .../Passes/All/OpenCurrentProject.java        |  4 ----
 src/Visual_DVM_2021/Passes/Pass_2021.java     |  5 ++--
 .../Passes/SapforAnalysis.java                |  5 ++--
 .../Windows/SearchReplaceForm.form            |  2 +-
 .../Windows/SearchReplaceForm.java            |  2 +-
 9 files changed, 15 insertions(+), 50 deletions(-)
 delete mode 100644 src/Common_old/UI/DebugPrintLevel.java
 rename src/{Common_old/UI => _VisualDVM}/Windows/SearchReplaceForm.form (99%)
 rename src/{Common_old/UI => _VisualDVM}/Windows/SearchReplaceForm.java (99%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 151d420b..6687f04d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,21 +8,14 @@
   <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/Visual/CommonUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Current.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/GlobalProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Properties.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/DebugPrintLevel.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common_old/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/FormType.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/ParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Variants/ParallelVariant.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProfilesForm.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/Common_old/UI/Windows/SearchReplaceForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Windows/SearchReplaceForm.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Windows/SearchReplaceForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass_2021.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -128,11 +121,11 @@
       <recent name="Common.Utils.CommonUtils" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Windows" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Syntax" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
       <recent name="C:\Users\misha\Documents\visual_dvm_2020\src\Visual_DVM_2021\Passes\UI" />
-      <recent name="E:\Visual_DVM_2020\src\Visual_DVM_2021\UI\Main" />
     </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="Visual_DVM_2021.Passes.UI" />
diff --git a/src/Common/Utils/Loggable.java b/src/Common/Utils/Loggable.java
index 6c01ced4..1687d4c3 100644
--- a/src/Common/Utils/Loggable.java
+++ b/src/Common/Utils/Loggable.java
@@ -1,6 +1,5 @@
 package Common.Utils;
 import Common.Visual.CommonUI;
-import Common_old.UI.DebugPrintLevel;
 import Common_old.Utils.Utils;
 
 import java.io.File;
@@ -30,10 +29,6 @@ public interface Loggable {
         } catch (Exception ignored) {
         }
     }
-    default void Print(DebugPrintLevel level, String message) {
-        if (level.isEnabled())
-            Print(CommonUtils.Brackets(level.getDescription()) + " " + message);
-    }
     default void PrintException(Exception ex) {
         StringWriter out = new StringWriter();
         PrintWriter writer = new PrintWriter(out);
diff --git a/src/Common_old/UI/DebugPrintLevel.java b/src/Common_old/UI/DebugPrintLevel.java
deleted file mode 100644
index 3aec1b2f..00000000
--- a/src/Common_old/UI/DebugPrintLevel.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package Common_old.UI;
-public enum DebugPrintLevel {
-    Undefined,
-    Passes,
-    Project;
-    public String getDescription() {
-        return toString();
-    }
-    public boolean isEnabled() {
-        switch (this) {
-            case Passes:
-                return true;
-            default:
-                return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Common_old/UI/UI.java b/src/Common_old/UI/UI.java
index 2c9f9f3a..0ea4324e 100644
--- a/src/Common_old/UI/UI.java
+++ b/src/Common_old/UI/UI.java
@@ -14,7 +14,7 @@ import Common_old.UI.Menus_2023.VersionsMenuBar.VersionsMenuBar;
 import Common_old.UI.Tables.*;
 import Common_old.UI.Trees.GraphTreeCellRenderer;
 import Common_old.UI.Trees.SelectionTreeCellRenderer;
-import Common_old.UI.Windows.SearchReplaceForm;
+import _VisualDVM.Windows.SearchReplaceForm;
 import GlobalData.Compiler.CompilersDBTable;
 import GlobalData.Compiler.CompilersMenuBar;
 import GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
index 385c1bee..7caa31c1 100644
--- a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
+++ b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
@@ -3,7 +3,6 @@ import Common.CurrentAnchestor;
 import Common.Utils.CommonUtils;
 import Common_old.Constants;
 import Common_old.Current;
-import Common_old.UI.DebugPrintLevel;
 import Common_old.UI.UI;
 import Common_old.Utils.Files.VDirectoryChooser;
 import Common_old.Utils.Utils;
@@ -55,12 +54,10 @@ public class OpenCurrentProject extends Pass_2021<db_project_info> {
                 mode = Mode.ProjectInfo;
                 target = (db_project_info) arg;
                 dir = target.Home;
-                CommonUtils.MainLog.Print(DebugPrintLevel.Project, "готовая версия " + CommonUtils.Brackets(dir.getAbsolutePath()));
                 return needsOpen();
             }
         }
         if ((dir != null) && needsOpen()) {
-            CommonUtils.MainLog.Print(DebugPrintLevel.Project, CommonUtils.Brackets(dir.toString()));
             if (!dir.isDirectory()) {
                 Log.Writeln_(CommonUtils.Brackets(dir) + "\nне является папкой!");
                 return false;
@@ -95,7 +92,6 @@ public class OpenCurrentProject extends Pass_2021<db_project_info> {
                         return;
                     }
                 }
-                CommonUtils.MainLog.Print(DebugPrintLevel.Project, "построение дерева версий");
                 target = new db_project_info(dir);
                 new_root = target.CreateVersionsTree();
                 target.Open();
diff --git a/src/Visual_DVM_2021/Passes/Pass_2021.java b/src/Visual_DVM_2021/Passes/Pass_2021.java
index 36a0aec9..2e1497f0 100644
--- a/src/Visual_DVM_2021/Passes/Pass_2021.java
+++ b/src/Visual_DVM_2021/Passes/Pass_2021.java
@@ -5,7 +5,6 @@ import Common.Visual.CommonUI;
 import Common_old.Current;
 import GlobalData.GlobalDatabase;
 import _VisualDVM.Global;
-import Common_old.UI.DebugPrintLevel;
 import Common_old.UI.Menus_2023.PassButton;
 import Common_old.UI.Menus_2023.PassControl;
 import Common_old.UI.Menus_2023.StablePassMenuItem;
@@ -295,7 +294,7 @@ public class Pass_2021<T> {
         target = null;
         Log = new TextLog();
         if (!getDescription().isEmpty())
-            CommonUtils.MainLog.Print(DebugPrintLevel.Passes, getDescription() + " стартует..");
+            CommonUtils.MainLog.Print(getDescription() + " стартует..");
         timer.Start();
         //------------------------------->
         try {
@@ -382,7 +381,7 @@ public class Pass_2021<T> {
         //------------------------------->
         timer.Stop();
         if (!getDescription().isEmpty()) {
-            CommonUtils.MainLog.Print(DebugPrintLevel.Passes,
+            CommonUtils.MainLog.Print(
                     getDescription() +
                             " окончен за " + timer.Print() +
                             " состояние " + CommonUtils.Brackets(state.getDescription())
diff --git a/src/Visual_DVM_2021/Passes/SapforAnalysis.java b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
index 64aec123..a8745a6b 100644
--- a/src/Visual_DVM_2021/Passes/SapforAnalysis.java
+++ b/src/Visual_DVM_2021/Passes/SapforAnalysis.java
@@ -2,7 +2,6 @@ package Visual_DVM_2021.Passes;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import _VisualDVM.Global;
-import Common_old.UI.DebugPrintLevel;
 import Common_old.UI.Menus_2023.PassControl;
 import Common_old.UI.Menus_2023.PassMenuItem;
 import Common_old.UI.UI;
@@ -83,7 +82,7 @@ public class SapforAnalysis extends SapforPass {
             unpack(sapfor.getResult());
         }
         if (!isAtomic() && !asDonePhase) {
-            CommonUtils.MainLog.Print(DebugPrintLevel.Passes, "Поиск выполненных фаз..");
+            CommonUtils.MainLog.Print("Поиск выполненных фаз..");
             sapfor.RunAnalysis(
                     "SPF_GetPassesStateStr",
                     -Global.messagesServer.getPort(),
@@ -116,7 +115,7 @@ public class SapforAnalysis extends SapforPass {
                     }
                 }
             }
-            CommonUtils.MainLog.Print(DebugPrintLevel.Passes, "Фазы получены.");
+            CommonUtils.MainLog.Print("Фазы получены.");
         }
     }
     //---------------------------------------------
diff --git a/src/Common_old/UI/Windows/SearchReplaceForm.form b/src/_VisualDVM/Windows/SearchReplaceForm.form
similarity index 99%
rename from src/Common_old/UI/Windows/SearchReplaceForm.form
rename to src/_VisualDVM/Windows/SearchReplaceForm.form
index 875881a4..a5bc77c4 100644
--- a/src/Common_old/UI/Windows/SearchReplaceForm.form
+++ b/src/_VisualDVM/Windows/SearchReplaceForm.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Common_old.UI.Windows.SearchReplaceForm">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Windows.SearchReplaceForm">
   <grid id="cbd77" binding="MainPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
diff --git a/src/Common_old/UI/Windows/SearchReplaceForm.java b/src/_VisualDVM/Windows/SearchReplaceForm.java
similarity index 99%
rename from src/Common_old/UI/Windows/SearchReplaceForm.java
rename to src/_VisualDVM/Windows/SearchReplaceForm.java
index 6a6aa18e..c2cdb357 100644
--- a/src/Common_old/UI/Windows/SearchReplaceForm.java
+++ b/src/_VisualDVM/Windows/SearchReplaceForm.java
@@ -1,4 +1,4 @@
-package Common_old.UI.Windows;
+package _VisualDVM.Windows;
 import Common.Utils.CommonUtils;
 import Common.Visual.CommonUI;
 import Common.Visual.Windows.Form;