промежуточный. частичный рефакторинг с прицелом на библиотечную часть

src/Common/Database/Database.java

@@ -1,7 +1,11 @@
 package Common.Database;
-import Common.Constants;
-import Common.Global;
-import Common.Utils.Utils;
+import Common_old.Constants;
+import Common.Database.Tables.DBTable;
+import _VisualDVM.Global;
+import Common_old.Utils.Utils;
+import Common.Database.Objects.DBObject;
+import Common.Database.Tables.DataSet;
+import Common.Database.Objects.iDBObject;
 import Repository.RepositoryRefuseException;
 import Visual_DVM_2021.Passes.PassCode_2021;
 

src/Common/Database/Objects/DBObject.java

@@ -1,7 +1,7 @@
-package Common.Database;
-import Common.UI.Selectable;
+package Common.Database.Objects;
+import Common_old.UI.Selectable;
 import Common.Utils.Index;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.Serializable;
@@ -39,8 +39,6 @@ public abstract class DBObject implements Selectable, Serializable {
     public String getDialogName() {
         return getPK().toString();
     }
-    //статус. например завершенность багрепорта или состояние задачи на запуск. как правило обладает цветным шрифтом.
-    //как объект будут называть по внешним ключам.
     public String getFKName() {
         return getClass().getSimpleName().toLowerCase() + "_id";
     }
@@ -61,5 +59,4 @@ public abstract class DBObject implements Selectable, Serializable {
         this.SynchronizeFields(src);
     }
     //---------
-
 }

src/Common/Database/Objects/iDBObject.java

@@ -1,5 +1,5 @@
-package Common.Database;
-import Common.Constants;
+package Common.Database.Objects;
+import Common_old.Constants;
 import com.google.gson.annotations.Expose;
 import com.sun.org.glassfish.gmbal.Description;
 //автоинкрементальный ключ

src/Common/Database/Objects/nDBObject.java

@@ -1,5 +1,5 @@
-package Common.Database;
-import Common.Utils.Utils;
+package Common.Database.Objects;
+import Common_old.Utils.Utils;
 import com.sun.org.glassfish.gmbal.Description;
 public abstract class nDBObject extends DBObject {
     @Description("PRIMARY KEY, UNIQUE")

src/Common/Database/Objects/rDBObject.java

@@ -1,4 +1,4 @@
-package Common.Database;
+package Common.Database.Objects;
 import java.util.Date;
 //объект репозитория. ключ имя, и есть данные отправителя.
 public class rDBObject extends nDBObject {

src/Common/Database/Objects/riDBObject.java

@@ -1,5 +1,5 @@
-package Common.Database;
-public class riDBObject extends iDBObject{
+package Common.Database.Objects;
+public class riDBObject extends iDBObject {
     //-
     public String sender_name = "";
     public String sender_address = "";

src/Common/Database/SQLITE/SQLiteDatabase.java

@@ -1,10 +1,10 @@
 package Common.Database.SQLITE;
-import Common.Database.DBObject;
-import Common.Database.DBTable;
-import Common.Database.DBTableColumn;
+import Common.Database.Objects.DBObject;
+import Common.Database.Tables.DBTable;
+import Common.Database.Tables.DBTableColumn;
 import Common.Database.Database;
-import Common.UI.UI;
-import Common.Utils.Utils;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassException;
 import javafx.util.Pair;
 
@@ -13,7 +13,7 @@ import java.sql.*;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 
-import static Common.Utils.Utils.requireNonNullElse;
+import static Common_old.Utils.Utils.requireNonNullElse;
 public abstract class SQLiteDatabase extends Database {
     protected Connection conn = null;
     protected Statement statement = null;

src/Common/Database/Tables/ColumnType.java

@@ -1,4 +1,4 @@
-package Common.Database;
+package Common.Database.Tables;
 public enum ColumnType {
     UNDEFINED,
     INT,

src/Common/Database/Tables/DBTable.java

@@ -1,4 +1,7 @@
-package Common.Database;
+package Common.Database.Tables;
+import Common.Database.Database;
+import Common.Database.Objects.DBObject;
+
 import java.lang.reflect.Field;
 public abstract class DBTable<K, D extends DBObject> extends DataSet<K, D> {
     //-

src/Common/Database/Tables/DBTableColumn.java

@@ -1,4 +1,4 @@
-package Common.Database;
+package Common.Database.Tables;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;

src/Common/Database/Tables/DataSet.java

@@ -1,12 +1,15 @@
-package Common.Database;
-import Common.Current;
-import Common.UI.DataSetControlForm;
-import Common.UI.Menus_2023.DataMenuBar;
-import Common.UI.Tables.ColumnFilter;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DBObjectDialog;
-import Common.UI.Windows.Dialog.DialogFields;
+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_old.UI.Tables.ColumnFilter;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DBObjectDialog;
+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 javax.swing.*;
@@ -44,10 +47,10 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         ui_ = createUI();
         ui_.setContent(content_in);
         //-->
-        if (UI.menuBars.containsKey(getClass())) {
-            DataMenuBar bar = UI.menuBars.get(getClass());
+        if ( CommonUI.menuBars.containsKey(getClass())) {
+            DataMenuBar bar =  CommonUI.menuBars.get(getClass());
             content_in.add(bar, BorderLayout.NORTH);
-            setFilterUI(count -> UI.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
+            setFilterUI(count ->  CommonUI.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
             if (ui_.hasCheckBox())
                 bar.createSelectionButtons(this);
         }
@@ -55,7 +58,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
         //----
         createFilters();
         if (!filters.isEmpty()) {
-            DataMenuBar menuBar = UI.menuBars.get(getClass());
+            DataMenuBar menuBar =  CommonUI.menuBars.get(getClass());
             for (DataSetFilter<D> filter : filters)
                 menuBar.addMenus(filter.menu);
         }

src/Common/Database/Tables/DataSetAnchestor.java

@@ -1,4 +1,6 @@
-package Common.Database;
+package Common.Database.Tables;
+import Common.Database.Objects.DBObject;
+
 import java.util.LinkedHashMap;
 public abstract class DataSetAnchestor {
     //чтобы обмануть стирание типов во всех параметризованных полях. используется не во всех потомках.

src/Common/Database/Tables/FKBehaviour.java

@@ -1,4 +1,4 @@
-package Common.Database;
+package Common.Database.Tables;
 public class FKBehaviour {
     public FKDataBehaviour data; //поведение данных внешнего ключа при удалении/модификации
     public FKCurrentObjectBehaviuor ui; //поведение интерфейсов таблиц внешнего ключа при показе текущего объекта.

src/Common/Database/Tables/FKCurrentObjectBehaviuor.java

@@ -1,4 +1,4 @@
-package Common.Database;
+package Common.Database.Tables;
 public enum FKCurrentObjectBehaviuor {
     PASSIVE,
     ACTIVE

src/Common/Database/Tables/FKDataBehaviour.java

@@ -1,4 +1,4 @@
-package Common.Database;
+package Common.Database.Tables;
 //поведение таблиц имеющих внешние ключи
 public enum FKDataBehaviour {
     NONE,

src/Common/Database/Tables/iDBTable.java

@@ -1,4 +1,5 @@
-package Common.Database;
+package Common.Database.Tables;
+import Common.Database.Objects.iDBObject;
 public abstract class iDBTable<D extends iDBObject> extends DBTable<Integer, D> {
     public iDBTable(Class<D> d_in) {
         super(Integer.class, d_in);

src/Common/UI/VisualCache/VisualCache.java

@@ -1,3 +0,0 @@
-package Common.UI.VisualCache;
-public class VisualCache {
-}

src/Common/Utils/CommonUtils.java

@@ -0,0 +1,26 @@
+package Common.Utils;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.nio.charset.Charset;
+public class CommonUtils {
+    public static Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setPrettyPrinting().create();
+    /*
+    public static String jsonToPrettyFormat(String packed) {
+        JsonParser parser = new JsonParser();
+        JsonObject json = parser.parse(packed).getAsJsonObject();
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        return gson.toJson(json);
+    }
+     */
+    public static <T> T jsonFromFile(File file, Class<T> json_class) throws Exception {
+        return gson.fromJson(FileUtils.readFileToString(file, Charset.defaultCharset()), json_class);
+    }
+    public static void jsonToFile(Object json_object, File file) throws Exception {
+        FileUtils.writeStringToFile(file, gson.toJson(json_object));
+    }
+}

src/Common/Utils/InterruptThread.java

@@ -1,5 +1,5 @@
 package Common.Utils;
-import Common.Constants;
+import Common_old.Constants;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/Common/Utils/StringTemplate.java

@@ -1,4 +1,6 @@
 package Common.Utils;
+import Common_old.Utils.Utils;
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 public class StringTemplate {

src/Common/Utils/TextLog.java

@@ -1,7 +1,7 @@
 package Common.Utils;
-import Common.Global;
+import _VisualDVM.Global;
 public class TextLog {
-    String text = "";
+    public String text = "";
     public void Writeln(String line) {
         text += line + "\n";
     }

src/Common/Visual/CommonUI.java

@@ -0,0 +1,8 @@
+package Common.Visual;
+import Common_old.UI.Menus_2023.DataMenuBar;
+import Common.Database.Tables.DataSet;
+
+import java.util.LinkedHashMap;
+public class CommonUI {
+    public static LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
+}

src/Common/Visual/DBObjectFilter.java

@@ -1,6 +1,8 @@
-package Common.Database;
-import Common.UI.Menus_2023.StableMenuItem;
-import Common.Utils.Utils;
+package Common.Visual;
+import Common_old.UI.Menus_2023.StableMenuItem;
+import Common_old.Utils.Utils;
+import Common.Database.Objects.DBObject;
+import Common.Database.Tables.DataSet;
 
 import javax.swing.*;
 //одиночный фильтр, пункт фильтрационного меню.
@@ -12,10 +14,10 @@ public abstract class DBObjectFilter<D extends DBObject> {
     int count = 0;
     //--
     static String getNotActiveIconPath() {
-        return "/icons/NotPick.png";
+        return "/Common/icons/NotPick.png";
     }
     static String getActiveIconPath() {
-        return "/icons/Pick.png";
+        return "/Common/icons/Pick.png";
     }
     void Mark() {
         menuItem.setIcon(Utils.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));

src/Common/Visual/DataSetFilter.java

@@ -1,6 +1,8 @@
-package Common.Database;
-import Common.UI.Menus_2023.StableMenuItem;
-import Common.UI.Menus_2023.VisualiserMenu;
+package Common.Visual;
+import Common_old.UI.Menus_2023.StableMenuItem;
+import Common_old.UI.Menus_2023.VisualiserMenu;
+import Common.Database.Objects.DBObject;
+import Common.Database.Tables.DataSet;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -9,10 +11,6 @@ public abstract class DataSetFilter<D extends DBObject> {
     public VisualiserMenu menu;
     //--
     protected DataSet<?, D> dataSet;
-    //--
-    //JMenuItem bSelectAll;
-    //JMenuItem bUnSelectAll;
-    //--
     protected Vector<DBObjectFilter<D>> field_filters;
     public DataSetFilter(String name, DataSet dataSet_in) {
         dataSet = dataSet_in;

src/Common_old/Constants.java

@@ -1,4 +1,4 @@
-package Common;
+package Common_old;
 import Common.Utils.Vector_;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
@@ -8,6 +8,21 @@ public class Constants {
     public static final int Nan = -1;
     public static final int planner_version = 3;
     //--
+    public static final String ComponentsDirectoryName = "Components";
+    public static final String DataDirectoryName = "Data";
+    public static final String BugsDirectoryName = "Bugs";
+    public static final String BackUpsDirectoryName = "BackUps";
+    public static final String DataBackUpsDirectoryName = "DataBackUps";
+    public static final String TempDirectoryName = "Temp";
+    public static final String ProjectsDirectoryName = "Projects";
+    public static final String CompilationTasksDirectoryName = "CompilationTasks";
+    public static final String RunTasksDirectoryName = "RunTasks";
+    public static final String StsDirectoryName = "Sts";
+    public static final String RepoDirectoryName = "Repo";
+    public static final String TestsDirectoryName = "Tests";
+    public static final String DVMPackagesDirectoryName = "DVMPackages";
+    public static final String PerformanceAnalyzerDirectoryName = "PerformanceAnalyzer";
+    //--
     //SVN vmk-post@yandex.ru
     public static final String REPOSITORY_AUTHENTICATION = "--username dvmhuser --password dvmh2013 --non-interactive";
     public static final String DVM_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/dvm";
@@ -90,6 +105,7 @@ public class Constants {
             "killed by signal",
             "bad termination"
     };
+    //-------------------------------------------------------
     public static String[] resourses_names = new String[]{
             //--
             "Process_r.h",

src/Common_old/Current.java

@@ -1,6 +1,6 @@
-package Common;
-import Common.Database.iDBObject;
-import Common.UI.Themes.VisualiserTheme;
+package Common_old;
+import Common.Database.Objects.iDBObject;
+import Common_old.UI.Themes.VisualiserTheme;
 import Common.Utils.TextLog;
 import GlobalData.Account.Account;
 import GlobalData.Compiler.Compiler;

src/Common_old/GlobalProperties.java

@@ -1,4 +1,4 @@
-package Common;
+package Common_old;
 import com.google.gson.annotations.Expose;
 
 import java.io.File;

src/Common_old/Properties.java

@@ -1,6 +1,7 @@
-package Common;
-import Common.UI.Menus_2023.StableMenuItem;
-import Common.Utils.Utils;
+package Common_old;
+import Common.Utils.CommonUtils;
+import Common_old.UI.Menus_2023.StableMenuItem;
+import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
@@ -10,11 +11,11 @@ import java.lang.reflect.Field;
 public abstract class Properties {
     public void addFlagMenuItem(JMenu menu, String fieldName) {
         JMenuItem menu_item = new StableMenuItem(getFieldDescription(fieldName),
-                getFlag(fieldName) ? "/icons/Pick.png" : "/icons/NotPick.png");
+                getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png");
         //-
         menu_item.addActionListener(e -> {
             if (Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
-                menu_item.setIcon(Utils.getIcon(getFlag(fieldName) ? "/icons/Pick.png" : "/icons/NotPick.png"));
+                menu_item.setIcon(Utils.getIcon(getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
         });
         menu.add(menu_item);
     }
@@ -40,7 +41,7 @@ public abstract class Properties {
     }
     public void Update() {
         try {
-            Utils.jsonToFile(this, getFile());
+            CommonUtils.jsonToFile(this, getFile());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -51,7 +52,7 @@ public abstract class Properties {
     public boolean updateField(String name, Object newValue) {
         try {
             Field field = getClass().getField(name);
-            Object oldValue = field.get(Global.properties);
+            Object oldValue = field.get(this);
             //---
             if (newValue.equals(oldValue))
                 return false;
@@ -68,7 +69,7 @@ public abstract class Properties {
     public void switchAndUpdateFlag(String name) {
         try {
             Field field = getClass().getField(name);
-            boolean oldValue = (boolean) field.get(Global.properties);
+            boolean oldValue = (boolean) field.get(this);
             boolean newValue = !oldValue;
             //---
             field.set(this, newValue);

src/Common_old/UI/ComboBox/StyledTextComboBox.java

@@ -1,5 +1,5 @@
-package Common.UI.ComboBox;
-import Common.UI.Menus.TextComboBoxMenu;
+package Common_old.UI.ComboBox;
+import Common_old.UI.Menus.TextComboBoxMenu;
 
 import javax.swing.*;
 public class StyledTextComboBox extends JComboBox<String> {

src/Common_old/UI/ControlForm.java

@@ -1,5 +1,5 @@
-package Common.UI;
-import Common.Global;
+package Common_old.UI;
+import _VisualDVM.Global;
 
 import javax.swing.*;
 import java.awt.*;

src/Common_old/UI/ControlWithCurrentForm.java

@@ -1,5 +1,5 @@
-package Common.UI;
-import Common.Current;
+package Common_old.UI;
+import Common_old.Current;
 
 import java.awt.*;
 public class ControlWithCurrentForm<C extends Component> extends ControlForm<C> {

src/Common_old/UI/DataControl.java

@@ -1,5 +1,5 @@
-package Common.UI;
-import Common.Database.DBObject;
+package Common_old.UI;
+import Common.Database.Objects.DBObject;
 public interface DataControl {
     DBObject getRowObject(int rowIndex); //получить объект, сответствующий данной строке.
     void SelectRowByPK(Object pk);

src/Common_old/UI/DataControl_OLD.java

@@ -1,5 +1,5 @@
-package Common.UI;
-import Common.Current;
+package Common_old.UI;
+import Common_old.Current;
 public interface DataControl_OLD {
     //todo скорее всего устареет.
     default Current getCurrent() {

src/Common_old/UI/DataSetControlForm.java

@@ -1,15 +1,15 @@
-package Common.UI;
-import Common.Constants;
-import Common.Current;
-import Common.Database.DBObject;
-import Common.Database.DBTable;
-import Common.Database.DataSet;
-import Common.Database.FKBehaviour;
-import Common.Global;
-import Common.UI.Menus.TableMenu;
-import Common.UI.Tables.ColumnInfo;
-import Common.UI.Tables.DataTable;
-import Common.UI.Tables.Grid.GridAnchestor;
+package Common_old.UI;
+import Common_old.Constants;
+import Common_old.Current;
+import Common.Database.Objects.DBObject;
+import Common.Database.Tables.DBTable;
+import Common.Database.Tables.DataSet;
+import Common.Database.Tables.FKBehaviour;
+import _VisualDVM.Global;
+import Common_old.UI.Menus.TableMenu;
+import Common_old.UI.Tables.ColumnInfo;
+import Common_old.UI.Tables.DataTable;
+import Common_old.UI.Tables.Grid.GridAnchestor;
 import GlobalData.Grid.Grid;
 
 import javax.swing.*;
@@ -22,8 +22,8 @@ import java.util.Vector;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static Common.UI.Tables.TableEditors.EditorSelect;
-import static Common.UI.Tables.TableRenderers.RendererSelect;
+import static Common_old.UI.Tables.TableEditors.EditorSelect;
+import static Common_old.UI.Tables.TableRenderers.RendererSelect;
 public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
     protected JPanel dataPanel;
     protected DataSet dataSource;

src/Common_old/UI/DebugPrintLevel.java

@@ -1,4 +1,4 @@
-package Common.UI;
+package Common_old.UI;
 public enum DebugPrintLevel {
     Undefined,
     Passes,

src/Common_old/UI/DragDrop/ExampleDrop.java

@@ -1,4 +1,4 @@
-package Common.UI.DragDrop;
+package Common_old.UI.DragDrop;
 import javax.swing.*;
 /**
  * A simple example showing how to use {@link FileDrop}

src/Common_old/UI/DragDrop/FileDrop.java

@@ -1,5 +1,5 @@
-package Common.UI.DragDrop;
-import Common.Global;
+package Common_old.UI.DragDrop;
+import _VisualDVM.Global;
 
 import java.awt.datatransfer.DataFlavor;
 import java.io.*;

src/Common_old/UI/Editor/BaseEditor.java

@@ -1,11 +1,11 @@
-package Common.UI.Editor;
-import Common.Current;
-import Common.Global;
-import Common.UI.Menus.StyledPopupMenu;
-import Common.UI.Menus.TextEditorMenu;
-import Common.UI.Themes.ThemeElement;
-import Common.UI.UI;
-import Common.UI.Windows.Dialog.DialogFields;
+package Common_old.UI.Editor;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.Menus.StyledPopupMenu;
+import Common_old.UI.Menus.TextEditorMenu;
+import Common_old.UI.Themes.ThemeElement;
+import Common_old.UI.UI;
+import Common_old.UI.Windows.Dialog.DialogFields;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 
 import javax.swing.event.HyperlinkEvent;

src/Common_old/UI/Editor/CaretInfo.java

@@ -1,5 +1,5 @@
-package Common.UI.Editor;
-import Common.Global;
+package Common_old.UI.Editor;
+import _VisualDVM.Global;
 import ProjectData.Files.UI.Editor.SPFEditor;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 public class CaretInfo {

src/Common_old/UI/Editor/Viewer.java

@@ -1,4 +1,4 @@
-package Common.UI.Editor;
+package Common_old.UI.Editor;
 public class Viewer extends BaseEditor {
     public Viewer() {
         setLineWrap(true);

src/Common_old/UI/EmptyDialogFields.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.UI.EmptyDialogFields">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Common_old.UI.EmptyDialogFields">
   <grid id="27dc6" binding="content" layout-manager="BorderLayout" hgap="0" vgap="0">
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>

src/Common_old/UI/EmptyDialogFields.java

@@ -1,5 +1,5 @@
-package Common.UI;
-import Common.UI.Windows.Dialog.DialogFields;
+package Common_old.UI;
+import Common_old.UI.Windows.Dialog.DialogFields;
 
 import javax.swing.*;
 import java.awt.*;

src/Common_old/UI/Label/ShortLabel.java

@@ -1,4 +1,4 @@
-package Common.UI.Label;
+package Common_old.UI.Label;
 import javax.swing.*;
 public class ShortLabel extends JLabel {
     int max = 0;

src/Common_old/UI/List/HyperlinksStyledList.java

@@ -1,6 +1,6 @@
-package Common.UI.List;
-import Common.Current;
-import Common.UI.Themes.VisualiserFonts;
+package Common_old.UI.List;
+import Common_old.Current;
+import Common_old.UI.Themes.VisualiserFonts;
 public class HyperlinksStyledList extends StyledList {
     @Override
     public void applyTheme() {

src/Common_old/UI/List/StyledList.java

@@ -1,7 +1,7 @@
-package Common.UI.List;
-import Common.Current;
-import Common.UI.Themes.ThemeElement;
-import Common.UI.Themes.VisualiserFonts;
+package Common_old.UI.List;
+import Common_old.Current;
+import Common_old.UI.Themes.ThemeElement;
+import Common_old.UI.Themes.VisualiserFonts;
 
 import javax.swing.*;
 public class StyledList extends JList implements ThemeElement {

src/Common_old/UI/Menus/AttachementsMenu.java

@@ -1,6 +1,6 @@
-package Common.UI.Menus;
-import Common.Current;
-import Common.Global;
+package Common_old.UI.Menus;
+import Common_old.Current;
+import _VisualDVM.Global;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 

src/Common_old/UI/Menus/FileStyleMenu.java

@@ -1,5 +1,5 @@
-package Common.UI.Menus;
-import Common.Current;
+package Common_old.UI.Menus;
+import Common_old.Current;
 import ProjectData.Files.LanguageStyle;
 
 import javax.swing.*;

src/Common_old/UI/Menus/GraphMenu.java

@@ -1,5 +1,5 @@
-package Common.UI.Menus;
-import Common.UI.Trees.StyledTree;
+package Common_old.UI.Menus;
+import Common_old.UI.Trees.StyledTree;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;

src/Common_old/UI/Menus/MainEditorMenu.java

@@ -1,8 +1,8 @@
-package Common.UI.Menus;
-import Common.Current;
-import Common.Global;
-import Common.UI.Editor.CaretInfo;
-import Common.Utils.Utils;
+package Common_old.UI.Menus;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.Editor.CaretInfo;
+import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.UI.Editor.SPFEditor;
 import ProjectData.SapforData.Functions.FuncCall;

src/Common_old/UI/Menus/PassesSubMenu.java

@@ -1,7 +1,7 @@
-package Common.UI.Menus;
-import Common.Current;
-import Common.UI.Themes.VisualiserFonts;
-import Common.Utils.Utils;
+package Common_old.UI.Menus;
+import Common_old.Current;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 

src/Common_old/UI/Menus/ProjectFilesMenu.java

@@ -1,13 +1,13 @@
-package Common.UI.Menus;
-import Common.Current;
-import Common.Global;
-import Common.UI.Menus_2023.LanguagesSubmenu;
-import Common.UI.Menus_2023.StableMenuItem;
-import Common.UI.Menus_2023.StylesSubmenu;
-import Common.UI.Menus_2023.TypesSubmenu;
-import Common.UI.Trees.StyledTree;
-import Common.UI.UI;
-import Common.Utils.Utils;
+package Common_old.UI.Menus;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.Menus_2023.LanguagesSubmenu;
+import Common_old.UI.Menus_2023.StableMenuItem;
+import Common_old.UI.Menus_2023.StylesSubmenu;
+import Common_old.UI.Menus_2023.TypesSubmenu;
+import Common_old.UI.Trees.StyledTree;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 import ProjectData.Files.FileType;
 import ProjectData.Files.LanguageStyle;
 import ProjectData.LanguageName;

src/Common_old/UI/Menus/PropertiesSubmenu.java

@@ -1,8 +1,8 @@
-package Common.UI.Menus;
-import Common.Current;
-import Common.Global;
-import Common.UI.Themes.VisualiserFonts;
-import Common.Utils.Utils;
+package Common_old.UI.Menus;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.Utils.Utils;
 
 import javax.swing.*;
 public class PropertiesSubmenu extends JMenu {

src/Common_old/UI/Menus/SelectionTreeMenu.java

@@ -1,10 +1,10 @@
-package Common.UI.Menus;
-import Common.Current;
-import Common.UI.Menus_2023.StableMenuItem;
-import Common.UI.Selectable;
-import Common.UI.Trees.DataTree;
-import Common.UI.Trees.SelectableTree;
-import Common.Utils.Utils;
+package Common_old.UI.Menus;
+import Common_old.Current;
+import Common_old.UI.Menus_2023.StableMenuItem;
+import Common_old.UI.Selectable;
+import Common_old.UI.Trees.DataTree;
+import Common_old.UI.Trees.SelectableTree;
+import Common_old.Utils.Utils;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;

src/Common_old/UI/Menus/StyledPopupMenu.java

@@ -1,6 +1,6 @@
-package Common.UI.Menus;
-import Common.Current;
-import Common.UI.Themes.ThemeElement;
+package Common_old.UI.Menus;
+import Common_old.Current;
+import Common_old.UI.Themes.ThemeElement;
 
 import javax.swing.*;
 import javax.swing.event.PopupMenuEvent;

src/Common_old/UI/Menus/TableMenu.java

@@ -1,6 +1,6 @@
-package Common.UI.Menus;
-import Common.Constants;
-import Common.Utils.Utils;
+package Common_old.UI.Menus;
+import Common_old.Constants;
+import Common_old.Utils.Utils;
 
 import javax.swing.*;
 public class TableMenu extends StyledPopupMenu {

src/Common_old/UI/Menus/TestsCompilationFilterMenu.java

@@ -1,4 +1,4 @@
-package Common.UI.Menus;
+package Common_old.UI.Menus;
 import GlobalData.Tasks.TaskState;
 
 import javax.swing.*;

src/Common_old/UI/Menus/TextComboBoxMenu.java

@@ -1,6 +1,6 @@
-package Common.UI.Menus;
-import Common.UI.UI;
-import Common.Utils.Utils;
+package Common_old.UI.Menus;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;

src/Common_old/UI/Menus/TextEditorMenu.java

@@ -1,5 +1,5 @@
-package Common.UI.Menus;
-import Common.Utils.Utils;
+package Common_old.UI.Menus;
+import Common_old.Utils.Utils;
 
 import javax.swing.*;
 import javax.swing.text.JTextComponent;

src/Common_old/UI/Menus/VersionsMenu.java

@@ -1,10 +1,10 @@
-package Common.UI.Menus;
-import Common.Current;
-import Common.Global;
-import Common.UI.Menus_2023.StableMenuItem;
-import Common.UI.Trees.DataTree;
-import Common.UI.UI;
-import Common.Utils.Utils;
+package Common_old.UI.Menus;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.Menus_2023.StableMenuItem;
+import Common_old.UI.Trees.DataTree;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class VersionsMenu extends GraphMenu<DataTree> {

src/Common_old/UI/Menus/VisualiserMenuItem.java

@@ -1,7 +1,7 @@
-package Common.UI.Menus;
-import Common.Current;
-import Common.UI.Themes.VisualiserFonts;
-import Common.Utils.Utils;
+package Common_old.UI.Menus;
+import Common_old.Current;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.Utils.Utils;
 
 import javax.swing.*;
 public class VisualiserMenuItem extends JMenuItem {

src/Common_old/UI/Menus_2023/CredentialsBar/CredentialsBar.java

@@ -1,13 +1,11 @@
-package Common.UI.Menus_2023.CredentialsBar;
-import Common.Current;
-import Common.UI.Menus_2023.MenuBarButton;
-import Common.UI.Menus_2023.VisualiserMenuBar;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.UI;
+package Common_old.UI.Menus_2023.CredentialsBar;
+import Common_old.Current;
+import Common_old.UI.Menus_2023.MenuBarButton;
+import Common_old.UI.Menus_2023.VisualiserMenuBar;
+import Common_old.UI.Themes.VisualiserFonts;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
-import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 public class CredentialsBar extends VisualiserMenuBar {

src/Common_old/UI/Menus_2023/DataMenuBar.java

@@ -1,5 +1,5 @@
-package Common.UI.Menus_2023;
-import Common.Database.DataSet;
+package Common_old.UI.Menus_2023;
+import Common.Database.Tables.DataSet;
 import Visual_DVM_2021.Passes.PassCode_2021;
 
 import javax.swing.*;

src/Common_old/UI/Menus_2023/ECButtonPosition.java

@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023;
+package Common_old.UI.Menus_2023;
 public enum ECButtonPosition {
     Up,
     Down,

src/Common_old/UI/Menus_2023/ExpandCollapseButton.java

@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023;
+package Common_old.UI.Menus_2023;
 public class ExpandCollapseButton extends MenuBarButton {
     protected String description;
     protected ECButtonPosition position;

src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java

@@ -1,7 +1,7 @@
-package Common.UI.Menus_2023.FastAccessMenuBar;
-import Common.Global;
-import Common.UI.Menus_2023.VisualiserMenuBar;
-import Common.UI.UI;
+package Common_old.UI.Menus_2023.FastAccessMenuBar;
+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;

src/Common_old/UI/Menus_2023/FileMenuBar/FileMenuBar.java

@@ -1,11 +1,7 @@
-package Common.UI.Menus_2023.FileMenuBar;
-import Common.Current;
-import Common.UI.Menus_2023.ECButtonPosition;
-import Common.UI.Menus_2023.ExpandCollapseButton;
-import Common.UI.Menus_2023.MenuBarButton;
-import Common.UI.Menus_2023.VisualiserMenuBar;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.UI;
+package Common_old.UI.Menus_2023.FileMenuBar;
+import Common_old.UI.Menus_2023.MenuBarButton;
+import Common_old.UI.Menus_2023.VisualiserMenuBar;
+import Common_old.UI.UI;
 import ProjectData.Files.UI.Editor.SPFEditor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 

src/Common_old/UI/Menus_2023/FileMenuBar/FileSettingsMenu.java

@@ -1,10 +1,10 @@
-package Common.UI.Menus_2023.FileMenuBar;
-import Common.Current;
-import Common.UI.Menus_2023.LanguagesSubmenu;
-import Common.UI.Menus_2023.StylesSubmenu;
-import Common.UI.Menus_2023.TypesSubmenu;
-import Common.UI.Menus_2023.VisualiserMenu;
-import Common.UI.UI;
+package Common_old.UI.Menus_2023.FileMenuBar;
+import Common_old.Current;
+import Common_old.UI.Menus_2023.LanguagesSubmenu;
+import Common_old.UI.Menus_2023.StylesSubmenu;
+import Common_old.UI.Menus_2023.TypesSubmenu;
+import Common_old.UI.Menus_2023.VisualiserMenu;
+import Common_old.UI.UI;
 import ProjectData.Files.FileType;
 import ProjectData.Files.LanguageStyle;
 import ProjectData.LanguageName;

src/Common_old/UI/Menus_2023/LanguagesSubmenu.java

@@ -1,5 +1,5 @@
-package Common.UI.Menus_2023;
-import Common.Utils.Utils;
+package Common_old.UI.Menus_2023;
+import Common_old.Utils.Utils;
 import ProjectData.LanguageName;
 
 import javax.swing.*;

src/Common_old/UI/Menus_2023/MainMenuBar/AnalysesMenu.java

@@ -1,5 +1,5 @@
-package Common.UI.Menus_2023.MainMenuBar;
-import Common.UI.Menus_2023.VisualiserMenu;
+package Common_old.UI.Menus_2023.MainMenuBar;
+import Common_old.UI.Menus_2023.VisualiserMenu;
 import Repository.Component.Sapfor.Sapfor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;

src/Common_old/UI/Menus_2023/MainMenuBar/GlobalCleaningMenu.java

@@ -1,5 +1,5 @@
-package Common.UI.Menus_2023.MainMenuBar;
-import Common.UI.Menus_2023.VisualiserMenu;
+package Common_old.UI.Menus_2023.MainMenuBar;
+import Common_old.UI.Menus_2023.VisualiserMenu;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class GlobalCleaningMenu extends VisualiserMenu {

src/Common_old/UI/Menus_2023/MainMenuBar/LastOpenedProjectsMenu.java

@@ -1,7 +1,7 @@
-package Common.UI.Menus_2023.MainMenuBar;
-import Common.Global;
-import Common.UI.Menus.VisualiserMenuItem;
-import Common.UI.Menus_2023.VisualiserMenu;
+package Common_old.UI.Menus_2023.MainMenuBar;
+import _VisualDVM.Global;
+import Common_old.UI.Menus.VisualiserMenuItem;
+import Common_old.UI.Menus_2023.VisualiserMenu;
 import GlobalData.DBLastProject.DBLastProject;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;

src/Common_old/UI/Menus_2023/MainMenuBar/MainMenuBar.java

@@ -1,11 +1,9 @@
-package Common.UI.Menus_2023.MainMenuBar;
-import Common.Global;
-import Common.UI.Menus_2023.ECButtonPosition;
-import Common.UI.Menus_2023.ExpandCollapseButton;
-import Common.UI.Menus_2023.MenuBarButton;
-import Common.UI.Menus_2023.VisualiserMenuBar;
-import Common.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
-import Common.UI.UI;
+package Common_old.UI.Menus_2023.MainMenuBar;
+import _VisualDVM.Global;
+import Common_old.UI.Menus_2023.MenuBarButton;
+import Common_old.UI.Menus_2023.VisualiserMenuBar;
+import Common_old.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
+import Common_old.UI.UI;
 import Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;

src/Common_old/UI/Menus_2023/MainMenuBar/MainWindow.java

@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.MainMenuBar;
+package Common_old.UI.Menus_2023.MainMenuBar;
 import Visual_DVM_2021.UI.Interface.*;
 public interface MainWindow {
     void Show();

src/Common_old/UI/Menus_2023/MainMenuBar/TransformationsMenu.java

@@ -1,6 +1,6 @@
-package Common.UI.Menus_2023.MainMenuBar;
-import Common.UI.Menus.PassesSubMenu;
-import Common.UI.Menus_2023.VisualiserMenu;
+package Common_old.UI.Menus_2023.MainMenuBar;
+import Common_old.UI.Menus.PassesSubMenu;
+import Common_old.UI.Menus_2023.VisualiserMenu;
 import Repository.Component.Sapfor.Sapfor;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;

src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java

@@ -1,11 +1,7 @@
-package Common.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu;
-import Common.Current;
-import Common.Global;
-import Common.UI.Menus_2023.SettingsSubmenu;
-import Common.UI.Themes.VisualiserFonts;
+package Common_old.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu;
+import _VisualDVM.Global;
+import Common_old.UI.Menus_2023.SettingsSubmenu;
 import GlobalData.Settings.SettingName;
-
-import javax.swing.*;
 public class CompactnessSettingsMenu extends SettingsSubmenu {
     public CompactnessSettingsMenu(){
         super("Компактность отображения", null,

src/Common_old/UI/Menus_2023/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java

@@ -1,8 +1,8 @@
-package Common.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu;
-import Common.Global;
-import Common.UI.Menus.PropertiesSubmenu;
-import Common.UI.Menus_2023.SettingsSubmenu;
-import Common.UI.Menus_2023.VisualiserMenu;
+package Common_old.UI.Menus_2023.MainMenuBar.VisualiserSettingsMenu;
+import _VisualDVM.Global;
+import Common_old.UI.Menus.PropertiesSubmenu;
+import Common_old.UI.Menus_2023.SettingsSubmenu;
+import Common_old.UI.Menus_2023.VisualiserMenu;
 import GlobalData.Settings.SettingName;
 public class VisualiserSettingsMenu extends VisualiserMenu {
     public VisualiserSettingsMenu() {

src/Common_old/UI/Menus_2023/MenuBarButton.java

@@ -1,7 +1,7 @@
-package Common.UI.Menus_2023;
-import Common.Current;
-import Common.UI.Themes.VisualiserFonts;
-import Common.Utils.Utils;
+package Common_old.UI.Menus_2023;
+import Common_old.Current;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.Utils.Utils;
 
 import javax.swing.*;
 import java.awt.*;

src/Common_old/UI/Menus_2023/PassButton.java

@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023;
+package Common_old.UI.Menus_2023;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.awt.*;

src/Common_old/UI/Menus_2023/PassControl.java

@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023;
+package Common_old.UI.Menus_2023;
 public interface PassControl {
     void setIcon(String icon_path);
     void setEnabled(boolean flag);

src/Common_old/UI/Menus_2023/PassMenuItem.java

@@ -1,6 +1,6 @@
-package Common.UI.Menus_2023;
-import Common.UI.Menus.VisualiserMenuItem;
-import Common.Utils.Utils;
+package Common_old.UI.Menus_2023;
+import Common_old.UI.Menus.VisualiserMenuItem;
+import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.Pass_2021;
 public class PassMenuItem extends VisualiserMenuItem implements PassControl {
     @Override

src/Common_old/UI/Menus_2023/ProjectMenuBar/FilesOperationsMenu.java

@@ -1,5 +1,5 @@
-package Common.UI.Menus_2023.ProjectMenuBar;
-import Common.UI.Menus_2023.VisualiserMenu;
+package Common_old.UI.Menus_2023.ProjectMenuBar;
+import Common_old.UI.Menus_2023.VisualiserMenu;
 public class FilesOperationsMenu extends VisualiserMenu {
     public FilesOperationsMenu() {
         super("Массовые операции над файлами","/icons/MassFiles.png" );

src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectMenuBar.java

@@ -1,7 +1,7 @@
-package Common.UI.Menus_2023.ProjectMenuBar;
-import Common.UI.Menus_2023.MenuBarButton;
-import Common.UI.Menus_2023.VisualiserMenuBar;
-import Common.UI.UI;
+package Common_old.UI.Menus_2023.ProjectMenuBar;
+import Common_old.UI.Menus_2023.MenuBarButton;
+import Common_old.UI.Menus_2023.VisualiserMenuBar;
+import Common_old.UI.UI;
 
 import javax.swing.*;
 import java.awt.*;

src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectSettingsMenu.java

@@ -1,10 +1,10 @@
-package Common.UI.Menus_2023.ProjectMenuBar;
-import Common.Current;
-import Common.Global;
-import Common.UI.Menus_2023.LanguagesSubmenu;
-import Common.UI.Menus_2023.SettingsSubmenu;
-import Common.UI.Menus_2023.StylesSubmenu;
-import Common.UI.Menus_2023.VisualiserMenu;
+package Common_old.UI.Menus_2023.ProjectMenuBar;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.Menus_2023.LanguagesSubmenu;
+import Common_old.UI.Menus_2023.SettingsSubmenu;
+import Common_old.UI.Menus_2023.StylesSubmenu;
+import Common_old.UI.Menus_2023.VisualiserMenu;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.LanguageStyle;
 import ProjectData.LanguageName;

src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java

@@ -1,9 +1,9 @@
-package Common.UI.Menus_2023.ProjectMenuBar;
-import Common.Current;
-import Common.UI.Menus_2023.VisualiserMenu;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.UI;
-import Common.Utils.Utils;
+package Common_old.UI.Menus_2023.ProjectMenuBar;
+import Common_old.Current;
+import Common_old.UI.Menus_2023.VisualiserMenu;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 import ProjectData.ProjectView;
 
 import javax.swing.*;

src/Common_old/UI/Menus_2023/SettingsSubmenu.java

@@ -1,8 +1,8 @@
-package Common.UI.Menus_2023;
-import Common.Current;
-import Common.Global;
-import Common.UI.Themes.VisualiserFonts;
-import Common.Utils.Utils;
+package Common_old.UI.Menus_2023;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 
 import javax.swing.*;

src/Common_old/UI/Menus_2023/StableMenuItem.java

@@ -1,7 +1,7 @@
-package Common.UI.Menus_2023;
-import Common.UI.Menus.VisualiserMenuItem;
-import Common.UI.UI;
-import Common.Utils.Utils;
+package Common_old.UI.Menus_2023;
+import Common_old.UI.Menus.VisualiserMenuItem;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 
 import javax.swing.*;
 import javax.swing.plaf.ComponentUI;