no message

2024-10-07 17:46:38 +03:00
parent 6537eebe09
commit e7f661f7ad
87 changed files with 279 additions and 222 deletions
--- a/src/Common/1.txt
+++ b/src/Common/1.txt
--- a/src/Common/Database/Objects/DBObject.java
+++ b/src/Common/Database/Objects/DBObject.java
@@ -1,6 +1,6 @@
 package Common.Database.Objects;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Selectable;
+import Common.Visual.Selectable;
 import Common.Utils.Index;
 import com.sun.org.glassfish.gmbal.Description;

--- a/src/Common/Database/Tables/DataSet.java
+++ b/src/Common/Database/Tables/DataSet.java
@@ -2,7 +2,7 @@ package Common.Database.Tables;
 import Common_old.Current;
 import Common.Visual.DataSetFilter;
 import Common_old.UI.DataSetControlForm;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Common_old.UI.Tables.ColumnFilter;
 import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.DBObjectDialog;
@@ -10,7 +10,7 @@ import Common_old.UI.Windows.Dialog.DialogFields;
 import Common.Utils.TextLog;
 import Common.Database.Objects.DBObject;
 import Common.Visual.CommonUI;
-import Visual_DVM_2021.UI.Interface.FilterWindow;
+import Common.Visual.FilterInterface;

 import javax.swing.*;
 import java.awt.*;
@@ -28,7 +28,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
    public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
    //-
    public DataSetControlForm ui_;
-    protected FilterWindow f_ui; // отображение количества объектов
+    protected FilterInterface f_ui; // отображение количества объектов
    //-
    public LinkedHashMap<Integer, ColumnFilter> columnsFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
    //--
@@ -42,7 +42,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
        Name = d.getSimpleName();
    }
    public void mountUI(JPanel content_in) {
-        UI.Clear(content_in);
+        CommonUI.Clear(content_in);
        //-->
        ui_ = createUI();
        ui_.setContent(content_in);
@@ -66,7 +66,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
    public DataSetControlForm getUi() {
        return ui_;
    }
-    public void setFilterUI(FilterWindow ui_in) {
+    public void setFilterUI(FilterInterface ui_in) {
        f_ui = ui_in;
    }
    public void ClearUI() {
--- a/src/Common/Utils/CommonUtils.java
+++ b/src/Common/Utils/CommonUtils.java
@@ -6,6 +6,9 @@ import org.apache.commons.io.FileUtils;

 import java.io.File;
 import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.Vector;
+import java.util.stream.Collectors;
 public class CommonUtils {
    //JSON
    //--
@@ -243,6 +246,16 @@ public class CommonUtils {
        }
        return (cc == 0);
    }
+    public static String removeRedundantSpaces(String s_in) {
+        return String.join(" ",
+                Arrays.stream(s_in.split(" ")).filter(d -> !d.isEmpty()).collect(Collectors.toCollection(Vector::new)));
+    }
+    public static String removeCharacters(String string, String... to_remove) {
+        String res = string;
+        for (String c : to_remove)
+            res = res.replace(c, "");
+        return res;
+    }
    //ФАЙЛЫ
    public static String getExtension(File file) {
        String fn = file.getName();
--- a/src/Visual_DVM_2021/UI/Interface/Loggable.java
+++ b/src/Visual_DVM_2021/UI/Interface/Loggable.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.UI.Interface;
+package Common.Utils;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.DebugPrintLevel;
--- a/src/Common/Utils/StringTemplate.java
+++ b/src/Common/Utils/StringTemplate.java
@@ -1,6 +1,4 @@
 package Common.Utils;
-import Common_old.Utils.Utils;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 public class StringTemplate {
@@ -13,8 +11,8 @@ public class StringTemplate {
    public String pattern = "";
    //------------------------------------------------------------------
    public StringTemplate(String p, String s) {
-        prefix = Utils.pack(p);
-        suffix = Utils.pack(s);
+        prefix = CommonUtils.removeRedundantSpaces(p);
+        suffix = CommonUtils.removeRedundantSpaces(s);
        String[] prefix_words = prefix.split(" ");
        String[] suffix_words = suffix.split(" ");
        //настраиваем регулярное выражение----------
--- a/src/Common/Visual/CommonUI.java
+++ b/src/Common/Visual/CommonUI.java
@@ -1,8 +1,40 @@
 package Common.Visual;
-import Common_old.UI.Menus_2023.DataMenuBar;
 import Common.Database.Tables.DataSet;

+import javax.swing.*;
+import java.awt.*;
 import java.util.LinkedHashMap;
+import java.util.Stack;
 public class CommonUI {
    public static LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
+    public static Stack<Component> windowsStack = new Stack<>();
+    //-----
+    public static void Clear(Container container) {
+        container.removeAll();
+        container.repaint();
+        container.revalidate();
+    }
+    // http://java-online.ru/swing-joptionpane.xhtml
+    public static <T> void TrySelect(JComboBox box, T value_in) {
+        if (value_in != null) {
+            for (int i = 0; i < box.getItemCount(); ++i) {
+                T value = (T) box.getItemAt(i);
+                if (value.equals(value_in)) {
+                    box.setSelectedIndex(i);
+                    return;
+                }
+            }
+            box.addItem(value_in);
+            box.setSelectedIndex(box.getItemCount() - 1);
+        }
+    }
+    public static void TrySelect_s(JComboBox box, String value_string_in) {
+        for (int i = 0; i < box.getItemCount(); ++i) {
+            Object value = box.getItemAt(i);
+            if (value.toString().equals(value_string_in)) {
+                box.setSelectedIndex(i);
+                return;
+            }
+        }
+    }
 }
--- a/src/Common_old/UI/Menus_2023/DataMenuBar.java
+++ b/src/Common_old/UI/Menus_2023/DataMenuBar.java
@@ -1,5 +1,7 @@
-package Common_old.UI.Menus_2023;
+package Common.Visual;
 import Common.Database.Tables.DataSet;
+import Common_old.UI.Menus_2023.MenuBarButton;
+import Common_old.UI.Menus_2023.VisualiserMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;

 import javax.swing.*;
@@ -24,7 +26,7 @@ public class DataMenuBar extends VisualiserMenuBar {
        if (selectAllButton == null) {
            add(selectAllButton = new MenuBarButton() {
                {
-                    setIcon("/icons/SelectAll.png");
+                    setIcon("/Common/icons/SelectAll.png");
                    setToolTipText("Выбрать всё");
                    setPreferredSize(d);
                    setMinimumSize(d);
@@ -35,7 +37,7 @@ public class DataMenuBar extends VisualiserMenuBar {
        if (unselectAllButton == null) {
            add(unselectAllButton = new MenuBarButton() {
                {
-                    setIcon("/icons/UnselectAll.png");
+                    setIcon("/Common/icons/UnselectAll.png");
                    setToolTipText("Отменить всё");
                    setPreferredSize(d);
                    setMinimumSize(d);
--- a/src/Visual_DVM_2021/UI/Interface/FilterWindow.java
+++ b/src/Visual_DVM_2021/UI/Interface/FilterWindow.java
@@ -1,5 +1,5 @@
-package Visual_DVM_2021.UI.Interface;
-public interface FilterWindow extends VisualizerForm {
+package Common.Visual;
+public interface FilterInterface {
    void ShowMatchesCount(int count);
    default void ShowNoMatches() {
        ShowMatchesCount(0);
--- a/src/Common/Visual/Selectable.java
+++ b/src/Common/Visual/Selectable.java
@@ -1,4 +1,4 @@
-package Common_old.UI;
+package Common.Visual;
 import Common_old.Utils.Utils;

 import javax.swing.*;
--- a/src/Common/Visual/StatusEnum.java
+++ b/src/Common/Visual/StatusEnum.java
@@ -1,4 +1,4 @@
-package Common_old.UI;
+package Common.Visual;
 import _VisualDVM.Syntax.VisualiserFonts;
 public interface StatusEnum {
    default String getDescription() {
--- a/src/Common_old/UI/DataSetControlForm.java
+++ b/src/Common_old/UI/DataSetControlForm.java
@@ -1,5 +1,6 @@
 package Common_old.UI;
 import Common.CommonConstants;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
@@ -53,7 +54,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
    @Override
    public void Clear() {
        super.Clear();
-        UI.Clear(dataPanel);
+        CommonUI.Clear(dataPanel);
    }
    public DataSet getDataSource() {
        return dataSource;
--- a/src/Common_old/UI/Menus/SelectionTreeMenu.java
+++ b/src/Common_old/UI/Menus/SelectionTreeMenu.java
@@ -2,7 +2,7 @@ package Common_old.UI.Menus;
 import Common.Utils.CommonUtils;
 import Common_old.Current;
 import Common_old.UI.Menus_2023.StableMenuItem;
-import Common_old.UI.Selectable;
+import Common.Visual.Selectable;
 import Common_old.UI.Trees.DataTree;
 import Common_old.UI.Trees.SelectableTree;

--- a/src/Common_old/UI/Menus/TextComboBoxMenu.java
+++ b/src/Common_old/UI/Menus/TextComboBoxMenu.java
@@ -1,5 +1,5 @@
 package Common_old.UI.Menus;
-import Common_old.UI.UI;
+import Common.Visual.CommonUI;
 import Common_old.Utils.Utils;

 import javax.swing.*;
@@ -27,7 +27,7 @@ public class TextComboBoxMenu extends StyledPopupMenu {
                new AbstractAction() {
                    @Override
                    public void actionPerformed(ActionEvent e) {
-                        UI.TrySelect(box, Utils.getFromClipboard());
+                        CommonUI.TrySelect(box, Utils.getFromClipboard());
                    }
                });
        add(m_paste);
--- a/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java
+++ b/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java
@@ -1,7 +1,7 @@
 package Common_old.UI.Menus_2023.FastAccessMenuBar;
+import Common.Visual.CommonUI;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.VisualiserMenuBar;
-import Common_old.UI.UI;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
@@ -33,7 +33,7 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
        repaint();
    }
    public void Refresh() {
-        UI.Clear(this);
+        CommonUI.Clear(this);
        int i = 1;
        for (Pass_2021 pass : Pass_2021.FAPasses) {
            if (pass.stats.HasUsages()) {
@@ -44,6 +44,6 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
        }
    }
    public void Drop(){
-        UI.Clear(this);
+        CommonUI.Clear(this);
    }
 }
--- a/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
+++ b/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
@@ -1,5 +1,5 @@
 package Common_old.UI.Menus_2023.VariantsMenuBar;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class VariantsMenuBar extends DataMenuBar {
    public VariantsMenuBar() {
--- a/src/Common_old/UI/Tables/StatusEnumRenderer.java
+++ b/src/Common_old/UI/Tables/StatusEnumRenderer.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Tables;
 import Common_old.Current;
-import Common_old.UI.StatusEnum;
+import Common.Visual.StatusEnum;

 import javax.swing.*;
 public class StatusEnumRenderer extends RendererCell<StatusEnum> {
--- a/src/Common_old/UI/Trees/SelectableTree.java
+++ b/src/Common_old/UI/Trees/SelectableTree.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Trees;
 import Common_old.Current;
-import Common_old.UI.Selectable;
+import Common.Visual.Selectable;

 import javax.swing.tree.DefaultMutableTreeNode;
 public class SelectableTree extends DataTree {
--- a/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java
+++ b/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Trees;
 import Common_old.Current;
-import Common_old.UI.Selectable;
+import Common.Visual.Selectable;
 import _VisualDVM.Syntax.VisualiserFonts;

 import javax.swing.*;
--- a/src/Common_old/UI/Trees/TreeForm.java
+++ b/src/Common_old/UI/Trees/TreeForm.java
@@ -1,6 +1,6 @@
 package Common_old.UI.Trees;
+import Common.Visual.CommonUI;
 import Common_old.UI.ControlForm;
-import Common_old.UI.UI;

 import java.awt.*;
 public class TreeForm<C extends StyledTree> extends ControlForm<C> {
@@ -25,6 +25,6 @@ public class TreeForm<C extends StyledTree> extends ControlForm<C> {
    @Override
    public void Clear() {
        super.Clear();
-        UI.Clear(content);
+        CommonUI.Clear(content);
    }
 }
--- a/src/Common_old/UI/UI.java
+++ b/src/Common_old/UI/UI.java
@@ -1,7 +1,7 @@
 package Common_old.UI;
 import Common_old.Current;
 import Common_old.UI.Menus_2023.CredentialsBar.CredentialsBar;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Common_old.UI.Menus_2023.FastAccessMenuBar.FastAccessMenuBar;
 import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar;
 import Common_old.UI.Menus_2023.MainMenuBar.MainMenuBar;
@@ -105,7 +105,6 @@ import javax.swing.text.Highlighter;
 import javax.swing.tree.TreeCellRenderer;
 import java.awt.*;
 import java.util.LinkedHashMap;
-import java.util.Stack;
 import java.util.Vector;

 import static Common_old.UI.Tables.TableEditors.*;
@@ -130,36 +129,6 @@ public class UI {
    public static LinkedHashMap<Common_old.UI.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>();
    public static LinkedHashMap<VisualiserThemeName, VisualiserTheme> themes = new LinkedHashMap<>();
    public static LinkedHashMap<FormType, ThemeElement> windows = new LinkedHashMap<>();
-    public static Stack<Component> windowsStack = new Stack<>();
-    //-----
-    public static void Clear(Container container) {
-        container.removeAll();
-        container.repaint();
-        container.revalidate();
-    }
-    // http://java-online.ru/swing-joptionpane.xhtml
-    public static <T> void TrySelect(JComboBox box, T value_in) {
-        if (value_in != null) {
-            for (int i = 0; i < box.getItemCount(); ++i) {
-                T value = (T) box.getItemAt(i);
-                if (value.equals(value_in)) {
-                    box.setSelectedIndex(i);
-                    return;
-                }
-            }
-            box.addItem(value_in);
-            box.setSelectedIndex(box.getItemCount() - 1);
-        }
-    }
-    public static void TrySelect_s(JComboBox box, String value_string_in) {
-        for (int i = 0; i < box.getItemCount(); ++i) {
-            Object value = box.getItemAt(i);
-            if (value.toString().equals(value_string_in)) {
-                box.setSelectedIndex(i);
-                return;
-            }
-        }
-    }
    public static RemoteFileChooser getRemoteFileChooser() {
        return (RemoteFileChooser) windows.get(FormType.RemoteFileChooser);
    }
@@ -172,49 +141,6 @@ public class UI {
    public static SearchReplaceForm getSearchReplaceForm() {
        return (SearchReplaceForm) windows.get(FormType.SearchReplace);
    }
-    public static void refreshTheme() {
-        Current.set(Current.Theme, themes.get(Global.db.settings.get(SettingName.DarkThemeOn).toBoolean() ? VisualiserThemeName.Dark : VisualiserThemeName.Light));
-        // refreshTheme_r(Visualiser.getMainWindow().MainPanel);
-        /* Открыть
-        refreshTheme_r(Visualiser.searchReplaceForm.MainPanel);
-        refreshTheme_r(Visualiser.ComponentsWindow.fields.MainPanel);
-        refreshTheme_r(Visualiser.remoteFileChooser.fields.MainPanel);
-        refreshTheme_r(Visualiser.runStatisticForm.fields.MainPanel);
-        //-----------------------------------------------------------------
-
-        UIManager.put("ToolTip.background", Current.getTheme().background);
-        UIManager.put("ToolTip.foreground", Current.getTheme().foreground);
-        UIManager.put("Panel.background", Current.getTheme().background);
-        UIManager.put("Panel.foreground", Current.getTheme().foreground);
-
-        UIManager.put("TextPane.background", Current.getTheme().background);
-        UIManager.put("TextPane.foreground", Current.getTheme().foreground);
-
-        UIManager.put("Label.background", Current.getTheme().background);
-        UIManager.put("Label.foreground", Current.getTheme().foreground);
-
-        UIManager.put("ToolBar.background", Current.getTheme().background);
-        UIManager.put("ToolBar.foreground", Current.getTheme().foreground);
-
-        for (TableCellRenderer renderer : TableRenderers.values()) {
-            if (renderer instanceof WindowControl) {
-                ((WindowControl) renderer).applyTheme();
-            }
-        }
-        for (TreeCellRenderer renderer : TreeRenderers.values()) {
-            if (renderer instanceof WindowControl) {
-                ((WindowControl) renderer).applyTheme();
-            }
-        }
-        //для текущего файла отдельно
-        ///  if (Current.HasFile())
-        //     Current.getFile().form.Body.applyTheme();
-        //------------
-        //  UIManager.put("TabbedPane.unselectedForeground", Color.red);
-        //  UIManager.put("TabbedPane.selectedBackground", Color.black);
-        //----------------------------
-         */
-    }
    public static void CreateMenus() {
        mainMenuBar = new MainMenuBar();
        testingBar = new TestingBar();
@@ -362,7 +288,7 @@ public class UI {
    public static Component getFrontWindow() {
        Component res = null;
        try {
-            res = windowsStack.peek();
+            res = CommonUI.windowsStack.peek();
        } catch (Exception ignored){

        }
--- a/src/Common_old/UI/Windows/Dialog/Dialog.java
+++ b/src/Common_old/UI/Windows/Dialog/Dialog.java
@@ -1,4 +1,5 @@
 package Common_old.UI.Windows.Dialog;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Syntax.ThemeElement;
@@ -53,7 +54,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
        addWindowListener(new WindowAdapter() {
            public void windowClosing(WindowEvent e) {
-                UI.windowsStack.pop();
+                CommonUI.windowsStack.pop();
                onCancel();
                onClose();
            }
@@ -119,7 +120,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
        Init(params);
        ShowTitle();
        setAlwaysOnTop(isOnTop());
-        UI.windowsStack.push(this);
+        CommonUI.windowsStack.push(this);
        setVisible(true);
        return OK;
    }
--- a/src/Common_old/UI/Windows/SearchReplaceForm.java
+++ b/src/Common_old/UI/Windows/SearchReplaceForm.java
@@ -1,5 +1,6 @@
 package Common_old.UI.Windows;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.TextField.StyledTextField;
 import Common_old.UI.Trees.StyledTree;
@@ -144,7 +145,7 @@ public class SearchReplaceForm extends Form {
    }
    public void showNoFilesMatches() {
        lFilesMatchesCount.setText("—");
-        UI.Clear(filesTreePanel);
+        CommonUI.Clear(filesTreePanel);
    }
    public void showFilesMatches() {
        long total = 0;
--- a/src/Common_old/Utils/Utils.java
+++ b/src/Common_old/Utils/Utils.java
@@ -37,7 +37,6 @@ import java.util.*;
 import java.util.concurrent.Semaphore;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 public class Utils {
    public static boolean isLinuxSystemCommand(String text) {
@@ -211,16 +210,6 @@ public class Utils {
    public static String getRelativeAddress(File file, File anchestor) {
        return file.getAbsolutePath().substring(anchestor.getAbsolutePath().length() + 1);
    }
-    public static String pack(String s_in) {
-        return String.join(" ",
-                Arrays.stream(s_in.split(" ")).filter(d -> !d.isEmpty()).collect(Collectors.toCollection(Vector::new)));
-    }
-    public static String remove(String string, String... to_remove) {
-        String res = string;
-        for (String c : to_remove)
-            res = res.replace(c, "");
-        return res;
-    }
    //для переименования/добавления новых файлов.
    public static boolean validateFileShortNewName(String name, TextLog Log) {
        boolean res = true;
@@ -556,7 +545,7 @@ public class Utils {
        try {
            for (String line : FileUtils.readLines(test, Charset.defaultCharset())) {
                //  #pragma dvm array distribute[block][block], не важно
-                String packedLine = remove(pack(line).toLowerCase(), "\n", "\r", "\t");
+                String packedLine = CommonUtils.removeCharacters(CommonUtils.removeRedundantSpaces(line).toLowerCase(), "\n", "\r", "\t");
                if (packedLine.startsWith(prefix)) {
                    packedLine = packedLine.substring(prefix.length());
                    boolean bracketOpen = false;
@@ -942,8 +931,8 @@ public class Utils {
            line2 = line2.toUpperCase();
        }
        if (!Global.db.settings.get(SettingName.SpacesOn).toBoolean()) {
-            line1 = remove(line1, " ", "\t");
-            line2 = remove(line2, " ", "\t");
+            line1 = CommonUtils.removeCharacters(line1, " ", "\t");
+            line2 = CommonUtils.removeCharacters(line2, " ", "\t");
        }
        return line1.equals(line2);
    }
--- a/src/Common_old/Utils/Validators/DVMHelpParser.java
+++ b/src/Common_old/Utils/Validators/DVMHelpParser.java
@@ -1,5 +1,5 @@
 package Common_old.Utils.Validators;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import GlobalData.Compiler.Compiler;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
 import GlobalData.CompilerOption.CompilerOption;
@@ -75,7 +75,7 @@ public class DVMHelpParser {
        state = HelpParserState.Search;
        for (String line_ : lines) {
            line = line_; //нужна для окружения. там пробелы нужно считать сразу.
-            t_line = Utils.remove(line_.trim(), "\r");
+            t_line = CommonUtils.removeCharacters(line_.trim(), "\r");
            switch (state) {
                case Search:
                    switch (t_line) {
--- a/src/GlobalData/Compiler/CompilersDBTable.java
+++ b/src/GlobalData/Compiler/CompilersDBTable.java
@@ -1,5 +1,6 @@
 package GlobalData.Compiler;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.DataSetControlForm;
 import Common_old.UI.UI;
@@ -95,7 +96,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
                fields.tfHelpCommand.setText(Result.help_command);
                fields.tfVersionCommand.setText(Result.version_command);
                fields.tfHome.setText(Result.home_path);
-                UI.TrySelect(fields.cbCompilerType, Result.type);
+                CommonUI.TrySelect(fields.cbCompilerType, Result.type);
                fields.events_on = true;
            }
            @Override
--- a/src/GlobalData/Compiler/CompilersMenuBar.java
+++ b/src/GlobalData/Compiler/CompilersMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.Compiler;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class CompilersMenuBar extends DataMenuBar {
    public CompilersMenuBar() {
--- a/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
+++ b/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
@@ -1,8 +1,8 @@
 package GlobalData.CompilerEnvironment.UI;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.Tables.DBObjectEditor;
 import _VisualDVM.Syntax.VisualiserFonts;
-import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
 import GlobalData.CompilerEnvironment.CompilerEnvironment;
 public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
@@ -21,7 +21,7 @@ public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvir
        };
        dialog.fields.setEditable(value.valueVariants.isEmpty());
        if (!value.value.isEmpty())
-            UI.TrySelect(dialog.fields, value.value);
+            CommonUI.TrySelect(dialog.fields, value.value);
        if (dialog.ShowDialog("Изменить значение опции " + value.name,
                value.valueVariants
        )) {
--- a/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
+++ b/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
@@ -1,8 +1,8 @@
 package GlobalData.CompilerOption.UI;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.Tables.DBObjectEditor;
 import _VisualDVM.Syntax.VisualiserFonts;
-import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
 import GlobalData.CompilerOption.CompilerOption;
 public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> {
@@ -15,7 +15,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
            //-
            ComboTextDialog dialog = new ComboTextDialog();
            if (!value.parameterValue.isEmpty())
-                UI.TrySelect(dialog.fields, value.parameterValue);
+                CommonUI.TrySelect(dialog.fields, value.parameterValue);
            dialog.fields.setEditable(value.parameterVariants.isEmpty());
            if (dialog.ShowDialog("Изменить значение опции " + value.name,
                    value.parameterVariants)) {
--- a/src/GlobalData/DVMParameter/DVMParameterDBTable.java
+++ b/src/GlobalData/DVMParameter/DVMParameterDBTable.java
@@ -1,10 +1,10 @@
 package GlobalData.DVMParameter;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import _VisualDVM.Global;
 import Common_old.UI.DataSetControlForm;
-import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.DBObjectDialog;
 import Common_old.Utils.Utils;
 import GlobalData.DVMParameter.UI.DVMParameterFields;
@@ -53,7 +53,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
        return new DBObjectDialog<DVMParameter, DVMParameterFields>(DVMParameterFields.class) {
            @Override
            public void fillFields() {
-                UI.TrySelect(fields.cbName, Result.name);
+                CommonUI.TrySelect(fields.cbName, Result.name);
                fields.tfValue.setText(Result.value);
            }
            //https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java
--- a/src/GlobalData/DVMParameter/DVMParametersMenuBar.java
+++ b/src/GlobalData/DVMParameter/DVMParametersMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.DVMParameter;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMParametersMenuBar extends DataMenuBar {
    public DVMParametersMenuBar() {
--- a/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
@@ -1,10 +1,10 @@
 package GlobalData.EnvironmentValue;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import _VisualDVM.Global;
 import Common_old.UI.DataSetControlForm;
-import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.DBObjectDialog;
 import Common_old.Utils.Utils;
 import GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
@@ -25,7 +25,7 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
        return new DBObjectDialog<EnvironmentValue, EnvironmentValueFields>(EnvironmentValueFields.class) {
            @Override
            public void fillFields() {
-                UI.TrySelect(fields.cbName, Result.name);
+                CommonUI.TrySelect(fields.cbName, Result.name);
                fields.tfValue.setText(Result.value);
            }
            //https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java
--- a/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
+++ b/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.EnvironmentValue;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class EnvironmentValuesMenuBar extends DataMenuBar {
    public EnvironmentValuesMenuBar() {
--- a/src/GlobalData/Machine/MachinesDBTable.java
+++ b/src/GlobalData/Machine/MachinesDBTable.java
@@ -1,4 +1,5 @@
 package GlobalData.Machine;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.DataSetControlForm;
 import Common_old.UI.UI;
@@ -49,7 +50,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
                fields.tfName.setText(Result.name);
                fields.tfAddress.setText(Result.address);
                fields.sPort.setValue(Result.port);
-                UI.TrySelect(fields.cbMachineType, Result.type);
+                CommonUI.TrySelect(fields.cbMachineType, Result.type);
            }
            @Override
            public void ProcessResult() {
--- a/src/GlobalData/Machine/MachinesMenuBar.java
+++ b/src/GlobalData/Machine/MachinesMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.Machine;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
--- a/src/GlobalData/Makefile/MakefilesMenuBar.java
+++ b/src/GlobalData/Makefile/MakefilesMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.Makefile;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class MakefilesMenuBar extends DataMenuBar {
    public MakefilesMenuBar() {
--- a/src/GlobalData/Module/ModulesMenuBar.java
+++ b/src/GlobalData/Module/ModulesMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.Module;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class ModulesMenuBar extends DataMenuBar {
    public ModulesMenuBar() {
--- a/src/GlobalData/Module/UI/ModuleAnchestorFields.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorFields.java
@@ -1,4 +1,5 @@
 package GlobalData.Module.UI;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.ComboBox.StyledTextComboBox;
 import Common_old.UI.UI;
@@ -39,7 +40,7 @@ public class ModuleAnchestorFields implements DialogFields {
            public void actionPerformed(ActionEvent e) {
                Pass_2021<String> pass = Pass_2021.passes.get(PassCode_2021.PickCompilerOptions);
                if (pass.Do(compiler)) {
-                    UI.TrySelect(cbFlags, pass.target);
+                    CommonUI.TrySelect(cbFlags, pass.target);
                }
            }
        });
@@ -58,7 +59,7 @@ public class ModuleAnchestorFields implements DialogFields {
        cbCompilers.addActionListener(e -> {
            if (cbCompilers.getSelectedItem() instanceof Compiler) {
                Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
-                UI.TrySelect(cbCommands,
+                CommonUI.TrySelect(cbCommands,
                        linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName));
            }
        });
--- a/src/GlobalData/Module/UI/ModuleAnchestorForm.java
+++ b/src/GlobalData/Module/UI/ModuleAnchestorForm.java
@@ -1,7 +1,7 @@
 package GlobalData.Module.UI;
 import Common.CommonConstants;
+import Common.Visual.CommonUI;
 import Common_old.Current;
-import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.DBObjectDialog;
 import GlobalData.Compiler.Compiler;
 import GlobalData.Compiler.CompilerType;
@@ -93,9 +93,9 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
    }
    @Override
    public void fillFields() {
-        UI.TrySelect(fields.cbFlags, Result.flags);
-        UI.TrySelect(fields.cbCommands, Result.command);
-        UI.TrySelect(fields.cbCompilers, Result.getCompiler());
+        CommonUI.TrySelect(fields.cbFlags, Result.flags);
+        CommonUI.TrySelect(fields.cbCommands, Result.command);
+        CommonUI.TrySelect(fields.cbCompilers, Result.getCompiler());
        //--------------------------------------------
        fields.setListeners(Result);
    }
--- a/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
+++ b/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
@@ -1,9 +1,9 @@
 package GlobalData.RunConfiguration;
 import Common.CommonConstants;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.DataSetControlForm;
-import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
@@ -43,14 +43,14 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
                    if (compiler.isVisible() && compiler.type.equals(CompilerType.dvm))
                        fields.cbLauncherCall.addItem(compiler);
                }
-                UI.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
-                UI.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions);
+                CommonUI.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
+                CommonUI.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions);
                fields.tfArgs.setText(Result.args);
                fields.cbLauncherCall.addActionListener(new ActionListener() {
                    @Override
                    public void actionPerformed(ActionEvent e) {
                        if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
-                            UI.TrySelect(fields.cbLaunchOptions, "run");
+                            CommonUI.TrySelect(fields.cbLaunchOptions, "run");
                        }
                    }
                });
--- a/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
+++ b/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.RunConfiguration;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;

 import javax.swing.*;
--- a/src/GlobalData/Tasks/TaskState.java
+++ b/src/GlobalData/Tasks/TaskState.java
@@ -1,5 +1,5 @@
 package GlobalData.Tasks;
-import Common_old.UI.StatusEnum;
+import Common.Visual.StatusEnum;
 import _VisualDVM.Syntax.VisualiserFonts;
 public enum TaskState implements StatusEnum {
    Inactive,
--- a/src/GlobalData/User/UserState.java
+++ b/src/GlobalData/User/UserState.java
@@ -1,5 +1,5 @@
 package GlobalData.User;
-import Common_old.UI.StatusEnum;
+import Common.Visual.StatusEnum;
 import _VisualDVM.Syntax.VisualiserFonts;
 public enum UserState implements StatusEnum {
    initial, //на пользователя еще не заходили.
--- a/src/GlobalData/User/UsersMenuBar.java
+++ b/src/GlobalData/User/UsersMenuBar.java
@@ -1,5 +1,5 @@
 package GlobalData.User;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class UsersMenuBar extends DataMenuBar {
    public UsersMenuBar() {
--- a/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java
+++ b/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java
@@ -1,5 +1,5 @@
 package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
 public class IntervalDirective extends BaseDirective {
    protected String prefix;
@@ -19,9 +19,9 @@ public class IntervalDirective extends BaseDirective {
    }
    @Override
    public String getReplacementText() {
-        prefix = Utils.pack(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
+        prefix = CommonUtils.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
        word = name.getText();
-        suffix = Utils.pack(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
+        suffix = CommonUtils.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
        String pp = prefix.replace(" ", "");
        String ps = suffix.replace(" ", "");
        if ((!ps.isEmpty()) && (ps.charAt(0) != ','))
--- a/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java
+++ b/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java
@@ -1,5 +1,5 @@
 package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
-import Common_old.Utils.Utils;
+import Common.Utils.CommonUtils;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
 //промежуточный тип. относится ко всем директивам со скобками и требующим запятых.
 public class SpecDirective extends BaseDirective {
@@ -16,9 +16,9 @@ public class SpecDirective extends BaseDirective {
    }
    @Override
    public String getReplacementText() {
-        prefix = Utils.pack(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
+        prefix = CommonUtils.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
        word = get_word();
-        suffix = Utils.pack(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
+        suffix = CommonUtils.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
        String pp = prefix.replace(" ", "");
        String ps = suffix.replace(" ", "");
        if (!pp.isEmpty() && (pp.charAt(pp.length() - 1) != ',') && (pp.charAt(pp.length() - 1) != '('))
--- a/src/ProjectData/Project/UI/VersionsTree.java
+++ b/src/ProjectData/Project/UI/VersionsTree.java
@@ -3,7 +3,7 @@ import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Menus.GraphMenu;
 import Common_old.UI.Menus.VersionsMenu;
-import Common_old.UI.Selectable;
+import Common.Visual.Selectable;
 import Common_old.UI.Trees.DataTree;
 import Common_old.UI.Trees.TreeRenderers;
 import Visual_DVM_2021.Passes.PassCode_2021;
--- a/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
+++ b/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
@@ -1,7 +1,7 @@
 package ProjectData.Project.UI;
 import Common_old.Current;
 import _VisualDVM.Global;
-import Common_old.UI.Selectable;
+import Common.Visual.Selectable;
 import _VisualDVM.Syntax.VisualiserFonts;
 import Common_old.UI.Trees.StyledTreeCellRenderer;
 import ProjectData.Project.db_project_info;
--- a/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
+++ b/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
@@ -1,4 +1,5 @@
 package ProjectData.SapforData.Arrays.UI;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.ControlForm;
 import Common_old.UI.Tables.Grid.GridAnchestor;
@@ -25,7 +26,7 @@ public class DimensionsTableForm extends ControlForm<StyledTable> {
    @Override
    public void Clear() {
        super.Clear();
-        UI.Clear(content);
+        CommonUI.Clear(content);
    }
    @Override
    public void CreateControl() {
--- a/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
+++ b/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Functions.UI.Graph;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.ControlForm;
-import Common_old.UI.UI;
 import com.mxgraph.swing.mxGraphComponent;

 import java.awt.*;
@@ -22,6 +22,6 @@ public class FunctionsGraphForm extends ControlForm<mxGraphComponent> {
    @Override
    public void Clear() {
        super.Clear();
-        UI.Clear(content);
+        CommonUI.Clear(content);
    }
 }
--- a/src/Repository/BugReport/BugReportState.java
+++ b/src/Repository/BugReport/BugReportState.java
@@ -1,5 +1,5 @@
 package Repository.BugReport;
-import Common_old.UI.StatusEnum;
+import Common.Visual.StatusEnum;
 import _VisualDVM.Syntax.VisualiserFonts;

 import java.io.Serializable;
--- a/src/Repository/BugReport/BugReportsMenuBar.java
+++ b/src/Repository/BugReport/BugReportsMenuBar.java
@@ -1,5 +1,5 @@
 package Repository.BugReport;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class BugReportsMenuBar extends DataMenuBar {
    public BugReportsMenuBar() {
--- a/src/Repository/Component/Component.java
+++ b/src/Repository/Component/Component.java
@@ -8,7 +8,7 @@ import Common_old.Utils.Files.VFileChooser;
 import Common.Utils.TextLog;
 import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.UI.Interface.Loggable;
+import Common.Utils.Loggable;

 import java.io.File;
 import java.nio.file.Files;
--- a/src/Repository/Component/ComponentState.java
+++ b/src/Repository/Component/ComponentState.java
@@ -1,5 +1,5 @@
 package Repository.Component;
-import Common_old.UI.StatusEnum;
+import Common.Visual.StatusEnum;
 import _VisualDVM.Syntax.VisualiserFonts;
 public enum ComponentState implements StatusEnum {
    Undefined,
--- a/src/Repository/Component/ComponentsMenuBar.java
+++ b/src/Repository/Component/ComponentsMenuBar.java
@@ -1,6 +1,6 @@
 package Repository.Component;
 import Common_old.Current;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Common_old.UI.Menus_2023.VisualiserMenu;
 import _VisualDVM.Syntax.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
--- a/src/Repository/Server/ComponentsServer.java
+++ b/src/Repository/Server/ComponentsServer.java
@@ -247,7 +247,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                    for (String sType : types) {
                        ComponentType componentType = ComponentType.valueOf(sType);
                        File vFile = Paths.get(Global.Home, "Components", sType, "version.txt").toFile();
-                        String v_string = Utils.remove(
+                        String v_string = CommonUtils.removeCharacters(
                                Utils.ReadAllText(vFile),
                                "\n", "\r"
                        );
@@ -263,7 +263,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                    for (String sType : types_) {
                        ComponentType componentType = ComponentType.valueOf(sType);
                        File vFile = Paths.get(Global.Home, "Components", sType, "minimal_version.txt").toFile();
-                        String mv_string = Utils.remove(
+                        String mv_string = CommonUtils.removeCharacters(
                                Utils.ReadAllText(vFile),
                                "\n", "\r"
                        );
--- a/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
+++ b/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
@@ -1,5 +1,5 @@
 package Repository.SubscriberWorkspace;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SubscriberWorkspacesMenuBar extends DataMenuBar {
    public SubscriberWorkspacesMenuBar() {
--- a/src/Repository/Subscribes/SubscribersMenuBar.java
+++ b/src/Repository/Subscribes/SubscribersMenuBar.java
@@ -1,5 +1,5 @@
 package Repository.Subscribes;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SubscribersMenuBar extends DataMenuBar {
    public SubscribersMenuBar() {
--- a/src/Repository/Subscribes/UI/SubscriberForm.java
+++ b/src/Repository/Subscribes/UI/SubscriberForm.java
@@ -1,7 +1,7 @@
 package Repository.Subscribes.UI;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import _VisualDVM.Global;
-import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.DBObjectDialog;
 import Common_old.Utils.Utils;
 import GlobalData.Account.AccountRole;
@@ -34,7 +34,7 @@ public class SubscriberForm extends DBObjectDialog<Subscriber, SubscriberFields>
        fields.tfName.setText(Result.name);
        fields.tfAddress.setText(Result.address);
        fields.cbMail.setSelected(Result.mailOn!=0);
-        UI.TrySelect(fields.cbRole, Result.role);
+        CommonUI.TrySelect(fields.cbRole, Result.role);
    }
    @Override
    public void SetEditLimits() {
--- a/src/TestingSystem/Common/Group/GroupsDBTable.java
+++ b/src/TestingSystem/Common/Group/GroupsDBTable.java
@@ -1,7 +1,7 @@
 package TestingSystem.Common.Group;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common_old.UI.DataSetControlForm;
-import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.DBObjectDialog;
 import Common.Database.Objects.DBObject;
 import Common.Database.Tables.FKBehaviour;
@@ -120,8 +120,8 @@ public class GroupsDBTable extends iDBTable<Group> {
            @Override
            public void fillFields() {
                fields.tfName.setText(Result.description);
-                UI.TrySelect(fields.cbType, Result.type);
-                UI.TrySelect(fields.cbLanguage, Result.language);
+                CommonUI.TrySelect(fields.cbType, Result.type);
+                CommonUI.TrySelect(fields.cbLanguage, Result.language);
            }
            @Override
            public void ProcessResult() {
--- a/src/TestingSystem/Common/Group/GroupsMenuBar.java
+++ b/src/TestingSystem/Common/Group/GroupsMenuBar.java
@@ -1,6 +1,6 @@
 package TestingSystem.Common.Group;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import Common_old.Utils.Utils;
 import TestingSystem.Common.Group.UI.AddGroupMenu;
--- a/src/TestingSystem/Common/TasksPackageState.java
+++ b/src/TestingSystem/Common/TasksPackageState.java
@@ -1,5 +1,5 @@
 package TestingSystem.Common;
-import Common_old.UI.StatusEnum;
+import Common.Visual.StatusEnum;
 import _VisualDVM.Syntax.VisualiserFonts;

 import java.util.Arrays;
--- a/src/TestingSystem/Common/Test/TestsMenuBar.java
+++ b/src/TestingSystem/Common/Test/TestsMenuBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.Common.Test;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import TestingSystem.Common.Test.UI.AddTestMenu;
 import TestingSystem.Common.Test.UI.EditTestMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
--- a/src/TestingSystem/Common/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -13,7 +13,7 @@ import Repository.Server.ServerCode;
 import TestingSystem.Common.TestingPackage.TestingPackage;
 import TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
 import Repository.RepositoryClient;
-import Visual_DVM_2021.UI.Interface.Loggable;
+import Common.Utils.Loggable;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;

--- a/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
+++ b/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMConfiguration;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMConfigurationsMenuBar extends DataMenuBar {
    public DVMConfigurationsMenuBar() {
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
@@ -1,6 +1,6 @@
 package TestingSystem.DVM.DVMPackage;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
--- a/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java
+++ b/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMSettings.UI;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMSettingsBar extends DataMenuBar {
    public DVMSettingsBar() {
--- a/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java
+++ b/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.DVM.DVMTasks;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMRunTasksBar extends DataMenuBar {
    public DVMRunTasksBar() {
--- a/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
+++ b/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforConfiguration;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforConfigurationsMenuBar extends DataMenuBar {
    public SapforConfigurationsMenuBar() {
--- a/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java
+++ b/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforSettings;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforSettingsBar extends DataMenuBar {
    public SapforSettingsBar() {
--- a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java
+++ b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforSettingsCommand;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforSettingsCommandsBar extends DataMenuBar {
    public SapforSettingsCommandsBar() {
--- a/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
+++ b/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
@@ -1,8 +1,8 @@
 package TestingSystem.SAPFOR.SapforSettingsCommand;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Tables.iDBTable;
 import Common_old.UI.DataSetControlForm;
-import Common_old.UI.UI;
 import Common_old.UI.Windows.Dialog.DBObjectDialog;
 import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields;
@@ -62,7 +62,7 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
            }
            @Override
            public void fillFields() {
-                UI.TrySelect(fields.cbPassCode, Result.passCode);
+                CommonUI.TrySelect(fields.cbPassCode, Result.passCode);
            }
            @Override
            public void ProcessResult() {
--- a/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
+++ b/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.SapforTask;
-import Common_old.UI.StatusEnum;
+import Common.Visual.StatusEnum;
 import _VisualDVM.Syntax.VisualiserFonts;
 public enum ComparisonState implements StatusEnum {
    Unknown,
--- a/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
+++ b/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
@@ -1,6 +1,6 @@
 package TestingSystem.SAPFOR.SapforTasksPackage.UI;
 import _VisualDVM.Global;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Common_old.UI.Menus_2023.MenuBarButton;
 import Common_old.Utils.Utils;
 import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.ServerSapfor;
-import Common_old.UI.StatusEnum;
+import Common.Visual.StatusEnum;
 import _VisualDVM.Syntax.VisualiserFonts;
 public enum ServerSapforState implements StatusEnum {
    Queued,
--- a/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
+++ b/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
@@ -1,5 +1,5 @@
 package TestingSystem.SAPFOR.ServerSapfor;
-import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Visual.DataMenuBar;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class ServerSapforsBar extends DataMenuBar {
    public ServerSapforsBar() {
--- a/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java
@@ -1,6 +1,6 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.CommonUtils;
-import Common_old.UI.Selectable;
+import Common.Visual.Selectable;
 import Common_old.UI.UI;
 import ProjectData.SapforData.Includes.DependencyInfo;
 import ProjectData.SapforData.Includes.FileInfo;
--- a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
+++ b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java
@@ -127,9 +127,6 @@ public class UpdateSetting extends Pass_2021<DBSetting> {
                    if (Current.HasProject())
                        UI.fastAccessMenuBar.Refresh();
                    break;
-                case DarkThemeOn:
-                    UI.refreshTheme();
-                    break;
                case ShowFullArraysDeclarations:
                    if (Current.HasProject())
                        Current.getProject().declaratedArrays.ShowUI();
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Editor.BaseEditor;
@@ -285,7 +286,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
    CommentFields commentFields = new CommentFields();
    @Override
    public void SwitchScreen(boolean small) {
-        UI.Clear(descriptionPanel);
+        CommonUI.Clear(descriptionPanel);
        //------------------------------------------------------------------
        descriptionInterface = small ? descriptionTabs : descriptionFields;
        descriptionInterface.setEditorScroll(bugDescriptionScroll);
@@ -295,7 +296,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
        descriptionPanel.revalidate();
        descriptionPanel.repaint();
        //---------
-        UI.Clear(commentPanel);
+        CommonUI.Clear(commentPanel);
        //------------------------------------------------------------------
        commentInterface = small ? commentTabs : commentFields;
        commentInterface.setEditorScroll(bugCommentScroll);
@@ -365,7 +366,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
        settingsTools = new VisualiserMenuBar();
    }
    public void EnableBugreports() {
-        UI.Clear(accountPanel);
+        CommonUI.Clear(accountPanel);
        accountPanel.add(SC10);
        UI.getMainWindow().SwitchTestingTabs(true);
    }
--- a/src/Visual_DVM_2021/UI/Main/FileForm.java
+++ b/src/Visual_DVM_2021/UI/Main/FileForm.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common.CommonConstants;
+import Common.Visual.CommonUI;
 import _VisualDVM.Global;
 import Common_old.UI.Editor.Viewer;
 import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar;
@@ -213,7 +214,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
    }
    @Override
    public void ShowText() {
-        UI.Clear(editorPanel);
+        CommonUI.Clear(editorPanel);
        editorPanel.add(new RTextScrollPane(Body = new SPFEditor(file)));
        UI.getSearchReplaceForm().setEditor(Body);
        if (UI.getSearchReplaceForm().isVisible())
@@ -367,12 +368,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
    @Override
    public void CollapseGraphs() {
        Global.db.splitters.get("SC12").position = SC12.getDividerLocation();
-        UI.Clear(editorBackground);
+        CommonUI.Clear(editorBackground);
        editorBackground.add(editorPanel);
    }
    @Override
    public void ExpandGraphs() {
-        UI.Clear(editorBackground);
+        CommonUI.Clear(editorBackground);
        SC12.setRightComponent(editorPanel);
        editorBackground.add(SC12);
        //--
@@ -382,12 +383,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
    @Override
    public void CollapseMessages() {
        Global.db.splitters.get("SC1").position = SC1.getDividerLocation();
-        UI.Clear(content);
+        CommonUI.Clear(content);
        content.add(editorBackground);
    }
    @Override
    public void ExpandMessages() {
-        UI.Clear(content);
+        CommonUI.Clear(content);
        SC1.setLeftComponent(editorBackground);
        content.add(SC1);
        SC1.setDividerLocation(Global.db.splitters.get("SC1").position);
--- a/src/Visual_DVM_2021/UI/Main/MainForm.java
+++ b/src/Visual_DVM_2021/UI/Main/MainForm.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.UI.Main;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Menus_2023.MainMenuBar.MainWindow;
@@ -234,7 +235,7 @@ public class MainForm extends Form implements MainWindow {
        getTestsWindow().ShowAll();
        if (getTestingWindow() != null)
            getTestingWindow().ShowAll();
-        UI.windowsStack.push(this);
+        CommonUI.windowsStack.push(this);
        super.Show();
    }
    @Override
--- a/src/Visual_DVM_2021/UI/Main/ProjectForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ProjectForm.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.UI.Main;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.Editor.Viewer;
@@ -170,7 +171,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
                projectTabs.setSelectedIndex(0);
            }
        });
-        UI.Clear(fileBackground);
+        CommonUI.Clear(fileBackground);
        //filesTabs.removeAll();
    }
    @Override
@@ -252,7 +253,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
    }
    @Override
    public void ShowProjectView() {
-        UI.Clear(projectViewPanel);
+        CommonUI.Clear(projectViewPanel);
        ProjectView view = Current.getProjectView();
        menuBar.getProjectViewMenu().setToolTipText(view.getDescription());
        menuBar.getProjectViewMenu().setIcon(Utils.getIcon(view.getIcon()));
@@ -294,7 +295,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
    public void CollapseProjectTrees() {
        Global.db.splitters.get("SC3").position = SC3.getDividerLocation();
        //---
-        UI.Clear(projectBackground);
+        CommonUI.Clear(projectBackground);
        projectBackground.add(fileBackground);
    }
    @Override
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.UI.Main;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import Common.Database.Objects.DBObject;
 import Common_old.UI.Label.ShortLabel;
@@ -114,7 +115,7 @@ public class SapforPackagesComparisonForm {
    }
    //---
    public void showNoTree() {
-        UI.Clear(treePanel);
+        CommonUI.Clear(treePanel);
    }
    public void showObject() {
        lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : ""));
--- a/src/Visual_DVM_2021/UI/Main/TestingForm.java
+++ b/src/Visual_DVM_2021/UI/Main/TestingForm.java
@@ -1,5 +1,6 @@
 package Visual_DVM_2021.UI.Main;
 import Common.CommonConstants;
+import Common.Visual.CommonUI;
 import Common_old.Current;
 import _VisualDVM.Global;
 import Common_old.UI.TextField.StyledTextField;
@@ -311,7 +312,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
    @Override
    public void CollapseCredentials() {
        Global.db.splitters.get("SC71").position = SC71.getDividerLocation();
-        UI.Clear(credentialsPanel);
+        CommonUI.Clear(credentialsPanel);
        credentialsPanel.add(UI.credentialsBar);
        SC71.setDividerLocation(30);
        SC71.setDividerSize(0);
@@ -320,7 +321,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
    }
    @Override
    public void ExpandCredentials() {
-        UI.Clear(credentialsPanel);
+        CommonUI.Clear(credentialsPanel);
        credentialsPanel.add(SC18);
        SC71.setDividerLocation(200);
        SC71.setDividerSize(3);
--- a/src/Visual_DVM_2021/UI/Main/VersionsForm.java
+++ b/src/Visual_DVM_2021/UI/Main/VersionsForm.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.UI.Main;
+import Common.Visual.CommonUI;
 import Common_old.UI.Trees.TreeForm;
 import Common_old.UI.UI;
 import ProjectData.Project.UI.VersionsTree;
@@ -50,7 +51,7 @@ public class VersionsForm implements FormWithSplitters, VersionsWindow {
    }
    @Override
    public void ShowNoProjectVariants() {
-        UI.Clear(variantsFormPanel);
+        CommonUI.Clear(variantsFormPanel);
        versionsTabs.setEnabledAt(0, false);
    }
    @Override
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -25,7 +25,7 @@ import TestingSystem.DVM.RemoteDVMTestingPlanner;
 import TestingSystem.SAPFOR.PackageModeSupervisor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.UI.Interface.Loggable;
+import Common.Utils.Loggable;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;