промежуточный. частичный рефакторинг с прицелом на библиотечную часть
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Interface;
|
||||
import Common.Global;
|
||||
import _VisualDVM.Global;
|
||||
public interface FormWithSplitters {
|
||||
default void LoadSplitters() {
|
||||
Global.db.splitters.Load(this);
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package Visual_DVM_2021.UI.Interface;
|
||||
import Common.Current;
|
||||
import Common.UI.DebugPrintLevel;
|
||||
import Common.UI.UI;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Current;
|
||||
import Common_old.UI.DebugPrintLevel;
|
||||
import Common_old.UI.UI;
|
||||
import Common_old.Utils.Utils;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package Visual_DVM_2021.UI.Interface;
|
||||
import Common.UI.Trees.TreeForm;
|
||||
import Common.UI.UI;
|
||||
import Common_old.UI.Trees.TreeForm;
|
||||
import Common_old.UI.UI;
|
||||
public interface ProjectWindow {
|
||||
//-
|
||||
ArraysWindow getArraysWindow();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Interface;
|
||||
import Common.UI.Trees.TreeForm;
|
||||
import Common_old.UI.Trees.TreeForm;
|
||||
import ProjectData.Project.db_project_info;
|
||||
public interface VersionsWindow extends VisualizerForm {
|
||||
VariantsWindow getVariantsWindow();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common_old.Current;
|
||||
import Visual_DVM_2021.UI.Interface.AnalysisWindow;
|
||||
|
||||
import javax.swing.*;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common.UI.TextField.StyledTextField;
|
||||
import Common_old.Current;
|
||||
import Common_old.UI.TextField.StyledTextField;
|
||||
import ProjectData.SapforData.Arrays.ProjectArray;
|
||||
import Visual_DVM_2021.UI.Interface.ArraysWindow;
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common.Global;
|
||||
import Common.UI.Editor.BaseEditor;
|
||||
import Common.UI.Editor.Viewer;
|
||||
import Common.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Common.UI.TextField.StyledTextField;
|
||||
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.Viewer;
|
||||
import Common_old.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Common_old.UI.TextField.StyledTextField;
|
||||
import Common_old.UI.UI;
|
||||
import Common_old.Utils.Utils;
|
||||
import GlobalData.Settings.SettingName;
|
||||
import Repository.BugReport.BugReport;
|
||||
import Repository.BugReport.BugReportInterface;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common.UI.Windows.Dialog.Text.ComboTextDialog;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Current;
|
||||
import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
|
||||
import Common_old.Utils.Utils;
|
||||
|
||||
import java.util.Vector;
|
||||
public class CombineFilesDialog extends ComboTextDialog {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Common_old.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.Pass_2021;
|
||||
import Visual_DVM_2021.UI.Interface.CommentInterface;
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Constants;
|
||||
import Common.Current;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Global;
|
||||
import Common.UI.Editor.BaseEditor;
|
||||
import Common.UI.Label.ShortLabel;
|
||||
import Common.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Common.UI.UI;
|
||||
import Common_old.Constants;
|
||||
import Common_old.Current;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.Editor.BaseEditor;
|
||||
import Common_old.UI.Label.ShortLabel;
|
||||
import Common_old.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Common_old.UI.UI;
|
||||
import Common.Utils.TextLog;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Utils.Utils;
|
||||
import Visual_DVM_2021.Passes.Pass_2021;
|
||||
import javafx.util.Pair;
|
||||
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common_old.Current;
|
||||
import GlobalData.Tasks.CompilationTask.CompilationTask;
|
||||
public class CompilationTasksComparisonForm extends TasksComparisonForm<CompilationTask> {
|
||||
public CompilationTasksComparisonForm(ComparisonForm<CompilationTask> slave_in) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common_old.Current;
|
||||
import TestingSystem.DVM.DVMTasks.DVMRunTask;
|
||||
public class DVMRunTasksComparisonForm extends TasksComparisonForm<DVMRunTask> {
|
||||
public DVMRunTasksComparisonForm(ComparisonForm<DVMRunTask> slave_in) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Global;
|
||||
import _VisualDVM.Global;
|
||||
import Visual_DVM_2021.UI.Interface.DebugWindow;
|
||||
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Common_old.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.Pass_2021;
|
||||
import Visual_DVM_2021.UI.Interface.DescriptionInterface;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Constants;
|
||||
import Common.Global;
|
||||
import Common.UI.Editor.Viewer;
|
||||
import Common.UI.Menus_2023.FileMenuBar.FileMenuBar;
|
||||
import Common.UI.Trees.TreeForm;
|
||||
import Common.UI.UI;
|
||||
import Common_old.Constants;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.Editor.Viewer;
|
||||
import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar;
|
||||
import Common_old.UI.Trees.TreeForm;
|
||||
import Common_old.UI.UI;
|
||||
import GlobalData.Settings.SettingName;
|
||||
import ProjectData.Files.DBProjectFile;
|
||||
import ProjectData.Files.UI.Editor.SPFEditor;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common.UI.TextField.StyledTextField;
|
||||
import Common.UI.UI;
|
||||
import Common_old.Current;
|
||||
import Common_old.UI.TextField.StyledTextField;
|
||||
import Common_old.UI.UI;
|
||||
import ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
|
||||
import ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphUI;
|
||||
import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common.Global;
|
||||
import Common.UI.Menus_2023.MainMenuBar.MainWindow;
|
||||
import Common.UI.UI;
|
||||
import Common.UI.Windows.Form;
|
||||
import Common.UI.Windows.FormType;
|
||||
import Common.Utils.Utils;
|
||||
import GlobalData.Compiler.CompilerType;
|
||||
import Common_old.Current;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.Menus_2023.MainMenuBar.MainWindow;
|
||||
import Common_old.UI.UI;
|
||||
import Common_old.UI.Windows.Form;
|
||||
import Common_old.UI.Windows.FormType;
|
||||
import Common_old.Utils.Utils;
|
||||
import TestingSystem.Common.Group.Group;
|
||||
import TestingSystem.Common.Test.Test;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Global;
|
||||
import Common.UI.Windows.Dialog.DialogFields;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.Windows.Dialog.DialogFields;
|
||||
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
|
||||
|
||||
import javax.swing.*;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Global;
|
||||
import Common.UI.Windows.Dialog.Dialog;
|
||||
import Common.UI.Windows.FormType;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.Windows.Dialog.Dialog;
|
||||
import Common_old.UI.Windows.FormType;
|
||||
import GlobalData.FormsParams.DBForm;
|
||||
public class ProfilesForm extends Dialog<Object, ProfilesFields> {
|
||||
private DBForm info = null;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common.Global;
|
||||
import Common.UI.Editor.Viewer;
|
||||
import Common.UI.Menus_2023.ProjectMenuBar.ProjectMenuBar;
|
||||
import Common.UI.Trees.TreeForm;
|
||||
import Common.UI.UI;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Current;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.Editor.Viewer;
|
||||
import Common_old.UI.Menus_2023.ProjectMenuBar.ProjectMenuBar;
|
||||
import Common_old.UI.Trees.TreeForm;
|
||||
import Common_old.UI.UI;
|
||||
import Common_old.Utils.Utils;
|
||||
import GlobalData.Settings.SettingName;
|
||||
import ProjectData.Files.DBProjectFile;
|
||||
import ProjectData.Files.UI.FilesTree;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common_old.Current;
|
||||
import GlobalData.Tasks.RunTask.RunTask;
|
||||
public class RunTasksComparisonForm extends TasksComparisonForm<RunTask> {
|
||||
public RunTasksComparisonForm(ComparisonForm<RunTask> slave_in) {
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common.Database.DBObject;
|
||||
import Common.UI.Label.ShortLabel;
|
||||
import Common.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Common.UI.UI;
|
||||
import Common_old.Current;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common_old.UI.Label.ShortLabel;
|
||||
import Common_old.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Common_old.UI.UI;
|
||||
import Common.Utils.TextLog;
|
||||
import TestingSystem.SAPFOR.Json.SapforVersion_json;
|
||||
import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
|
||||
import TestingSystem.SAPFOR.SapforTask.SapforTask;
|
||||
import TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Constants;
|
||||
import Common.Current;
|
||||
import Common.Global;
|
||||
import Common.UI.Menus_2023.MenuBarButton;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Constants;
|
||||
import Common_old.Current;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.Menus_2023.MenuBarButton;
|
||||
import Common_old.Utils.Utils;
|
||||
import GlobalData.Settings.SettingName;
|
||||
import ProjectData.Files.ProjectFile;
|
||||
import TestingSystem.SAPFOR.Json.SapforVersion_json;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Common_old.UI.Menus_2023.VisualiserMenuBar;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.Pass_2021;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Global;
|
||||
import Common.UI.Menus_2023.MenuBarButton;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.Menus_2023.MenuBarButton;
|
||||
import GlobalData.Settings.SettingName;
|
||||
|
||||
import javax.swing.*;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Constants;
|
||||
import Common.Current;
|
||||
import Common.Global;
|
||||
import Common.UI.TextField.StyledTextField;
|
||||
import Common.UI.UI;
|
||||
import Common_old.Constants;
|
||||
import Common_old.Current;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.TextField.StyledTextField;
|
||||
import Common_old.UI.UI;
|
||||
import GlobalData.Compiler.CompilerType;
|
||||
import GlobalData.Credentials.Credentials;
|
||||
import TestingSystem.Common.TestingServer;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Global;
|
||||
import _VisualDVM.Global;
|
||||
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
|
||||
import Visual_DVM_2021.UI.Interface.TestsWindow;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common.UI.Trees.TreeForm;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Current;
|
||||
import Common_old.UI.Trees.TreeForm;
|
||||
import Common_old.Utils.Utils;
|
||||
import ProjectData.SapforData.Arrays.UI.DimensionsTableForm;
|
||||
import ProjectData.SapforData.Arrays.UI.RulesTree;
|
||||
import Visual_DVM_2021.UI.Interface.VariantsWindow;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.Current;
|
||||
import Common.Global;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Current;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.Utils.Utils;
|
||||
import GlobalData.Settings.SettingName;
|
||||
import ProjectData.Files.DBProjectFile;
|
||||
import ProjectData.Files.ProjectFile;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.UI.Trees.TreeForm;
|
||||
import Common.UI.UI;
|
||||
import Common_old.UI.Trees.TreeForm;
|
||||
import Common_old.UI.UI;
|
||||
import ProjectData.Project.UI.VersionsTree;
|
||||
import ProjectData.Project.db_project_info;
|
||||
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.UI.DragDrop.FileDrop;
|
||||
import Common_old.UI.DragDrop.FileDrop;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.Pass_2021;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user