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

src/ProjectData/DBArray/ArraysDBTable.java

@@ -1,7 +1,7 @@
 package ProjectData.DBArray;
-import Common.Current;
-import Common.Database.DBTable;
-import Common.UI.DataSetControlForm;
+import Common_old.Current;
+import Common.Database.Tables.DBTable;
+import Common_old.UI.DataSetControlForm;
 public class ArraysDBTable extends DBTable<String, DBArray> {
     public ArraysDBTable() {
         super(String.class, DBArray.class);

src/ProjectData/DBArray/DBArray.java

@@ -1,5 +1,5 @@
 package ProjectData.DBArray;
-import Common.Database.DBObject;
+import Common.Database.Objects.DBObject;
 import ProjectData.SapforData.Arrays.ArrayState;
 import ProjectData.SapforData.Arrays.ProjectArray;
 import com.sun.org.glassfish.gmbal.Description;

src/ProjectData/Files/DBProjectFile.java

@@ -1,9 +1,8 @@
 package ProjectData.Files;
-import Common.Constants;
-import Common.Current;
-import Common.Global;
-import Common.UI.UI;
-import Common.Utils.Utils;
+import Common_old.Constants;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.Utils.Utils;
 import ProjectData.GCOV.GCOV_info;
 import ProjectData.LanguageName;
 import ProjectData.Messages.Errors.MessageError;
@@ -19,7 +18,6 @@ import ProjectData.SapforData.Loops.Loop;
 import Visual_DVM_2021.UI.Main.FileForm;
 import com.sun.org.glassfish.gmbal.Description;
 import javafx.util.Pair;
-import org.apache.commons.io.FileUtils;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;

src/ProjectData/Files/FilesDBTable.java

@@ -1,5 +1,5 @@
 package ProjectData.Files;
-import Common.Database.DBTable;
+import Common.Database.Tables.DBTable;
 public class FilesDBTable extends DBTable<String, DBProjectFile> {
     public FilesDBTable() {
         super(String.class, DBProjectFile.class);

src/ProjectData/Files/ProjectFile.java

@@ -1,7 +1,7 @@
 package ProjectData.Files;
-import Common.Constants;
-import Common.Database.DBObject;
-import Common.Utils.Utils;
+import Common_old.Constants;
+import Common.Database.Objects.DBObject;
+import Common_old.Utils.Utils;
 import ProjectData.LanguageName;
 
 import javax.swing.*;

src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java

@@ -1,6 +1,6 @@
 package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
-import Common.UI.Editor.CaretInfo;
-import Common.Utils.Utils;
+import Common_old.UI.Editor.CaretInfo;
+import Common_old.Utils.Utils;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
 import org.fife.ui.autocomplete.BasicCompletion;

src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java

@@ -1,5 +1,5 @@
 package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
 public class IntervalDirective extends BaseDirective {
     protected String prefix;

src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java

@@ -1,5 +1,5 @@
 package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
 //промежуточный тип. относится ко всем директивам со скобками и требующим запятых.
 public class SpecDirective extends BaseDirective {

src/ProjectData/Files/UI/Editor/SPFEditor.java

@@ -1,16 +1,16 @@
 package ProjectData.Files.UI.Editor;
-import Common.Current;
-import Common.Global;
-import Common.UI.Editor.BaseEditor;
-import Common.UI.Editor.CaretInfo;
-import Common.UI.Menus.StyledPopupMenu;
-import Common.UI.UI;
-import Common.Utils.Utils;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.Editor.BaseEditor;
+import Common_old.UI.Editor.CaretInfo;
+import Common_old.UI.Menus.StyledPopupMenu;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileState;
 import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
-import Common.UI.Menus.MainEditorMenu;
+import Common_old.UI.Menus.MainEditorMenu;
 import ProjectData.SapforData.Loops.Loop;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;

src/ProjectData/Files/UI/FileGraphTree.java

@@ -1,7 +1,7 @@
 package ProjectData.Files.UI;
-import Common.Current;
-import Common.UI.Trees.DataTree;
-import Common.UI.Trees.TreeRenderers;
+import Common_old.Current;
+import Common_old.UI.Trees.DataTree;
+import Common_old.UI.Trees.TreeRenderers;
 import ProjectData.SapforData.FileObject;
 import ProjectData.SapforData.FileObjectWithMessages;
 

src/ProjectData/Files/UI/FilesHyperlinksPanel.java

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

src/ProjectData/Files/UI/FilesTree.java

@@ -1,12 +1,12 @@
 package ProjectData.Files.UI;
-import Common.Current;
-import Common.Global;
-import Common.UI.DragDrop.FileDrop;
-import Common.UI.Menus.GraphMenu;
-import Common.UI.Menus.ProjectFilesMenu;
-import Common.UI.UI;
-import Common.UI.Trees.StyledTree;
-import Common.UI.Trees.TreeRenderers;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.DragDrop.FileDrop;
+import Common_old.UI.Menus.GraphMenu;
+import Common_old.UI.Menus.ProjectFilesMenu;
+import Common_old.UI.UI;
+import Common_old.UI.Trees.StyledTree;
+import Common_old.UI.Trees.TreeRenderers;
 import ProjectData.Files.DBProjectFile;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;

src/ProjectData/Files/UI/FilesTreeCellRenderer.java

@@ -1,8 +1,8 @@
 package ProjectData.Files.UI;
-import Common.Current;
-import Common.Global;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.Trees.StyledTreeCellRenderer;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.UI.Trees.StyledTreeCellRenderer;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileState;
 

src/ProjectData/Messages/Errors/ErrorsDBTable.java

@@ -1,5 +1,5 @@
 package ProjectData.Messages.Errors;
-import Common.Current;
+import Common_old.Current;
 import ProjectData.Messages.MessagesDBTable;
 public class ErrorsDBTable extends MessagesDBTable<MessageError> {
     public ErrorsDBTable() {

src/ProjectData/Messages/Message.java

@@ -1,8 +1,8 @@
 package ProjectData.Messages;
-import Common.Constants;
-import Common.Current;
-import Common.Global;
-import Common.Utils.Utils;
+import Common_old.Constants;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.SapforData.FileObject;
 import ProjectData.SapforData.FileObjectWithMessages;

src/ProjectData/Messages/MessagesDBTable.java

@@ -1,10 +1,10 @@
 package ProjectData.Messages;
-import Common.Current;
-import Common.Database.DataSet;
-import Common.Database.iDBTable;
-import Common.UI.DataSetControlForm;
-import Common.UI.Tables.ColumnFilter;
-import Common.UI.Tables.TableRenderers;
+import Common_old.Current;
+import Common.Database.Tables.DataSet;
+import Common.Database.Tables.iDBTable;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.Tables.ColumnFilter;
+import Common_old.UI.Tables.TableRenderers;
 
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;

src/ProjectData/Messages/Notes/NotesDBTable.java

@@ -1,5 +1,5 @@
 package ProjectData.Messages.Notes;
-import Common.Current;
+import Common_old.Current;
 import ProjectData.Messages.MessagesDBTable;
 public class NotesDBTable extends MessagesDBTable<MessageNote> {
     public NotesDBTable() {

src/ProjectData/Messages/Recommendations/MessageRecommendation.java

@@ -1,6 +1,6 @@
 package ProjectData.Messages.Recommendations;
-import Common.Database.iDBObject;
-import Common.Utils.Utils;
+import Common.Database.Objects.iDBObject;
+import Common_old.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import com.sun.org.glassfish.gmbal.Description;

src/ProjectData/Messages/Recommendations/RecommendationsDBTable.java

@@ -1,8 +1,8 @@
 package ProjectData.Messages.Recommendations;
-import Common.Current;
-import Common.Database.iDBTable;
-import Common.UI.DataSetControlForm;
-import Common.UI.Tables.TableRenderers;
+import Common_old.Current;
+import Common.Database.Tables.iDBTable;
+import Common_old.UI.DataSetControlForm;
+import Common_old.UI.Tables.TableRenderers;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
 public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {

src/ProjectData/Messages/Warnings/WarningsDBTable.java

@@ -1,5 +1,5 @@
 package ProjectData.Messages.Warnings;
-import Common.Current;
+import Common_old.Current;
 import ProjectData.Messages.MessagesDBTable;
 public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
     //https://stackoverflow.com/questions/13079777/editable-jtableheader

src/ProjectData/PredictorStatistic/PredictorStatisticsDBTable.java

@@ -1,5 +1,5 @@
 package ProjectData.PredictorStatistic;
-import Common.Database.DBTable;
+import Common.Database.Tables.DBTable;
 public class PredictorStatisticsDBTable extends DBTable<String, PredictorStatistics_2021> {
     public PredictorStatisticsDBTable() {
         super(String.class, PredictorStatistics_2021.class);

src/ProjectData/PredictorStatistic/PredictorStatistics_2021.java

@@ -1,5 +1,5 @@
 package ProjectData.PredictorStatistic;
-import Common.Database.DBObject;
+import Common.Database.Objects.DBObject;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Date;

src/ProjectData/Project/ProjectInfoDBTable.java

@@ -1,5 +1,5 @@
 package ProjectData.Project;
-import Common.Database.DBTable;
+import Common.Database.Tables.DBTable;
 public class ProjectInfoDBTable extends DBTable<String, db_project_info> {
     public ProjectInfoDBTable() {
         super(String.class, db_project_info.class);

src/ProjectData/Project/UI/VersionsTree.java

@@ -1,11 +1,11 @@
 package ProjectData.Project.UI;
-import Common.Current;
-import Common.Global;
-import Common.UI.Menus.GraphMenu;
-import Common.UI.Menus.VersionsMenu;
-import Common.UI.Selectable;
-import Common.UI.Trees.DataTree;
-import Common.UI.Trees.TreeRenderers;
+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_old.UI.Trees.DataTree;
+import Common_old.UI.Trees.TreeRenderers;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 

src/ProjectData/Project/UI/VersionsTreeCellRenderer.java

@@ -1,9 +1,9 @@
 package ProjectData.Project.UI;
-import Common.Current;
-import Common.Global;
-import Common.UI.Selectable;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.Trees.StyledTreeCellRenderer;
+import Common_old.Current;
+import _VisualDVM.Global;
+import Common_old.UI.Selectable;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.UI.Trees.StyledTreeCellRenderer;
 import ProjectData.Project.db_project_info;
 
 import javax.swing.*;

src/ProjectData/Project/db_project_info.java

@@ -1,12 +1,12 @@
 package ProjectData.Project;
-import Common.Constants;
-import Common.Current;
-import Common.Database.DBObject;
-import Common.Global;
-import Common.UI.UI;
+import Common_old.Constants;
+import Common_old.Current;
+import Common.Database.Objects.DBObject;
+import _VisualDVM.Global;
+import Common_old.UI.UI;
 import Common.Utils.Index;
 import Common.Utils.TextLog;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import GlobalData.DBLastProject.DBLastProject;
 import GlobalData.Settings.SettingName;
 import ProjectData.DBArray.DBArray;
@@ -330,7 +330,7 @@ public class db_project_info extends DBObject {
         return Paths.get(Home.getAbsolutePath(), Constants.data, Constants.attachments).toFile();
     }
     public File getAnalyzerDirectory() {
-        return Paths.get(Home.getAbsolutePath(), Constants.data, Global.PerformanceAnalyzer).toFile();
+        return Paths.get(Home.getAbsolutePath(), Constants.data, Constants.PerformanceAnalyzerDirectoryName).toFile();
     }
     public Vector<File> getScreenShots() {
         Vector<File> res = new Vector<>();

src/ProjectData/SapforData/Arrays/ArrayDecl.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Arrays;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 // это то что отображается в боковом графе файла. не путать с сапфоровским ProjectArray

src/ProjectData/SapforData/Arrays/ArraysSet.java

@@ -1,17 +1,17 @@
 package ProjectData.SapforData.Arrays;
-import Common.Current;
-import Common.Database.DataSet;
-import Common.Global;
-import Common.UI.DataSetControlForm;
+import Common_old.Current;
+import Common.Database.Tables.DataSet;
+import _VisualDVM.Global;
+import Common_old.UI.DataSetControlForm;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 
 import java.util.Vector;
 
-import static Common.UI.Tables.TableEditors.EditorHyperlinks;
-import static Common.UI.Tables.TableRenderers.RendererHiddenList;
-import static Common.UI.Tables.TableRenderers.RendererHyperlinks;
+import static Common_old.UI.Tables.TableEditors.EditorHyperlinks;
+import static Common_old.UI.Tables.TableRenderers.RendererHiddenList;
+import static Common_old.UI.Tables.TableRenderers.RendererHyperlinks;
 public class ArraysSet extends DataSet<Long, ProjectArray> {
     public ArraysSet() {
         super(Long.class, ProjectArray.class);

src/ProjectData/SapforData/Arrays/Distribution/Dimension.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Arrays.Distribution;
-import Common.Database.DBObject;
+import Common.Database.Objects.DBObject;
 import ProjectData.SapforData.Arrays.ProjectArray;
 public class Dimension extends DBObject {
     //--------------------------------------

src/ProjectData/SapforData/Arrays/ProjectArray.java

@@ -1,8 +1,8 @@
 package ProjectData.SapforData.Arrays;
-import Common.Current;
-import Common.Database.DBObject;
+import Common_old.Current;
+import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import ProjectData.DBArray.DBArray;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.Arrays.Distribution.Dimension;

src/ProjectData/SapforData/Arrays/Templates/TemplateDimension.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Arrays.Templates;
-import Common.Database.DBObject;
+import Common.Database.Objects.DBObject;
 import ProjectData.SapforData.Arrays.ProjectArray;
 import ProjectData.SapforData.Regions.ParallelRegion;
 //для генерации вариантов и для управления распределением измерений.

src/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Arrays.Templates;
-import Common.Current;
+import Common_old.Current;
 public enum TemplateDimensionState {
     multiplied, //0
     distributed; //1

src/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java

@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common.Current;
-import Common.UI.Tables.RendererCell;
-import Common.UI.Themes.VisualiserFonts;
+import Common_old.Current;
+import Common_old.UI.Tables.RendererCell;
+import Common_old.UI.Themes.VisualiserFonts;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
 import javax.swing.*;

src/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java

@@ -1,8 +1,8 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common.Current;
-import Common.UI.Tables.DBObjectEditor;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.UI;
+import Common_old.Current;
+import Common_old.UI.Tables.DBObjectEditor;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.UI.UI;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
 import javax.swing.*;

src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java

@@ -1,17 +1,17 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common.Current;
-import Common.UI.ControlForm;
-import Common.UI.Tables.Grid.GridAnchestor;
-import Common.UI.Tables.StyledTable;
-import Common.UI.UI;
+import Common_old.Current;
+import Common_old.UI.ControlForm;
+import Common_old.UI.Tables.Grid.GridAnchestor;
+import Common_old.UI.Tables.StyledTable;
+import Common_old.UI.UI;
 import ProjectData.SapforData.Arrays.ProjectArray;
 import ProjectData.SapforData.Arrays.Templates.TemplateDimension;
 
 import java.awt.*;
 import java.util.Vector;
 
-import static Common.UI.Tables.TableEditors.EditorDimension;
-import static Common.UI.Tables.TableRenderers.RendererDimension;
+import static Common_old.UI.Tables.TableEditors.EditorDimension;
+import static Common_old.UI.Tables.TableRenderers.RendererDimension;
 public class DimensionsTableForm extends ControlForm<StyledTable> {
     public DimensionsTableForm() {
         super(StyledTable.class);

src/ProjectData/SapforData/Arrays/UI/DistributionMenu.java

@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common.UI.Menus.GraphMenu;
-import Common.UI.Trees.StyledTree;
+import Common_old.UI.Menus.GraphMenu;
+import Common_old.UI.Trees.StyledTree;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 

src/ProjectData/SapforData/Arrays/UI/FileArraysTree.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common.Current;
+import Common_old.Current;
 import ProjectData.Files.UI.FileGraphTree;
 public class FileArraysTree extends FileGraphTree {
     public FileArraysTree() {

src/ProjectData/SapforData/Arrays/UI/RulesTree.java

@@ -1,14 +1,14 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common.Current;
-import Common.UI.Menus.GraphMenu;
-import Common.UI.Trees.StyledTree;
-import Common.UI.Trees.TreeRenderers;
+import Common_old.Current;
+import Common_old.UI.Menus.GraphMenu;
+import Common_old.UI.Trees.StyledTree;
+import Common_old.UI.Trees.TreeRenderers;
 import ProjectData.SapforData.Regions.ParallelRegion;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
 
-import static Common.UI.Trees.TreeRenderers.RendererRule;
+import static Common_old.UI.Trees.TreeRenderers.RendererRule;
 public class RulesTree extends StyledTree {
     public RulesTree() {
         super(Current.getProject().align_rules_root);

src/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java

@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Arrays.UI;
-import Common.Current;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.Trees.StyledTreeCellRenderer;
+import Common_old.Current;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.UI.Trees.StyledTreeCellRenderer;
 import ProjectData.SapforData.Regions.ParallelRegion;
 
 import javax.swing.*;

src/ProjectData/SapforData/FileObject.java

@@ -1,8 +1,8 @@
 package ProjectData.SapforData;
-import Common.Current;
-import Common.Database.iDBObject;
-import Common.UI.UI;
-import Common.Utils.Utils;
+import Common_old.Current;
+import Common.Database.Objects.iDBObject;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import com.sun.org.glassfish.gmbal.Description;
 //объект принадлежащий файлу и относящийся к его строке.

src/ProjectData/SapforData/FileObjectWithMessages.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData;
-import Common.UI.Themes.VisualiserFonts;
+import Common_old.UI.Themes.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Messages.Errors.MessageError;
 import ProjectData.Messages.Message;

src/ProjectData/SapforData/Functions/FuncCall.java

@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Functions;
-import Common.UI.UI;
-import Common.Utils.Utils;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 import Visual_DVM_2021.Passes.PassCode_2021;

src/ProjectData/SapforData/Functions/FuncCallH.java

@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Functions;
-import Common.UI.UI;
-import Common.Utils.Utils;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
 

src/ProjectData/SapforData/Functions/FuncCoordinates.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Functions;
-import Common.Database.DBObject;
+import Common.Database.Objects.DBObject;
 import com.sun.org.glassfish.gmbal.Description;
 public class FuncCoordinates extends DBObject {
     @Description("PRIMARY KEY, UNIQUE")

src/ProjectData/SapforData/Functions/FuncCoordinatesDBTable.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Functions;
-import Common.Database.DBTable;
+import Common.Database.Tables.DBTable;
 public class FuncCoordinatesDBTable extends DBTable<String, FuncCoordinates> {
     public FuncCoordinatesDBTable() {
         super(String.class, FuncCoordinates.class);

src/ProjectData/SapforData/Functions/FuncInfo.java

@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Functions;
 import Common.Utils.Index;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 import com.mxgraph.model.mxCell;

src/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Functions.UI;
-import Common.Current;
+import Common_old.Current;
 import ProjectData.Files.UI.FileGraphTree;
 public class FileFunctionsTree extends FileGraphTree {
     public FileFunctionsTree() {

src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java

@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Functions.UI.Graph;
-import Common.Current;
-import Common.UI.ControlForm;
-import Common.UI.UI;
+import Common_old.Current;
+import Common_old.UI.ControlForm;
+import Common_old.UI.UI;
 import com.mxgraph.swing.mxGraphComponent;
 
 import java.awt.*;

src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java

@@ -1,9 +1,9 @@
 package ProjectData.SapforData.Functions.UI.Graph;
-import Common.Current;
-import Common.UI.Menus.VisualiserMenuItem;
-import Common.UI.Menus.StyledPopupMenu;
-import Common.UI.UI;
-import Common.Utils.Utils;
+import Common_old.Current;
+import Common_old.UI.Menus.VisualiserMenuItem;
+import Common_old.UI.Menus.StyledPopupMenu;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;

src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java

@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Functions.UI.Graph;
-import Common.Current;
-import Common.UI.UI;
-import Common.Utils.Utils;
+import Common_old.Current;
+import Common_old.UI.UI;
+import Common_old.Utils.Utils;
 import ProjectData.SapforData.Functions.FuncCoordinates;
 import ProjectData.SapforData.Functions.FuncInfo;
 import ProjectData.SapforData.Functions.FunctionType;

src/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Functions.UI.Graph;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import com.mxgraph.swing.mxGraphComponent;
 import javafx.util.Pair;
 

src/ProjectData/SapforData/Functions/UI/InlineMenu.java

@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Functions.UI;
-import Common.Current;
-import Common.UI.Menus.SelectionTreeMenu;
-import Common.UI.Trees.SelectableTree;
+import Common_old.Current;
+import Common_old.UI.Menus.SelectionTreeMenu;
+import Common_old.UI.Trees.SelectableTree;
 import ProjectData.SapforData.Functions.FuncInfo;
 public class InlineMenu extends SelectionTreeMenu {
     public InlineMenu(SelectableTree tree_in) {

src/ProjectData/SapforData/Functions/UI/InlineMenu2.java

@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Functions.UI;
-import Common.UI.Menus.SelectionTreeMenu;
-import Common.UI.Trees.SelectableTree;
+import Common_old.UI.Menus.SelectionTreeMenu;
+import Common_old.UI.Trees.SelectableTree;
 import ProjectData.SapforData.Functions.FuncCallH;
 
 import javax.swing.tree.DefaultMutableTreeNode;

src/ProjectData/SapforData/Functions/UI/InlineTree.java

@@ -1,8 +1,8 @@
 package ProjectData.SapforData.Functions.UI;
-import Common.Current;
-import Common.UI.Menus.GraphMenu;
-import Common.UI.Trees.SelectableTree;
-import Common.UI.Trees.TreeRenderers;
+import Common_old.Current;
+import Common_old.UI.Menus.GraphMenu;
+import Common_old.UI.Trees.SelectableTree;
+import Common_old.UI.Trees.TreeRenderers;
 import ProjectData.SapforData.FileObject;
 public class InlineTree extends SelectableTree {
     public InlineTree() {

src/ProjectData/SapforData/Functions/UI/InlineTree2.java

@@ -1,8 +1,8 @@
 package ProjectData.SapforData.Functions.UI;
-import Common.Current;
-import Common.UI.Menus.GraphMenu;
-import Common.UI.Trees.SelectableTree;
-import Common.UI.Trees.TreeRenderers;
+import Common_old.Current;
+import Common_old.UI.Menus.GraphMenu;
+import Common_old.UI.Trees.SelectableTree;
+import Common_old.UI.Trees.TreeRenderers;
 import ProjectData.SapforData.FileObject;
 public class InlineTree2 extends SelectableTree {
     public InlineTree2() {

src/ProjectData/SapforData/Includes/DependencyInfo.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Includes;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import ProjectData.SapforData.FileObject;
 public class DependencyInfo extends FileObject {
     public DependencyInfo(String file_in) {

src/ProjectData/SapforData/Includes/FileInfo.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Includes;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import ProjectData.SapforData.FileObject;
 
 import javax.swing.*;

src/ProjectData/SapforData/Includes/UI/IncludesMenu.java

@@ -1,7 +1,7 @@
 package ProjectData.SapforData.Includes.UI;
-import Common.Current;
-import Common.UI.Menus.SelectionTreeMenu;
-import Common.UI.Trees.SelectableTree;
+import Common_old.Current;
+import Common_old.UI.Menus.SelectionTreeMenu;
+import Common_old.UI.Trees.SelectableTree;
 import ProjectData.SapforData.Includes.FileInfo;
 public class IncludesMenu extends SelectionTreeMenu {
     public IncludesMenu(SelectableTree tree_in) {

src/ProjectData/SapforData/Includes/UI/IncludesTree.java

@@ -1,8 +1,8 @@
 package ProjectData.SapforData.Includes.UI;
-import Common.Current;
-import Common.UI.Menus.GraphMenu;
-import Common.UI.Trees.SelectableTree;
-import Common.UI.Trees.TreeRenderers;
+import Common_old.Current;
+import Common_old.UI.Menus.GraphMenu;
+import Common_old.UI.Trees.SelectableTree;
+import Common_old.UI.Trees.TreeRenderers;
 public class IncludesTree extends SelectableTree {
     public IncludesTree() {
         super(Current.getProject().includes_root);

src/ProjectData/SapforData/Loops/EGoto.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common.UI.Themes.VisualiserFonts;
+import Common_old.UI.Themes.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 public class EGoto extends FileObjectWithMessages {

src/ProjectData/SapforData/Loops/IGoto.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common.UI.Themes.VisualiserFonts;
+import Common_old.UI.Themes.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 public class IGoto extends FileObjectWithMessages {

src/ProjectData/SapforData/Loops/IO.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common.UI.Themes.VisualiserFonts;
+import Common_old.UI.Themes.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 public class IO extends FileObjectWithMessages {

src/ProjectData/SapforData/Loops/Loop.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common.UI.Themes.VisualiserFonts;
+import Common_old.UI.Themes.VisualiserFonts;
 import Common.Utils.Index;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.Messages.Message;

src/ProjectData/SapforData/Loops/LoopState.java

@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Loops;
-import Common.UI.Themes.VisualiserFonts;
-import Common.UI.UI;
+import Common_old.UI.Themes.VisualiserFonts;
+import Common_old.UI.UI;
 
 import javax.swing.text.Highlighter;
 public enum LoopState {

src/ProjectData/SapforData/Loops/NonRectIter.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common.UI.Themes.VisualiserFonts;
+import Common_old.UI.Themes.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 public class NonRectIter extends FileObjectWithMessages {

src/ProjectData/SapforData/Loops/Stop.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops;
-import Common.UI.Themes.VisualiserFonts;
+import Common_old.UI.Themes.VisualiserFonts;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.FileObjectWithMessages;
 public class Stop extends FileObjectWithMessages {

src/ProjectData/SapforData/Loops/UI/FileLoopsTree.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Loops.UI;
-import Common.Current;
+import Common_old.Current;
 import ProjectData.Files.UI.FileGraphTree;
 public class FileLoopsTree extends FileGraphTree {
     public FileLoopsTree() {

src/ProjectData/SapforData/Regions/ParallelRegion.java

@@ -1,8 +1,8 @@
 package ProjectData.SapforData.Regions;
-import Common.Current;
-import Common.Database.DBObject;
+import Common_old.Current;
+import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
-import Common.Utils.Utils;
+import Common_old.Utils.Utils;
 import ProjectData.Files.DBProjectFile;
 import ProjectData.SapforData.Arrays.Distribution.AlignRule;
 import ProjectData.SapforData.Arrays.Distribution.DataDirective;

src/ProjectData/SapforData/Regions/RegionsSet.java

@@ -1,12 +1,12 @@
 package ProjectData.SapforData.Regions;
-import Common.Current;
-import Common.Database.DataSet;
-import Common.UI.DataSetControlForm;
+import Common_old.Current;
+import Common.Database.Tables.DataSet;
+import Common_old.UI.DataSetControlForm;
 
 import java.math.BigInteger;
 
-import static Common.UI.Tables.TableRenderers.RendererMultiline;
-import static Common.UI.Tables.TableRenderers.RendererTopLeft;
+import static Common_old.UI.Tables.TableRenderers.RendererMultiline;
+import static Common_old.UI.Tables.TableRenderers.RendererTopLeft;
 public class RegionsSet extends DataSet<BigInteger, ParallelRegion> {
     //суррогат. нужен только для сохры столбцов. во всяком случае пока.
     public RegionsSet() {

src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java

@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Regions.UI;
-import Common.Current;
-import Common.UI.Tables.StyledCellLabel;
+import Common_old.Current;
+import Common_old.UI.Tables.StyledCellLabel;
 import ProjectData.SapforData.Arrays.ProjectArray;
 import javafx.util.Pair;
 

src/ProjectData/SapforData/Regions/UI/ParallelRegionFields.java

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

src/ProjectData/SapforData/Variants/ParallelVariant.java

@@ -1,6 +1,6 @@
 package ProjectData.SapforData.Variants;
-import Common.Database.DBObject;
-import Common.UI.UI;
+import Common.Database.Objects.DBObject;
+import Common_old.UI.UI;
 import ProjectData.PredictorStatistic.PredictorStatistics_2021;
 import ProjectData.Project.db_project_info;
 import ProjectData.SapforData.Arrays.ProjectArray;

src/ProjectData/SapforData/Variants/UI/VariantRankRenderer.java

@@ -1,5 +1,5 @@
 package ProjectData.SapforData.Variants.UI;
-import Common.UI.Tables.MaskedIntegerValueRenderer;
+import Common_old.UI.Tables.MaskedIntegerValueRenderer;
 public class VariantRankRenderer extends MaskedIntegerValueRenderer {
     @Override
     public long getMask() {

src/ProjectData/SapforData/Variants/VariantsSet.java

@@ -1,9 +1,9 @@
 package ProjectData.SapforData.Variants;
-import Common.Current;
-import Common.Database.DataSet;
-import Common.UI.DataSetControlForm;
+import Common_old.Current;
+import Common.Database.Tables.DataSet;
+import Common_old.UI.DataSetControlForm;
 
-import static Common.UI.Tables.TableRenderers.*;
+import static Common_old.UI.Tables.TableRenderers.*;
 public class VariantsSet extends DataSet<String, ParallelVariant> {
     public VariantsSet() {
         super(String.class, ParallelVariant.class);