diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c51445ae..c4c2b728 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,32 +8,245 @@ - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Common/Current_.java b/src/Common/Current_.java index c1d79565..8cc18b90 100644 --- a/src/Common/Current_.java +++ b/src/Common/Current_.java @@ -7,26 +7,4 @@ public interface Current_ { default String getDescription(){ return "?"; } - LinkedHashMap objects = new LinkedHashMap<>(); - static Object get(Current_ name) { - if (!objects.containsKey(name)) - objects.put(name,null); - return objects.get(name); - } - static Object set(Current_ name, Object object) { - if (objects.containsKey(name)) - objects.replace(name, object); - else objects.put(name, object); - return object; - } - static boolean Check(TextLog Log, Current_... names) { - for (Current_ name : names) - if (Current_.get(name) == null) - Log.Writeln_(name.getDescription() + " не выбран(а)"); - return Log.isEmpty(); - } - //применять только для наследников iDBObject - static boolean matchCurrentID(Current_ name, int id) { - return (Current_.get(name) != null) && (((iDBObject) Current_.get(name)).id == id); - } } diff --git a/src/Common/Database/Tables/DataSet.java b/src/Common/Database/Tables/DataSet.java index 6a24be05..85510e8e 100644 --- a/src/Common/Database/Tables/DataSet.java +++ b/src/Common/Database/Tables/DataSet.java @@ -10,6 +10,7 @@ import Common.Utils.TextLog; import Common.Database.Objects.DBObject; import Common.Visual.UI_; import Common.Visual.FilterInterface; +import _VisualDVM.Global; import javax.swing.*; import java.awt.*; @@ -244,19 +245,19 @@ public class DataSet extends DataSetAnchestor { return null; } public boolean CheckCurrent(TextLog log) { - return Current_.Check(log, CurrentName()); + return Global.mainModule.Check(log, CurrentName()); } public boolean hasCurrent() { - return Current_.get(CurrentName()) != null; + return Global.mainModule.get(CurrentName()) != null; } public void dropCurrent() { - Current_.set(CurrentName(), null); + Global.mainModule.set(CurrentName(), null); } public D getCurrent() { - return (D) Current_.get(CurrentName()); + return (D) Global.mainModule.get(CurrentName()); } public void setCurrent(D o) { - Current_.set(CurrentName(), o); + Global.mainModule.set(CurrentName(), o); } public Vector getCheckedOrCurrent() { Vector res = new Vector<>(); diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java index 46dba46f..4b7a444c 100644 --- a/src/Common/Passes/Pass.java +++ b/src/Common/Passes/Pass.java @@ -130,7 +130,7 @@ public class Pass { try { Global.mainModule.getDb().Update(stats); FAPasses.sort(new SortPassesByStats()); - if (Current.HasProject()) + if (Global.mainModule.HasProject()) UI.fastAccessMenuBar.Refresh(); } catch (Exception ex) { Utils_.MainLog.PrintException(ex); @@ -306,10 +306,10 @@ public class Pass { animation_sem.acquire(); //--- form = null; - Current_.set(Current.PassForm, null); + Global.mainModule.set(Current.PassForm, null); System.gc(); //-- - Current_.set(Current.PassForm, form = new PassForm(this)); + Global.mainModule.set(Current.PassForm, form = new PassForm(this)); dispatcher = new SwingWorker() { @Override protected Object doInBackground() { diff --git a/src/Common/Visual/Trees/DataTree.java b/src/Common/Visual/Trees/DataTree.java index 8aa5203f..8f668699 100644 --- a/src/Common/Visual/Trees/DataTree.java +++ b/src/Common/Visual/Trees/DataTree.java @@ -2,6 +2,7 @@ package Common.Visual.Trees; import Common.Current_; import Common.Utils.Utils_; import Common.Visual.DataControl_OLD; +import _VisualDVM.Global; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; @@ -11,7 +12,7 @@ public class DataTree extends StyledTree implements DataControl_OLD { } public void ChangeCurrentObject(DefaultMutableTreeNode node) { if (getCurrent() != null) - Current_.set(getCurrent(), node.getUserObject()); + Global.mainModule.set(getCurrent(), node.getUserObject()); } @Override public void ShowCurrentObject() throws Exception { diff --git a/src/Common/Visual/Trees/SelectableTree.java b/src/Common/Visual/Trees/SelectableTree.java index e88714cd..c5f3ef77 100644 --- a/src/Common/Visual/Trees/SelectableTree.java +++ b/src/Common/Visual/Trees/SelectableTree.java @@ -1,6 +1,7 @@ package Common.Visual.Trees; import Common.Current_; import Common.Visual.Selectable; +import _VisualDVM.Global; import javax.swing.tree.DefaultMutableTreeNode; public class SelectableTree extends DataTree { @@ -9,7 +10,7 @@ public class SelectableTree extends DataTree { } @Override public void LeftMouseAction1() { - Object element = Current_.get(getCurrent()); + Object element = Global.mainModule.get(getCurrent()); if ((element instanceof Selectable)) { ((Selectable) element).SwitchSelection(); updateUI(); diff --git a/src/MainModule_/MainModule_.java b/src/MainModule_/MainModule_.java index b71a950a..f0b11794 100644 --- a/src/MainModule_/MainModule_.java +++ b/src/MainModule_/MainModule_.java @@ -1,19 +1,23 @@ package MainModule_; +import Common.Current_; +import Common.Database.Objects.iDBObject; import Common.Database.VisualiserDatabase; import Common.Passes.Pass; import Common.Passes.PassCode_; -import Common.Utils.Utils_; +import Common.Utils.TextLog; import java.util.LinkedHashMap; //Основной объект визуализатора. public abstract class MainModule_ { - protected D db; - protected Class db_class; - public LinkedHashMap passes; + D db; + Class db_class; + LinkedHashMap passes; + LinkedHashMap objects; public D getDb() { return db; } public MainModule_(Class db_class_in) { + objects = new LinkedHashMap<>(); try { db_class = db_class_in; } catch (Exception ex) { @@ -30,4 +34,26 @@ public abstract class MainModule_ { public void DeactivateDB() throws Exception{ if (db != null) db.Disconnect(); } + //-- + public Object get(Current_ name) { + if (!objects.containsKey(name)) + objects.put(name,null); + return objects.get(name); + } + public Object set(Current_ name, Object object) { + if (objects.containsKey(name)) + objects.replace(name, object); + else objects.put(name, object); + return object; + } + public boolean Check(TextLog Log, Current_... names) { + for (Current_ name : names) + if (get(name) == null) + Log.Writeln_(name.getDescription() + " не выбран(а)"); + return Log.isEmpty(); + } + //применять только для наследников iDBObject + public boolean matchCurrentID(Current_ name, int id) { + return (get(name) != null) && (((iDBObject) get(name)).id == id); + } } diff --git a/src/Visual_DVM_2021/Passes/AbortTestingPackage.java b/src/Visual_DVM_2021/Passes/AbortTestingPackage.java index 769441d1..165cc869 100644 --- a/src/Visual_DVM_2021/Passes/AbortTestingPackage.java +++ b/src/Visual_DVM_2021/Passes/AbortTestingPackage.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage; @@ -21,8 +22,8 @@ public abstract class AbortTestingPackage extends TestingSystemPass { } @Override public boolean canStart(Object... args) throws Exception { - if (Current.getAccount().role.equals(AccountRole.Undefined)) { + if (Global.mainModule.getAccount().role.equals(AccountRole.Undefined)) { Log.Writeln_("Для создания отчёта требуется регистрация"); return false; } - if (Current.HasProject()) { - String version = Current.getProject().Home.getAbsolutePath().substring(Current.getRoot().Home.getParent().length()); + if (Global.mainModule.HasProject()) { + String version = Global.mainModule.getProject().Home.getAbsolutePath().substring(Global.mainModule.getRoot().Home.getParent().length()); if (version.toCharArray()[0] == '\\') version = version.substring(1); - target = new BugReport(Current.getAccount().name, Current.getAccount().email, + target = new BugReport(Global.mainModule.getAccount().name, Global.mainModule.getAccount().email, "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'", version); return true; } else { if (UI_.Warning("Создать отчёт об ошибке без прикрепления проекта.")) { target = new BugReport(); target.genName(); - target.sender_name = Current.getAccount().name; - target.sender_address = Current.getAccount().email; + target.sender_name = Global.mainModule.getAccount().name; + target.sender_address = Global.mainModule.getAccount().email; target.project_version = ""; target.visualiser_version = Global.visualiser.version; target.sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version; @@ -62,15 +62,15 @@ public class AddBugReport extends AddObjectPass { } @Override protected void performPreparation() throws Exception { - Current.getSapfor().ResetAllAnalyses(); + Global.mainModule.getSapfor().ResetAllAnalyses(); } @Override protected void body() throws Exception { super.body(); if (!target.project_version.isEmpty()) { - Current.getRoot().cleanDepAndGCOVR(); //удаление депов и гкова + Global.mainModule.getRoot().cleanDepAndGCOVR(); //удаление депов и гкова //логи во вложения. - File attachementsDir = Current.getProject().getAttachmentsDirectory(); + File attachementsDir = Global.mainModule.getProject().getAttachmentsDirectory(); Vector logs = new Vector<>(); logs.add(Utils_.MainLog.getLogFile()); logs.add(Paths.get(Global.ComponentsDirectory.getAbsolutePath(), "Sapfor_log.txt").toFile()); @@ -81,7 +81,7 @@ public class AddBugReport extends AddObjectPass { Files.copy(file.toPath(), Paths.get(attachementsDir.getAbsolutePath(), file.getName()), StandardCopyOption.REPLACE_EXISTING); } //запаковка рута - passes.get(PassCode.ZipFolderPass).Do(Current.getRoot().Home.getAbsolutePath(), BugReportInterface.getArchiveFile(target).getAbsolutePath()); + passes.get(PassCode.ZipFolderPass).Do(Global.mainModule.getRoot().Home.getAbsolutePath(), BugReportInterface.getArchiveFile(target).getAbsolutePath()); } } @Override diff --git a/src/Visual_DVM_2021/Passes/All/AddFile.java b/src/Visual_DVM_2021/Passes/All/AddFile.java index 6130ca92..e4260f8a 100644 --- a/src/Visual_DVM_2021/Passes/All/AddFile.java +++ b/src/Visual_DVM_2021/Passes/All/AddFile.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.Text.FileNameForm; import _VisualDVM.Utils; @@ -41,7 +42,7 @@ public class AddFile extends ChangeFilePass { } if (fileName != null) { //-> - parent_node = Current.getProjectCurrentParentNode(); + parent_node = Global.mainModule.getProjectCurrentParentNode(); target_dir = (File) parent_node.getUserObject(); //-> dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile(); diff --git a/src/Visual_DVM_2021/Passes/All/AddUser.java b/src/Visual_DVM_2021/Passes/All/AddUser.java index 95c9c6b7..15303bab 100644 --- a/src/Visual_DVM_2021/Passes/All/AddUser.java +++ b/src/Visual_DVM_2021/Passes/All/AddUser.java @@ -20,7 +20,7 @@ public class AddUser extends AddObjectPass { @Override protected boolean canStart(Object... args) throws Exception { if (super.canStart(args)) { - Machine machine = Current.getMachine(); + Machine machine = Global.mainModule.getMachine(); if (machine.type.equals(MachineType.Local) && (machine.getUsers().size() > 0)) { Log.Writeln_("У локальной машины может быть только один пользователь"); return false; diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java b/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java index 890ba497..06792c25 100644 --- a/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java +++ b/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; public class AppendBugReportComment extends AppendBugReportField { @Override @@ -14,6 +15,6 @@ public class AppendBugReportComment extends AppendBugReportField { } @Override protected boolean canUpdate() { - return Current.getAccount().ExtendedCheckAccessRights(target, Log); + return Global.mainModule.getAccount().ExtendedCheckAccessRights(target, Log); } } diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java b/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java index eba8a0b1..86e20d35 100644 --- a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java +++ b/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReportInterface; @@ -27,12 +28,12 @@ public class AppendBugReportField extends ComponentsRepositoryPass { return ""; } protected boolean canUpdate() { - return Current.getAccount().CheckAccessRights(target.sender_address, Log); + return Global.mainModule.getAccount().CheckAccessRights(target.sender_address, Log); } @Override protected boolean canStart(Object... args) throws Exception { - if (Current_.Check(Log, Current.BugReport)) { - target = Current.getBugReport(); + if (Global.mainModule.Check(Log, Current.BugReport)) { + target = Global.mainModule.getBugReport(); if (!BugReportInterface.CheckNotDraft(target,Log)) return false; fieldName = (String) args[0]; @@ -51,7 +52,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass { target.SynchronizeFields((BugReport) response.object); oldValue = (String) BugReport.class.getField(fieldName).get(target); newValue = oldValue + "\n" + Utils_.Brackets(Utils_.print_date( - new Date())) + " " + Current.getAccount().name + new Date())) + " " + Global.mainModule.getAccount().name + " : " + addition; //2. дописываем нужное поле. BugReport.class.getField(fieldName).set(target, newValue); @@ -85,7 +86,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass { } passes.get(PassCode.Email).Do( new EmailMessage( - message_header + " " + Utils_.Brackets(Current.getAccount().name), + message_header + " " + Utils_.Brackets(Global.mainModule.getAccount().name), message_text, BugReportInterface.getRecipients(target) ) diff --git a/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java b/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java index a90ace11..fdcaeb36 100644 --- a/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java +++ b/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.Repository.BugReport.BugReport; import Visual_DVM_2021.Passes.PassCode; @@ -22,8 +23,8 @@ public class ApplyBugReportSettings extends Pass { } @Override protected boolean canStart(Object... args) { - if (Current_.Check(Log, Current.BugReport)) { - target = Current.getBugReport(); + if (Global.mainModule.Check(Log, Current.BugReport)) { + target = Global.mainModule.getBugReport(); long vv = target.visualiser_version; if (vv < 500) { Log.Writeln_("Автоматическое применение настроек поддерживается только в отчётах об ошибках,\n" + diff --git a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java b/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java index 8249ee3f..e5f33e49 100644 --- a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java +++ b/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.Text.ComboTextDialog; import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; @@ -23,13 +24,13 @@ public class ApplyCurrentFunction extends Pass { protected boolean canStart(Object... args) throws Exception { if (passes.get(PassCode.SPF_GetGraphFunctions).isDone()) { ComboTextDialog ff = new ComboTextDialog(); - Vector names = new Vector<>(Current.getProject().allFunctions.keySet()); + Vector names = new Vector<>(Global.mainModule.getProject().allFunctions.keySet()); names.sort(Comparator.naturalOrder()); if (ff.ShowDialog("Выберите имя текущей процедуры", names)) { String func_name = ff.Result; - if (Current.getProject().allFunctions.containsKey(func_name)) { - FuncInfo fi = Current.getProject().allFunctions.get(func_name); - Current_.set(Current.Function, fi); + if (Global.mainModule.getProject().allFunctions.containsKey(func_name)) { + FuncInfo fi = Global.mainModule.getProject().allFunctions.get(func_name); + Global.mainModule.set(Current.Function, fi); return true; } else { Log.Writeln_("Проект не содержит процедуры с именем " + Utils_.Brackets(func_name)); diff --git a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java b/src/Visual_DVM_2021/Passes/All/ApplyProfile.java index d8b352d6..c3c4965c 100644 --- a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java +++ b/src/Visual_DVM_2021/Passes/All/ApplyProfile.java @@ -25,8 +25,8 @@ public class ApplyProfile extends Pass { } @Override protected boolean canStart(Object... args) throws Exception { - if (Current_.Check(Log, Current.SapforProfile)) { - target = (SapforProfile) Current_.get(Current.SapforProfile); + if (Global.mainModule.Check(Log, Current.SapforProfile)) { + target = (SapforProfile) Global.mainModule.get(Current.SapforProfile); return true; } return false; diff --git a/src/Visual_DVM_2021/Passes/All/BuildComponent.java b/src/Visual_DVM_2021/Passes/All/BuildComponent.java index 102dc080..62a9acef 100644 --- a/src/Visual_DVM_2021/Passes/All/BuildComponent.java +++ b/src/Visual_DVM_2021/Passes/All/BuildComponent.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.Repository.Component.Component; import Visual_DVM_2021.Passes.PassCode; @@ -19,7 +20,7 @@ public class BuildComponent extends ProcessPass { } @Override protected boolean canStart(Object... args) throws Exception { - target = Current.getComponent(); + target = Global.mainModule.getComponent(); return true; } @Override diff --git a/src/Visual_DVM_2021/Passes/All/CheckAccount.java b/src/Visual_DVM_2021/Passes/All/CheckAccount.java index 45804fc6..1fc15e33 100644 --- a/src/Visual_DVM_2021/Passes/All/CheckAccount.java +++ b/src/Visual_DVM_2021/Passes/All/CheckAccount.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Visual_DVM_2021.Passes.PassCode; import Common.Passes.Pass; @@ -46,7 +47,7 @@ public class CheckAccount extends Pass { //временно. оффлайн проверка по почте - target = Current.getAccount().email.equals("?") ? + target = Global.mainModule.getAccount().email.equals("?") ? (Pass.passes.get(PassCode.EditAccount).Do() && Pass.passes.get(PassCode.CheckRegistrationOnServer).Do()) : (Pass.passes.get(PassCode.CheckRegistrationOnServer).Do()); @@ -59,10 +60,10 @@ public class CheckAccount extends Pass { protected void showDone() throws Exception { if (UI.getMainWindow() != null) { UI.getMainWindow().getCallbackWindow().ShowAccount(); - if (Current.HasBugReport()) + if (Global.mainModule.HasBugReport()) UI.getMainWindow().getCallbackWindow().ShowCurrentBugReport(); } - if (Current.getAccount().isAdmin()) + if (Global.mainModule.getAccount().isAdmin()) Pass.passes.get(PassCode.PublishComponent).setControlsVisible(true); setControlsVisible(false); //если проверка успешна, кнопку больше не показывать. } diff --git a/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java b/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java index 45cbd41b..45d0048f 100644 --- a/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java +++ b/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Subscribes.Subscriber; @@ -7,8 +8,8 @@ import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; public class CheckRegistrationOnServer extends ComponentsRepositoryPass { @Override protected void ServerAction() throws Exception { - Command(new ServerExchangeUnit_2021(ServerCode.CheckSubscriberRole, "", Current.getAccount())); + Command(new ServerExchangeUnit_2021(ServerCode.CheckSubscriberRole, "", Global.mainModule.getAccount())); target = (Subscriber) response.object; - Current.getAccount().role = target.role; + Global.mainModule.getAccount().role = target.role; } } diff --git a/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java b/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java index 9f50cc13..ef3c51ae 100644 --- a/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java +++ b/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; @@ -8,13 +9,13 @@ public class CheckRemoteWorkspace extends ComponentsRepositoryPass { - Vector srcPackages; - Vector inexistingTests; - Vector inexistingConfigurations; - //- - Vector src_ids; - Vector src_jsons; - //- - public CloneDVMPackage() { - super(DVMPackage.class); - } - @Override - public String getIconPath() { - return "/icons/MultiFiles.png"; - } - @Override - protected Database getDb() { - return Global.testingServer.db; - } - protected void createTarget() { - target = new DVMPackage(); - target.id = CommonConstants.Nan; - //- - target.sender_name = Current.getAccount().name; - target.sender_address = Current.getAccount().email; - //- - target.machine_name = Current.getMachine().name; - target.machine_address = Current.getMachine().address; - target.machine_port = Current.getMachine().port; - //- - target.user_name = Current.getUser().login; - target.user_password = Current.getUser().password; - target.user_workspace = Current.getUser().workspace; - //-- - target.drv = Current.getCompiler().call_command; - target.version = Current.getCompiler().getVersionInfo(); - //-- - target.kernels = 1; //Global.properties.TestingKernels; - target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0; - //-- - target.tasksCount = 0; - //-- - target.package_json = new DVMPackage_json(); - } - protected void CloneTasks(DVMPackage_json src_json, DVMPackage_json dst_json) throws Exception { - for (DVMCompilationTask src_compilationTask : src_json.compilationTasks) { - if (Global.testingServer.db.tests.containsKey(src_compilationTask.test_id) - ) { - Group group = Global.testingServer.db.groups.get(src_compilationTask.group_id); - Test test = Global.testingServer.db.tests.get(src_compilationTask.test_id); - //-- - DVMCompilationTask compilationTask = new DVMCompilationTask(); - //-- - compilationTask.group_id = group.id; - compilationTask.group_description = group.description; - compilationTask.language = src_compilationTask.language; - //-- - compilationTask.test_id = test.id; - compilationTask.test_description = test.description; - compilationTask.test_type = group.type; - //-- - compilationTask.maxtime = src_compilationTask.maxtime; - //-- - compilationTask.flags = src_compilationTask.flags; - compilationTask.kernels = 1; - //--- - for (DVMRunTask src_runTask : src_compilationTask.runTasks) { - DVMRunTask runTask = new DVMRunTask(); - //-- - runTask.group_id = group.id; - runTask.group_description = group.description; - runTask.language = src_runTask.language; - //-- - runTask.test_id = test.id; - runTask.test_description = test.description; - runTask.test_type = group.type; - //-- - runTask.compilation_maxtime = src_runTask.compilation_maxtime; - runTask.compilation_state = TaskState.Waiting; - runTask.maxtime = src_runTask.maxtime; - //-- - runTask.cube = src_runTask.cube; - runTask.min_dim = src_runTask.min_dim; - runTask.max_dim = src_runTask.max_dim; - runTask.matrix = src_runTask.matrix; - runTask.environments = src_runTask.environments; - runTask.usr_par = src_runTask.usr_par; - runTask.args = test.args; - //-- - runTask.flags = src_runTask.flags; - runTask.kernels = (group.type == TestType.Performance) ? target.kernels : - Math.min(Utils.getMatrixProcessors(src_runTask.matrix), target.kernels); - compilationTask.runTasks.add(runTask); - } - //-- - dst_json.compilationTasks.add(compilationTask); - //- - } else { - inexistingTests.add(String.valueOf(src_compilationTask.test_id)); - } - } - } - @Override - protected boolean canStart(Object... args) throws Exception { - srcPackages = new Vector<>(); - if (!Current.getAccount().CheckRegistered(Log)) - return false; - //---- - srcPackages = Global.testingServer.db.dvmPackages.getCheckedOrCurrent(); - if (srcPackages.isEmpty()){ - Log.Writeln_("Не отмечено или не выбрано ни одного пакета DVM"); - return false; - } - //- - if (!Current_.Check(Log, Current.Machine, Current.User, Current.Compiler)) - return false; - //--- - if (!Current.getMachine().type.equals(MachineType.Server)) { - Log.Writeln_("Тестирование поддерживается только на одиночном удалённом сервере."); - return false; - } - if (!Current.getUser().state.equals(UserState.ready_to_work)) { - Log.Writeln_("Пользователь не готов к работе. Выполните инициализацию пользователя!"); - return false; - } - if (!Current.getCompiler().type.equals(CompilerType.dvm)) { - Log.Writeln_("Тестирование поддерживается только для DVM компиляторов."); - return false; - } - if (!Current.getCompiler().versionLoaded) - passes.get(PassCode.ShowCompilerVersion).Do(Current.getCompiler(), false); - //- - for (DVMPackage dvmPackage : Global.testingServer.db.dvmPackages.Data.values()) { - if (dvmPackage.state.equals(TasksPackageState.Draft)) { - Log.Writeln_("Может существовать только один пакет, готовящийся к публикации."); - return false; - } - } - //-- - src_ids = new Vector<>(); - src_jsons = new Vector<>(); - for (DVMPackage src : srcPackages) { - if (src.state.equals(TasksPackageState.Draft)) { - Log.Writeln_("Пакет " + Utils_.Brackets(src.id) + " является черновиком."); - return false; - } - src_ids.add(src.id); - } - //-- - TestingSystemPass getJsonsPass = new TestingSystemPass() { - @Override - public String getDescription() { - return "Получить информацию о задачах исходных пакетов"; - } - @Override - protected void ServerAction() throws Exception { - Command(new ServerExchangeUnit_2021(ServerCode.GetDVMPackagesJson, null, src_ids)); - src_jsons.addAll((Vector) response.object); - } - }; - if (!getJsonsPass.Do()) - return false; - //-- - createTarget(); - //-- - inexistingTests = new Vector<>(); - inexistingConfigurations = new Vector<>(); //не нужно. - //-- - for (DVMPackage_json srcJson: src_jsons){ - CloneTasks(srcJson, target.package_json); - } - ///- - //инициализируем идентификаторы задач. - for (DVMCompilationTask compilationTask : target.package_json.compilationTasks) { - //-- - compilationTask.id = target.package_json.getMaxTaskId(); - //- - for (DVMRunTask runTask : compilationTask.runTasks) { - runTask.id = target.package_json.getMaxTaskId(); - runTask.dvmcompilationtask_id = compilationTask.id; - target.tasksCount++; - } - } - return inexistingTests.isEmpty() || UI_.Question(inexistingTests.size() + " тестов отсутствует. Продолжить"); - } - @Override - protected void body() throws Exception { - //черновик не вставляется в бд. идет только как элемент списка. - Global.testingServer.db.dvmPackages.Data.put(target.id, target); - } - @Override - protected void showDone() throws Exception { - super.showDone(); - Global.testingServer.db.dvmRunTasks.ShowDVMPackage(target); - } -} diff --git a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java b/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java deleted file mode 100644 index 0cec2e87..00000000 --- a/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java +++ /dev/null @@ -1,187 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Common.CommonConstants; -import Common.Current_; -import Common.Utils.Utils_; -import Common.Visual.UI_; -import _VisualDVM.Current; -import Common.Database.Database; -import _VisualDVM.Global; -import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import _VisualDVM.TestingSystem.Common.TasksPackageState; -import _VisualDVM.TestingSystem.Common.Test.Test; -import _VisualDVM.TestingSystem.SAPFOR.Json.SapforConfiguration_json; -import _VisualDVM.TestingSystem.SAPFOR.Json.SapforPackage_json; -import _VisualDVM.TestingSystem.SAPFOR.Json.SapforTest_json; -import _VisualDVM.TestingSystem.SAPFOR.Json.SapforTestingSet_json; -import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; -import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; -import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask; -import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState; -import Common.Passes.AddObjectPass; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; - -import java.util.Vector; -public class CloneSapforPackage extends AddObjectPass { - Vector srcPackages; - //-- - Vector inexistingTests; - Vector inexistingConfigurations; - //-- - public CloneSapforPackage() { - super(SapforPackage.class); - } - protected SapforTestingSet_json cloneTestingSet(SapforTestingSet_json src) { - SapforTestingSet_json dst = new SapforTestingSet_json(); - dst.id = target.package_json.getMaxSetId(); - //-- - for (SapforTest_json src_TestJson : src.tests) { - if (Global.testingServer.db.tests.containsKey(src_TestJson.id)) { - Test test = Global.testingServer.db.tests.get(src_TestJson.id); - SapforTest_json testJson = new SapforTest_json(); - //-- - testJson.id = test.id; - testJson.description = test.description; - testJson.group_description = src_TestJson.group_description; - //-- - dst.tests.add(testJson); - //-- - } else { - inexistingTests.add(String.valueOf(src_TestJson.id)); - } - } - //-- - for (SapforConfiguration_json src_configuration : src.configurations) { - if (Global.testingServer.db.sapforConfigurations.containsKey(src_configuration.id)) { - SapforConfiguration configuration = Global.testingServer.db.sapforConfigurations.get(src_configuration.id); - SapforConfiguration_json configurationJson = new SapforConfiguration_json(); - //-- - configurationJson.id = configuration.id; - configurationJson.name = configuration.description; - configurationJson.flags = src_configuration.flags; - configurationJson.codes.addAll(src_configuration.codes); - //-- - dst.configurations.add(configurationJson); - } else { - inexistingConfigurations.add(String.valueOf(src_configuration.id)); - } - } - return dst; - } - @Override - public String getIconPath() { - return "/icons/MultiFiles.png"; - } - @Override - protected Database getDb() { - return Global.testingServer.db; - } - @Override - protected boolean canStart(Object... args) throws Exception { - srcPackages = new Vector<>(); - if (!Current.getAccount().CheckRegistered(Log)) - return false; - //-- - if (!Current_.Check(Log, Current.ServerSapfor)) - return false; - if (!Current.getServerSapfor().state.equals(ServerSapforState.Done)) { - Log.Writeln_("Выбранная версия SAPFOR не собрана!"); - return false; - } - //-- - srcPackages = Global.testingServer.db.sapforPackages.getCheckedOrCurrent(); - if (srcPackages.isEmpty()) { - Log.Writeln_("Не отмечено или не выбрано ни одного пакета SAPFOR"); - return false; - } - // todo изменить чтобы можно было. - for (SapforPackage sapforPackage : Global.testingServer.db.sapforPackages.Data.values()) { - if (sapforPackage.state.equals(TasksPackageState.Draft)) { - Log.Writeln_("Может существовать только один пакет, готовящийся к публикации."); - return false; - } - } - //-- - Vector src_ids = new Vector<>(); - Vector src_jsons = new Vector<>(); - for (SapforPackage src : srcPackages) { - if (src.state.equals(TasksPackageState.Draft)) { - Log.Writeln_("Пакет " + Utils_.Brackets(src.id) + " является черновиком."); - return false; - } - src_ids.add(src.id); - } - TestingSystemPass getJsonsPass = new TestingSystemPass() { - @Override - public String getDescription() { - return "Получить информацию о задачах исходных пакетов"; - } - @Override - protected void ServerAction() throws Exception { - Command(new ServerExchangeUnit_2021(ServerCode.GetSapforPackagesJson, null, src_ids)); - src_jsons.addAll((Vector) response.object); - } - }; - if (!getJsonsPass.Do()) - return false; - //-- - inexistingTests = new Vector<>(); - inexistingConfigurations = new Vector<>(); - //-- - target = new SapforPackage(); - target.id = CommonConstants.Nan; - //- - target.sender_name = Current.getAccount().name; - target.sender_address = Current.getAccount().email; - //- - target.drv = Current.getServerSapfor().call_command; - target.version = Current.getServerSapfor().version; - target.kernels = 1; //Global.properties.TestingKernels; - target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0; - //-- - target.sapforId = Current.getServerSapfor().id; - //-- - target.kernels =1; // Global.properties.TestingKernels; - target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0; - //-- - target.package_json = new SapforPackage_json(); - ///------------------------------- - target.package_json.kernels = target.kernels; - target.package_json.sapfor_drv = target.drv; - //-- - //- заполнение testing_set - /* - for (SapforPackage_json srcPackage : src_jsons) { - //-- - for (SapforTestingSet_json src : srcPackage.testingSets) { - SapforTestingSet_json dst = cloneTestingSet(src); - //-- - Vector new_tasks = target.getActualTestingSetTasks(dst); - if (!new_tasks.isEmpty()) { - target.package_json.testingSets.add(dst); - target.package_json.tasks.addAll(new_tasks); - } PerformAutoSapforTesting - } - } - */ - for (SapforTask task : target.package_json.tasks) { - task.id = target.package_json.getMaxTaskId(); - } - target.tasksCount = target.package_json.tasks.size(); - /* - target.testsNames = String.join(";", target.package_json.getTestsNames()); - target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames()); - */ - //-- - return inexistingTests.isEmpty() && inexistingConfigurations.isEmpty() || - UI_.Question( - (inexistingTests.isEmpty() ? "" : (inexistingTests.size() + " тестов отсутствует;")) + - (inexistingConfigurations.isEmpty() ? "" : (inexistingConfigurations.size() + " конфигураций отсутствует;")) + - "Будет добавлено " + target.package_json.tasks.size() + " задач. Продолжить" - ); - } - @Override - protected void body() throws Exception { - Global.testingServer.db.sapforPackages.Data.put(target.id, target); - } -} \ No newline at end of file diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java b/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java index 6c66d421..7dd1fa5e 100644 --- a/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java +++ b/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java @@ -1,11 +1,10 @@ package Visual_DVM_2021.Passes.All; -import Common.Current_; -import Common.Utils.Utils_; -import _VisualDVM.Current; -import _VisualDVM.Visual.UI; -import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.PassCode; import Common.Passes.Pass; +import Common.Utils.Utils_; +import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Global; +import _VisualDVM.ProjectData.Files.DBProjectFile; +import _VisualDVM.Visual.UI; import javax.swing.*; public class CloseCurrentFile extends Pass { @@ -23,7 +22,7 @@ public class CloseCurrentFile extends Pass { } @Override protected boolean canStart(Object... args) throws Exception { - return (target = Current.getFile()) != null; + return (target = Global.mainModule.getFile()) != null; } @Override protected void body() throws Exception { @@ -36,13 +35,7 @@ public class CloseCurrentFile extends Pass { } @Override protected void performDone() throws Exception { - Current_.set(Current.File, null); - Current_.set(Current.FileGraphElement, null); - //- - Current_.set(Current.Notes, null); - Current_.set(Current.Warnings, null); - Current_.set(Current.Errors, null); - //- + Global.mainModule.DropCurrentFile(); } @Override protected void showDone() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java b/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java index 337b742c..768cbed6 100644 --- a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java +++ b/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java @@ -24,7 +24,7 @@ public class CloseCurrentProject extends Pass { } @Override protected boolean canStart(Object... args) throws Exception { - return (target = Current.getProject()) != null; + return (target = Global.mainModule.getProject()) != null; } @Override protected void performPreparation() throws Exception { @@ -39,20 +39,9 @@ public class CloseCurrentProject extends Pass { protected void performDone() throws Exception { Global.files_multiselection = false; //-- - Current.getSapfor().ResetAllAnalyses(); - Current.getSapfor().cd(Utils_.getHomeDirectory()); - Current_.set(Current.Project, null); - Current_.set(Current.File, null); - Current_.set(Current.Function, null); - Current_.set(Current.SelectedFunction,null); - Current_.set(Current.ProjectNode, null); - Current_.set(Current.SelectedFile, null); - Current_.set(Current.SelectedDirectory, null); - //-мб перестраховка. мб и нет. - Current_.set(Current.ParallelVariant, null); - Current_.set(Current.Dimensions, null); - Current_.set(Current.Array, null); - Current_.set(Current.DBArray, null); + Global.mainModule.getSapfor().ResetAllAnalyses(); + Global.mainModule.getSapfor().cd(Utils_.getHomeDirectory()); + Global.mainModule.DropCurrentProject(); //- } @Override diff --git a/src/Visual_DVM_2021/Passes/All/CloseProject.java b/src/Visual_DVM_2021/Passes/All/CloseProject.java index 9bd82c78..274cabd9 100644 --- a/src/Visual_DVM_2021/Passes/All/CloseProject.java +++ b/src/Visual_DVM_2021/Passes/All/CloseProject.java @@ -2,12 +2,13 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; import Common.Passes.Pass; public class CloseProject extends Pass { @Override protected boolean canStart(Object... args) throws Exception { - return (target = Current.getProject()) != null; + return (target = Global.mainModule.getProject()) != null; } @Override protected void body() throws Exception { @@ -15,9 +16,9 @@ public class CloseProject extends Pass { } @Override protected void performDone() throws Exception { - Current.getSapfor().ResetAllAnalyses(); - Current.getSapfor().cd(Utils_.getHomeDirectory()); - Current_.set(Current.Project, null); + Global.mainModule.getSapfor().ResetAllAnalyses(); + Global.mainModule.getSapfor().cd(Utils_.getHomeDirectory()); + Global.mainModule.set(Current.Project, null); //- } } \ No newline at end of file diff --git a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java b/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java index 09d95469..a5563756 100644 --- a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java +++ b/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java @@ -39,8 +39,8 @@ public class CompareDVMRunTasks extends Pass> { master = target.get(0); slave = null; return UI_.Question("Отобразить задачу " + Utils_.Brackets(master.getPK())); - } else if ((target.size() == 0) && (Current.HasDVMRunTask())) { - master = Current.getDVMRunTask(); + } else if ((target.size() == 0) && (Global.mainModule.HasDVMRunTask())) { + master = Global.mainModule.getDVMRunTask(); slave = null; return UI_.Question("Отобразить задачу " + Utils_.Brackets(master.getPK())); } else { diff --git a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java index 5999c608..d13b8076 100644 --- a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java +++ b/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java @@ -39,8 +39,8 @@ public class CompareSapforPackages extends Pass> { master = target.get(0); slave = null; return UI_.Question("Отобразить пакет " + Utils_.Brackets(master.getPK())); - } else if ((target.size() == 0) && (Current.HasSapforPackage())) { - master = Current.getSapforPackage(); + } else if ((target.size() == 0) && (Global.mainModule.HasSapforPackage())) { + master =Global.mainModule.getSapforPackage(); slave = null; return UI_.Question("Отобразить пакет " + Utils_.Brackets(master.getPK())); } else { diff --git a/src/Visual_DVM_2021/Passes/All/Compile.java b/src/Visual_DVM_2021/Passes/All/Compile.java index 6883f8d4..0b84fc55 100644 --- a/src/Visual_DVM_2021/Passes/All/Compile.java +++ b/src/Visual_DVM_2021/Passes/All/Compile.java @@ -19,7 +19,7 @@ public class Compile extends Pass { CompilationTask compilationTask = null; @Override protected PassCode necessary() { - return Current.getProject().languageName.equals(LanguageName.fortran) ? PassCode.SPF_ParseFilesWithOrder : null; + return Global.mainModule.getProject().languageName.equals(LanguageName.fortran) ? PassCode.SPF_ParseFilesWithOrder : null; } @Override public String getIconPath() { @@ -31,15 +31,15 @@ public class Compile extends Pass { } @Override protected boolean canStart(Object... args) { - if (Current_.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile)) { - target = Current.getProject(); + if (Global.mainModule.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile)) { + target = Global.mainModule.getProject(); subpass = null; compilationTask = null; - if (Current.getUser().state != UserState.ready_to_work) - Log.Writeln_("Пользователь " + Utils_.Brackets(Current.getUser().login) + + if (Global.mainModule.getUser().state != UserState.ready_to_work) + Log.Writeln_("Пользователь " + Utils_.Brackets(Global.mainModule.getUser().login) + " не проинициализирован\nПерейдите на вкладку 'Настройки компиляции и запуска',\n" + " и выполните команду 'Инициализация пользователя'\n"); - Current.getMakefile().Validate(Log); + Global.mainModule.getMakefile().Validate(Log); return Log.isEmpty(); } return false; @@ -47,9 +47,9 @@ public class Compile extends Pass { @Override protected void performPreparation() throws Exception { compilationTask = new CompilationTask(); - compilationTask.machine_id = Current.getMachine().id; - compilationTask.user_id = Current.getUser().id; - compilationTask.makefile_id = Current.getMakefile().id; + compilationTask.machine_id = Global.mainModule.getMachine().id; + compilationTask.user_id = Global.mainModule.getUser().id; + compilationTask.makefile_id = Global.mainModule.getMakefile().id; compilationTask.project_path = target.Home.getAbsolutePath(); compilationTask.project_description = target.description; //------------------------------------------ @@ -65,7 +65,7 @@ public class Compile extends Pass { @Override protected void body() throws Exception { - switch (Current.getMachine().type) { + switch (Global.mainModule.getMachine().type) { case Local: if (Utils_.isWindows()) { subpass = passes.get(PassCode.WindowsLocalCompilation); @@ -74,12 +74,12 @@ public class Compile extends Pass { break; case Undefined: case MVS_cluster: - throw new PassException("Компиляция не реализована для типа машины " + Utils_.DQuotes(Current.getMachine().type)); + throw new PassException("Компиляция не реализована для типа машины " + Utils_.DQuotes(Global.mainModule.getMachine().type)); default: subpass = passes.get(PassCode.RemoteCompilation); break; } - subpass.Do(Current.getCompilationTask(), Current.getProject()); + subpass.Do(Global.mainModule.getCompilationTask(), Global.mainModule.getProject()); } @Override protected boolean validate() { diff --git a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java index 07833129..c4dae74c 100644 --- a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java +++ b/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Visual.UI_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; @@ -24,11 +25,11 @@ public class ConvertCorrectnessTests extends TestingSystemPass { } @Override protected boolean canStart(Object... args) throws Exception { - if (!Current.getAccount().isAdmin()) { + if (!Global.mainModule.getAccount().isAdmin()) { Log.Writeln_("Вы не являетесь администратором"); return false; } - if (!Current_.Check(Log, Current.ServerSapfor)){ + if (!Global.mainModule.Check(Log, Current.ServerSapfor)){ return false; } return UI_.Warning("Загрузить полный пакет DVM тестов на корректность и производительность."); @@ -40,8 +41,8 @@ public class ConvertCorrectnessTests extends TestingSystemPass { @Override protected void performPreparation() throws Exception { passes.get(PassCode.CloseCurrentProject); - Current_.set(Current.Root, null); - Current_.set(Current.Version, null); + Global.mainModule.set(Current.Root, null); + Global.mainModule.set(Current.Version, null); } @Override protected void showPreparation() throws Exception { @@ -49,7 +50,8 @@ public class ConvertCorrectnessTests extends TestingSystemPass { } @Override protected void ServerAction() throws Exception { - Command(new ServerExchangeUnit_2021(ServerCode.RefreshDVMTests, String.valueOf(Current.getServerSapfor().id), Current.getAccount())); + Command(new ServerExchangeUnit_2021(ServerCode.RefreshDVMTests, + String.valueOf(Global.mainModule.getServerSapfor().id), Global.mainModule.getAccount())); } @Override protected void performFinish() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java index 8d4a6948..0db921c1 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java +++ b/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.Text.FileNameForm; import Visual_DVM_2021.Passes.ChangeFilePass; @@ -17,7 +18,7 @@ public class CreateEmptyDirectory extends ChangeFilePass { if ((ff = new FileNameForm()).ShowDialog("Введите имя создаваемой папки")) { fileName = ff.Result; //-> - parent_node = Current.getProjectCurrentParentNode(); + parent_node = Global.mainModule.getProjectCurrentParentNode(); target_dir = (File) parent_node.getUserObject(); //-> dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile(); diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java index 5db20d10..07a80979 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java +++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java @@ -3,6 +3,7 @@ import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.VDirectoryChooser; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Settings.SettingName; import Visual_DVM_2021.Passes.PassCode; @@ -59,7 +60,7 @@ public class CreateGroupFromDirectory extends PublishTests { return false; } if (passes.get(PassCode.PublishGroup).Do(dir.getName().toUpperCase())) { - group = Current.getGroup(); + group = Global.mainModule.getGroup(); } else return false; //--------------- Vector files = new Vector<>(Arrays.asList(files_)); diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java index e58a2138..589fa23b 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java +++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java @@ -3,6 +3,7 @@ import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.VFileChooser; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.TestingSystem.Common.Group.Group; @@ -45,7 +46,7 @@ public class CreateGroupFromFiles extends PublishTests{ return false; } if (passes.get(PassCode.PublishGroup).Do(dir.getName().toUpperCase())) { - group = Current.getGroup(); + group = Global.mainModule.getGroup(); } else return false; //-- return super.canStart(files, group); diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java index 62b528a5..8f362bfb 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java +++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java @@ -4,6 +4,7 @@ import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.VDirectoryChooser; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.ProjectData.Files.ProjectFile; @@ -59,8 +60,8 @@ public class CreateTestFromDirectory extends Pass { Vector project_files = new Vector<>(); protected boolean initTarget() throws Exception { target = new Test(); - target.sender_address = Current.getAccount().email; - target.sender_name = Current.getAccount().name; + target.sender_address = Global.mainModule.getAccount().email; + target.sender_name = Global.mainModule.getAccount().name; target.group_id = group.id; target.description = dir.getName(); return true; @@ -71,9 +72,9 @@ public class CreateTestFromDirectory extends Pass { if (args.length == 0) { //-- from_files_chooser = true; - if (!Current_.Check(Log, Current.Group)) + if (!Global.mainModule.Check(Log, Current.Group)) return false; - group = Current.getGroup(); + group = Global.mainModule.getGroup(); if (!selectFiles()) return false; //- @@ -203,7 +204,7 @@ public class CreateTestFromDirectory extends Pass { //-- получить размерность консольным сапфором. папка уже отправлена и чистить ее не нужно!! ShowMessage2("Синтаксический анализ и определение размерности"); if (group.language == LanguageName.fortran) {//если не определит, будут нули. - Sapfor.getMinMaxDim(Sapfor.getTempCopy(Current.getSapfor().getFile()), tempProject, target); + Sapfor.getMinMaxDim(Sapfor.getTempCopy(Global.mainModule.getSapfor().getFile()), tempProject, target); } } @Override diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java index 61424908..763f962a 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java +++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.FileType; import _VisualDVM.ProjectData.Files.ProjectFile; @@ -51,8 +52,8 @@ public class CreateTestFromFile extends Pass { } //-- target = new Test(); - target.sender_address = Current.getAccount().email; - target.sender_name = Current.getAccount().name; + target.sender_address = Global.mainModule.getAccount().email; + target.sender_name = Global.mainModule.getAccount().name; target.group_id = group.id; target.description = Utils_.getNameWithoutExtension(file_in.getName()); target.files = file_in.getName(); @@ -84,6 +85,6 @@ public class CreateTestFromFile extends Pass { File tempProject = packTestCode(); ShowMessage2("Синтаксический анализ и определение размерности"); if (group.language == LanguageName.fortran) - Sapfor.getMinMaxDim(Sapfor.getTempCopy(Current.getSapfor().getFile()), tempProject, target); + Sapfor.getMinMaxDim(Sapfor.getTempCopy(Global.mainModule.getSapfor().getFile()), tempProject, target); } } diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java index 3d15637a..0d97c39b 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java +++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.FileState; import _VisualDVM.ProjectData.Files.ProjectFile; import _VisualDVM.ProjectData.Project.db_project_info; @@ -15,9 +16,9 @@ public class CreateTestFromProject extends CreateTestFromDirectory { @Override protected boolean canStart(Object... args) throws Exception { if (args.length == 0) { - if (Current_.Check(Log, Current.Group, Current.Project)) { - project = Current.getProject(); - if (super.canStart(Current.getProject().Home, Current.getGroup())){ + if (Global.mainModule.Check(Log, Current.Group, Current.Project)) { + project = Global.mainModule.getProject(); + if (super.canStart(Global.mainModule.getProject().Home, Global.mainModule.getGroup())){ from_files_chooser = true; //чтобы опубликовал. return true; } @@ -26,7 +27,7 @@ public class CreateTestFromProject extends CreateTestFromDirectory { project = (db_project_info) args[0]; group = (Group) args[1]; //если проект не текущий, освежить его бд. - if (!Current.HasProject() || !Current.getProject().Home.equals(project.Home)) { + if (!Global.mainModule.HasProject() || !Global.mainModule.getProject().Home.equals(project.Home)) { project.Open(); project.Close(); } diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java index 82344fed..c5fdfcfe 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java +++ b/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.VFileChooser; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Settings.SettingName; import Visual_DVM_2021.Passes.PassCode; @@ -21,7 +22,7 @@ public class CreateTestsFromFiles extends PublishTests { } @Override protected boolean canStart(Object... args) throws Exception { - if (Current_.Check(Log, Current.Group)){ + if (Global.mainModule.Check(Log, Current.Group)){ Utils.RestoreSelectedDirectory(fileChooser); Vector files = fileChooser.ShowMultiDialog(); if (files.isEmpty()){ @@ -29,7 +30,7 @@ public class CreateTestsFromFiles extends PublishTests { return false; } Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, fileChooser.getCurrentDirectory()); - return super.canStart(files, Current.getGroup()); + return super.canStart(files, Global.mainModule.getGroup()); } return false; } diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java index b149b1c9..0452fd06 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java +++ b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java @@ -3,6 +3,7 @@ import Common.Current_; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.TestingSystem.Common.Test.Test; import Visual_DVM_2021.Passes.PassCode; @@ -22,13 +23,13 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests { protected boolean canStart(Object... args) throws Exception { target = new Vector<>(); //--- - if (Current_.Check(Log, Current.Group)) { - group = Current.getGroup(); + if (Global.mainModule.Check(Log, Current.Group)) { + group = Global.mainModule.getGroup(); } else return false; //--------------------- Vector versions = new Vector<>(); - Current.getRoot().getSelectedVersions(versions); + Global.mainModule.getRoot().getSelectedVersions(versions); if (versions.isEmpty()) { Log.Writeln_("Не отмечено ни одной версии."); return false; diff --git a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java index f766d198..3ccd4b86 100644 --- a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java +++ b/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java @@ -42,8 +42,8 @@ public class DVMConvertProject extends ComponentsRepositoryPass version = null; badFiles = ""; //-- - if (Current_.Check(Log, Current.Project)) { - target = Current.getProject(); + if (Global.mainModule.Check(Log, Current.Project)) { + target = Global.mainModule.getProject(); programsToConvert = target.getPrograms().get(target.languageName); programsNames = new Vector<>(); if (programsToConvert.size() > 100) { @@ -136,10 +136,10 @@ public class DVMConvertProject extends ComponentsRepositoryPass @Override protected void showFinish() throws Exception { UI.getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages(); - if (Current.HasFile()) { - Current.getFile().form.ShowCompilationOutput(); + if (Global.mainModule.HasFile()) { + Global.mainModule.getFile().form.ShowCompilationOutput(); if (!output.isEmpty()) - Current.getFile().form.FocusCompilationOut(); + Global.mainModule.getFile().form.FocusCompilationOut(); } if (!badFiles.isEmpty()) UI_.Error(badFiles); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java b/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java index 2f22e520..464cb376 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java @@ -11,7 +11,7 @@ public class DeleteBugReport extends DeleteObjectPass { } @Override protected boolean canStart(Object... args) throws Exception { - return super.canStart(args) && Current.getAccount().CheckAccessRights(target.sender_address, Log); + return super.canStart(args) && Global.mainModule.getAccount().CheckAccessRights(target.sender_address, Log); } @Override protected void performDone() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java b/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java index 83b07993..771bb405 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java @@ -3,6 +3,7 @@ import Common.Current_; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.DBProjectFile; @@ -21,9 +22,9 @@ public class DeleteDirectory extends ChangeFilePass { @Override protected boolean canStart(Object... args) { resetArgs(); - dst_node = Current.getProjectNode(); + dst_node = Global.mainModule.getProjectNode(); if ((dst_node != null) && (dst_node.getUserObject() instanceof File)) { - target_dir = Current.getSelectedDirectory(); + target_dir = Global.mainModule.getSelectedDirectory(); if (target_dir.equals(project.Home)) { Log.Writeln("Нельзя удалять домашнюю папку проекта."); return false; @@ -35,7 +36,7 @@ public class DeleteDirectory extends ChangeFilePass { } @Override protected void performPreparation() throws Exception { - if (Current.HasFile() && (Utils.isAnchestor(Current.getFile().file, target_dir))) + if (Global.mainModule.HasFile() && (Utils.isAnchestor(Global.mainModule.getFile().file, target_dir))) passes.get(PassCode.CloseCurrentFile).Do(); } @Override @@ -56,7 +57,7 @@ public class DeleteDirectory extends ChangeFilePass { } @Override protected void performDone() throws Exception { - Current_.set(Current.SelectedDirectory, null); - Current_.set(Current.ProjectNode, null); + Global.mainModule.set(Current.SelectedDirectory, null); + Global.mainModule.set(Current.ProjectNode, null); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java index d6dd72c9..5885b0c0 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java @@ -58,7 +58,7 @@ public class DeleteDownloadedBugReports extends Pass { } @Override protected void performPreparation() throws Exception { - if (Current.HasProject()) + if (Global.mainModule.HasProject()) passes.get(PassCode.CloseCurrentProject).Do(); } @Override diff --git a/src/Visual_DVM_2021/Passes/All/DeleteFile.java b/src/Visual_DVM_2021/Passes/All/DeleteFile.java index 6022e5a5..960f2dc0 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteFile.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteFile.java @@ -3,6 +3,7 @@ import Common.Current_; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.DBProjectFile; @@ -16,13 +17,13 @@ public class DeleteFile extends ChangeFilePass { @Override protected boolean canStart(Object... args) { resetArgs(); - return (Current_.Check(Log, Current.SelectedFile)) && + return (Global.mainModule.Check(Log, Current.SelectedFile)) && UI_.Warning("Удалить файл " - + Utils_.Brackets((target = Current.getSelectedFile()).name)); + + Utils_.Brackets((target = Global.mainModule.getSelectedFile()).name)); } @Override protected void performPreparation() throws Exception { - if (Current.HasFile() && (Current.getFile().file.equals(target.file))) + if (Global.mainModule.HasFile() && (Global.mainModule.getFile().file.equals(target.file))) passes.get(PassCode.CloseCurrentFile).Do(); } @Override @@ -33,7 +34,7 @@ public class DeleteFile extends ChangeFilePass { } @Override protected void performDone() throws Exception { - Current_.set(Current.SelectedFile, null); - Current_.set(Current.ProjectNode, null); + Global.mainModule.set(Current.SelectedFile, null); + Global.mainModule.set(Current.ProjectNode, null); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java b/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java index b08a1b93..ec48477a 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; import Visual_DVM_2021.Passes.PassCode; import Common.Passes.Pass; @@ -9,8 +10,8 @@ import java.util.Vector; public class DeleteLonelyM extends Pass { @Override protected boolean canStart(Object... args) throws Exception { - if (Current_.Check(Log, Current.Root)) { - target = Current.getRoot(); + if (Global.mainModule.Check(Log, Current.Root)) { + target = Global.mainModule.getRoot(); return true; } return false; diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java index 8dfcb754..a450e7e7 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Visual.UI_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.DBProjectFile; @@ -14,29 +15,29 @@ public class DeleteSelectedFiles extends Pass { } @Override protected boolean canStart(Object... args) throws Exception { - if (Current.getProject().db.files.getCheckedCount() == 0) { + if (Global.mainModule.getProject().db.files.getCheckedCount() == 0) { Log.Writeln_("Не отмечено ни одного файла."); return false; } - return UI_.Warning("Удалить " + Current.getProject().db.files.getCheckedCount() + " файлов."); + return UI_.Warning("Удалить " + Global.mainModule.getProject().db.files.getCheckedCount() + " файлов."); } @Override protected void performPreparation() throws Exception { boolean hasCurrent = false; boolean hasSelected = false; - if (Current.HasFile()) { - for (DBProjectFile file : Current.getProject().db.files.getCheckedItems()) { - if (Current.getFile().file.equals(file.file)) + if (Global.mainModule.HasFile()) { + for (DBProjectFile file :Global.mainModule.getProject().db.files.getCheckedItems()) { + if (Global.mainModule.getFile().file.equals(file.file)) hasCurrent = true; - if (Current.getSelectedFile().file.equals(file.file)) + if (Global.mainModule.getSelectedFile().file.equals(file.file)) hasSelected = true; } } if (hasCurrent) passes.get(PassCode.CloseCurrentFile).Do(); if (hasSelected) { - Current_.set(Current.SelectedFile, null); - Current_.set(Current.ProjectNode, null); + Global.mainModule.set(Current.SelectedFile, null); + Global.mainModule.set(Current.ProjectNode, null); } } @Override @@ -45,10 +46,10 @@ public class DeleteSelectedFiles extends Pass { } @Override protected void body() throws Exception { - for (DBProjectFile file : Current.getProject().db.files.getCheckedItems()) { + for (DBProjectFile file : Global.mainModule.getProject().db.files.getCheckedItems()) { ShowMessage1(file.name); UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RemoveNode(file.node); - Current.getProject().db.Delete(file); + Global.mainModule.getProject().db.Delete(file); Utils.forceDeleteWithCheck(file.file); } } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java index 01c9c846..1d2a752b 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java @@ -27,19 +27,19 @@ public class DeleteSelectedVersions extends Pass> { Log.Writeln_("Нажмите правую клавишу мыши, и перейдите в режим выбора версий."); return false; } - if (!Current_.Check(Log, Current.Root)) { + if (!Global.mainModule.Check(Log, Current.Root)) { return false; } Vector allVersions = new Vector<>(); - Current.getRoot().getSelectedVersions(allVersions); + Global.mainModule.getRoot().getSelectedVersions(allVersions); if (allVersions.size() == 0) { Log.Writeln_("Не отмечено ни одной версии."); return false; } - int q = Current.getRoot().getSelectedVersionsForDeletion(target); - if (Current.HasProject()) { + int q = Global.mainModule.getRoot().getSelectedVersionsForDeletion(target); + if (Global.mainModule.HasProject()) { for (db_project_info version : target) { - if (Current.getProject().Home.getAbsolutePath().startsWith(version.Home.getAbsolutePath())) { + if (Global.mainModule.getProject().Home.getAbsolutePath().startsWith(version.Home.getAbsolutePath())) { has_current_project = true; break; } diff --git a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java b/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java index ccf87f98..d0834bf0 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java +++ b/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java @@ -10,6 +10,6 @@ public class DeleteServerSapfor extends DeleteServerObject { protected boolean canStart(Object... args) { if (args.length > 0) { target = (db_project_info) args[0]; - current = (Current.getVersion() != null) && Current.getVersion().Home.equals(target.Home); + current = (Global.mainModule.getVersion() != null) && Global.mainModule.getVersion().Home.equals(target.Home); return true; } else { - if (((target = Current.getVersion()) != null) && (!UI_.isActive() || + if (((target = Global.mainModule.getVersion()) != null) && (!UI_.isActive() || UI_.Warning("Удалить " + - ((Current.HasProject() && target.Home.equals(Current.getProject().Home)) ? "текущий проект" : "версию ") + ((Global.mainModule.HasProject() && target.Home.equals(Global.mainModule.getProject().Home)) ? "текущий проект" : "версию ") + Utils_.Brackets(target.name)))) { current = true; return true; @@ -36,8 +37,8 @@ public class DeleteVersion extends Pass { protected void performPreparation() throws Exception { if (target.parent != null) target.parent.checkLastModification(target); - if (Current.HasProject()) { - if ((Current.getProject().Home.getAbsolutePath().startsWith(target.Home.getAbsolutePath()))) + if (Global.mainModule.HasProject()) { + if ((Global.mainModule.getProject().Home.getAbsolutePath().startsWith(target.Home.getAbsolutePath()))) passes.get(PassCode.CloseCurrentProject).Do(); } if (UI_.isActive()) { @@ -52,11 +53,11 @@ public class DeleteVersion extends Pass { protected void performDone() throws Exception { parent = target.parent; if (current) - Current_.set(Current.Version, null); + Global.mainModule.set(Current.Version, null); if (parent != null) { UI.getVersionsWindow().getVersionsForm().getTree().RemoveNode(target.node); parent.versions.remove(target.name); } else - Current_.set(Current.Root, null); + Global.mainModule.set(Current.Root, null); } } diff --git a/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java b/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java index 01af8ea4..feeece05 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java +++ b/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java @@ -23,7 +23,7 @@ public class DownloadAllBugReportsArchives extends ComponentsRepositoryPass { @Override protected void ServerAction() throws Exception { - target = Current.getComponent(); + target = Global.mainModule.getComponent(); String packed = target.getComponentType()+"\n"+target.getFileName(); Command(new ServerExchangeUnit_2021(ServerCode.ReceiveComponent, packed)); Utils_.bytesToFile((byte[]) response.object, target.getNewFile()); diff --git a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java index 20d0509d..b9ecf128 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java +++ b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java @@ -15,9 +15,9 @@ public class DownloadDVMPackage extends DownloadDVMPackages { } DVMPackage dvmPackage; protected boolean canStart(Object... args) throws Exception { - if (Current_.Check(Log, Current.DVMPackage)) { + if (Global.mainModule.Check(Log, Current.DVMPackage)) { //-- - dvmPackage = Current.getDVMPackage(); + dvmPackage = Global.mainModule.getDVMPackage(); //-- if (!dvmPackage.state.isDone() diff --git a/src/Visual_DVM_2021/Passes/All/DownloadProject.java b/src/Visual_DVM_2021/Passes/All/DownloadProject.java index 27204a7f..41422501 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadProject.java +++ b/src/Visual_DVM_2021/Passes/All/DownloadProject.java @@ -23,7 +23,7 @@ public class DownloadProject extends CurrentConnectionPass { protected void ServerAction() throws Exception { dialogOK = (UI.getRemoteFileChooser().ShowDialog(getDescription(), this, true)); if (dialogOK) { - src = Current.getRemoteFile(); + src = Global.mainModule.getRemoteFile(); remote_archive = new RemoteFile(src.full_name, src.name + ".zip", false); local_archive = Utils.getTempFileName(remote_archive.name); if ((user.connection.getFileKBSize(src.full_name)) <= maxSize) { @@ -42,12 +42,12 @@ public class DownloadProject extends CurrentConnectionPass { } else throw new PassException("Размер проекта превышает " + maxSize + " KB.\n"); } else { //диалога не вышло, сбрасываем файл. - Current_.set(Current.RemoteFile, null); + Global.mainModule.set(Current.RemoteFile, null); } } @Override protected boolean validate() { - Current_.Check(Log, Current.RemoteFile); + Global.mainModule.Check(Log, Current.RemoteFile); return (Log.isEmpty()); } @Override diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java b/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java index 4b3f1089..6297f97e 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java +++ b/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask; import _VisualDVM.TestingSystem.Common.Test.Test; public class DownloadTaskTest extends DownloadTest { @@ -11,8 +12,8 @@ public class DownloadTaskTest extends DownloadTest { @Override protected boolean canStart(Object... args) throws Exception { target = null; - if (Current.getAccount().CheckRegistered(Log) && Current_.Check(Log, Current.DVMRunTask)) { - DVMRunTask task = Current.getDVMRunTask(); + if (Global.mainModule.getAccount().CheckRegistered(Log) && Global.mainModule.Check(Log, Current.DVMRunTask)) { + DVMRunTask task = Global.mainModule.getDVMRunTask(); //-- квазиобъект, нам от него нужно только имя. target = new Test(); target.id = task.test_id; diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTest.java b/src/Visual_DVM_2021/Passes/All/DownloadTest.java index ffeab5fa..0a6b453b 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadTest.java +++ b/src/Visual_DVM_2021/Passes/All/DownloadTest.java @@ -21,8 +21,8 @@ public class DownloadTest extends TestingSystemPass { } @Override protected boolean canStart(Object... args) throws Exception { - if (Current.getAccount().CheckRegistered(Log) && Current_.Check(Log, Current.Test)) { - target = Current.getTest(); + if (Global.mainModule.getAccount().CheckRegistered(Log) && Global.mainModule.Check(Log, Current.Test)) { + target = Global.mainModule.getTest(); return true; } return false; @@ -30,7 +30,7 @@ public class DownloadTest extends TestingSystemPass { @Override protected void performPreparation() throws Exception { passes.get(PassCode.CloseCurrentProject).Do(); - Current_.set(Current.Root, null); //чтобы гарантированно не существовало корня. + Global.mainModule.set(Current.Root, null); //чтобы гарантированно не существовало корня. Utils.forceDeleteWithCheck(target.getArchive()); Utils.forceDeleteWithCheck(target.getHomePath()); } diff --git a/src/Visual_DVM_2021/Passes/All/DropAnalyses.java b/src/Visual_DVM_2021/Passes/All/DropAnalyses.java index a11c8b95..19f05c2c 100644 --- a/src/Visual_DVM_2021/Passes/All/DropAnalyses.java +++ b/src/Visual_DVM_2021/Passes/All/DropAnalyses.java @@ -1,13 +1,14 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; import Visual_DVM_2021.Passes.CurrentProjectPass; +import _VisualDVM.Global; public class DropAnalyses extends CurrentProjectPass { @Override protected boolean canStart(Object... args) throws Exception { - return super.canStart(args) && (Current.getSapfor() != null); + return super.canStart(args) && (Global.mainModule.getSapfor() != null); } @Override protected void body() throws Exception { - Current.getSapfor().ResetAllAnalyses(); + Global.mainModule.getSapfor().ResetAllAnalyses(); } } diff --git a/src/Visual_DVM_2021/Passes/All/EditAccount.java b/src/Visual_DVM_2021/Passes/All/EditAccount.java index a60aee43..ab204313 100644 --- a/src/Visual_DVM_2021/Passes/All/EditAccount.java +++ b/src/Visual_DVM_2021/Passes/All/EditAccount.java @@ -61,9 +61,9 @@ public class EditAccount extends Email { @Override protected void performDone() throws Exception { super.performDone(); - Current.getAccount().name = name; - Current.getAccount().email = email; - Global.mainModule.getDb().Update(Current.getAccount()); + Global.mainModule.getAccount().name = name; + Global.mainModule.getAccount().email = email; + Global.mainModule.getDb().Update(Global.mainModule.getAccount()); //это не регистрация. только заполнение почты в своей бд и ее подтверждение на реальность. } } diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java b/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java index d0aa413e..b2b220de 100644 --- a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java +++ b/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.SessionMaxtimeDialog; import Visual_DVM_2021.Passes.CurrentProjectPass; +import _VisualDVM.Global; public class EditProjectCompilationMaxtime extends CurrentProjectPass { @Override public String getIconPath() { @@ -15,7 +16,7 @@ public class EditProjectCompilationMaxtime extends CurrentProjectPass { @Override protected boolean canStart(Object... args) throws Exception { return super.canStart(args) && - (f = new SessionMaxtimeDialog()).ShowDialog("максимальное время компиляции", Current.getProject().compilation_maxtime); + (f = new SessionMaxtimeDialog()).ShowDialog("максимальное время компиляции", Global.mainModule.getProject().compilation_maxtime); } @Override protected void body() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java b/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java index 86243b3c..4b5137a9 100644 --- a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java +++ b/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.SessionMaxtimeDialog; import Visual_DVM_2021.Passes.CurrentProjectPass; +import _VisualDVM.Global; public class EditProjectRunMaxtime extends CurrentProjectPass { @Override public String getIconPath() { @@ -15,7 +16,7 @@ public class EditProjectRunMaxtime extends CurrentProjectPass { @Override protected boolean canStart(Object... args) throws Exception { return super.canStart(args) && - (f = new SessionMaxtimeDialog()).ShowDialog("максимальное время запуска", Current.getProject().run_maxtime); + (f = new SessionMaxtimeDialog()).ShowDialog("максимальное время запуска", Global.mainModule.getProject().run_maxtime); } @Override protected void body() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/ExcludeFile.java b/src/Visual_DVM_2021/Passes/All/ExcludeFile.java index c938e707..e70cb497 100644 --- a/src/Visual_DVM_2021/Passes/All/ExcludeFile.java +++ b/src/Visual_DVM_2021/Passes/All/ExcludeFile.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.FileState; @@ -16,8 +17,8 @@ public class ExcludeFile extends Pass { target = (DBProjectFile) args[0]; return !target.state.equals(FileState.Excluded); } - return Current_.Check(Log, Current.SelectedFile) - && !(target = Current.getSelectedFile()).state.equals(FileState.Excluded); + return Global.mainModule.Check(Log, Current.SelectedFile) + && !(target = Global.mainModule.getSelectedFile()).state.equals(FileState.Excluded); } @Override protected void body() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java index 23e9617c..24b091fc 100644 --- a/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java +++ b/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java @@ -18,9 +18,7 @@ public class ExcludeSelectedFiles extends Pass> { return false; } - target = new Vector<>(); - for (DBProjectFile file: Current.getProject().db.files.Data.values()) - if (file.isSelected()) target.add(file); + target = Global.mainModule.getProject().db.files.getCheckedItems(); if (target.isEmpty()){ Log.Writeln_("Не отмечено ни одного файла."); return false; diff --git a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java index a989b487..3071237c 100644 --- a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java +++ b/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java @@ -62,9 +62,9 @@ public class ExportDVMPackageToExcel extends Pass> { if (Global.testingServer.db.dvmPackages.getCheckedCount() > 0) { target = Global.testingServer.db.dvmPackages.getCheckedItems(); } else { - if (Current_.Check(Log, Current.DVMPackage)) { + if (Global.mainModule.Check(Log, Current.DVMPackage)) { target = new Vector<>(); - target.add(Current.getDVMPackage()); + target.add(Global.mainModule.getDVMPackage()); } else return false; } Vector packagesToDownload = new Vector<>(); diff --git a/src/Visual_DVM_2021/Passes/All/GCOV.java b/src/Visual_DVM_2021/Passes/All/GCOV.java index ddedb523..fc7a3560 100644 --- a/src/Visual_DVM_2021/Passes/All/GCOV.java +++ b/src/Visual_DVM_2021/Passes/All/GCOV.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Module.Module; import _VisualDVM.ProjectData.Files.DBProjectFile; @@ -50,9 +51,9 @@ public class GCOV extends Precompilation { @Override protected void showPreparation() throws Exception { //super.showPreparation(); тут не надо отображать пустые анализы. - if (Current.HasFile()) { - Current.getFile().form.ShowNoRunOutput(); - Current.getFile().form.ShowNoGCOVLog(); + if (Global.mainModule.HasFile()) { + Global.mainModule.getFile().form.ShowNoRunOutput(); + Global.mainModule.getFile().form.ShowNoGCOVLog(); } } @Override @@ -108,16 +109,16 @@ public class GCOV extends Precompilation { @Override protected void showDone() throws Exception { super.showDone(); - if (Current.HasFile()) { - Current.getFile().form.ShowRunOutput(); - Current.getFile().form.ShowGCOVLog(); + if (Global.mainModule.HasFile()) { + Global.mainModule.getFile().form.ShowRunOutput(); + Global.mainModule.getFile().form.ShowGCOVLog(); } } @Override protected void showFail() throws Exception { super.showFail(); - if (Current.HasFile()) - Current.getFile().form.FocusCompilationOut(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.FocusCompilationOut(); } @Override protected void performDone() throws Exception { @@ -125,8 +126,8 @@ public class GCOV extends Precompilation { } @Override protected void FocusResult() { - if (Current.HasFile()) - Current.getFile().form.FocusGCOVLog(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.FocusGCOVLog(); } /* @Override diff --git a/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java b/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java index 112f74ab..3e387da7 100644 --- a/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java +++ b/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; @@ -11,17 +12,17 @@ public class GetComponentsBackupsFromServer extends ComponentsRepositoryPass(); - return (Current_.Check(Log, Current.Component)); + return (Global.mainModule.Check(Log, Current.Component)); } @Override protected void ServerAction() throws Exception { - Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsBackups, Current.getComponent().getComponentType().toString())); + Command(new ServerExchangeUnit_2021(ServerCode.GetComponentsBackups, Global.mainModule.getComponent().getComponentType().toString())); target = (Vector) response.object; } @Override protected boolean validate() { if (target.isEmpty()) { - Log.Writeln_("Не найдено резервных копий на сервере для компонента " + Current.getComponent().getComponentType().getDescription()); + Log.Writeln_("Не найдено резервных копий на сервере для компонента " + Global.mainModule.getComponent().getComponentType().getDescription()); return false; } return true; diff --git a/src/Visual_DVM_2021/Passes/All/IncludeFile.java b/src/Visual_DVM_2021/Passes/All/IncludeFile.java index 42512c7f..402017ac 100644 --- a/src/Visual_DVM_2021/Passes/All/IncludeFile.java +++ b/src/Visual_DVM_2021/Passes/All/IncludeFile.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.FileState; @@ -16,8 +17,8 @@ public class IncludeFile extends Pass { target = (DBProjectFile) args[0]; return target.state.equals(FileState.Excluded); } - return Current_.Check(Log, Current.SelectedFile) - && (target = Current.getSelectedFile()).state.equals(FileState.Excluded); + return Global.mainModule.Check(Log, Current.SelectedFile) + && (target =Global.mainModule.getSelectedFile()).state.equals(FileState.Excluded); } @Override protected void body() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java b/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java index 6b85be0e..617ed834 100644 --- a/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java +++ b/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java @@ -17,9 +17,7 @@ public class IncludeSelectedFiles extends Pass> { Log.Writeln_("Нажмите правую клавишу мыши, и перейдите в режим выбора файлов."); return false; } - target = new Vector<>(); - for (DBProjectFile file : Current.getProject().db.files.Data.values()) - if (file.isSelected()) target.add(file); + target = Global.mainModule.getProject().db.files.getCheckedItems(); if (target.isEmpty()) { Log.Writeln_("Не отмечено ни одного файла."); return false; diff --git a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java b/src/Visual_DVM_2021/Passes/All/InitialiseUser.java index f4d51177..ba411b94 100644 --- a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java +++ b/src/Visual_DVM_2021/Passes/All/InitialiseUser.java @@ -21,11 +21,11 @@ public class InitialiseUser extends Pass { } @Override protected boolean canStart(Object... args) throws Exception { - return Current_.Check(Log, Current.Machine, Current.User); + return Global.mainModule.Check(Log, Current.Machine, Current.User); } @Override protected void body() throws Exception { - switch (Current.getMachine().type) { + switch (Global.mainModule.getMachine().type) { case Local: passes.get(PassCode.LocalInitaliseUser).Do(); break; @@ -36,23 +36,23 @@ public class InitialiseUser extends Pass { if (workspace == null) { if (passes.get(PassCode.RemoteInitialiseUser).Do()){ workspace = new SubscriberWorkspace(); - workspace.email=Current.getAccount().email; - workspace.URL=Current.getMachine().getURL(); - workspace.login=Current.getUser().login; + workspace.email=Global.mainModule.getAccount().email; + workspace.URL=Global.mainModule.getMachine().getURL(); + workspace.login=Global.mainModule.getUser().login; workspace.path=((RemoteFile) passes.get(PassCode.RemoteInitialiseUser).target).full_name; //--- if (passes.get(PassCode.PublishRemoteWorkspace).Do(workspace)) { - Current.getUser().workspace = workspace.path; - Current.getUser().state = UserState.ready_to_work; - Global.mainModule.getDb().Update(Current.getUser()); + Global.mainModule.getUser().workspace = workspace.path; + Global.mainModule.getUser().state = UserState.ready_to_work; + Global.mainModule.getDb().Update(Global.mainModule.getUser()); } } } else { //рега была. просто заносим то что там пользователю - Current.getUser().workspace = workspace.path; - Current.getUser().state = UserState.ready_to_work; - Global.mainModule.getDb().Update(Current.getUser()); + Global.mainModule.getUser().workspace = workspace.path; + Global.mainModule.getUser().state = UserState.ready_to_work; + Global.mainModule.getDb().Update(Global.mainModule.getUser()); } } break; diff --git a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java index ec9d6d56..03193568 100644 --- a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java +++ b/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java @@ -12,7 +12,7 @@ import java.io.File; public class LocalInitaliseUser extends ProcessPass { @Override protected boolean canStart(Object... args) throws Exception { - target = Current.getUser(); + target = Global.mainModule.getUser(); return true; } @Override diff --git a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java b/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java index 4e4fc45d..5f197687 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java +++ b/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java @@ -23,8 +23,8 @@ public class OpenBugReportTestProject extends Pass { } @Override protected boolean canStart(Object... args) throws Exception { - if (Current_.Check(Log, Current.BugReport) && - (BugReportInterface.CheckNotDraft(target=Current.getBugReport(),Log))) { + if (Global.mainModule.Check(Log, Current.BugReport) && + (BugReportInterface.CheckNotDraft(target=Global.mainModule.getBugReport(),Log))) { if (!target.project_version.isEmpty()) { root = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(), @@ -43,7 +43,7 @@ public class OpenBugReportTestProject extends Pass { @Override protected void performPreparation() throws Exception { passes.get(PassCode.CloseCurrentProject).Do(); - Current_.set(Current.Root, null); //чтобы гарантированно не существовало корня. + Global.mainModule.set(Current.Root, null); //чтобы гарантированно не существовало корня. } @Override protected void body() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java b/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java index d9678f19..3d61dd49 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java +++ b/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java @@ -1,6 +1,8 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; +import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.DBProjectFile; import Visual_DVM_2021.Passes.PassCode; @@ -9,7 +11,7 @@ public class OpenCurrentFile extends Pass { @Override protected boolean canStart(Object... args) throws Exception { target = (args.length > 0) ? (DBProjectFile) args[0] : null; - return (target != null) && (!Current.HasFile() || (!Current.getFile().file.equals(target.file))); + return (target != null) && (!Global.mainModule.HasFile() || (!Global.mainModule.getFile().file.equals(target.file))); } @Override protected void performPreparation() throws Exception { @@ -21,7 +23,7 @@ public class OpenCurrentFile extends Pass { } @Override protected void performDone() throws Exception { - Current_.set(Current.File, target); + Global.mainModule.set(Current.File, target); } @Override protected void showDone() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java index 2c2fd9ce..fd433c24 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java +++ b/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java @@ -36,7 +36,7 @@ public class OpenCurrentProject extends Pass { return true; } boolean needsOpen() { - return !Current.HasProject() || !Current.getProject().Home.equals(dir); + return !Global.mainModule.HasProject() || !Global.mainModule.getProject().Home.equals(dir); } //----------------- @Override @@ -80,8 +80,8 @@ public class OpenCurrentProject extends Pass { root_changes = true; switch (mode) { case Directory: - if (Current.HasRoot()) { - db_project_info root = Current.getRoot(); + if (Global.mainModule.HasRoot()) { + db_project_info root = Global.mainModule.getRoot(); db_project_info project = root.find_version_r(dir); if (project != null) { Utils_.MainLog.Print("версия найдена в текущем корне"); @@ -106,10 +106,10 @@ public class OpenCurrentProject extends Pass { } @Override protected void performDone() throws Exception { - Current_.set(Current.Project, target); - Current_.set(Current.ProjectView, ProjectView.Files); + Global.mainModule.set(Current.Project, target); + Global.mainModule.set(Current.ProjectView, ProjectView.Files); if (root_changes) - Current_.set(Current.Root, new_root); + Global.mainModule.set(Current.Root, new_root); Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir.getParent()); Pass.passes.get(PassCode.UpdateSetting).Do( SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0") diff --git a/src/Visual_DVM_2021/Passes/All/OpenProject.java b/src/Visual_DVM_2021/Passes/All/OpenProject.java index e03ed67e..e9040834 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenProject.java +++ b/src/Visual_DVM_2021/Passes/All/OpenProject.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; import Visual_DVM_2021.Passes.PassCode; import Common.Passes.Pass; @@ -21,7 +22,7 @@ public class OpenProject extends Pass { } @Override protected void performDone() throws Exception { - Current_.set(Current.Project, target); + Global.mainModule.set(Current.Project, target); /* пока непонятно надо Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do( diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java index 55b3a0fe..ff9454bd 100644 --- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java +++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java @@ -30,8 +30,8 @@ public class PickCompilerEnvironments extends Pass { //- @Override protected boolean canStart(Object... args) throws Exception { - if (Current_.Check(Log, Current.RunConfiguration)) { - RunConfiguration configuration = Current.getRunConfiguration(); + if (Global.mainModule.Check(Log, Current.RunConfiguration)) { + RunConfiguration configuration = Global.mainModule.getRunConfiguration(); if (configuration.compiler_id == CommonConstants.Nan) { Log.Writeln_("Отсутвует DVM компилятор, связанный с текущей конфигурацией запуска.\n" + "Если конфигурация содержит вызов DVM компилятора, но была создана на версии 801 и ниже,\n" + @@ -73,14 +73,14 @@ public class PickCompilerEnvironments extends Pass { } @Override protected void body() throws Exception { - LinkedHashMap envValues = Current.getRunConfiguration().getEnvMap(); + LinkedHashMap envValues = Global.mainModule.getRunConfiguration().getEnvMap(); for (CompilerEnvironment compilerEnv : compiler.environments.Data.values()) { if (compilerEnv.isSelected()) { EnvironmentValue confEnv; if (!envValues.containsKey(compilerEnv.name)) { confEnv = new EnvironmentValue(); - confEnv.machine_id = Current.getRunConfiguration().machine_id; - confEnv.run_configuration_id = Current.getRunConfiguration().id; + confEnv.machine_id = Global.mainModule.getRunConfiguration().machine_id; + confEnv.run_configuration_id = Global.mainModule.getRunConfiguration().id; confEnv.name = compilerEnv.name; confEnv.value = compilerEnv.value; Global.mainModule.getDb().Insert(confEnv); diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java index 58d07909..fd441456 100644 --- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java +++ b/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Dialog; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment; @@ -21,7 +22,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass { return false; } target = ""; - compiler = Current.getCompiler(); + compiler = Global.mainModule.getCompiler(); if (!compiler.type.equals(CompilerType.dvm)) { Log.Writeln_("Выбор переменных окружения возможен только для DVM компилятора,"); return false; diff --git a/src/Visual_DVM_2021/Passes/All/Precompilation.java b/src/Visual_DVM_2021/Passes/All/Precompilation.java index e865f346..72a504ba 100644 --- a/src/Visual_DVM_2021/Passes/All/Precompilation.java +++ b/src/Visual_DVM_2021/Passes/All/Precompilation.java @@ -49,7 +49,7 @@ public class Precompilation extends Pass { } @Override protected boolean canStart(Object... args) throws Exception { - target = Current.getProject(); + target = Global.mainModule.getProject(); if (Utils_.isWindows()) { //-- makepath = Global.mainModule.getDb().settings.get(SettingName.LocalMakePathWindows).toString(); @@ -134,9 +134,9 @@ public class Precompilation extends Pass { @Override protected void showPreparation() throws Exception { UI.getMainWindow().getProjectWindow().ShowNoAnalyses(); - if (Current.HasFile()) { - Current.getFile().form.ShowNoMessages(); - Current.getFile().form.ShowNoAnalyses(); + if (Global.mainModule.HasFile()) { + Global.mainModule.getFile().form.ShowNoMessages(); + Global.mainModule.getFile().form.ShowNoAnalyses(); } } protected static void unpackPrecompilationMessages(db_project_info target, String text) throws Exception { @@ -241,9 +241,9 @@ public class Precompilation extends Pass { @Override protected void showFinish() throws Exception { UI.getMainWindow().getProjectWindow().RefreshProjectTreeAndMessages(); - if (Current.HasFile()) { - Current.getFile().form.ShowCompilationOutput(); - Current.getFile().form.FocusCompilationOut(); + if (Global.mainModule.HasFile()) { + Global.mainModule.getFile().form.ShowCompilationOutput(); + Global.mainModule.getFile().form.FocusCompilationOut(); } } @Override diff --git a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java b/src/Visual_DVM_2021/Passes/All/PublishBugReport.java index d5f854c4..d6e2c0c3 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java +++ b/src/Visual_DVM_2021/Passes/All/PublishBugReport.java @@ -25,8 +25,8 @@ public class PublishBugReport extends Pass { } @Override protected boolean canStart(Object... args) { - if (Current_.Check(Log, Current.BugReport)) { - target = Current.getBugReport(); + if (Global.mainModule.Check(Log, Current.BugReport)) { + target = Global.mainModule.getBugReport(); if (!target.state.equals(BugReportState.draft)) { Log.Writeln_("Отчёт об ошибке " + target.id + " уже опубликован!"); return false; @@ -36,7 +36,7 @@ public class PublishBugReport extends Pass { if (!UI_.Question("Для отчёта об ошибке не назначен исполнитель.\nВсе равно опубликовать его")) return false; } - if (!Current.getAccount().CheckAccessRights(target.sender_address, Log) && (BugReportInterface.CheckDraft(target, Log))) { + if (!Global.mainModule.getAccount().CheckAccessRights(target.sender_address, Log) && (BugReportInterface.CheckDraft(target, Log))) { return false; } return true; @@ -63,8 +63,8 @@ public class PublishBugReport extends Pass { message.addAttachement(BugReportInterface.getArchiveFile(target)); //со скринами будет небольшой трабл. потому что теретически возможна ситуация, //что проект черновика бага уже закрыт. - if (Current.HasProject()) { - for (File screen : Current.getProject().getScreenShots()) + if (Global.mainModule.HasProject()) { + for (File screen : Global.mainModule.getProject().getScreenShots()) message.addAttachement(screen); } } diff --git a/src/Visual_DVM_2021/Passes/All/PublishComponent.java b/src/Visual_DVM_2021/Passes/All/PublishComponent.java index 2e0b6c4d..558cde23 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishComponent.java +++ b/src/Visual_DVM_2021/Passes/All/PublishComponent.java @@ -36,16 +36,16 @@ public class PublishComponent extends ComponentsRepositoryPass { Log.Writeln_("Публикация компонент разрешена только для Windows"); return false; } - if (!Current.HasAccount()) { + if (!Global.mainModule.HasAccount()) { Log.Writeln_("Окно компонент было открыто до синхронизации прав"); return false; } - if (!Current.getAccount().role.equals(AccountRole.Admin)) { + if (!Global.mainModule.getAccount().role.equals(AccountRole.Admin)) { Log.Writeln_("Вы не являетесь администратором"); } ; - if (Current_.Check(Log, Current.Component)) { - target = Current.getComponent(); + if (Global.mainModule.Check(Log, Current.Component)) { + target = Global.mainModule.getComponent(); target.needs_update_minimal_version = false; f.fields.cbUpdateMinimalVersion.setSelected(false); f.fields.lMinimalVersion.setText(String.valueOf(target.minimal_version)); @@ -72,7 +72,7 @@ public class PublishComponent extends ComponentsRepositoryPass { String change_description = (f.Result == null) ? "не указаны" : f.Result; String change_record_header = String.join(" ", Utils_.Brackets(Utils_.print_date(new Date())) + ":", - Current.getAccount().name + Utils_.RBrackets(Current.getAccount().email), + Global.mainModule.getAccount().name + Utils_.RBrackets(Global.mainModule.getAccount().email), "публикует версию", Utils_.DQuotes(target.version) ); String change_record = String.join("\n", change_record_header, "Изменения:", diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java b/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java index 5ccbf1ae..a6340b19 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java +++ b/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java @@ -11,11 +11,11 @@ public class PublishSapforSettingsCommand extends PublishServerObject { } @Override protected boolean canStart(Object... args) { - return Current_.Check(Log, Current.User); + return Global.mainModule.Check(Log, Current.User); } @Override protected void Connect() throws Exception { - machine = Current.getMachine(); - user = Current.getUser(); + machine = Global.mainModule.getMachine(); + user =Global.mainModule.getUser(); super.Connect(); } @Override @@ -49,7 +50,7 @@ public class RemoteInitialiseUser extends ConnectionPass { if (!modules_log.isEmpty()) throw new PassException(modules_log); //-------------------------------------- - RemoteFile info = new RemoteFile(target, Current.getAccount().email); + RemoteFile info = new RemoteFile(target, Global.mainModule.getAccount().email); user.connection.writeToFile("", info); } } diff --git a/src/Visual_DVM_2021/Passes/All/RenameDirectory.java b/src/Visual_DVM_2021/Passes/All/RenameDirectory.java index c350a54c..027987bf 100644 --- a/src/Visual_DVM_2021/Passes/All/RenameDirectory.java +++ b/src/Visual_DVM_2021/Passes/All/RenameDirectory.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.Text.FileNameForm; import _VisualDVM.Utils; @@ -25,11 +26,11 @@ public class RenameDirectory extends ChangeFilePass { current = false; old_current_file = null; new_current_file = null; - dst_node = Current.getProjectNode(); + dst_node = Global.mainModule.getProjectNode(); if ((dst_node != null) && (dst_node.getUserObject() instanceof File)) { - target_dir = Current.getSelectedDirectory(); - if (current = Current.HasFile() && Utils.isAnchestor(Current.getFile().file, target_dir)) { - old_current_file = Current.getFile(); + target_dir = Global.mainModule.getSelectedDirectory(); + if (current = Global.mainModule.HasFile() && Utils.isAnchestor(Global.mainModule.getFile().file, target_dir)) { + old_current_file = Global.mainModule.getFile(); } if ((ff = new FileNameForm()).ShowDialog("Введите новое имя папки", target_dir.getName())) { fileName = ff.Result; @@ -80,8 +81,8 @@ public class RenameDirectory extends ChangeFilePass { } @Override protected void performDone() throws Exception { - Current.getSapfor().ResetAllAnalyses(); - Current_.set(Current.SelectedDirectory, dst); + Global.mainModule.getSapfor().ResetAllAnalyses(); + Global.mainModule.set(Current.SelectedDirectory, dst); if (current && new_current_file != null) passes.get(PassCode.OpenCurrentFile).Do(new_current_file); } diff --git a/src/Visual_DVM_2021/Passes/All/RenameFile.java b/src/Visual_DVM_2021/Passes/All/RenameFile.java index 5fb78565..a61c9b03 100644 --- a/src/Visual_DVM_2021/Passes/All/RenameFile.java +++ b/src/Visual_DVM_2021/Passes/All/RenameFile.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.Text.FileNameForm; import _VisualDVM.ProjectData.Files.DBProjectFile; @@ -19,13 +20,13 @@ public class RenameFile extends ChangeFilePass { protected boolean canStart(Object... args) { resetArgs(); current = false; - if (Current_.Check(Log, Current.SelectedFile)) { - old = Current.getSelectedFile(); - current = Current.HasFile() && Current.getFile().file.equals(old.file); + if (Global.mainModule.Check(Log, Current.SelectedFile)) { + old = Global.mainModule.getSelectedFile(); + current = Global.mainModule.HasFile() && Global.mainModule.getFile().file.equals(old.file); if ((ff = new FileNameForm()).ShowDialog("Введите новое имя файла", old.file.getName())) { fileName = ff.Result; //-> - parent_node = Current.getProjectCurrentParentNode(); + parent_node = Global.mainModule.getProjectCurrentParentNode(); target_dir = (File) parent_node.getUserObject(); //-> dst = Paths.get(target_dir.getAbsolutePath(), fileName).toFile(); @@ -58,8 +59,8 @@ public class RenameFile extends ChangeFilePass { } @Override protected void performDone() throws Exception { - Current.getSapfor().ResetAllAnalyses(); - Current_.set(Current.SelectedFile, target); + Global.mainModule.getSapfor().ResetAllAnalyses(); + Global.mainModule.set(Current.SelectedFile, target); if (current) passes.get(PassCode.OpenCurrentFile).Do(target); } diff --git a/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java b/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java index 9d7c1b9d..84fdf020 100644 --- a/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java +++ b/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import Visual_DVM_2021.Passes.PassCode; @@ -34,9 +35,8 @@ public class ReplaceTestProject extends CreateTestFromProject { } @Override protected boolean initTarget() throws Exception { - if (Current_.Check(Log, Current.Test)) { - target = Current.getTest(); - + if (Global.mainModule.Check(Log, Current.Test)) { + target = Global.mainModule.getTest(); return true; } return false; diff --git a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java index 3cd9e7eb..c1cf9ae1 100644 --- a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java +++ b/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java @@ -5,6 +5,7 @@ import Common.Visual.UI_; import _VisualDVM.Constants; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.VFileChooser; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.Repository.Server.ServerCode; @@ -33,9 +34,9 @@ public class ReplaceTestsFromFiles extends TestingSystemPass> { //- @Override protected boolean canStart(Object... args) throws Exception { - if (!Current_.Check(Log, Current.Group)) + if (!Global.mainModule.Check(Log, Current.Group)) return false; - group = Current.getGroup(); + group = Global.mainModule.getGroup(); //--->>> Utils.RestoreSelectedDirectory(fileChooser); Vector files = fileChooser.ShowMultiDialog(); diff --git a/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java b/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java index 876e1dea..68183540 100644 --- a/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java +++ b/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java @@ -10,7 +10,7 @@ public class ResetCurrentProject extends CurrentProjectPass { protected void performPreparation() throws Exception { passes.get(PassCode.DeleteDebugResults).Do(); passes.get(PassCode.CloseCurrentProject).Do(); - Current_.set(Current.Root, null); + Global.mainModule.set(Current.Root, null); } @Override protected void body() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java b/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java index 3a6d78e9..1cec814a 100644 --- a/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java +++ b/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java @@ -80,8 +80,8 @@ public class ResurrectComponentFromServer extends CurrentComponentPass { content = tree; } }; - if (d.ShowDialog("Выбор версии для восстановления")&& Current_.Check(Log, Current.ComponentServerBackup)){ - remoteFile = Current.getComponentServerBackup(); + if (d.ShowDialog("Выбор версии для восстановления")&& Global.mainModule.Check(Log, Current.ComponentServerBackup)){ + remoteFile = Global.mainModule.getComponentServerBackup(); return true; }; } diff --git a/src/Visual_DVM_2021/Passes/All/Run.java b/src/Visual_DVM_2021/Passes/All/Run.java index 7b33a68b..9ad37797 100644 --- a/src/Visual_DVM_2021/Passes/All/Run.java +++ b/src/Visual_DVM_2021/Passes/All/Run.java @@ -28,7 +28,7 @@ public class Run extends Pass { } @Override protected void performPreparation() throws Exception { - runTasks = Current.getRunConfiguration().generateRunTasks(target, Current.getCompilationTask()); + runTasks = Global.mainModule.getRunConfiguration().generateRunTasks(target, Global.mainModule.getCompilationTask()); for (RunTask runTask : runTasks) { Global.mainModule.getDb().Insert(runTask); Utils.forceDeleteWithCheck(runTask.getLocalWorkspace()); @@ -41,17 +41,17 @@ public class Run extends Pass { @Override protected boolean canStart(Object... args) { subpass = null; - if (Current_.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile, Current.RunConfiguration, + if (Global.mainModule.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile, Current.RunConfiguration, Current.CompilationTask)) { //- - target = Current.getProject(); + target = Global.mainModule.getProject(); //- - if (Current.getMachine().type.equals(MachineType.MVS_cluster) && - Current.getRunConfiguration().LauncherCall.isEmpty() + if (Global.mainModule.getMachine().type.equals(MachineType.MVS_cluster) && + Global.mainModule.getRunConfiguration().LauncherCall.isEmpty() ) { Log.Writeln_("Запуск напрямую на кластере запрещён.Используйте для запуска DVM систему или MPI"); } - if (!Current.getCompilationTask().state.equals(TaskState.Done)) + if (!Global.mainModule.getCompilationTask().state.equals(TaskState.Done)) Log.Writeln_("Текущая задача на компиляцию еще не выполнялась, или была завершена с ошибками"); return Log.isEmpty(); } @@ -59,7 +59,7 @@ public class Run extends Pass { } @Override protected void body() throws Exception { - switch (Current.getMachine().type) { + switch (Global.mainModule.getMachine().type) { case Local: if (Utils_.isWindows()) { subpass = passes.get(PassCode.WindowsLocalRun); @@ -68,7 +68,7 @@ public class Run extends Pass { break; case Undefined: case MVS_cluster: - throw new PassException("Запуск не реализован для типа машины " + Utils_.DQuotes(Current.getMachine().type)); + throw new PassException("Запуск не реализован для типа машины " + Utils_.DQuotes(Global.mainModule.getMachine().type)); /* case MVS_cluster: subpass = passes.get(PassCode_2021.MVSRun); @@ -95,7 +95,7 @@ public class Run extends Pass { case DoneWithErrors: task_completed = true; if (task.hasDvmSts) { - Utils.CheckAndCleanDirectory(Current.getProject().getStatisticDirectory()); + Utils.CheckAndCleanDirectory(Global.mainModule.getProject().getStatisticDirectory()); Pass.passes.get(PassCode.SPF_StatisticAnalyzer).Do(task); } break; diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java b/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java index cc2e2e8a..9ae394de 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; import Visual_DVM_2021.Passes.SapforFilesModification; +import _VisualDVM.Global; public class SPF_ChangeSpfIntervals extends SapforFilesModification { // SPF_ChangeSpfIntervals (addOpt1_c -> file, addOpt2_c-> int lines, '|' as delimiter) int start; @@ -9,11 +10,11 @@ public class SPF_ChangeSpfIntervals extends SapforFilesModification { int mod; @Override protected boolean canStart(Object... args) throws Exception { - if (super.canStart(args) && Current_.Check(Log, Current.File)) { + if (super.canStart(args) && Global.mainModule.Check(Log, Current.File)) { start = (int) args[0]; end = (int) args[1]; mod = (int) args[2]; - addOpt1 = Current.getFile().name; + addOpt1 = Global.mainModule.getFile().name; addOpt2 = start + "|" + end + "|" + mod; return true; } diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java b/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java index 3015a598..4f2cbbb5 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Utils.Index; import _VisualDVM.ProjectData.Files.DBProjectFile; @@ -22,8 +23,8 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis { @Override protected void showPreparation() { UI.getMainWindow().getProjectWindow().getArraysWindow().ShowNoArrays(); - if (Current.HasFile()) - Current.getFile().form.ShowNoArrays(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.ShowNoArrays(); } @Override public void unpack(String packed) throws Exception { @@ -55,16 +56,16 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis { @Override protected void FocusResult() { UI.getMainWindow().getProjectWindow().FocusArrays(); - if (Current.HasFile()) - Current.getFile().form.FocusArrays(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.FocusArrays(); } @Override protected void showDone() throws Exception { UI.getMainWindow().getProjectWindow().getArraysWindow().ShowArrays(); UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowArraysCount(); UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions(); - if (Current.HasFile()) - Current.getFile().form.ShowArrays(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.ShowArrays(); super.showDone(); } } diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java index 853ed660..4570e923 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java @@ -80,14 +80,14 @@ public class SPF_GetGCovInfo extends SilentSapforPass { } @Override protected void showDone() throws Exception { - if (Current.HasFile()) - Current.getFile().form.ShowGCOV(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.ShowGCOV(); for (PassControl control: controls) control.setIcon(getDoneIconPath()); } @Override protected void FocusResult() { - if (Current.HasFile()) - Current.getFile().form.FocusGCOVLog(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.FocusGCOVLog(); } } diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java index a02a2f1b..692b6bd1 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java @@ -130,9 +130,9 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass { int x = (int) (screenDims.getKey() * target.fgScreen); int y = (int) (screenDims.getValue() * target.fgScreen); Vector visibleFuncNames = new Vector<>(); - if (showByCurrentFunction && Current.HasFunction()) { + if (showByCurrentFunction && Global.mainModule.HasFunction()) { Vector rawVisible = - getNeighbors(Current.getFunction().funcName, + getNeighbors(Global.mainModule.getFunction().funcName, depth, showIn, showOut); diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java index afc6a477..24c15894 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Utils.Index; import _VisualDVM.ProjectData.Files.DBProjectFile; @@ -16,8 +17,8 @@ import java.util.Vector; public class SPF_GetGraphFunctions extends SapforAnalysis { @Override protected void showPreparation() { - if (Current.HasFile()) - Current.getFile().form.ShowNoFunctions(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.ShowNoFunctions(); UI.getMainWindow().getProjectWindow().ShowNoFunctions(); if (SPF_GetGraphFunctionPositions.showByCurrentFunction) UI.getMainWindow().getProjectWindow().getFunctionsWindow().ShowNoCurrentFunction(); @@ -33,8 +34,8 @@ public class SPF_GetGraphFunctions extends SapforAnalysis { @Override protected void performPreparation() throws Exception { super.performPreparation(); //удаление интеррупта. - Current_.set(Current.Function, null); - Current_.set(Current.SelectedFunction,null); + Global.mainModule.set(Current.Function, null); + Global.mainModule.set(Current.SelectedFunction,null); target.main_function = null; target.main_functionH = null; target.allFunctions.clear(); @@ -130,8 +131,8 @@ public class SPF_GetGraphFunctions extends SapforAnalysis { @Override protected void FocusResult() { super.FocusResult(); - if (Current.HasFile()) - Current.getFile().form.FocusFunctions(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.FocusFunctions(); UI.getMainWindow().getProjectWindow().FocusFunctions(); } @Override @@ -139,8 +140,8 @@ public class SPF_GetGraphFunctions extends SapforAnalysis { super.showDone(); UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowFunctionsCount(); UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions(); - if (Current.HasFile()) - Current.getFile().form.ShowFunctions(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.ShowFunctions(); passes.get(PassCode.SPF_GetGraphFunctionPositions).Do(); } } \ No newline at end of file diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java index 65f51422..a83553e7 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Utils.Index; import _VisualDVM.ProjectData.Files.DBProjectFile; @@ -15,8 +16,8 @@ public class SPF_GetGraphLoops extends SapforAnalysis { } @Override protected void showPreparation() { - if (Current.HasFile()) - Current.getFile().form.ShowNoLoops(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.ShowNoLoops(); } @Override protected boolean alwaysCheck() { @@ -61,15 +62,15 @@ public class SPF_GetGraphLoops extends SapforAnalysis { @Override protected void FocusResult() { super.FocusResult(); - if (Current.HasFile()) - Current.getFile().form.FocusLoops(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.FocusLoops(); } @Override protected void showDone() throws Exception { UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowLoopsCount(); UI.getMainWindow().getProjectWindow().getAnalysisWindow().ShowRegions(); - if (Current.HasFile()) - Current.getFile().form.ShowLoops(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.ShowLoops(); super.showDone(); } } \ No newline at end of file diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java b/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java index 94622419..aeacb483 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.DBProjectFile; @@ -71,7 +72,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis { if (d_file.style == LanguageStyle.none) d_file.UpdateStyle(father.style); //---------------------------------------- - if (Current.HasFile() && Current.getFile().name.equals(d_file.name)) + if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(d_file.name)) update_current = true; //----------------------------------------- } @@ -97,7 +98,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis { protected void showDone() throws Exception { UI.getMainWindow().getProjectWindow().ShowIncludes(); if (update_current) - Current.getFile().form.ShowProperties(); + Global.mainModule.getFile().form.ShowProperties(); super.showDone(); } @Override diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java index c91b30f9..122b5310 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java @@ -15,7 +15,7 @@ public class SPF_InlineProcedure extends SapforFilesModification { @Override protected boolean canStart(Object... args) throws Exception { if (super.canStart(args) && (call = (args.length > 0) ? (FuncCall) args[0] : null) != null) { - addOpt1 = call.funcName + "|" + Current.getFile().name; + addOpt1 = call.funcName + "|" + Global.mainModule.getFile().name; addOpt2 = String.valueOf(call.parent_offset); Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1"); // Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.PARSE_FOR_INLINE, "1"); @@ -32,6 +32,6 @@ public class SPF_InlineProcedure extends SapforFilesModification { @Override protected void showDone() throws Exception { super.showDone(); - Current.getFile().form.getEditor().gotoLine(call.line); + Global.mainModule.getFile().form.getEditor().gotoLine(call.line); } } diff --git a/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java b/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java index 3072a91f..310c8754 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java @@ -2,13 +2,14 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; import Visual_DVM_2021.Passes.SapforFilesModification; +import _VisualDVM.Global; // SPF_LoopUnionCurrent (addOpt1_c -> file, addOpt2_c-> line) public class SPF_LoopUnionCurrent extends SapforFilesModification { @Override protected boolean canStart(Object... args) throws Exception { - if (super.canStart(args) && Current_.Check(Log, Current.File)) { - addOpt1 = Current.getFile().name; - addOpt2 = String.valueOf(Current.getFile().form.getEditor().getCurrentLine()); + if (super.canStart(args) && Global.mainModule.Check(Log, Current.File)) { + addOpt1 = Global.mainModule.getFile().name; + addOpt2 = String.valueOf(Global.mainModule.getFile().form.getEditor().getCurrentLine()); return true; } return false; diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java b/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java index 81652651..4213e73b 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.Dimension; @@ -23,8 +24,8 @@ public class SPF_ModifyArrayDistribution extends SapforModification { @Override protected boolean canStart(Object... args) throws Exception { region = null; - if (Current_.Check(Log, Current.ParallelRegion) && super.canStart(args) && passes.get(PassCode.SPF_GetArrayLinks).Do()) { - region = Current.getParallelRegion(); + if (Global.mainModule.Check(Log, Current.ParallelRegion) && super.canStart(args) && passes.get(PassCode.SPF_GetArrayLinks).Do()) { + region = Global.mainModule.getParallelRegion(); DBObjectDialog dialog = new DBObjectDialog(ParallelRegionFields.class) { @Override public int getDefaultHeight() { diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java b/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java index a7cf90af..5181998f 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java +++ b/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java @@ -144,9 +144,9 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis { protected void showPreparation() throws Exception { if (!precompilation_done) { UI.getMainWindow().getProjectWindow().ShowNoAnalyses(); - if (Current.HasFile()) { - Current.getFile().form.ShowNoMessages(); - Current.getFile().form.ShowNoAnalyses(); + if (Global.mainModule.HasFile()) { + Global.mainModule.getFile().form.ShowNoMessages(); + Global.mainModule.getFile().form.ShowNoAnalyses(); } } } @@ -183,8 +183,8 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis { protected void showFinish() throws Exception { super.showFinish(); UI.getMainWindow().getProjectWindow().ShowAllAnalyses(); - if (Current.HasFile()) - Current.getFile().form.ShowAllAnalyses(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.ShowAllAnalyses(); } @Override protected void showFail() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/Save.java b/src/Visual_DVM_2021/Passes/All/Save.java index ef7e381d..03cadece 100644 --- a/src/Visual_DVM_2021/Passes/All/Save.java +++ b/src/Visual_DVM_2021/Passes/All/Save.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import Common.Passes.Pass; import org.apache.commons.io.FileUtils; @@ -14,8 +15,8 @@ public class Save extends Pass { } @Override protected boolean canStart(Object... args) { - if (Current.HasFile()) { - target = Current.getFile(); + if (Global.mainModule.HasFile()) { + target = Global.mainModule.getFile(); return (target.NeedsSave); } return false; diff --git a/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java b/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java index 5480180b..1dc049e0 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java +++ b/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; public class SaveBugReportExecutor extends UpdateBugReportField { @Override public String getIconPath() { @@ -12,9 +13,9 @@ public class SaveBugReportExecutor extends UpdateBugReportField { } @Override protected boolean canStart(Object... args) throws Exception { - return (Current_.Check(Log, Current.Subscriber)) && - super.canStart("executor", Current.getSubscriber().name, - "executor_address", Current.getSubscriber().address + return (Global.mainModule.Check(Log, Current.Subscriber)) && + super.canStart("executor", Global.mainModule.getSubscriber().name, + "executor_address", Global.mainModule.getSubscriber().address ); } } diff --git a/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java b/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java index e8e22218..44a3373e 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java +++ b/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates; import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm; @@ -19,26 +20,26 @@ public class SaveFunctionsGraphCoordinates extends Pass { graphForm = UI.getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphWindow(); if (!graphForm.isShown()) Log.Writeln_("Сначала отобразите граф"); - if (Current.getProject().functionsGraph.isEmpty()) + if (Global.mainModule.getProject().functionsGraph.isEmpty()) Log.Writeln_("Граф процедур пуст"); return Log.isEmpty(); } @Override protected void body() throws Exception { - for (String funcName : Current.getProject().functionsGraph.vertexCoordinates.keySet()) { + for (String funcName : Global.mainModule.getProject().functionsGraph.vertexCoordinates.keySet()) { FuncCoordinates coords = null; - if (Current.getProject().db.funcCoordinates.containsKey(funcName)) { - coords = Current.getProject().db.funcCoordinates.get(funcName); + if (Global.mainModule.getProject().db.funcCoordinates.containsKey(funcName)) { + coords = Global.mainModule.getProject().db.funcCoordinates.get(funcName); coords.name=funcName; - coords.X = Current.getProject().functionsGraph.vertexCoordinates.get(funcName).getKey(); - coords.Y = Current.getProject().functionsGraph.vertexCoordinates.get(funcName).getValue(); - Current.getProject().db.Update(coords); + coords.X = Global.mainModule.getProject().functionsGraph.vertexCoordinates.get(funcName).getKey(); + coords.Y = Global.mainModule.getProject().functionsGraph.vertexCoordinates.get(funcName).getValue(); + Global.mainModule.getProject().db.Update(coords); } else { coords = new FuncCoordinates(); coords.name=funcName; - coords.X = Current.getProject().functionsGraph.vertexCoordinates.get(funcName).getKey(); - coords.Y = Current.getProject().functionsGraph.vertexCoordinates.get(funcName).getValue(); - Current.getProject().db.Insert(coords); + coords.X = Global.mainModule.getProject().functionsGraph.vertexCoordinates.get(funcName).getKey(); + coords.Y = Global.mainModule.getProject().functionsGraph.vertexCoordinates.get(funcName).getValue(); + Global.mainModule.getProject().db.Insert(coords); } } } diff --git a/src/Visual_DVM_2021/Passes/All/SaveGraph.java b/src/Visual_DVM_2021/Passes/All/SaveGraph.java index e3128313..0c538256 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveGraph.java +++ b/src/Visual_DVM_2021/Passes/All/SaveGraph.java @@ -35,7 +35,7 @@ public class SaveGraph extends Pass { graphForm = UI.getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphWindow(); if (!graphForm.isShown()) Log.Writeln_("Сначала отобразите граф"); - if (Current.getProject().functionsGraph.isEmpty()) + if (Global.mainModule.getProject().functionsGraph.isEmpty()) Log.Writeln_("Граф процедур пуст"); return Log.isEmpty(); } diff --git a/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java b/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java index d663fa5a..946c8666 100644 --- a/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java +++ b/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass; public class SelectRemoteFile extends CurrentConnectionPass { @@ -8,9 +9,9 @@ public class SelectRemoteFile extends CurrentConnectionPass { boolean needs_directory = false; @Override protected boolean canStart(Object... args) { - if (Current_.Check(Log, Current.Machine, Current.User)) { + if (Global.mainModule.Check(Log, Current.Machine, Current.User)) { needs_directory = (boolean) args[0]; - Current_.set(Current.RemoteFile, null); + Global.mainModule.set(Current.RemoteFile, null); return true; } return false; diff --git a/src/Visual_DVM_2021/Passes/All/SendBugReport.java b/src/Visual_DVM_2021/Passes/All/SendBugReport.java index 2084ee95..9f150858 100644 --- a/src/Visual_DVM_2021/Passes/All/SendBugReport.java +++ b/src/Visual_DVM_2021/Passes/All/SendBugReport.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Repository.BugReport.BugReportInterface; import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.Server.ServerCode; @@ -9,18 +10,18 @@ import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; public class SendBugReport extends ComponentsRepositoryPass { @Override protected void ServerAction() throws Exception { - if (!Current.getBugReport().project_version.isEmpty()) { + if (!Global.mainModule.getBugReport().project_version.isEmpty()) { //отправить архив. Command(new ServerExchangeUnit_2021(ServerCode.SendBugReport, - Current.getBugReport().id, - Utils_.fileToBytes(BugReportInterface.getArchiveFile(Current.getBugReport())) + Global.mainModule.getBugReport().id, + Utils_.fileToBytes(BugReportInterface.getArchiveFile(Global.mainModule.getBugReport())) )); } // синхрон бд - Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", Current.getBugReport())); + Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", Global.mainModule.getBugReport())); } @Override protected void performFail() throws Exception { - Current.getBugReport().state = BugReportState.draft; + Global.mainModule.getBugReport().state = BugReportState.draft; } } diff --git a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java index a3271a82..3988926e 100644 --- a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java +++ b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.LanguageName; import Visual_DVM_2021.Passes.FilesMassPass; @@ -15,7 +16,7 @@ public class SetSelectedFilesLanguage extends FilesMassPass { @Override protected void operation(DBProjectFile file) { file.UpdateLanguage(target); - if (Current.HasFile() && file.file.equals(Current.getFile().file)) + if (Global.mainModule.HasFile() && file.file.equals(Global.mainModule.getFile().file)) file.form.ShowLanguage(); } } diff --git a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java index 0f4f925c..fd46a7e5 100644 --- a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java +++ b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.LanguageStyle; import Visual_DVM_2021.Passes.FilesMassPass; @@ -16,7 +17,7 @@ public class SetSelectedFilesStyle extends FilesMassPass { protected void operation(DBProjectFile file) { file.UpdateStyle(target); - if (Current.HasFile() && file.file.equals(Current.getFile().file)) + if (Global.mainModule.HasFile() && file.file.equals(Global.mainModule.getFile().file)) file.form.ShowStyle(); } } diff --git a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java index ffb6c75f..6ab7e785 100644 --- a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java +++ b/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.FileType; import Visual_DVM_2021.Passes.FilesMassPass; @@ -15,7 +16,7 @@ public class SetSelectedFilesType extends FilesMassPass { @Override protected void operation(DBProjectFile file) { file.UpdateType(target); - if (Current.HasFile() && file.file.equals(Current.getFile().file)) + if (Global.mainModule.HasFile() && file.file.equals(Global.mainModule.getFile().file)) file.form.ShowType(); } } diff --git a/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java b/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java index 8215b82f..b06a5662 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java +++ b/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Machine.MachineType; import Visual_DVM_2021.Passes.PassCode; @@ -23,8 +24,8 @@ public class ShowCompilerHelp extends Pass { protected boolean canStart(Object... args) throws Exception { target = null; if (args.length == 0) { - if (Current_.Check(Log, Current.Compiler)) { - compiler = Current.getCompiler(); + if (Global.mainModule.Check(Log, Current.Compiler)) { + compiler = Global.mainModule.getCompiler(); needsShow = true; return true; } @@ -39,7 +40,7 @@ public class ShowCompilerHelp extends Pass { protected void body() throws Exception { subpass = null; compiler.ResetHelp(); - if (Current.getMachine().type.equals(MachineType.Local)) { + if (Global.mainModule.getMachine().type.equals(MachineType.Local)) { subpass = passes.get(PassCode.LocalSingleCommand); } else { subpass = passes.get(PassCode.RemoteSingleCommand); diff --git a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java b/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java index d6ced659..792b2ac8 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java +++ b/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java @@ -26,8 +26,8 @@ public class ShowCompilerVersion extends Pass { protected boolean canStart(Object... args) throws Exception { target = null; if (args.length == 0) { - if (Current_.Check(Log, Current.Compiler)) { - compiler = Current.getCompiler(); + if (Global.mainModule.Check(Log, Current.Compiler)) { + compiler = Global.mainModule.getCompiler(); needsShow = true; return true; } @@ -42,7 +42,7 @@ public class ShowCompilerVersion extends Pass { protected void body() throws Exception { subpass = null; compiler.ResetVersion(); - if (Current.getMachine().type.equals(MachineType.Local)) { + if (Global.mainModule.getMachine().type.equals(MachineType.Local)) { subpass = passes.get(PassCode.LocalSingleCommand); } else { subpass = passes.get(PassCode.RemoteSingleCommand); diff --git a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java b/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java index 1df75432..b5fc6e55 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java +++ b/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java @@ -3,6 +3,7 @@ import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Server.ServerCode; @@ -25,8 +26,8 @@ public class ShowComponentChangesLog extends ComponentsRepositoryPass File res; @Override protected boolean canStart(Object... args) throws Exception { - if (Current_.Check(Log, Current.Component)) { - target = Current.getComponent(); + if (Global.mainModule.Check(Log, Current.Component)) { + target = Global.mainModule.getComponent(); return true; } return false; diff --git a/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java b/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java index 49b9dcf6..eec98914 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java +++ b/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Makefile.UI.MakefilePreviewForm; import _VisualDVM.ProjectData.Project.db_project_info; import Visual_DVM_2021.Passes.PassCode; @@ -20,15 +21,15 @@ public class ShowMakefilePreview extends Pass { } @Override protected boolean canStart(Object... args) { - if (Current_.Check(Log, Current.Project)) { - target = Current.getProject(); - return Current_.Check(Log, Current.Makefile); + if (Global.mainModule.Check(Log, Current.Project, Current.Makefile)) { + target = Global.mainModule.getProject(); + return true; } return false; } @Override protected void body() throws Exception { new MakefilePreviewForm().ShowDialog("Предпросмотр мейкфайла для текущего проекта", - Current.getMakefile().Generate(target)); + Global.mainModule.getMakefile().Generate(target)); } } diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java index eabe8762..58eba350 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java +++ b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Constants; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; public class ShowSapforCompilationErr extends ShowTestingServerFile{ @Override @@ -18,9 +19,9 @@ public class ShowSapforCompilationErr extends ShowTestingServerFile{ } @Override protected boolean canStart(Object... args) throws Exception { - if (!Current_.Check(Log,Current.ServerSapfor)){ + if (!Global.mainModule.Check(Log,Current.ServerSapfor)){ return false; } - return super.canStart("Поток ошибок", new RemoteFile(Current.getServerSapfor().home_path, Constants.err_file)); + return super.canStart("Поток ошибок", new RemoteFile(Global.mainModule.getServerSapfor().home_path, Constants.err_file)); } } diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java index 60838d4f..4082a9db 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java +++ b/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Constants; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; public class ShowSapforCompilationOut extends ShowTestingServerFile{ @Override @@ -18,9 +19,9 @@ public class ShowSapforCompilationOut extends ShowTestingServerFile{ } @Override protected boolean canStart(Object... args) throws Exception { - if (!Current_.Check(Log,Current.ServerSapfor)){ + if (!Global.mainModule.Check(Log,Current.ServerSapfor)){ return false; } - return super.canStart("Поток вывода", new RemoteFile(Current.getServerSapfor().home_path, Constants.out_file)); + return super.canStart("Поток вывода", new RemoteFile(Global.mainModule.getServerSapfor().home_path, Constants.out_file)); } } diff --git a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java index 2bc2a259..687aa974 100644 --- a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java +++ b/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java @@ -24,25 +24,25 @@ public class StartSelectedDVMConfigurations extends PublishServerObject configurations = Global.testingServer.db.dvm_configurations.getCheckedOrCurrent(); if (configurations.isEmpty()) { @@ -51,10 +51,10 @@ public class StartSelectedDVMConfigurations extends PublishServerObject { } @Override protected boolean canStart(Object... args) throws Exception { - return Current.getAccount().CheckRegistered(Log); + return Global.mainModule.getAccount().CheckRegistered(Log); } @Override protected void showPreparation() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java b/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java index d7e28ef1..9ab2fe80 100644 --- a/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java +++ b/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes.All; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Controls.PassButton; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; @@ -14,7 +15,7 @@ public class SynchronizeTests extends TestingSystemPass { File new_db_file; @Override protected boolean canStart(Object... args) throws Exception { - return Current.getAccount().CheckRegistered(Log); + return Global.mainModule.getAccount().CheckRegistered(Log); } @Override public String getIconPath() { diff --git a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java b/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java index e7a33720..4deca46c 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java +++ b/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java @@ -24,16 +24,16 @@ public class UpdateBugReportField extends ComponentsRepositoryPass { String old_description = ""; String old_comment = ""; protected boolean canUpdate() { - return Current.getAccount().CheckAccessRights(target.sender_address, Log); + return Global.mainModule.getAccount().CheckAccessRights(target.sender_address, Log); } @Override protected boolean canStart(Object... args) throws Exception { - if (!Current_.Check(Log, Current.BugReport)) + if (!Global.mainModule.Check(Log, Current.BugReport)) return false; old_description = ""; old_comment = ""; //-- - target = Current.getBugReport(); + target = Global.mainModule.getBugReport(); fieldNames.clear(); fieldValues.clear(); for (int i = 0; i < args.length; ++i) { diff --git a/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java b/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java index a4d2ae35..cabcb7f1 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java +++ b/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.All; import Common.Current_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.PercentsForm; +import _VisualDVM.Global; public class UpdateBugReportProgress extends UpdateBugReportField { @Override public String getIconPath() { @@ -13,15 +14,15 @@ public class UpdateBugReportProgress extends UpdateBugReportField { } @Override protected boolean canStart(Object... args) throws Exception { - if (!Current_.Check(Log, Current.BugReport)) + if (!Global.mainModule.Check(Log, Current.BugReport)) return false; PercentsForm f = new PercentsForm(); - if (f.ShowDialog("Завершённость работы над ошибкой", Current.getBugReport().percentage)) + if (f.ShowDialog("Завершённость работы над ошибкой", Global.mainModule.getBugReport().percentage)) return super.canStart("percentage", f.Result); return false; } @Override protected boolean canUpdate() { - return Current.getAccount().ExtendedCheckAccessRights(target, Log); + return Global.mainModule.getAccount().ExtendedCheckAccessRights(target, Log); } } diff --git a/src/Visual_DVM_2021/Passes/All/UpdateComponent.java b/src/Visual_DVM_2021/Passes/All/UpdateComponent.java index 0c7fba5f..a7b6a374 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateComponent.java +++ b/src/Visual_DVM_2021/Passes/All/UpdateComponent.java @@ -19,7 +19,7 @@ public class UpdateComponent extends Pass { protected void body() throws Exception { PassCode subPassCode = null; // - switch (Current.getComponent().getComponentType()) { + switch (Global.mainModule.getComponent().getComponentType()) { case Sapfor_F: case Visualizer_2: subPassCode = Utils_.isWindows() ? PassCode.DownloadComponent : PassCode.BuildComponent; @@ -32,15 +32,15 @@ public class UpdateComponent extends Pass { } if ((subPassCode != null) && passes.get(subPassCode).Do()) { // - if (!Current.getComponent().getNewFile().exists()) - throw new PassException("Не удалось получить новый файл для компонента " + Current.getComponent().getComponentType().getDescription()); + if (!Global.mainModule.getComponent().getNewFile().exists()) + throw new PassException("Не удалось получить новый файл для компонента " + Global.mainModule.getComponent().getComponentType().getDescription()); //непосредственное обновление. - Current.getComponent().Update(); + Global.mainModule.getComponent().Update(); } } @Override protected void performFinish() throws Exception { - Current.getComponent().CheckIfNeedsUpdateOrPublish(); + Global.mainModule.getComponent().CheckIfNeedsUpdateOrPublish(); } @Override protected void showDone() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/UpdateProperty.java b/src/Visual_DVM_2021/Passes/All/UpdateProperty.java index eae8144e..c801284d 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateProperty.java +++ b/src/Visual_DVM_2021/Passes/All/UpdateProperty.java @@ -37,26 +37,26 @@ public class UpdateProperty extends Pass { UI.getMainWindow().getTestingWindow().ExpandCredentials(); break; case "collapseProjectTrees": - if (Current.HasProject()) { + if (Global.mainModule.HasProject()) { if ((boolean) newValue) UI.getMainWindow().getProjectWindow().CollapseProjectTrees(); else UI.getMainWindow().getProjectWindow().ExpandProjectTrees(); } break; case "collapseFileGraphs": - if (Current.HasFile()) { + if (Global.mainModule.HasFile()) { if ((boolean) newValue) - Current.getFile().form.CollapseGraphs(); + Global.mainModule.getFile().form.CollapseGraphs(); else - Current.getFile().form.ExpandGraphs(); + Global.mainModule.getFile().form.ExpandGraphs(); } break; case "collapseFileMessages": - if (Current.HasFile()) { + if (Global.mainModule.HasFile()) { if ((boolean) newValue) - Current.getFile().form.CollapseMessages(); + Global.mainModule.getFile().form.CollapseMessages(); else - Current.getFile().form.ExpandMessages(); + Global.mainModule.getFile().form.ExpandMessages(); } break; } diff --git a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java index 0f9811db..7fa255cd 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java +++ b/src/Visual_DVM_2021/Passes/All/UpdateSetting.java @@ -122,23 +122,23 @@ public class UpdateSetting extends Pass { target.Mark(); switch (target.Name) { case GCOVLimit: - if (Current.HasFile()) - Current.getFile().form.ShowGCOV(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.ShowGCOV(); break; case FastAccessPassesCount: - if (Current.HasProject()) + if (Global.mainModule.HasProject()) UI.fastAccessMenuBar.Refresh(); break; case ShowFullArraysDeclarations: - if (Current.HasProject()) - Current.getProject().declaratedArrays.ShowUI(); + if (Global.mainModule.HasProject()) + Global.mainModule.getProject().declaratedArrays.ShowUI(); break; case ShowFullTabsNames: UI.getMainWindow().getTestingWindow().RefreshTabsNames(); - if (Current.HasProject()) + if (Global.mainModule.HasProject()) UI.getMainWindow().getProjectWindow().RefreshTabsNames(); - if (Current.HasFile()) - Current.getFile().form.RefreshTabsNames(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.RefreshTabsNames(); break; case MPI_PROGRAM: Pass.passes.get(PassCode.CleanAnalyses).Do(); @@ -147,12 +147,12 @@ public class UpdateSetting extends Pass { break; case SmallScreen: boolean small = target.toBoolean(); - if (Current.HasProject()) + if (Global.mainModule.HasProject()) UI.getMainWindow().getProjectWindow().SwitchScreen(small); UI.getMainWindow().getCallbackWindow().SwitchScreen(small); break; case Precompilation: - Current.getSapfor().ResetAllAnalyses(); + Global.mainModule.getSapfor().ResetAllAnalyses(); break; } } diff --git a/src/Visual_DVM_2021/Passes/ChangeFilePass.java b/src/Visual_DVM_2021/Passes/ChangeFilePass.java index 8cb7cefe..bb691a42 100644 --- a/src/Visual_DVM_2021/Passes/ChangeFilePass.java +++ b/src/Visual_DVM_2021/Passes/ChangeFilePass.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes; import Common.Passes.Pass; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Text.FileNameForm; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; import javax.swing.tree.DefaultMutableTreeNode; @@ -21,6 +22,6 @@ public abstract class ChangeFilePass extends Pass { ff = null; parent_node = null; dst_node = null; - project = Current.getProject(); + project = Global.mainModule.getProject(); } } diff --git a/src/Visual_DVM_2021/Passes/CurrentComponentPass.java b/src/Visual_DVM_2021/Passes/CurrentComponentPass.java index e8a5b66d..24276bd7 100644 --- a/src/Visual_DVM_2021/Passes/CurrentComponentPass.java +++ b/src/Visual_DVM_2021/Passes/CurrentComponentPass.java @@ -2,12 +2,13 @@ package Visual_DVM_2021.Passes; import Common.Current_; import Common.Passes.Pass; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Repository.Component.Component; public abstract class CurrentComponentPass extends Pass { @Override protected boolean canStart(Object... args) throws Exception { - if (Current_.Check(Log, Current.Component)) { - target = Current.getComponent(); + if (Global.mainModule.Check(Log, Current.Component)) { + target = Global.mainModule.getComponent(); return true; } return false; diff --git a/src/Visual_DVM_2021/Passes/CurrentProjectPass.java b/src/Visual_DVM_2021/Passes/CurrentProjectPass.java index e034957a..3673352c 100644 --- a/src/Visual_DVM_2021/Passes/CurrentProjectPass.java +++ b/src/Visual_DVM_2021/Passes/CurrentProjectPass.java @@ -1,10 +1,11 @@ package Visual_DVM_2021.Passes; import Common.Passes.Pass; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; public abstract class CurrentProjectPass extends Pass { @Override protected boolean canStart(Object... args) throws Exception { - return (target = Current.getProject()) != null; + return (target = Global.mainModule.getProject()) != null; } } diff --git a/src/Visual_DVM_2021/Passes/FilesMassPass.java b/src/Visual_DVM_2021/Passes/FilesMassPass.java index 637e1980..f746938d 100644 --- a/src/Visual_DVM_2021/Passes/FilesMassPass.java +++ b/src/Visual_DVM_2021/Passes/FilesMassPass.java @@ -1,12 +1,13 @@ package Visual_DVM_2021.Passes; import Common.Passes.Pass; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.DBProjectFile; public abstract class FilesMassPass extends Pass { @Override protected boolean canStart(Object... args) throws Exception { - if (Current.getProject().db.files.getCheckedCount() == 0) { + if (Global.mainModule.getProject().db.files.getCheckedCount() == 0) { Log.Writeln_("Не отмечено ни одного файла."); return false; } @@ -20,15 +21,15 @@ public abstract class FilesMassPass extends Pass { */ @Override protected void body() throws Exception { - Current.getProject().db.BeginTransaction(); - for (DBProjectFile file : Current.getProject().db.files.getCheckedItems()) { + Global.mainModule.getProject().db.BeginTransaction(); + for (DBProjectFile file : Global.mainModule.getProject().db.files.getCheckedItems()) { ShowMessage1(file.name); operation(file); } } @Override protected void performFinish() throws Exception { - Current.getProject().db.Commit(); + Global.mainModule.getProject().db.Commit(); } protected abstract void operation(DBProjectFile file); @Override diff --git a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java index 9a923840..7802121c 100644 --- a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java +++ b/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java @@ -27,8 +27,8 @@ public abstract class OpenSapforVersionPass extends Pass { } @Override protected boolean canStart(Object... args) throws Exception { - if (Current_.Check(Log, getCurrentName())) { - target = (SapforVersion_json) Current_.get(getCurrentName()); + if (Global.mainModule.Check(Log, getCurrentName())) { + target = (SapforVersion_json) Global.mainModule.get(getCurrentName()); return true; } return false; diff --git a/src/Visual_DVM_2021/Passes/PassCode.java b/src/Visual_DVM_2021/Passes/PassCode.java index f7403b0e..225b8071 100644 --- a/src/Visual_DVM_2021/Passes/PassCode.java +++ b/src/Visual_DVM_2021/Passes/PassCode.java @@ -305,8 +305,6 @@ public enum PassCode implements PassCode_ { //-> TestPass, SPF_InsertPrivateFromGUI, - CloneDVMPackage, - CloneSapforPackage, SPF_RemoveDeadCode, ReplaceTestProject, ReplaceTestsFromFiles, @@ -438,10 +436,6 @@ public enum PassCode implements PassCode_ { return "Заменить тестовый проект на текущий"; case SPF_RemoveDeadCode: return "Удаление мертвого кода"; - case CloneSapforPackage: - return "Клонировать пакет SAPFOR с текущей версией"; - case CloneDVMPackage: - return "Клонировать пакет DVM c текущим компилятором"; case SPF_InsertPrivateFromGUI: return "Вставка директив приватизации"; case CreateTestFromSelectedFiles: diff --git a/src/Visual_DVM_2021/Passes/ProjectPass.java b/src/Visual_DVM_2021/Passes/ProjectPass.java deleted file mode 100644 index 992ee959..00000000 --- a/src/Visual_DVM_2021/Passes/ProjectPass.java +++ /dev/null @@ -1,13 +0,0 @@ -package Visual_DVM_2021.Passes; -import Common.Passes.Pass; -import _VisualDVM.Current; -import _VisualDVM.ProjectData.Project.db_project_info; -public class ProjectPass extends Pass { - protected db_project_info getProject(){ - return Current.getProject(); - } - @Override - protected boolean canStart(Object... args) throws Exception { - return (target = getProject()) != null; - } -} diff --git a/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java b/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java index a91dc171..9495ee2d 100644 --- a/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java +++ b/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.SSH; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; //завязан на текущие машину и юзера public abstract class CurrentConnectionPass extends ConnectionPass { @Override @@ -9,12 +10,12 @@ public abstract class CurrentConnectionPass extends ConnectionPass { } @Override protected boolean canStart(Object... args) { - return Current_.Check(Log, Current.User); + return Global.mainModule.Check(Log, Current.User); } @Override public void Connect() throws Exception { - machine = Current.getMachine(); - user = Current.getUser(); + machine = Global.mainModule.getMachine(); + user = Global.mainModule.getUser(); super.Connect(); } } diff --git a/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java b/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java index 9da2626e..2baa233e 100644 --- a/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java +++ b/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java @@ -42,7 +42,7 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass { //-- RemoteFile StartLog = new RemoteFile(serverHome, Constants.STARTED + "_by_" + - Current.getAccount().email + + Global.mainModule.getAccount().email + "_" + new Date().toString() ); @@ -74,7 +74,7 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass { ShowMessage1("Журнализация"); RemoteFile AbortLog = new RemoteFile(serverHome, Constants.ABORTED + "_by_" + - Current.getAccount().email + + Global.mainModule.getAccount().email + "_" + new Date().toString() ); diff --git a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java b/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java index 2ea227c1..7ee5418c 100644 --- a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java +++ b/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes.SSH; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Tasks.Supervisor.Remote.RemoteTaskSupervisor; public abstract class TaskConnectionPass extends ConnectionPass { public S supervisor; //инициализация идет в конструкторе потомка. @@ -20,7 +21,7 @@ public abstract class TaskConnectionPass extends machine = supervisor.task.getMachine(); user = supervisor.task.getUser(); super.Connect(); - user.connection.CheckUserInitialization(Current.getAccount().email); + user.connection.CheckUserInitialization(Global.mainModule.getAccount().email); /* String log = user.connection.CheckModulesVersion(); if (!log.isEmpty()) { @@ -39,6 +40,6 @@ public abstract class TaskConnectionPass extends } @Override public void Interrupt() throws Exception { - Current.getProject().CreateInterruptFile(); + Global.mainModule.getProject().CreateInterruptFile(); } } diff --git a/src/Visual_DVM_2021/Passes/SapforFilesModification.java b/src/Visual_DVM_2021/Passes/SapforFilesModification.java index 29a8daed..e1e91827 100644 --- a/src/Visual_DVM_2021/Passes/SapforFilesModification.java +++ b/src/Visual_DVM_2021/Passes/SapforFilesModification.java @@ -13,11 +13,11 @@ public class SapforFilesModification extends SapforModification { protected void performPreparation() throws Exception { super.performPreparation(); if ((Global.mainModule.getDb()).settings.get(SettingName.SaveModifications).toBoolean()) { - Current.getProject().createModification(); + Global.mainModule.getProject().createModification(); } } @Override protected void performDone() throws Exception { - Current.getSapfor().UpdateProjectFiles(true); + Global.mainModule.getSapfor().UpdateProjectFiles(true); } } diff --git a/src/Visual_DVM_2021/Passes/SapforPass.java b/src/Visual_DVM_2021/Passes/SapforPass.java index 54c66a82..00cd0eb6 100644 --- a/src/Visual_DVM_2021/Passes/SapforPass.java +++ b/src/Visual_DVM_2021/Passes/SapforPass.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes; import Common.Passes.PassException; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; public class SapforPass extends SilentSapforPass { //отличается наличием журнала и сообщений @@ -25,6 +26,6 @@ public class SapforPass extends SilentSapforPass { @Override public void Interrupt() throws Exception { // target.CreateInterruptFile(); - Current.getSapfor().Interrupt(); + Global.mainModule.getSapfor().Interrupt(); } } diff --git a/src/Visual_DVM_2021/Passes/SapforTransformation.java b/src/Visual_DVM_2021/Passes/SapforTransformation.java index 04bb49c7..116d82c0 100644 --- a/src/Visual_DVM_2021/Passes/SapforTransformation.java +++ b/src/Visual_DVM_2021/Passes/SapforTransformation.java @@ -78,7 +78,7 @@ public class SapforTransformation extends SapforPass { @Override protected void showFinish() throws Exception { super.showFinish(); - Current_.set(Current.ProjectView, ProjectView.Files); + Global.mainModule.set(Current.ProjectView, ProjectView.Files); UI.getMainWindow().getProjectWindow().ShowProjectView(); } @Override diff --git a/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java b/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java index 9e84de48..bc6d664f 100644 --- a/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java +++ b/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java @@ -27,8 +27,8 @@ public abstract class SaveCurrentConfiguration(); tests = new Vector<>(); diff --git a/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java b/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java index ce9b7cd7..929c12ca 100644 --- a/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java +++ b/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.Server; import Common.Current_; import _VisualDVM.Current; import Common.Database.Objects.riDBObject; +import _VisualDVM.Global; import _VisualDVM.Repository.RepositoryServer; public abstract class CloneServerObject extends PublishServerObject { public D src; @@ -16,18 +17,18 @@ public abstract class CloneServerObject(); target.add(table.getCurrent().getPK()); return getDb().tables.get(d).CheckCurrent(Log) && getDb().tables.get(d).ShowDeleteObjectDialog(table.getCurrent()); diff --git a/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java b/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java index d5148443..6d66d107 100644 --- a/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java +++ b/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java @@ -2,6 +2,7 @@ package Visual_DVM_2021.Passes.Server; import _VisualDVM.Current; import Common.Database.Objects.DBObject; import Common.Database.Objects.riDBObject; +import _VisualDVM.Global; import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; @@ -18,12 +19,12 @@ public class PublishServerObject @Override protected boolean canStart(Object... args) throws Exception { pk = null; - if (Current.getAccount().CheckRegistered(Log)) { + if (Global.mainModule.getAccount().CheckRegistered(Log)) { target = d.newInstance(); if (target instanceof riDBObject) { riDBObject rTarget = (riDBObject) target; - rTarget.sender_name = Current.getAccount().name; - rTarget.sender_address = Current.getAccount().email; + rTarget.sender_name = Global.mainModule.getAccount().name; + rTarget.sender_address = Global.mainModule.getAccount().email; } return fillObjectFields(); } diff --git a/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java b/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java index ffa04683..a79535a7 100644 --- a/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java +++ b/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java @@ -23,8 +23,8 @@ public abstract class ShowCurrentConfigurationTests ext @Override protected boolean canStart(Object... args) throws Exception { target = null; - if (Current_.Check(Log, currentName())) { - target = (C) Current_.get(currentName()); + if (Global.mainModule.Check(Log, currentName())) { + target = (C) Global.mainModule.get(currentName()); return true; } return false; diff --git a/src/Visual_DVM_2021/Passes/SilentSapforPass.java b/src/Visual_DVM_2021/Passes/SilentSapforPass.java index 4e35c5db..77a308cd 100644 --- a/src/Visual_DVM_2021/Passes/SilentSapforPass.java +++ b/src/Visual_DVM_2021/Passes/SilentSapforPass.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Repository.Component.Sapfor.Sapfor; public class SilentSapforPass extends CurrentProjectPass { protected Sapfor sapfor; @@ -16,7 +17,7 @@ public class SilentSapforPass extends CurrentProjectPass { } @Override protected boolean canStart(Object... args) throws Exception { - return super.canStart(args) && ((sapfor = Current.getSapfor()) != null); + return super.canStart(args) && ((sapfor = Global.mainModule.getSapfor()) != null); } @Override protected void performPreparation() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/StartTestingPackage.java b/src/Visual_DVM_2021/Passes/StartTestingPackage.java index 7d01f919..3103fd6f 100644 --- a/src/Visual_DVM_2021/Passes/StartTestingPackage.java +++ b/src/Visual_DVM_2021/Passes/StartTestingPackage.java @@ -22,11 +22,11 @@ public abstract class StartTestingPackage

extends Publ protected abstract Current getCurrentName(); @Override protected boolean canStart(Object... args) throws Exception { - if (!Current.getAccount().CheckRegistered(Log)) { + if (!Global.mainModule.getAccount().CheckRegistered(Log)) { return false; } - if (Current_.Check(Log, getCurrentName())) { - target = (P) Current_.get(getCurrentName()); + if (Global.mainModule.Check(Log, getCurrentName())) { + target = (P) Global.mainModule.get(getCurrentName()); //- if (!target.state.equals(TasksPackageState.Draft)) { Log.Writeln_("Возможно запустить только пакет, готовящийся к публикации!"); diff --git a/src/Visual_DVM_2021/Passes/Transformation.java b/src/Visual_DVM_2021/Passes/Transformation.java index bf8275cc..a64cbe7d 100644 --- a/src/Visual_DVM_2021/Passes/Transformation.java +++ b/src/Visual_DVM_2021/Passes/Transformation.java @@ -1,6 +1,7 @@ package Visual_DVM_2021.Passes; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.PassMenuItem; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Project.db_project_info; @@ -39,7 +40,7 @@ public class Transformation extends CurrentProjectPass { @Override protected void showFinish() throws Exception { super.showFinish(); - Current_.set(Current.ProjectView, ProjectView.Files); + Global.mainModule.set(Current.ProjectView, ProjectView.Files); UI.getMainWindow().getProjectWindow().ShowProjectView(); } @Override diff --git a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java b/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java index 8175dd68..80e0a9bb 100644 --- a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java +++ b/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java @@ -3,6 +3,7 @@ import _VisualDVM.Current; import Common.Visual.TextField.StyledTextField; import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.VDirectoryChooser; +import _VisualDVM.Global; import javax.swing.*; import java.awt.*; @@ -17,7 +18,7 @@ public class CopyProjectFields implements DialogFields { private JPanel content; private JButton bBrowse; public CopyProjectFields() { - tfName.setText(Current.getProject().name + "_copy"); + tfName.setText(Global.mainModule.getProject().name + "_copy"); bBrowse.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/src/Visual_DVM_2021/Passes/VariantsMassPass.java b/src/Visual_DVM_2021/Passes/VariantsMassPass.java index 7f3a116d..8d7d3ec9 100644 --- a/src/Visual_DVM_2021/Passes/VariantsMassPass.java +++ b/src/Visual_DVM_2021/Passes/VariantsMassPass.java @@ -1,5 +1,6 @@ package Visual_DVM_2021.Passes; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant; @@ -13,7 +14,7 @@ public abstract class VariantsMassPass extends CurrentProjectPass { } @Override public void Interrupt() throws Exception { - Current.getSapfor().Interrupt(); + Global.mainModule.getSapfor().Interrupt(); } @Override protected boolean canStart(Object... args) throws Exception { @@ -43,7 +44,7 @@ public abstract class VariantsMassPass extends CurrentProjectPass { @Override protected void performFinish() throws Exception { //распаковку соо делаем только 1 раз. после всей массы вариантов. - Sapfor sapfor = Current.getSapfor(); + Sapfor sapfor = Global.mainModule.getSapfor(); target.unpackMessagesAndLog(sapfor.getOutputMessage(), sapfor.getOutput()); } @Override @@ -59,7 +60,7 @@ public abstract class VariantsMassPass extends CurrentProjectPass { UI.getMainWindow().getProjectWindow().FocusFile(); } //- - if (Current.HasFile()) - Current.getFile().form.ShowMessages(); + if (Global.mainModule.HasFile()) + Global.mainModule.getFile().form.ShowMessages(); } } diff --git a/src/_VisualDVM/Current.java b/src/_VisualDVM/Current.java index 26a2d6a5..3a1da2a4 100644 --- a/src/_VisualDVM/Current.java +++ b/src/_VisualDVM/Current.java @@ -203,234 +203,4 @@ public enum Current implements Current_ { return ""; } } - //------------------------------------------------------------------------------------->> - public static boolean HasProject() { - return Current_.get(Project) != null; - } - public static boolean HasFile() { - return Current_.get(File) != null; - } - public static boolean HasSelectedFile() { - return Current_.get(SelectedFile) != null; - } - public static boolean HasAccount() { - return Current_.get(Account) != null; - } - public static boolean HasMachine() { - return Current_.get(Machine) != null; - } - public static boolean HasUser() { - return Current_.get(User) != null; - } - public static boolean HasCompiler() { - return Current_.get(Compiler) != null; - } - public static boolean HasRemoteFile() { - return Current_.get(RemoteFile) != null; - } - public static boolean HasMakefile() { - return Current_.get(Makefile) != null; - } - public static boolean HasRunConfiguration() { - return Current_.get(RunConfiguration) != null; - } - public static boolean HasCompilationTask() { - return Current_.get(CompilationTask) != null; - } - public static boolean HasRunTask() { - return Current_.get(RunTask) != null; - } - public static boolean HasPassForm() { - return Current_.get(PassForm) != null; - } - public static boolean HasProjectView() { - return Current_.get(ProjectView) != null; - } - public static SapforSettings getSapforSettings() { - return (SapforSettings) Current_.get(SapforSettings); - } - public static boolean HasSapforSettings() { - return Current_.get(SapforSettings) != null; - } - public static db_project_info getProject() { - return (db_project_info) Current_.get(Project); - } - public static DBProjectFile getFile() { - return (DBProjectFile) Current_.get(File); - } - public static _VisualDVM.Repository.Component.Component getComponent() { - return (_VisualDVM.Repository.Component.Component) Current_.get(Component); - } - public static _VisualDVM.Repository.BugReport.BugReport getBugReport() { - return (BugReport) Current_.get(BugReport); - } - public static db_project_info getRoot() { - return (db_project_info) Current_.get(Root); - } - public static boolean HasRoot() { - return Current_.get(Root) != null; - } - public static db_project_info getVersion() { - return (db_project_info) Current_.get(Version); - } - public static Account getAccount() { - return (Account) Current_.get(Account); - } - public static boolean HasSubscriber() { - return Current_.get(Current.Subscriber) != null; - } - public static _VisualDVM.Repository.Subscribes.Subscriber getSubscriber() { - return (Subscriber) Current_.get(Current.Subscriber); - } - public static Machine getMachine() { - return (Machine) Current_.get(Current.Machine); - } - public static User getUser() { - return (User) Current_.get(Current.User); - } - public static Compiler getCompiler() { - return (Compiler) Current_.get(Current.Compiler); - } - public static CompilationTask getCompilationTask() { - return (CompilationTask) Current_.get(Current.CompilationTask); - } - public static RunTask getRunTask() { - return (RunTask) Current_.get(Current.RunTask); - } - public static RemoteFile getRemoteFile() { - return (RemoteFile) Current_.get(Current.RemoteFile); - } - public static Makefile getMakefile() { - return (Makefile) Current_.get(Current.Makefile); - } - public static Module getModule() { - return (Module) Current_.get(Current.Module); - } - public static RunConfiguration getRunConfiguration() { - return (RunConfiguration) Current_.get(Current.RunConfiguration); - } - public static _VisualDVM.Repository.Component.Sapfor.Sapfor getSapfor() { - return (_VisualDVM.Repository.Component.Sapfor.Sapfor) Current_.get(Current.Sapfor); - } - public static boolean HasGroup() { - return Current_.get(Current.Group) != null; - } - public static _VisualDVM.TestingSystem.Common.Group.Group getGroup() { - return (_VisualDVM.TestingSystem.Common.Group.Group) Current_.get(Current.Group); - } - public static boolean HasConfiguration() { - return Current_.get(Current.DVMConfiguration) != null; - } - public static DVMConfiguration getDVMConfiguration() { - return (DVMConfiguration) Current_.get(Current.DVMConfiguration); - } - public static SapforConfiguration getSapforConfiguration() { - return (_VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) Current_.get(Current.SapforConfiguration); - } - public static Test getTest() { - return (_VisualDVM.TestingSystem.Common.Test.Test) Current_.get(Current.Test); - } - public static boolean HasTest() { - return Current_.get(Current.Test) != null; - } - public static boolean HasVersion() { - return Current_.get(Current.Version) != null; - } - public static RemoteFile getComponentServerBackup() { - return (RemoteFile) Current_.get(Current.ComponentServerBackup); - } - public static boolean HasComponentServerBackup() { - return Current_.get(Current.ComponentServerBackup) != null; - } - public static DefaultMutableTreeNode getProjectNode() { - return (DefaultMutableTreeNode) Current_.get(Current.ProjectNode); - } - public static DefaultMutableTreeNode getProjectCurrentParentNode() { - DefaultMutableTreeNode node = Current.getProjectNode(); - //если в дереве еще никто не выделялся, берем корень. - if (node == null) - return Current.getProject().filesTreeRoot; - return (node.getUserObject() instanceof DBProjectFile) ? (DefaultMutableTreeNode) node.getParent() : node; - } - public static File getSelectedDirectory() { - return (File) Current_.get(Current.SelectedDirectory); - } - public static DBProjectFile getSelectedFile() { - return (DBProjectFile) Current_.get(Current.SelectedFile); - } - public static boolean HasBugReport() { - return Current_.get(Current.BugReport) != null; - } - public static PassForm getPassForm() { - return (Visual_DVM_2021.Passes.UI.PassForm) Current_.get(Current.PassForm); - } - public static ParallelRegion getParallelRegion() { - return (ParallelRegion) Current_.get(Current.ParallelRegion); - } - public static boolean HasParallelRegion() { - return Current_.get(Current.ParallelRegion) != null; - } - public static boolean HasFunction() { - return Current_.get(Current.Function) != null; - } - public static boolean HasSelectedFunction() { - return Current_.get(Current.SelectedFunction) != null; - } - public static FuncInfo getFunction() { - return (FuncInfo) Current_.get(Current.Function); - } - public static FuncInfo getSelectionFunction() { - return (FuncInfo) Current_.get(Current.SelectedFunction); - } - public static boolean HasScenario() { - return Current_.get(Current.Scenario) != null; - } - public static db_project_info getPackageVersion() { - return (db_project_info) Current_.get(Current.PackageVersion); - } - public static boolean HasPackageVersion() { - return Current_.get(Current.PackageVersion) != null; - } - public static boolean HasSapforConfiguration() { - return Current_.get(Current.SapforConfiguration) != null; - } - public static _VisualDVM.ProjectData.ProjectView getProjectView() { - return (_VisualDVM.ProjectData.ProjectView) Current_.get(ProjectView); - } - public static boolean HasSapforProfile() { - return Current_.get(Current.SapforProfile) != null; - } - public static _VisualDVM.GlobalData.SapforProfile.SapforProfile getSapforProfile() { - return (_VisualDVM.GlobalData.SapforProfile.SapforProfile) Current_.get(Current.SapforProfile); - } - public static boolean HasServerSapfor() { - return Current_.get(Current.ServerSapfor) != null; - } - public static _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() { - return (_VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) Current_.get(Current.ServerSapfor); - } - public static boolean HasSubscriberWorkspace() { - return Current_.get(Current.SubscriberWorkspace) != null; - } - public static _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace getSubscriberWorkspace() { - return (_VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace) Current_.get(Current.SubscriberWorkspace); - } - public static boolean HasDVMPackage() { - return Current_.get(Current.DVMPackage) != null; - } - public static _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage getDVMPackage() { - return (_VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage) Current_.get(Current.DVMPackage); - } - public static boolean HasSapforPackage() { - return Current_.get(Current.SapforPackage) != null; - } - public static _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage getSapforPackage() { - return (_VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage) Current_.get(Current.SapforPackage); - } - public static boolean HasDVMRunTask() { - return Current_.get(Current.DVMRunTask) != null; - } - public static _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask getDVMRunTask() { - return (_VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask) Current_.get(Current.DVMRunTask); - } } diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java index f1b60e99..a0149fc9 100644 --- a/src/_VisualDVM/Global.java +++ b/src/_VisualDVM/Global.java @@ -1,5 +1,4 @@ package _VisualDVM; -import Common.Current_; import Common.Database.Tables.DataSet; import Common.Mode; import Common.Passes.Pass; @@ -9,7 +8,6 @@ import Common.Visual.UI_; import Visual_DVM_2021.Passes.PassCode; import _VisualDVM.GlobalData.Account.Account; import _VisualDVM.GlobalData.Account.AccountRole; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.DBSetting; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.ProjectData.ProjectView; @@ -155,7 +153,6 @@ public class Global { //- public static void FinishApplication() { try { - // if (Utils_.db != null) Utils_.db.Disconnect(); mainModule.DeactivateDB(); if (componentsServer.db != null) componentsServer.db.Disconnect(); @@ -228,8 +225,6 @@ public class Global { //-- public static void NormalMode(int port) throws Exception { mainModule= new MainModule(); - //-------------------------------->> - //-------------------------------->> UI_.active = true; UI_.setTheme(new LightSPFEditorTheme()); @@ -254,9 +249,9 @@ public class Global { //единственное меню до остальных. UI_.menuBars.put(ComponentsSet.class, new ComponentsMenuBar()); Components = new ComponentsSet(); - Current_.set(Current.ProjectView, ProjectView.Files); + mainModule.set(Current.ProjectView, ProjectView.Files); Components.put(ComponentType.Visualiser, visualiser = new Visualiser()); - Components.put(ComponentType.Sapfor_F, (Component) Current_.set(Current.Sapfor, new Sapfor_F())); + Components.put(ComponentType.Sapfor_F, (Component) mainModule.set(Current.Sapfor, new Sapfor_F())); Components.put(ComponentType.Visualizer_2, visualizer_2); Components.put(ComponentType.PerformanceAnalyzer, performanceAnalyzer = new PerformanceAnalyzer()); Components.put(ComponentType.Instruction, new Instruction()); @@ -288,11 +283,8 @@ public class Global { } } while (flag); } - //--- mainModule.ActivateDB(); - // ActivateDB(); //тут current getAccount; роль по умолчанию всегда неизвестна. - ///-------------- - Current_.set(Current.Account, new Account() { + mainModule.set(Current.Account, new Account() { { name = "M"; email = "vmk-post@yandex.ru"; @@ -311,14 +303,13 @@ public class Global { if (mainModule.getDb().settings.get(SettingName.AutoTestsLoad).toBoolean()) Pass.passes.get(PassCode.SynchronizeTests).Do(); Pass.CheckAllStats(); - Current.getSapfor().refreshPid(); //без сапфора сюда это все равно не дойдет. + Global.mainModule.getSapfor().refreshPid(); //без сапфора сюда это все равно не дойдет. UI.CreateMenus(); UI.CreateWindows(); } public static void ServerMode() throws Exception { CheckServerDirectories(); CreateLogAtComponentsPath(); - Utils.createEmptyFile("kek"); componentsServer = new ComponentsServer(); componentsServer.ActivateDB(); componentsServer.Start(); diff --git a/src/_VisualDVM/GlobalData/Compiler/Compiler.java b/src/_VisualDVM/GlobalData/Compiler/Compiler.java index c334c821..168f4a17 100644 --- a/src/_VisualDVM/GlobalData/Compiler/Compiler.java +++ b/src/_VisualDVM/GlobalData/Compiler/Compiler.java @@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.Compiler; import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Database.Objects.iDBObject; +import _VisualDVM.Global; import _VisualDVM.Validators.DVMHelpParser; import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironmentsSet; import _VisualDVM.GlobalData.CompilerOption.CompilerOptionsSet; @@ -85,7 +86,7 @@ public class Compiler extends iDBObject { } @Override public boolean isVisible() { - return Current.HasMachine() && Current.getMachine().id == machine_id; + return Global.mainModule.matchCurrentID(Current.Machine, machine_id); } //todo понять как извлекать версию чтобы выдавать нормальную инфу. @Override diff --git a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java index f107156a..2b38876d 100644 --- a/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java +++ b/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java @@ -3,6 +3,7 @@ import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; import Common.Visual.DataSetControlForm; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Utils; @@ -101,7 +102,7 @@ public class CompilersDBTable extends iDBTable { } @Override public void ProcessResult() { - Result.machine_id = Current.getMachine().id; + Result.machine_id = Global.mainModule.getMachine().id; Result.description = fields.tfDescription.getText(); Result.call_command = fields.tfCallCommand.getText(); Result.help_command = fields.tfHelpCommand.getText(); diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java index 07d3eb58..74348f3b 100644 --- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java +++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java @@ -4,6 +4,7 @@ import _VisualDVM.Current; import Common.Visual.TextField.StyledTextField; import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.VDirectoryChooser; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.Machine.MachineType; import Visual_DVM_2021.Passes.PassCode; @@ -31,13 +32,13 @@ public class CompilerFields implements DialogFields { CompilerType type = (CompilerType) cbCompilerType.getSelectedItem(); if (type == CompilerType.dvm) { String dst = null; - if (Current.getMachine().type.equals(MachineType.Local)) { + if (Global.mainModule.getMachine().type.equals(MachineType.Local)) { File file = directoryChooser.ShowDialog(); if (file != null) dst = file.getAbsolutePath(); } else { if (Pass.passes.get(PassCode.SelectRemoteFile).Do(true)) - dst = Current.getRemoteFile().full_name; + dst = Global.mainModule.getRemoteFile().full_name; } if (dst != null) tfHome.setText(dst); diff --git a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java index e0000fe9..afb7e2f1 100644 --- a/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java +++ b/src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java @@ -86,8 +86,8 @@ public class DVMParameterDBTable extends iDBTable { } @Override public void ProcessResult() { - Result.machine_id = Current.getMachine().id; - Result.run_configuration_id = Current.getRunConfiguration().id; + Result.machine_id = Global.mainModule.getMachine().id; + Result.run_configuration_id = Global.mainModule.getRunConfiguration().id; Result.name = (String) fields.cbName.getSelectedItem(); Result.value = fields.tfValue.getText(); } diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java index cc5cab4f..d4c3fe96 100644 --- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java +++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java @@ -3,6 +3,7 @@ import Common.CommonConstants; import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Database.Objects.iDBObject; +import _VisualDVM.Global; public class EnvironmentValue extends iDBObject { public String name = ""; public String value = ""; @@ -10,7 +11,7 @@ public class EnvironmentValue extends iDBObject { public int run_configuration_id = CommonConstants.Nan; @Override public boolean isVisible() { - return Current.HasRunConfiguration() && (run_configuration_id == Current.getRunConfiguration().id); + return Global.mainModule.matchCurrentID(Current.RunConfiguration, run_configuration_id); } @Override public String toString() { diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java index ec523d9e..ede6cdbd 100644 --- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java +++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java @@ -53,8 +53,8 @@ public class EnvironmentValuesDBTable extends iDBTable { } @Override public void ProcessResult() { - Result.machine_id = Current.getMachine().id; - Result.run_configuration_id = Current.getRunConfiguration().id; + Result.machine_id = Global.mainModule.getMachine().id; + Result.run_configuration_id = Global.mainModule.getRunConfiguration().id; Result.name = (String) fields.cbName.getSelectedItem(); Result.value = fields.tfValue.getText(); } diff --git a/src/_VisualDVM/GlobalData/GlobalDatabase.java b/src/_VisualDVM/GlobalData/GlobalDatabase.java index 42098e1a..9675b8d2 100644 --- a/src/_VisualDVM/GlobalData/GlobalDatabase.java +++ b/src/_VisualDVM/GlobalData/GlobalDatabase.java @@ -84,11 +84,11 @@ public class GlobalDatabase extends VisualiserDatabase { //--------------------------------------------------------------------------------- @Override public void Init() throws Exception { - Current_.set(Current.Account, + Global.mainModule.set(Current.Account, accounts.Data.isEmpty() ? Insert(new Account()) : accounts.getFirstRecord() ); - Current_.set(Current.Credentials, + Global.mainModule.set(Current.Credentials, credentials.Data.isEmpty() ? Insert(new Credentials()) : credentials.getFirstRecord()); //настройки компонент @@ -101,17 +101,17 @@ public class GlobalDatabase extends VisualiserDatabase { } public void SaveCredentials(){ try { - Credentials credentials = (Credentials) Current_.get(Current.Credentials); - if (Current.HasMachine()) - credentials.machine_id = Current.getMachine().id; - if (Current.HasUser()) - credentials.user_id = Current.getUser().id; - if (Current.HasCompiler()) - credentials.compiler_id = Current.getCompiler().id; - if (Current.HasMakefile()) - credentials.makefile_id = Current.getMakefile().id; - if (Current.HasRunConfiguration()) - credentials.runconfiguration_id = Current.getRunConfiguration().id; + Credentials credentials = Global.mainModule.getCredentials(); + if (Global.mainModule.HasMachine()) + credentials.machine_id = Global.mainModule.getMachine().id; + if (Global.mainModule.HasUser()) + credentials.user_id = Global.mainModule.getUser().id; + if (Global.mainModule.HasCompiler()) + credentials.compiler_id = Global.mainModule.getCompiler().id; + if (Global.mainModule.HasMakefile()) + credentials.makefile_id = Global.mainModule.getMakefile().id; + if (Global.mainModule.HasRunConfiguration()) + credentials.runconfiguration_id = Global.mainModule.getRunConfiguration().id; Update(credentials); } catch (Exception ex){ @@ -120,7 +120,7 @@ public class GlobalDatabase extends VisualiserDatabase { } public void UpdateCredentials() { try { - Update((DBObject) Current_.get(Current.Credentials)); + Update(Global.mainModule.getCredentials()); } catch (Exception ex) { Utils_.MainLog.PrintException(ex); } diff --git a/src/_VisualDVM/GlobalData/Makefile/Makefile.java b/src/_VisualDVM/GlobalData/Makefile/Makefile.java index cd9d9e2c..d381e396 100644 --- a/src/_VisualDVM/GlobalData/Makefile/Makefile.java +++ b/src/_VisualDVM/GlobalData/Makefile/Makefile.java @@ -23,7 +23,7 @@ public class Makefile extends ModuleAnchestor { } @Override public boolean isVisible() { - return Current.HasMachine() && (machine_id == Current.getMachine().id); + return Global.mainModule.matchCurrentID(Current.Machine, machine_id); } public LinkedHashMap getActiveModules() { return Global.mainModule.getDb().getByFKAndGroupBy(this, Module.class, "language", LanguageName.class).values().stream().filter(Module::isSelected).collect(Collectors.toMap(module -> module.language, module -> module, (a, b) -> b, LinkedHashMap::new)); @@ -177,26 +177,26 @@ public class Makefile extends ModuleAnchestor { Log.Writeln("Линковщик не выбран"); else { if (linker.type.equals(CompilerType.dvm)) { - if (!Current.getProject().languageName.getDVMLink().equals(command)) + if (!Global.mainModule.getProject().languageName.getDVMLink().equals(command)) Log.Writeln("команда линковки " + Utils_.Quotes(command) + " не соответствует языку текущего проекта " - + Current.getProject().languageName.getDescription() + "\n" + - "Используйте команду " + Current.getProject().languageName.getDVMLink()); + + Global.mainModule.getProject().languageName.getDescription() + "\n" + + "Используйте команду " + Global.mainModule.getProject().languageName.getDVMLink()); } } LinkedHashMap modules = getModules(); for (Module module : modules.values()) { - boolean isMain = module.language.equals(Current.getProject().languageName); + boolean isMain = module.language.equals(Global.mainModule.getProject().languageName); if (module.isSelected()) { if (module.getCompiler() == null) Log.Writeln("Не назначен компилятор для языка " + module.language.getDescription()); - if (isMain && Current.getProject().getPrograms().get(module.language).isEmpty()) + if (isMain && Global.mainModule.getProject().getPrograms().get(module.language).isEmpty()) Log.Writeln("В текущем проекте не найдено ни одной программы на языке " + module.language.getDescription()); } else { if (isMain) Log.Writeln("Языковой модуль, соответствующий языку текущего проекта " + - Current.getProject().languageName.getDescription() + " не помечен как активный."); + Global.mainModule.getProject().languageName.getDescription() + " не помечен как активный."); } } } diff --git a/src/_VisualDVM/GlobalData/Module/Module.java b/src/_VisualDVM/GlobalData/Module/Module.java index 9d68988f..07c2fd84 100644 --- a/src/_VisualDVM/GlobalData/Module/Module.java +++ b/src/_VisualDVM/GlobalData/Module/Module.java @@ -20,7 +20,7 @@ public class Module extends ModuleAnchestor { } @Override public boolean isVisible() { - return Current.HasMakefile() && (makefile_id == Current.getMakefile().id); + return Global.mainModule.matchCurrentID(Current.Makefile, makefile_id); } @Override public boolean isSelected() { diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java index f2230672..08db2bff 100644 --- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java +++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java @@ -3,6 +3,7 @@ import Common.Visual.UI_; import _VisualDVM.Current; import Common.Visual.Controls.StyledTextComboBox; import Common.Visual.Windows.Dialog.DialogFields; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Module.Module; @@ -27,7 +28,7 @@ public class ModuleAnchestorFields implements DialogFields { //считаем что машина есть. public ModuleAnchestorFields() { //- - LinkedHashMap compilers = Current.getMachine().getCompilers(); + LinkedHashMap compilers = Global.mainModule.getMachine().getCompilers(); compilers.values().forEach(compiler -> cbCompilers.addItem(compiler)); bHelp.addActionListener(e -> { if (cbCompilers.getSelectedItem() != null) { @@ -53,7 +54,7 @@ public class ModuleAnchestorFields implements DialogFields { public void setListeners(ModuleAnchestor target) { boolean linker = (target instanceof Makefile); LanguageName languageName = linker ? - (Current.HasProject() ? Current.getProject().languageName : LanguageName.n) : + (Global.mainModule.HasProject() ? Global.mainModule.getProject().languageName : LanguageName.n) : ((Module) target).language; cbCompilers.addActionListener(e -> { if (cbCompilers.getSelectedItem() instanceof Compiler) { diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java index 8784beb1..da0d30ff 100644 --- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java +++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java @@ -3,6 +3,7 @@ import Common.CommonConstants; import Common.Visual.UI_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.DBObjectDialog; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.Makefile.Makefile; @@ -101,7 +102,7 @@ public class ModuleAnchestorForm extends DBObjectDial } @Override public void ProcessResult() { - Result.machine_id = Current.getMachine().id; + Result.machine_id = Global.mainModule.getMachine().id; Compiler compiler = (Compiler) fields.cbCompilers.getSelectedItem(); Result.compiler_id = (compiler != null) ? compiler.id : CommonConstants.Nan; Result.command = command; diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java index c0867ec5..21440fad 100644 --- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java +++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java @@ -4,6 +4,7 @@ import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Dialog; +import _VisualDVM.Global; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import Visual_DVM_2021.Passes.SSH.ConnectionPass; import com.jcraft.jsch.ChannelSftp.LsEntry; @@ -36,11 +37,11 @@ public class RemoteFileChooser extends Dialog { } } public void ShowCurrentRemoteFile() { - fields.lCurrentFile.setText(Current.getRemoteFile().full_name); + fields.lCurrentFile.setText(Global.mainModule.getRemoteFile().full_name); } public void Refresh(String path) { try { - Current_.set(Current.RemoteFile, null);//сброс текущего файла перед любым обновлением. + Global.mainModule.set(Current.RemoteFile, null);//сброс текущего файла перед любым обновлением. fields.lCurrentFile.setText("?"); //------------------------------------------------------------------- root_file = new RemoteFile(path, true); @@ -89,8 +90,8 @@ public class RemoteFileChooser extends Dialog { @Override public void validateFields() { String target_name = target_is_directory ? "папка" : "файл"; - if (Current.HasRemoteFile()) { - if (target_is_directory != Current.getRemoteFile().isDirectory) + if (Global.mainModule.HasRemoteFile()) { + if (target_is_directory != Global.mainModule.getRemoteFile().isDirectory) Log.Writeln("Выбранный объект - не " + target_name); } else Log.Writeln(target_name + " не выбран(а)"); } diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java index 17a5f78d..54fd4854 100644 --- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java +++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java @@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.RemoteFile.UI; import _VisualDVM.Current; import Common.Visual.Trees.DataTree; import Common.Visual.Trees.TreeRenderers; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; public class RemoteFilesTree extends DataTree { public RemoteFilesTree() { @@ -21,8 +22,8 @@ public class RemoteFilesTree extends DataTree { } @Override public void LeftMouseAction2() { - if (Current.HasRemoteFile() && Current.getRemoteFile().isDirectory()) { - UI.getRemoteFileChooser().Refresh(Current.getRemoteFile().full_name); + if (Global.mainModule.HasRemoteFile() && Global.mainModule.getRemoteFile().isDirectory()) { + UI.getRemoteFileChooser().Refresh(Global.mainModule.getRemoteFile().full_name); } } } diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java index 6c63c592..66b6edef 100644 --- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java +++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java @@ -183,7 +183,7 @@ public class RunConfiguration extends iDBObject { } @Override public boolean isVisible() { - return Current.HasMachine() && (machine_id == Current.getMachine().id); + return Global.mainModule.matchCurrentID(Current.Machine, machine_id); } @Override public String getFKName() { diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java index ce054ef0..6fcf87d6 100644 --- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java +++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java @@ -65,11 +65,11 @@ public class RunConfigurationsDBTable extends iDBTable { fields.maxMatrixPanel.add(fields.maxMatrixBar = new MatrixBar(Result.maxMatrix)); //------------------------------------------->>> if (!edit) - fields.sMaxDim.setValue(Current.getProject().maxdim); + fields.sMaxDim.setValue(Global.mainModule.getProject().maxdim); } @Override public void ProcessResult() { - Result.machine_id = Current.getMachine().id; + Result.machine_id = Global.mainModule.getMachine().id; Result.LauncherCall = fields.cbLauncherCall.getSelectedItem().toString(); Result.LauncherOptions = (String) fields.cbLaunchOptions.getSelectedItem(); if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) { diff --git a/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java b/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java index 9011c0a0..71084d90 100644 --- a/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java +++ b/src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java @@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.SapforProfileSetting; import Common.CommonConstants; import _VisualDVM.Current; import Common.Database.Objects.iDBObject; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; import com.sun.org.glassfish.gmbal.Description; public class SapforProfileSetting extends iDBObject { @@ -13,6 +14,6 @@ public class SapforProfileSetting extends iDBObject { public int sapforprofile_id = CommonConstants.Nan; @Override public boolean isVisible() { - return Current.HasSapforProfile() && Current.getSapforProfile().id == sapforprofile_id; + return Global.mainModule.matchCurrentID(Current.SapforProfile, sapforprofile_id); } } diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java index c9bba1c1..be264911 100644 --- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java +++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java @@ -74,10 +74,10 @@ public class CompilationTask extends Task { @Override public boolean isVisible() { return - Current_.matchCurrentID(Current.Machine, machine_id) && - Current_.matchCurrentID(Current.User, user_id) && - Current.HasProject() && - belongsToProject(Current.getProject()); + Global.mainModule.matchCurrentID(Current.Machine, machine_id) && + Global.mainModule.matchCurrentID(Current.User, user_id) && + Global.mainModule.HasProject() && + belongsToProject(Global.mainModule.getProject()); } public Makefile getMakefile() { return Global.mainModule.getDb().getById(Makefile.class, makefile_id); diff --git a/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java b/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java index ac73b441..4370f43b 100644 --- a/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java +++ b/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java @@ -1,6 +1,7 @@ package _VisualDVM.GlobalData.Tasks.Passes; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Tasks.Supervisor.TaskSupervisor; import Visual_DVM_2021.Passes.ProcessPass; public abstract class TaskLocalPass extends ProcessPass { @@ -26,6 +27,6 @@ public abstract class TaskLocalPass extends ProcessPas } @Override public void Interrupt() throws Exception { - Current.getProject().CreateInterruptFile(); + Global.mainModule.getProject().CreateInterruptFile(); } } diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java index b4282aba..7925f2b8 100644 --- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java +++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java @@ -53,13 +53,13 @@ public class RunTask extends Task { @Override public boolean isVisible() { return - Current_.matchCurrentID(Current.Machine, machine_id) && - Current_.matchCurrentID(Current.User, user_id) && - Current_.matchCurrentID(Current.RunConfiguration, run_configuration_id) && - Current.HasProject() && - belongsToProject(Current.getProject()) && - Current.HasCompilationTask() && - compilation_task_id == Current.getCompilationTask().id; + Global.mainModule.matchCurrentID(Current.Machine, machine_id) && + Global.mainModule.matchCurrentID(Current.User, user_id) && + Global.mainModule.matchCurrentID(Current.RunConfiguration, run_configuration_id) && + Global.mainModule.HasProject() && + belongsToProject(Global.mainModule.getProject()) && + Global.mainModule.HasCompilationTask() && + compilation_task_id == Global.mainModule.getCompilationTask().id; } public RunConfiguration getRunConfiguration() { return (Global.mainModule.getDb()).runConfigurations.Data.get(run_configuration_id); diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java index 767e3ec6..483f8a8e 100644 --- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java +++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java @@ -1,5 +1,6 @@ package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import java.util.Map; @@ -16,7 +17,7 @@ public class LinuxLocalRunSupervisor extends LinuxLocalTaskSupervisor { } @Override protected Map getEnvs() { - return Current.getRunConfiguration().getEnvMap(); + return Global.mainModule.getRunConfiguration().getEnvMap(); } @Override protected String getScriptText() { diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java index 79113394..aa5d6001 100644 --- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java +++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java @@ -1,5 +1,6 @@ package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import java.util.Map; @@ -25,7 +26,7 @@ public class WindowsLocalRunSupervisor extends WindowsLocalTaskSupervisor getEnvs() { - return Current.getRunConfiguration().getEnvMap(); + return Global.mainModule.getRunConfiguration().getEnvMap(); } void kill_mpi() throws Exception { } diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java index 3acbeb47..02b7c31c 100644 --- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java +++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java @@ -1,6 +1,7 @@ package _VisualDVM.GlobalData.Tasks.Supervisor.Remote; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.Tasks.QueueSystem.MVS; import _VisualDVM.GlobalData.Tasks.TaskState; @@ -29,7 +30,7 @@ public class MVSRunSupervisor extends ServerRunSupervisor { } @Override protected void StartTask() throws Exception { - String env = String.join(" ", Current.getRunConfiguration().getEnvList()); + String env = String.join(" ", Global.mainModule.getRunConfiguration().getEnvList()); mvs_time = (task.maxtime / 60); //в минутах if (task.maxtime % 60 > 0) mvs_time += 1; String res = "maxtime=" + Utils_.DQuotes(mvs_time) + " ./run"; diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java index 266e8696..f36a2294 100644 --- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java +++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java @@ -1,5 +1,6 @@ package _VisualDVM.GlobalData.Tasks.Supervisor.Remote; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; @@ -14,7 +15,7 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor { @Override protected void StartTask() throws Exception { String res = "./run"; - String env = String.join(" ", Current.getRunConfiguration().getEnvList()); + String env = String.join(" ", Global.mainModule.getRunConfiguration().getEnvList()); if (!env.isEmpty()) res = env + " " + res; //-- task.PID = pass.user.connection.startShellProcess(getRemoteProject(),"PID", diff --git a/src/_VisualDVM/GlobalData/User/User.java b/src/_VisualDVM/GlobalData/User/User.java index 8ac6f573..f7d7ca31 100644 --- a/src/_VisualDVM/GlobalData/User/User.java +++ b/src/_VisualDVM/GlobalData/User/User.java @@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.User; import Common.CommonConstants; import _VisualDVM.Current; import Common.Database.Objects.iDBObject; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.TestingSystem.DVM.UserConnection; import com.sun.org.glassfish.gmbal.Description; @@ -38,7 +39,7 @@ public class User extends iDBObject { } @Override public boolean isVisible() { - return Current.HasMachine() && Current.getMachine().id == machine_id; + return Global.mainModule.matchCurrentID(Current.Machine, machine_id); } @Override public String getDialogName() { diff --git a/src/_VisualDVM/GlobalData/User/UsersDBTable.java b/src/_VisualDVM/GlobalData/User/UsersDBTable.java index 7d139ac8..ee4fb201 100644 --- a/src/_VisualDVM/GlobalData/User/UsersDBTable.java +++ b/src/_VisualDVM/GlobalData/User/UsersDBTable.java @@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.User; import _VisualDVM.Current; import Common.Visual.DataSetControlForm; import Common.Visual.Tables.TableRenderers; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Database.Objects.DBObject; @@ -43,7 +44,7 @@ public class UsersDBTable extends iDBTable { } @Override public void fillFields() { - if (Current.getMachine().type.equals(MachineType.Local)) { + if (Global.mainModule.getMachine().type.equals(MachineType.Local)) { Result.login = "этот пользователь"; fields.tfLogin.setEditable(false); } @@ -58,7 +59,7 @@ public class UsersDBTable extends iDBTable { } @Override public void ProcessResult() { - Result.machine_id = Current.getMachine().id; + Result.machine_id =Global.mainModule.getMachine().id; Result.login = fields.tfLogin.getText(); Result.authentication = UserAuthentication.password; Result.password = new String(fields.tfPassword.getPassword()); diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java index 23e357b1..55d05d3a 100644 --- a/src/_VisualDVM/MainModule.java +++ b/src/_VisualDVM/MainModule.java @@ -1,8 +1,291 @@ package _VisualDVM; +import Common.Current_; import MainModule_.MainModule_; +import Visual_DVM_2021.Passes.UI.PassForm; +import _VisualDVM.GlobalData.Account.Account; +import _VisualDVM.GlobalData.Compiler.Compiler; +import _VisualDVM.GlobalData.Credentials.Credentials; import _VisualDVM.GlobalData.GlobalDatabase; +import _VisualDVM.GlobalData.Machine.Machine; +import _VisualDVM.GlobalData.Makefile.Makefile; +import _VisualDVM.GlobalData.Module.Module; +import _VisualDVM.GlobalData.RemoteFile.RemoteFile; +import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; +import _VisualDVM.GlobalData.SapforProfile.SapforProfile; +import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask; +import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; +import _VisualDVM.GlobalData.User.User; +import _VisualDVM.ProjectData.Files.DBProjectFile; +import _VisualDVM.ProjectData.Project.db_project_info; +import _VisualDVM.ProjectData.ProjectView; +import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; +import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion; +import _VisualDVM.Repository.BugReport.BugReport; +import _VisualDVM.Repository.Component.Component; +import _VisualDVM.Repository.Component.Sapfor.Sapfor; +import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; +import _VisualDVM.Repository.Subscribes.Subscriber; +import _VisualDVM.TestingSystem.Common.Group.Group; +import _VisualDVM.TestingSystem.Common.Test.Test; +import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; +import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; +import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask; +import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; +import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; +import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; +import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor; + +import javax.swing.tree.DefaultMutableTreeNode; +import java.io.File; public class MainModule extends MainModule_ { public MainModule() { super(GlobalDatabase.class); } + //-- + public boolean HasProject() {return get(Current.Project) != null;} + public db_project_info getProject() { + return (db_project_info) get(Current.Project); + } + //-- + public boolean HasFile() { + return get(Current.File) != null; + } + public boolean HasAccount() { return get(Current.Account) != null; } + public boolean HasMachine() { + return get(Current.Machine) != null; + } + public boolean HasUser() { + return get(Current.User) != null; + } + public boolean HasCompiler() { + return get(Current.Compiler) != null; + } + public boolean HasRemoteFile() { + return get(Current.RemoteFile) != null; + } + public boolean HasMakefile() { + return get(Current.Makefile) != null; + } + public boolean HasRunConfiguration() { + return get(Current.RunConfiguration) != null; + } + public boolean HasCompilationTask() { + return get(Current.CompilationTask) != null; + } + public boolean HasRunTask() { + return get(Current.RunTask) != null; + } + public boolean HasPassForm() { + return get(Current.PassForm) != null; + } + public boolean HasProjectView() { + return get(Current.ProjectView) != null; + } + public Credentials getCredentials(){ + return (Credentials) get(Current.Credentials); + } + public SapforSettings getSapforSettings() { + return (SapforSettings) get(Current.SapforSettings); + } + public boolean HasSapforSettings() { + return get(Current.SapforSettings) != null; + } + public DBProjectFile getFile() { + return (DBProjectFile) get(Current.File); + } + public Component getComponent() { + return (Component) get(Current.Component); + } + public BugReport getBugReport() { + return (BugReport) get(Current.BugReport); + } + public db_project_info getRoot() { + return (db_project_info) get(Current.Root); + } + public boolean HasRoot() { + return get(Current.Root) != null; + } + public db_project_info getVersion() { + return (db_project_info) get(Current.Version); + } + public Account getAccount() { + return (Account) get(Current.Account); + } + public boolean HasSubscriber() { + return get(Current.Subscriber) != null; + } + public Subscriber getSubscriber() { + return (Subscriber) get(Current.Subscriber); + } + public Machine getMachine() { + return (Machine) get(Current.Machine); + } + public User getUser() { + return (User) get(Current.User); + } + public Compiler getCompiler() { + return (Compiler) get(Current.Compiler); + } + public CompilationTask getCompilationTask() { + return (CompilationTask) get(Current.CompilationTask); + } + public RunTask getRunTask() { + return (RunTask) get(Current.RunTask); + } + public RemoteFile getRemoteFile() { + return (RemoteFile) get(Current.RemoteFile); + } + public Makefile getMakefile() { + return (Makefile) get(Current.Makefile); + } + public Module getModule() { + return (Module) get(Current.Module); + } + public RunConfiguration getRunConfiguration() { + return (RunConfiguration) get(Current.RunConfiguration); + } + public Sapfor getSapfor() { + return (Sapfor) get(Current.Sapfor); + } + public boolean HasGroup() { + return get(Current.Group) != null; + } + public Group getGroup() { + return (Group) get(Current.Group); + } + public boolean HasConfiguration() { + return get(Current.DVMConfiguration) != null; + } + public DVMConfiguration getDVMConfiguration() { + return (DVMConfiguration) get(Current.DVMConfiguration); + } + public SapforConfiguration getSapforConfiguration() { + return (SapforConfiguration) get(Current.SapforConfiguration); + } + public Test getTest() { + return (Test) get(Current.Test); + } + public boolean HasTest() { + return get(Current.Test) != null; + } + public boolean HasVersion() { + return get(Current.Version) != null; + } + public RemoteFile getComponentServerBackup() { + return (RemoteFile) get(Current.ComponentServerBackup); + } + public boolean HasComponentServerBackup() { + return get(Current.ComponentServerBackup) != null; + } + public DefaultMutableTreeNode getProjectNode() { + return (DefaultMutableTreeNode) get(Current.ProjectNode); + } + public DefaultMutableTreeNode getProjectCurrentParentNode() { + DefaultMutableTreeNode node = getProjectNode(); + //если в дереве еще никто не выделялся, берем корень. + if (node == null) + return getProject().filesTreeRoot; + return (node.getUserObject() instanceof DBProjectFile) ? (DefaultMutableTreeNode) node.getParent() : node; + } + public File getSelectedDirectory() { + return (File) get(Current.SelectedDirectory); + } + public DBProjectFile getSelectedFile() { + return (DBProjectFile) get(Current.SelectedFile); + } + public boolean HasBugReport() { + return get(Current.BugReport) != null; + } + public PassForm getPassForm() { + return (PassForm) get(Current.PassForm); + } + public ParallelRegion getParallelRegion() { + return (ParallelRegion) get(Current.ParallelRegion); + } + public boolean HasParallelRegion() { + return get(Current.ParallelRegion) != null; + } + public boolean HasFunction() { + return get(Current.Function) != null; + } + public boolean HasSelectedFunction() { + return get(Current.SelectedFunction) != null; + } + public FuncInfo getFunction() { + return (FuncInfo) get(Current.Function); + } + public FuncInfo getSelectionFunction() { + return (FuncInfo) get(Current.SelectedFunction); + } + public boolean HasScenario() { + return get(Current.Scenario) != null; + } + public db_project_info getPackageVersion() { + return (db_project_info) get(Current.PackageVersion); + } + public boolean HasPackageVersion() { + return get(Current.PackageVersion) != null; + } + public boolean HasSapforConfiguration() { + return get(Current.SapforConfiguration) != null; + } + public ProjectView getProjectView() { + return (ProjectView) get(Current.ProjectView); + } + public boolean HasSapforProfile() { + return get(Current.SapforProfile) != null; + } + public SapforProfile getSapforProfile() { + return (SapforProfile) get(Current.SapforProfile); + } + public boolean HasServerSapfor() { + return get(Current.ServerSapfor) != null; + } + public ServerSapfor getServerSapfor() { + return (ServerSapfor) get(Current.ServerSapfor); + } + public boolean HasSubscriberWorkspace() { + return get(Current.SubscriberWorkspace) != null; + } + public SubscriberWorkspace getSubscriberWorkspace() { + return (SubscriberWorkspace) get(Current.SubscriberWorkspace); + } + public boolean HasDVMPackage() { + return get(Current.DVMPackage) != null; + } + public DVMPackage getDVMPackage() { + return (DVMPackage) get(Current.DVMPackage); + } + public boolean HasSapforPackage() { + return get(Current.SapforPackage) != null; + } + public SapforPackage getSapforPackage() { + return (SapforPackage) get(Current.SapforPackage); + } + public boolean HasDVMRunTask() { + return get(Current.DVMRunTask) != null; + } + public DVMRunTask getDVMRunTask() { + return (DVMRunTask) get(Current.DVMRunTask); + } + public void DropCurrentFile(){ + set(Current.File, null); + set(Current.FileGraphElement, null); + set(Current.Notes, null); + set(Current.Warnings, null); + set(Current.Errors, null); + } + public void DropCurrentProject(){ + set(Current.Project, null); + set(Current.File, null); + set(Current.Function, null); + set(Current.SelectedFunction,null); + set(Current.ProjectNode, null); + set(Current.SelectedFile, null); + set(Current.SelectedDirectory, null); + set(Current.ParallelVariant, null); + set(Current.Dimensions, null); + set(Current.Array, null); + set(Current.DBArray, null); + } } diff --git a/src/_VisualDVM/ProjectData/Files/DBProjectFile.java b/src/_VisualDVM/ProjectData/Files/DBProjectFile.java index 7d9a8a93..2018700d 100644 --- a/src/_VisualDVM/ProjectData/Files/DBProjectFile.java +++ b/src/_VisualDVM/ProjectData/Files/DBProjectFile.java @@ -2,6 +2,7 @@ package _VisualDVM.ProjectData.Files; import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.ProjectData.GCOV.GCOV_info; import _VisualDVM.ProjectData.LanguageName; @@ -356,7 +357,7 @@ public class DBProjectFile extends ProjectFile { for (FuncInfo fi : function_decls.values()) { for (FuncCall fc : fi.calls) { if ((fc.line == form.getEditor().getCurrentLine()) && - !Current.getSapfor().isIntrinsic(fc.funcName) + !Global.mainModule.getSapfor().isIntrinsic(fc.funcName) ) { return fc; } @@ -416,7 +417,7 @@ public class DBProjectFile extends ProjectFile { break; } languageName = parent.languageName; - if (sapforStyle) style = Current.getSapfor().getStyle(); + if (sapforStyle) style = Global.mainModule.getSapfor().getStyle(); else style = parent.style; } public void importSourceCodeSettings(DBProjectFile parent, boolean sapforStyle) throws Exception { @@ -430,7 +431,7 @@ public class DBProjectFile extends ProjectFile { break; } languageName = parent.languageName; - if (sapforStyle) style = Current.getSapfor().getStyle(); + if (sapforStyle) style =Global.mainModule.getSapfor().getStyle(); else style = parent.style; } //------------------ diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java index 03c434df..474252dc 100644 --- a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java +++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java @@ -65,7 +65,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface { if (!switching_language) { file.NeedsSave = true; if (Global.enable_text_changed && file.state != FileState.Excluded) { - Current.getSapfor().ResetAllAnalyses(); + Global.mainModule.getSapfor().ResetAllAnalyses(); //текст изменился, значит M ка более не актуальна. file.father.dropLastModification(); } diff --git a/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java b/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java index d853c65a..0277125d 100644 --- a/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java +++ b/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java @@ -3,6 +3,7 @@ import Common.Current_; import _VisualDVM.Current; import Common.Visual.Trees.DataTree; import Common.Visual.Trees.TreeRenderers; +import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.FileObject; import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages; @@ -22,11 +23,11 @@ public class FileGraphTree extends DataTree { } @Override public void ShowCurrentObject() throws Exception { - Current.getFile().form.EventsOff(); - Object o = Current_.get(getCurrent()); - Current.getFile().form.getEditor().gotoLine((o instanceof FileObjectWithMessages) ? (((FileObjectWithMessages) o).line) : 1); - Current.getFile().form.ShowMessages(); - Current.getFile().form.EventsOn(); + Global.mainModule.getFile().form.EventsOff(); + Object o = Global.mainModule.get(getCurrent()); + Global.mainModule.getFile().form.getEditor().gotoLine((o instanceof FileObjectWithMessages) ? (((FileObjectWithMessages) o).line) : 1); + Global.mainModule.getFile().form.ShowMessages(); + Global.mainModule.getFile().form.EventsOn(); } @Override protected boolean findNode(Object userObject, Object criteria) { diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java b/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java index 40afbaa5..f983ad62 100644 --- a/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java +++ b/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java @@ -19,7 +19,7 @@ import java.awt.event.KeyEvent; import java.io.File; public class FilesTree extends StyledTree { public FilesTree() { - super(Current.getProject().filesTreeRoot); + super(Global.mainModule.getProject().filesTreeRoot); this.addKeyListener(new KeyAdapter() { @Override public void keyPressed(KeyEvent e) { @@ -48,10 +48,10 @@ public class FilesTree extends StyledTree { new FileDrop(System.out, this, files -> { Pass.passes.get(PassCode.ImportFiles).Do(files); }); - Current_.set(Current.File, null); + Global.mainModule.set(Current.File, null); } private static void forkFD(PassCode file_pass, PassCode folder_pass) { - DefaultMutableTreeNode node = Current.getProjectNode(); + DefaultMutableTreeNode node = Global.mainModule.getProjectNode(); if (node != null) Pass.passes.get((node.getUserObject() instanceof DBProjectFile) ? file_pass : folder_pass).Do(); @@ -67,24 +67,24 @@ public class FilesTree extends StyledTree { @Override public void SelectionAction(TreePath e) { DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent(); - Current_.set(Current.ProjectNode, node); + Global.mainModule.set(Current.ProjectNode, node); Object o = node.getUserObject(); if (o instanceof File) { - Current_.set(Current.SelectedDirectory, o); - Current_.set(Current.SelectedFile, null); + Global.mainModule.set(Current.SelectedDirectory, o); + Global.mainModule.set(Current.SelectedFile, null); UI.getMainWindow().getProjectWindow().ShowNoSelectedFile(); } else if (o instanceof DBProjectFile) { - Current_.set(Current.SelectedFile, o); + Global.mainModule.set(Current.SelectedFile, o); File file = ((DBProjectFile) o).file; - Current_.set(Current.SelectedDirectory, file.getParentFile()); + Global.mainModule.set(Current.SelectedDirectory, file.getParentFile()); UI.getMainWindow().getProjectWindow().ShowSelectedFile(); } UI.getMainWindow().getProjectWindow().ShowSelectedDirectory(); } @Override public void LeftMouseAction2() { - if (Current.getProjectNode() != null) { - Object o = Current.getProjectNode().getUserObject(); + if (Global.mainModule.getProjectNode() != null) { + Object o = Global.mainModule.getProjectNode().getUserObject(); if (o instanceof DBProjectFile) { //очень важно. иначе по открытии файла дерево остается в фокусе. //и не происходит прокрутки скролла к строке!! @@ -95,8 +95,8 @@ public class FilesTree extends StyledTree { } @Override public void LeftMouseAction1() { - if (Global.files_multiselection && Current.getSelectedFile() != null) { - Current.getSelectedFile().SwitchSelection(); + if (Global.files_multiselection && Global.mainModule.getSelectedFile() != null) { + Global.mainModule.getSelectedFile().SwitchSelection(); updateUI(); } } diff --git a/src/_VisualDVM/ProjectData/Messages/Message.java b/src/_VisualDVM/ProjectData/Messages/Message.java index 45aa14cf..a34d0b1a 100644 --- a/src/_VisualDVM/ProjectData/Messages/Message.java +++ b/src/_VisualDVM/ProjectData/Messages/Message.java @@ -449,8 +449,8 @@ public class Message extends FileObject { } @Override public boolean isVisible() { - if (Current.HasFile() && Current.getFile().name.equals(file)) { - Object o = Current_.get(Current.FileGraphElement); + if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(file)) { + Object o =Global.mainModule.get(Current.FileGraphElement); return !(o instanceof FileObjectWithMessages) || ((FileObjectWithMessages) o).HasMessage(this); } else return false; } diff --git a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java index 84fab383..ee29bd9b 100644 --- a/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java +++ b/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java @@ -5,6 +5,7 @@ import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Tables.ColumnFilter; import Common.Visual.Tables.TableRenderers; +import _VisualDVM.Global; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; @@ -23,7 +24,7 @@ public class MessagesDBTable extends iDBTable { @Override public void ShowCurrentObject() throws Exception { super.ShowCurrentObject(); - Current.getFile().form.getEditor().gotoLine(getCurrent().line); + Global.mainModule.getFile().form.getEditor().gotoLine(getCurrent().line); } @Override protected void AdditionalInitColumns() { diff --git a/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java b/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java index d6d26a67..b5664b82 100644 --- a/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java +++ b/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java @@ -15,7 +15,7 @@ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; public class VersionsTree extends DataTree { public VersionsTree() { - super(Current.getRoot().node); + super(Global.mainModule.getRoot().node); SelectCurrentProject(); this.addKeyListener(new KeyAdapter() { @Override @@ -25,8 +25,8 @@ public class VersionsTree extends DataTree { Pass.passes.get(PassCode.DeleteVersion).Do(); break; case KeyEvent.VK_ENTER: - if (Current.HasVersion()) - Pass.passes.get(PassCode.OpenCurrentProject).Do(Current.getVersion()); + if (Global.mainModule.HasVersion()) + Pass.passes.get(PassCode.OpenCurrentProject).Do(Global.mainModule.getVersion()); break; } } @@ -41,7 +41,7 @@ public class VersionsTree extends DataTree { return Current.Version; } public void SelectCurrentProject() { - setSelectionPath(new TreePath(Current.getProject().node.getPath())); + setSelectionPath(new TreePath(Global.mainModule.getProject().node.getPath())); } @Override protected GraphMenu createMenu() { @@ -51,7 +51,7 @@ public class VersionsTree extends DataTree { public void LeftMouseAction1() { if (Global.versions_multiselection) { // только если есть режим выбора версий. - Object element = Current_.get(getCurrent()); + Object element = Global.mainModule.get(getCurrent()); if ((element instanceof Selectable)) { ((Selectable) element).SwitchSelection(); updateUI(); @@ -60,7 +60,7 @@ public class VersionsTree extends DataTree { } @Override public void LeftMouseAction2() { - Pass.passes.get(PassCode.OpenCurrentProject).Do(Current.getVersion()); + Pass.passes.get(PassCode.OpenCurrentProject).Do(Global.mainModule.getVersion()); } @Override protected int getStartLine() { diff --git a/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java b/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java index 4966902c..75bd6374 100644 --- a/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java +++ b/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java @@ -24,9 +24,9 @@ public class VersionsTreeCellRenderer extends StyledTreeCellRenderer { setIcon(((Selectable) o).GetSelectionIcon()); } else { URL imageUrl = null; - boolean current = Current.HasProject() && version.Home.equals(Current.getProject().Home); + boolean current = Global.mainModule.HasProject() && version.Home.equals(Global.mainModule.getProject().Home); String type_image_key = ""; - if (version.Home.equals(Current.getRoot().Home)) + if (version.Home.equals(Global.mainModule.getRoot().Home)) type_image_key = "Root"; else if (version.IsMCopy()) type_image_key = "M"; diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java index 56f8466c..ccb290a0 100644 --- a/src/_VisualDVM/ProjectData/Project/db_project_info.java +++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java @@ -435,8 +435,8 @@ public class db_project_info extends DBObject { db.ResetAI(MessageWarning.class); db.ResetAI(MessageRecommendation.class); //- - Current_.set(Current.Function, null); - Current_.set(Current.SelectedFunction, null); + Global.mainModule.set(Current.Function, null); + Global.mainModule.set(Current.SelectedFunction, null); } public void CleanVersions() throws Exception { node.removeAllChildren(); @@ -660,7 +660,7 @@ public class db_project_info extends DBObject { } public Vector getFilesForComparsion() { Vector res = new Vector<>(); - if (Current.HasProject() && this.Home.equals(Current.getProject().Home)) { + if (Global.mainModule.HasProject() && this.Home.equals(Global.mainModule.getProject().Home)) { // res = db.files.Data.values().stream().filter(file -> !file.state.equals(FileState.Excluded)).collect(Collectors.toCollection(Vector::new)); } else { @@ -1069,7 +1069,7 @@ public class db_project_info extends DBObject { target.Close(); } public void undoLastTransformation() throws Exception { - Current_.set(Current.Version, null); + Global.mainModule.set(Current.Version, null); //--- UI.getVersionsWindow().getVersionsForm().getTree().RemoveNode(last_version.node); Utils.forceDeleteWithCheck(last_version.Home); @@ -1498,8 +1498,8 @@ public class db_project_info extends DBObject { } public String getLocalName() { //требует отображения рута. без него работать не будет. - if (Current.HasRoot()) - return Home.getAbsolutePath().substring(Current.getRoot().Home.getParentFile().getAbsolutePath().length() + 1); + if (Global.mainModule.HasRoot()) + return Home.getAbsolutePath().substring(Global.mainModule.getRoot().Home.getParentFile().getAbsolutePath().length() + 1); else return Home.getName(); } public void SelectAllFiles(boolean b) { diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java index 430142fa..ec354147 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java @@ -79,6 +79,6 @@ public class ArraysSet extends DataSet { } @Override public void CheckAll(boolean flag) { - Pass.passes.get(PassCode.MassSelectArrays).Do(flag,new Vector(Current.getProject().declaratedArrays.Data.values())); + Pass.passes.get(PassCode.MassSelectArrays).Do(flag,new Vector(Global.mainModule.getProject().declaratedArrays.Data.values())); } } diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java index 3191e89a..62fdd103 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java @@ -3,6 +3,7 @@ import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Database.Objects.DBObject; import Common.Utils.Index; +import _VisualDVM.Global; import _VisualDVM.ProjectData.DBArray.DBArray; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.Dimension; @@ -104,7 +105,7 @@ public class ProjectArray extends DBObject { int idxPl = 3; for (int i = 0; i < numDeclPlaces; ++i, idxPl += 2) { String declFile = Utils_.toW(localSplited[idxPl]); - DBProjectFile file = Current.getProject().db.files.Data.get(declFile); + DBProjectFile file = Global.mainModule.getProject().db.files.Data.get(declFile); int declLine = Integer.parseInt(localSplited[idxPl + 1]); //declPlaces.add(new Pair<>(declFile, declLine)); ArrayDecl decl = new ArrayDecl(shortName, location, file, declLine); @@ -219,8 +220,8 @@ public class ProjectArray extends DBObject { } public void CreateDimensions() { for (BigInteger regID : regIDs) { - ParallelRegion region = Current.getProject().parallelRegions.get(regID); - for (int i = 0; i < Current.getProject().maxdim; ++i) { + ParallelRegion region = Global.mainModule.getProject().parallelRegions.get(regID); + for (int i = 0; i < Global.mainModule.getProject().maxdim; ++i) { dimensions.add(new TemplateDimension( i, this, region )); @@ -254,9 +255,9 @@ public class ProjectArray extends DBObject { if (!mask(banned_dimensions, binary)) { if (filter) { boolean valid = true; - if (Current.getProject().f_distributed()) + if (Global.mainModule.getProject().f_distributed()) valid = CheckFilterMask(i, true, binary); - if (valid && Current.getProject().f_multiplied()) + if (valid && Global.mainModule.getProject().f_multiplied()) valid = CheckFilterMask(i, false, binary); if (valid) varIDs.add(i); @@ -275,9 +276,9 @@ public class ProjectArray extends DBObject { if (!mask(banned_dimensions, binary)) { if (filter) { boolean valid = true; - if (Current.getProject().f_distributed()) + if (Global.mainModule.getProject().f_distributed()) valid = CheckFilterMask(i, true, binary); - if (valid && Current.getProject().f_multiplied()) + if (valid && Global.mainModule.getProject().f_multiplied()) valid = CheckFilterMask(i, false, binary); return valid; } else return true; @@ -344,12 +345,12 @@ public class ProjectArray extends DBObject { return CheckFilterMask(varID, distributed, ""); } public void SaveUserState() throws Exception { - if (Current.getProject().db.savedArrays.Data.containsKey(UniqKey)) { - DBArray sa = Current.getProject().db.savedArrays.Data.get(UniqKey); + if (Global.mainModule.getProject().db.savedArrays.Data.containsKey(UniqKey)) { + DBArray sa = Global.mainModule.getProject().db.savedArrays.Data.get(UniqKey); sa.State = State; - Current.getProject().db.Update(sa); + Global.mainModule.getProject().db.Update(sa); } else - Current.getProject().db.Insert(new DBArray(this)); + Global.mainModule.getProject().db.Insert(new DBArray(this)); } //----------------------------------------------------------------------- @Override diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java index 3b5d20d7..3a987a6d 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/Templates/TemplateDimensionState.java @@ -1,23 +1,24 @@ package _VisualDVM.ProjectData.SapforData.Arrays.Templates; import _VisualDVM.Current; +import _VisualDVM.Global; public enum TemplateDimensionState { multiplied, //0 distributed; //1 public String getMaskDescription() { switch (this) { case distributed: - if (Current.getProject().f_distributed()) { + if (Global.mainModule.getProject().f_distributed()) { return "BLOCK"; } else { - if (Current.getProject().f_multiplied()) + if (Global.mainModule.getProject().f_multiplied()) return " X "; else return "BLOCK"; } case multiplied: - if (Current.getProject().f_multiplied()) { + if (Global.mainModule.getProject().f_multiplied()) { return " * "; } else { - if (Current.getProject().f_distributed()) + if (Global.mainModule.getProject().f_distributed()) return " X "; else return " * "; } diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java index d88764ae..10b5990f 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java @@ -4,6 +4,7 @@ import _VisualDVM.Current; import Common.Visual.ControlForm; import Common.Visual.Tables.Grid.GridAnchestor; import Common.Visual.Tables.StyledTable; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray; import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension; @@ -32,10 +33,10 @@ public class DimensionsTableForm extends ControlForm { public void CreateControl() { Vector columns = new Vector<>(); columns.add("шаблон"); - for (int i = 0; i < Current.getProject().maxdim; ++i) + for (int i = 0; i < Global.mainModule.getProject().maxdim; ++i) columns.add(ProjectArray.alignNames[i]); Vector dimensions = new Vector<>(); - Current.getProject().templates.forEach(t -> dimensions.add(t.CreateTemplateCells())); + Global.mainModule.getProject().templates.forEach(t -> dimensions.add(t.CreateTemplateCells())); control = new StyledTable(new GridAnchestor(columns, dimensions) { @Override public Object getValueAt(int rowIndex, int columnIndex) { diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/FileArraysTree.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/FileArraysTree.java index 6e81fe10..e3122bb7 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/FileArraysTree.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/FileArraysTree.java @@ -1,9 +1,10 @@ package _VisualDVM.ProjectData.SapforData.Arrays.UI; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.UI.FileGraphTree; public class FileArraysTree extends FileGraphTree { public FileArraysTree() { - super(Current.getFile().getArraysTree()); + super(Global.mainModule.getFile().getArraysTree()); } @Override public String getBranchesName() { diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java index 0cd8ea3b..96095e97 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java @@ -1,6 +1,7 @@ package _VisualDVM.ProjectData.SapforData.Arrays.UI; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.GraphMenu; import Common.Visual.Trees.StyledTree; import Common.Visual.Trees.TreeRenderers; @@ -12,11 +13,11 @@ import javax.swing.tree.TreePath; import static Common.Visual.Trees.TreeRenderers.RendererRule; public class RulesTree extends StyledTree { public RulesTree() { - super(Current.getProject().align_rules_root); + super(Global.mainModule.getProject().align_rules_root); setRootVisible(false); expandRow(0); ExpandAll(); - Current_.set(Current.ParallelRegion, null); + Global.mainModule.set(Current.ParallelRegion, null); } @Override protected GraphMenu createMenu() { @@ -39,6 +40,6 @@ public class RulesTree extends StyledTree { region = (ParallelRegion) o; } } - Current_.set(Current.ParallelRegion, region); + Global.mainModule.set(Current.ParallelRegion, region); } } diff --git a/src/_VisualDVM/ProjectData/SapforData/FileObject.java b/src/_VisualDVM/ProjectData/SapforData/FileObject.java index a47b3a85..8c49c7a3 100644 --- a/src/_VisualDVM/ProjectData/SapforData/FileObject.java +++ b/src/_VisualDVM/ProjectData/SapforData/FileObject.java @@ -2,6 +2,7 @@ package _VisualDVM.ProjectData.SapforData; import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Database.Objects.iDBObject; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.DBProjectFile; import com.sun.org.glassfish.gmbal.Description; @@ -21,7 +22,7 @@ public abstract class FileObject extends iDBObject { return "файл " + Utils_.Brackets(file) + " строка: " + line; } public DBProjectFile getFather() { - return Current.getProject().db.files.Data.get(file); + return Global.mainModule.getProject().db.files.Data.get(file); } public void Show(boolean focus) { UI.getMainWindow().getProjectWindow().GotoFile(file, line, focus); diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java index bf72f91a..1c9662d3 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/FileFunctionsTree.java @@ -1,9 +1,10 @@ package _VisualDVM.ProjectData.SapforData.Functions.UI; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.UI.FileGraphTree; public class FileFunctionsTree extends FileGraphTree { public FileFunctionsTree() { - super(Current.getFile().getFunctionsTree()); + super(Global.mainModule.getFile().getFunctionsTree()); } @Override public String getBranchesName() { diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java index d3a9b221..eee25795 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java @@ -2,6 +2,7 @@ package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph; import Common.Visual.UI_; import _VisualDVM.Current; import Common.Visual.ControlForm; +import _VisualDVM.Global; import com.mxgraph.swing.mxGraphComponent; import java.awt.*; @@ -11,7 +12,7 @@ public class FunctionsGraphForm extends ControlForm { } @Override public void CreateControl() { - control = Current.getProject().DrawFunctionsGraph(); + control = Global.mainModule.getProject().DrawFunctionsGraph(); } @Override public void Show() { diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java index ff418125..f3b0090e 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java @@ -4,6 +4,7 @@ import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Visual.Menus.VisualiserMenuItem; import Common.Visual.Menus.StyledPopupMenu; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions; import Visual_DVM_2021.Passes.PassCode; @@ -19,8 +20,8 @@ public class FunctionsGraphMenu extends StyledPopupMenu { changeCurrent.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - if (Current.HasSelectedFunction()) { - Current_.set(Current.Function, Current.getSelectionFunction()); + if (Global.mainModule.HasSelectedFunction()) { + Global.mainModule.set(Current.Function, Global.mainModule.getSelectionFunction()); UI.getMainWindow().getProjectWindow().getFunctionsWindow().ShowCurrentFunction(); if (SPF_GetGraphFunctionPositions.showByCurrentFunction) { Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do(); @@ -32,8 +33,8 @@ public class FunctionsGraphMenu extends StyledPopupMenu { } @Override public void CheckElementsVisibility() { - if (Current.HasSelectedFunction()) { - changeCurrent.setText("Назначить процедуру " + Utils_.DQuotes(Current.getSelectionFunction().funcName) + " текущей."); + if (Global.mainModule.HasSelectedFunction()) { + changeCurrent.setText("Назначить процедуру " + Utils_.DQuotes(Global.mainModule.getSelectionFunction().funcName) + " текущей."); changeCurrent.setEnabled(true); } else { changeCurrent.setText("Невозможно назначить текущую процедуру: узел графа не выбран"); diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java index 54d7b436..d5aee952 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java @@ -3,6 +3,7 @@ import Common.Current_; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates; import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; import _VisualDVM.ProjectData.SapforData.Functions.FunctionType; @@ -138,10 +139,10 @@ public class FunctionsGraphUI extends mxGraph { // UI.Info("++"); LinkedHashMap mxVertexes = new LinkedHashMap<>(); for (String name : graph.vertexCoordinates.keySet()) { - funcInfo = Current.getProject().allFunctions.get(name); + funcInfo = Global.mainModule.getProject().allFunctions.get(name); String vertexType = funcInfo.type.toString(); if (SPF_GetGraphFunctionPositions.showByCurrentFunction) { - FuncInfo current_fi = (FuncInfo) Current_.get(Current.Function); + FuncInfo current_fi = (FuncInfo) Global.mainModule.get(Current.Function); if ((current_fi != null) && (funcInfo.funcName.equals(current_fi.funcName))) { vertexType = "current"; } @@ -200,18 +201,18 @@ public class FunctionsGraphUI extends mxGraph { // UI.Info(cell.getGeometry().getPoint().toString()); Point point = cell.getGeometry().getPoint(); try { - if (Current.getProject().db.funcCoordinates.containsKey(funcName)) { - coords = Current.getProject().db.funcCoordinates.get(funcName); + if (Global.mainModule.getProject().db.funcCoordinates.containsKey(funcName)) { + coords = Global.mainModule.getProject().db.funcCoordinates.get(funcName); coords.name = funcName; coords.X = point.getX(); coords.Y = point.getY(); - Current.getProject().db.Update(coords); + Global.mainModule.getProject().db.Update(coords); } else { coords = new FuncCoordinates(); coords.name = funcName; coords.X = point.getX(); coords.Y = point.getY(); - Current.getProject().db.Insert(coords); + Global.mainModule.getProject().db.Insert(coords); } } catch (Exception ignored) { } @@ -231,10 +232,10 @@ public class FunctionsGraphUI extends mxGraph { mxCell mx_cell = (mxCell) cell; if (mx_cell.isVertex()) { String func_name = (String) mx_cell.getValue(); - FuncInfo fi = Current.getProject().allFunctions.get(func_name); + FuncInfo fi = Global.mainModule.getProject().allFunctions.get(func_name); switch (e.getClickCount()) { case 1: - Current_.set(Current.SelectedFunction, fi); + Global.mainModule.set(Current.SelectedFunction, fi); break; case 2: switch (fi.type) { diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineMenu.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineMenu.java index 1c3f1b15..dd66785c 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineMenu.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineMenu.java @@ -1,5 +1,6 @@ package _VisualDVM.ProjectData.SapforData.Functions.UI; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.SelectionTreeMenu; import Common.Visual.Trees.SelectableTree; import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; @@ -13,7 +14,7 @@ public class InlineMenu extends SelectionTreeMenu { } @Override public void SelectAll(boolean select) { - for (FuncInfo fi : Current.getProject().allFunctions.values()) + for (FuncInfo fi : Global.mainModule.getProject().allFunctions.values()) fi.SelectAllChildren(select); } } diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java index 81977dbd..5327f1f0 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java @@ -1,13 +1,14 @@ package _VisualDVM.ProjectData.SapforData.Functions.UI; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.GraphMenu; import Common.Visual.Trees.SelectableTree; import Common.Visual.Trees.TreeRenderers; import _VisualDVM.ProjectData.SapforData.FileObject; public class InlineTree extends SelectableTree { public InlineTree() { - super(Current.getProject().inline_root); + super(Global.mainModule.getProject().inline_root); } @Override public TreeRenderers getRenderer() { @@ -19,7 +20,7 @@ public class InlineTree extends SelectableTree { } @Override public void ShowCurrentObject() { - Object o = Current_.get(getCurrent()); + Object o = Global.mainModule.get(getCurrent()); if (o instanceof FileObject) { ((FileObject) o).Show(false); } diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java index 322c1975..112ad689 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java @@ -1,13 +1,14 @@ package _VisualDVM.ProjectData.SapforData.Functions.UI; import Common.Current_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.GraphMenu; import Common.Visual.Trees.SelectableTree; import Common.Visual.Trees.TreeRenderers; import _VisualDVM.ProjectData.SapforData.FileObject; public class InlineTree2 extends SelectableTree { public InlineTree2() { - super(Current.getProject().inline_root2); + super(Global.mainModule.getProject().inline_root2); } @Override public TreeRenderers getRenderer() { @@ -23,7 +24,7 @@ public class InlineTree2 extends SelectableTree { } @Override public void ShowCurrentObject() { - Object o = Current_.get(getCurrent()); + Object o = Global.mainModule.get(getCurrent()); if (o instanceof FileObject) { ((FileObject) o).Show(false); } diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java index 25f74d3b..7a9872b9 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java +++ b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesMenu.java @@ -1,5 +1,6 @@ package _VisualDVM.ProjectData.SapforData.Includes.UI; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.SelectionTreeMenu; import Common.Visual.Trees.SelectableTree; import _VisualDVM.ProjectData.SapforData.Includes.FileInfo; @@ -13,7 +14,7 @@ public class IncludesMenu extends SelectionTreeMenu { } @Override public void SelectAll(boolean select) { - for (FileInfo fi : Current.getProject().addictedFiles.values()) + for (FileInfo fi : Global.mainModule.getProject().addictedFiles.values()) fi.SelectAllChildren(select); } } diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java index ecb5e278..8ef9388e 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java +++ b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java @@ -1,11 +1,12 @@ package _VisualDVM.ProjectData.SapforData.Includes.UI; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.GraphMenu; import Common.Visual.Trees.SelectableTree; import Common.Visual.Trees.TreeRenderers; public class IncludesTree extends SelectableTree { public IncludesTree() { - super(Current.getProject().includes_root); + super(Global.mainModule.getProject().includes_root); } @Override public Current getCurrent() { diff --git a/src/_VisualDVM/ProjectData/SapforData/Loops/UI/FileLoopsTree.java b/src/_VisualDVM/ProjectData/SapforData/Loops/UI/FileLoopsTree.java index 2edf9a77..04be271c 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Loops/UI/FileLoopsTree.java +++ b/src/_VisualDVM/ProjectData/SapforData/Loops/UI/FileLoopsTree.java @@ -1,9 +1,10 @@ package _VisualDVM.ProjectData.SapforData.Loops.UI; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.UI.FileGraphTree; public class FileLoopsTree extends FileGraphTree { public FileLoopsTree() { - super(Current.getFile().getLoopsTree()); + super(Global.mainModule.getFile().getLoopsTree()); } @Override public String getBranchesName() { diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java index 6929b29c..154ed914 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java +++ b/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java @@ -3,6 +3,7 @@ import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Database.Objects.DBObject; import Common.Utils.Index; +import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.AlignRule; import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.DataDirective; @@ -63,7 +64,7 @@ public class ParallelRegion extends DBObject { //------------------------------------------------------- if (new_array.isTemplFlag == 1) { maxdim = Math.max(maxdim, new_array.dimSize); - Current.getProject().templates.add(new_array); + Global.mainModule.getProject().templates.add(new_array); new_array.regIDs.add(regionId); } else if (new_array.isLoopArrayFlag != 1) arrays_count++; } @@ -82,7 +83,7 @@ public class ParallelRegion extends DBObject { for (String FKey : lines.keySet()) { for (Pair L : lines.get(FKey)) { lines_count += (L.getValue() - L.getKey()); - DBProjectFile f = Current.getProject().db.files.Data.get(FKey); + DBProjectFile f = Global.mainModule.getProject().db.files.Data.get(FKey); loops_count += f.FragmentLoopCount(L.getKey(), L.getValue()); fc_count += f.FragmentFunctionCallsCount(L.getKey(), L.getValue()); fd_count += f.FragmentFunctionDeclsCount(L.getKey(), L.getValue()); @@ -111,7 +112,7 @@ public class ParallelRegion extends DBObject { loops_count = 0; for (String FKey : lines.keySet()) { for (Pair L : lines.get(FKey)) { - DBProjectFile f = Current.getProject().db.files.Data.get(FKey); + DBProjectFile f = Global.mainModule.getProject().db.files.Data.get(FKey); loops_count += f.FragmentLoopCount(L.getKey(), L.getValue()); } } @@ -121,7 +122,7 @@ public class ParallelRegion extends DBObject { fc_count = 0; for (String FKey : lines.keySet()) { for (Pair L : lines.get(FKey)) { - DBProjectFile f = Current.getProject().db.files.Data.get(FKey); + DBProjectFile f = Global.mainModule.getProject().db.files.Data.get(FKey); fc_count += f.FragmentFunctionCallsCount(L.getKey(), L.getValue()); fd_count += f.FragmentFunctionDeclsCount(L.getKey(), L.getValue()); } @@ -131,7 +132,7 @@ public class ParallelRegion extends DBObject { arrays_count=0; for (String FKey : lines.keySet()) { for (Pair L : lines.get(FKey)) { - DBProjectFile f = Current.getProject().db.files.Data.get(FKey); + DBProjectFile f = Global.mainModule.getProject().db.files.Data.get(FKey); arrays_count += f.FragmentArraysCount(L.getKey(), L.getValue()); } } diff --git a/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java index 7a2034ac..2e1684f9 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java +++ b/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java @@ -1,6 +1,7 @@ package _VisualDVM.ProjectData.SapforData.Regions.UI; import _VisualDVM.Current; import Common.Visual.Tables.StyledCellLabel; +import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray; import javafx.util.Pair; @@ -40,15 +41,15 @@ public class ArrayAlignmentBar extends JToolBar { add(label); ChangeListener changeListener = e -> { //инфа о связях. из списка всех объявленных массивов. - ProjectArray d_array = Current.getProject().declaratedArrays.get(array.id); + ProjectArray d_array = Global.mainModule.getProject().declaratedArrays.get(array.id); //опять же, берем инфу из объявлений! for (ProjectArray d_link : d_array.links.values()) { //это массивы из объявлений. прежде чем их трогать проверим а есть ли они в текущей области. // по адресам принадлежность смотреть нельзя. // на момент поиска массивов у них их еще нет. а вот ид совпадают. - if (Current.getParallelRegion().ArrayBelongsToRegion(d_link.id)) { + if (Global.mainModule.getParallelRegion().ArrayBelongsToRegion(d_link.id)) { //инфа о массиве уже из области. имеющая адрес и бар. - ProjectArray r_link = Current.getParallelRegion().getArrayById(d_link.id); + ProjectArray r_link = Global.mainModule.getParallelRegion().getArrayById(d_link.id); Pair pair = r_link.bar.dimensions.get(dim); pair.getKey().setValue(K.getValue()); pair.getValue().setValue(B.getValue()); diff --git a/src/_VisualDVM/Repository/BugReport/BugReport.java b/src/_VisualDVM/Repository/BugReport/BugReport.java index 1b7a0c94..562d1949 100644 --- a/src/_VisualDVM/Repository/BugReport/BugReport.java +++ b/src/_VisualDVM/Repository/BugReport/BugReport.java @@ -70,7 +70,7 @@ public class BugReport extends rDBObject { date = new Date().getTime(); change_date = new Date().getTime(); state = BugReportState.draft; - owner = Current.getProject().Home; + owner = Global.mainModule.getProject().Home; } @Override public boolean isVisible() { diff --git a/src/_VisualDVM/Repository/BugReport/BugReportInterface.java b/src/_VisualDVM/Repository/BugReport/BugReportInterface.java index 948a8d3e..5e2a3d28 100644 --- a/src/_VisualDVM/Repository/BugReport/BugReportInterface.java +++ b/src/_VisualDVM/Repository/BugReport/BugReportInterface.java @@ -29,8 +29,8 @@ public class BugReportInterface { && object.project_version.toUpperCase().contains(filterVersion.toUpperCase()) && (!filterOpenedOnly || object.state.equals(BugReportState.active)) && (!filterMyOnly || - (object.sender_address.equalsIgnoreCase(Current.getAccount().email) || - object.executor_address.equalsIgnoreCase(Current.getAccount().email) + (object.sender_address.equalsIgnoreCase(Global.mainModule.getAccount().email) || + object.executor_address.equalsIgnoreCase(Global.mainModule.getAccount().email) ) ); } @@ -69,12 +69,12 @@ public class BugReportInterface { for (String a : data) if (a.length() > 0) res.add(a); - if (!res.contains(Current.getAccount().email)) - res.add(Current.getAccount().email); + if (!res.contains(Global.mainModule.getAccount().email)) + res.add(Global.mainModule.getAccount().email); return res; } public static File[] getAttachements(BugReport object) { - File[] project_attachements = Current.getProject().getAttachmentsDirectory().listFiles(); + File[] project_attachements = Global.mainModule.getProject().getAttachmentsDirectory().listFiles(); File[] res = new File[project_attachements.length + 1]; res[0] = getArchiveFile(object); for (int i = 0; i < project_attachements.length; ++i) @@ -97,7 +97,7 @@ public class BugReportInterface { } public static String getSettingsSummary(BugReport object) { return - (Current.HasAccount() ? (Current.getAccount().isAdmin() ? ("Адрес отправителя: " + object.sender_address + "\n") : "") : "") + + (Global.mainModule.HasAccount() ? (Global.mainModule.getAccount().isAdmin() ? ("Адрес отправителя: " + object.sender_address + "\n") : "") : "") + "Версия SAPFOR: " + object.sapfor_version + "\n" + "Версия визуализатора: " + object.visualiser_version + "\n" + "----------------------------------\n" + diff --git a/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java b/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java index 71874c61..67aa7dc1 100644 --- a/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java +++ b/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java @@ -72,7 +72,7 @@ public class PerformanceAnalyzer extends Component { } public void ConvertStatistic() throws Exception { message_in = (MessageJtoJ) in.readObject(); - String message = Current.getSapfor().readStatForAnalyzer(message_in.getMessage()); + String message = Global.mainModule.getSapfor().readStatForAnalyzer(message_in.getMessage()); message_out = new MessageJtoJ(message, message_in.getCommand()); out.writeObject(message_out); } @@ -117,7 +117,7 @@ public class PerformanceAnalyzer extends Component { try { StartServer(() -> { SendMessageOut(new MessageJtoJ( - Current.HasProject() ? Current.getProject().getAnalyzerDirectory().getAbsolutePath() : Global.PerformanceAnalyzerDirectory.getAbsolutePath(), "StatDirPath")); + Global.mainModule.HasProject() ? Global.mainModule.getProject().getAnalyzerDirectory().getAbsolutePath() : Global.PerformanceAnalyzerDirectory.getAbsolutePath(), "StatDirPath")); while (true) ConvertStatistic(); }); // UI.Info(String.valueOf(getPort())); diff --git a/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java b/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java index 69f36336..5d3f5721 100644 --- a/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java +++ b/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java @@ -1,6 +1,7 @@ package _VisualDVM.Repository.Component.Sapfor; import Common.Utils.Utils_; import _VisualDVM.Current; +import _VisualDVM.Global; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -28,8 +29,8 @@ public class MessagesServer { InputStreamReader(client.getInputStream())); String line; while ((line = in.readLine()) != null) { - if (Current.HasPassForm()) - Current.getPassForm().Result.ShowSapforMessage(line); + if (Global.mainModule.HasPassForm()) + Global.mainModule.getPassForm().Result.ShowSapforMessage(line); } } catch (Exception ex) { // UI.Print(DebugPrintLevel.MessagesServer, "соединение сброшено!"); diff --git a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java index 79d6226f..d8874c86 100644 --- a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java +++ b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java @@ -311,18 +311,18 @@ public abstract class Sapfor extends OSDComponent { //todo рефакторить. отвязать от текущего проекта. public void UpdateProjectFiles(boolean mode) throws Exception { ResetAllAnalyses(); - Current.getProject().dropLastModification(); + Global.mainModule.getProject().dropLastModification(); DBProjectFile cuf = null; - if (Current.HasFile()) { - cuf = Current.getFile(); + if (Global.mainModule.HasFile()) { + cuf = Global.mainModule.getFile(); Pass.passes.get(PassCode.CloseCurrentFile).Do(); } if (mode) //модификация { OldFiles.clear(); for (String name : ModifiedFiles.keySet()) { - if (Current.getProject().db.files.Data.containsKey(name)) { - File file = Current.getProject().db.files.Data.get(name).file; + if (Global.mainModule.getProject().db.files.Data.containsKey(name)) { + File file = Global.mainModule.getProject().db.files.Data.get(name).file; OldFiles.put(name, Utils.ReadAllText(file)); Utils.WriteToFile(file, ModifiedFiles.get(name)); } @@ -332,7 +332,7 @@ public abstract class Sapfor extends OSDComponent { { if (OldFiles.size() > 0) { for (String name : OldFiles.keySet()) { - File file = Current.getProject().db.files.Data.get(name).file; + File file = Global.mainModule.getProject().db.files.Data.get(name).file; Utils.WriteToFile(file, OldFiles.get(name)); } OldFiles.clear(); diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java index 8fd415f2..df4c77a3 100644 --- a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java +++ b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspace.java @@ -1,6 +1,7 @@ package _VisualDVM.Repository.SubscriberWorkspace; import _VisualDVM.Current; import Common.Database.Objects.iDBObject; +import _VisualDVM.Global; public class SubscriberWorkspace extends iDBObject { public String email; //почта public String URL; //адрес:порт машины @@ -8,9 +9,9 @@ public class SubscriberWorkspace extends iDBObject { public String path; //рабочая папка на машине @Override public boolean isVisible() { - return Current.HasSubscriber()&& - Current.getSubscriber().address.equals(email)&& - (Current.getAccount().isAdmin() || Current.getAccount().email.equals(Current.getSubscriber().address)); + return Global.mainModule.HasSubscriber()&& + Global.mainModule.getSubscriber().address.equals(email)&& + (Global.mainModule.getAccount().isAdmin() || Global.mainModule.getAccount().email.equals(Global.mainModule.getSubscriber().address)); } //- diff --git a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java b/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java index 3f939ac4..2cb51197 100644 --- a/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java +++ b/src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java @@ -7,6 +7,7 @@ import Common.Database.Tables.DBTable; import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKCurrentObjectBehaviuor; import Common.Database.Tables.FKDataBehaviour; +import _VisualDVM.Global; import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; import _VisualDVM.Repository.Subscribes.UI.SubscriberFields; @@ -30,9 +31,9 @@ public class SubsribersDBTable extends DBTable { } @Override protected void AdditionalInitColumns() { - boolean admin = Current.getAccount().role.equals(AccountRole.Admin); + boolean admin = Global.mainModule.getAccount().role.equals(AccountRole.Admin); columns.get(0).setVisible(admin); - columns.get(1).setVisible(Current.getBugReport() != null); + columns.get(1).setVisible(Global.mainModule.getBugReport() != null); columns.get(3).setVisible(admin); columns.get(4).setVisible(admin); } diff --git a/src/_VisualDVM/TestingSystem/Common/Group/Group.java b/src/_VisualDVM/TestingSystem/Common/Group/Group.java index 721c0dcc..d4648e28 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/Group.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/Group.java @@ -23,7 +23,7 @@ public class Group extends riDBObject { //-- @Override public boolean isVisible() { - return (!GroupsDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) && + return (!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(sender_address)) && Global.testingServer.db.groups.applyFilters(this); } public String getSummary() { diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Test.java b/src/_VisualDVM/TestingSystem/Common/Test/Test.java index eef5494c..6a9ef174 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/Test.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/Test.java @@ -60,7 +60,7 @@ public class Test extends riDBObject { //--- @Override public boolean isVisible() { - return Current.HasGroup() && (Current.getGroup().id == group_id); + return Global.mainModule.matchCurrentID(Current.Group,group_id); } //- public File getArchive() { diff --git a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java index 15560c3e..d6d6cafd 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java @@ -3,6 +3,7 @@ import _VisualDVM.Current; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Windows.Dialog.DBObjectDialog; +import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.UI.TestFields; @@ -74,8 +75,8 @@ public class TestDBTable extends iDBTable { @Override public void validateFields() { if (!edit) { - if (!Current.getGroup().language.equals(Current.getProject().languageName)) - Log.Writeln_("В текущую группу могут войти только тесты на языке " + Current.getGroup().language); + if (!Global.mainModule.getGroup().language.equals(Global.mainModule.getProject().languageName)) + Log.Writeln_("В текущую группу могут войти только тесты на языке " + Global.mainModule.getGroup().language); } } @Override @@ -90,8 +91,8 @@ public class TestDBTable extends iDBTable { Result.min_dim = (int) fields.sMinDim.getValue(); Result.max_dim = (int) fields.sMaxDim.getValue(); if (!edit) { - Result.sender_name = Current.getAccount().name; - Result.sender_address = Current.getAccount().email; + Result.sender_name = Global.mainModule.getAccount().name; + Result.sender_address = Global.mainModule.getAccount().email; } } }; diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java index 96126666..39deeb2f 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java @@ -4,6 +4,7 @@ import Common.Database.Objects.DBObject; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Tables.TableRenderers; +import _VisualDVM.Global; import _VisualDVM.ServerObjectsCache.ConfigurationCache; import _VisualDVM.ServerObjectsCache.VisualCaches; import Common.Visual.Windows.Dialog.DBObjectDialog; @@ -111,6 +112,6 @@ public class DVMConfigurationDBTable extends iDBTable { } @Override public boolean ShowEditObjectDialog(DBObject object) { - return (Current.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object); + return (Global.mainModule.getAccount().CheckAccessRights(((DVMConfiguration) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object); } } diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java index 4ced5663..fec3122b 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java @@ -110,7 +110,7 @@ public class DVMPackage extends TestingPackage { } @Override public boolean isVisible() { - return (!DVMPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) && + return (!DVMPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(sender_address)) && (!DVMPackageDBTable.filterActive || state.isActive()); } @Override diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java index 50776a43..7e14a69f 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java @@ -4,6 +4,7 @@ import Common.Database.Objects.DBObject; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Windows.Dialog.DBObjectDialog; +import _VisualDVM.Global; import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields; public class DVMSettingsDBTable extends iDBTable { public DVMSettingsDBTable() { @@ -141,6 +142,6 @@ public class DVMSettingsDBTable extends iDBTable { } @Override public boolean ShowEditObjectDialog(DBObject object) { - return (Current.getAccount().CheckAccessRights(((DVMSettings) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object); + return (Global.mainModule.getAccount().CheckAccessRights(((DVMSettings) object).sender_address, null)) ? super.ShowEditObjectDialog(object) : ViewObject(object); } } diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java index 37e35a03..28755051 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java @@ -4,6 +4,7 @@ import Common.Visual.TextField.StyledTextField; import Common.Visual.Windows.Dialog.DialogFields; import Visual_DVM_2021.Passes.PassCode; import Common.Passes.Pass; +import _VisualDVM.Global; import javax.swing.*; import java.awt.*; @@ -39,7 +40,7 @@ public class DVMSettingsFields implements DialogFields { @Override public void actionPerformed(ActionEvent e) { Pass pass = Pass.passes.get(PassCode.PickCompilerOptions); - if (pass.Do(Current.getCompiler())) { + if (pass.Do(Global.mainModule.getCompiler())) { tfFlags.setText((String)pass.target); } } @@ -48,7 +49,7 @@ public class DVMSettingsFields implements DialogFields { @Override public void actionPerformed(ActionEvent e) { Pass pass = Pass.passes.get(PassCode.PickCompilerEnvironmentsForTesting); - if (pass.Do(Current.getCompiler())) + if (pass.Do(Global.mainModule.getCompiler())) tfEnvironments.setText((String)pass.target); } }); diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java index 353c7efc..39cf2f4b 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java @@ -52,7 +52,7 @@ public class SapforPackage extends TestingPackage { } @Override public boolean isVisible() { - return (!SapforPackageDBTable.filterMyOnly || Current.getAccount().email.equals(sender_address)) && + return (!SapforPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(sender_address)) && (!SapforPackageDBTable.filterActive || state.isActive()) ; } diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java index 5667ee9e..4ea1d94e 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java @@ -4,6 +4,7 @@ import _VisualDVM.Current; import Common.Database.Objects.DBObject; import Common.Database.Objects.riDBObject; import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Global; import com.sun.org.glassfish.gmbal.Description; public class SapforSettingsCommand extends riDBObject { @Description("DEFAULT -1") @@ -11,7 +12,7 @@ public class SapforSettingsCommand extends riDBObject { public PassCode passCode = PassCode.SPF_RemoveDvmDirectives; @Override public boolean isVisible() { - return Current.HasSapforSettings() && (Current.getSapforSettings().id == sapforsettings_id); + return Global.mainModule.matchCurrentID(Current.SapforSettings,sapforsettings_id); } @Override public void SynchronizeFields(DBObject src) { diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java index 4f8da19f..6fc525eb 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java @@ -4,6 +4,7 @@ import _VisualDVM.Current; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Windows.Dialog.DBObjectDialog; +import _VisualDVM.Global; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields; import Visual_DVM_2021.Passes.PassCode; @@ -67,7 +68,7 @@ public class SapforSettingsCommandsDBTable extends iDBTable { - if (Current.HasProject()) { - UI.getVersionsWindow().getVersionsForm().getTree().SelectNode(Current.getProject().node); + if (Global.mainModule.HasProject()) { + UI.getVersionsWindow().getVersionsForm().getTree().SelectNode(Global.mainModule.getProject().node); Pass.passes.get(PassCode.DeleteVersion).Do(); } }); @@ -62,7 +62,7 @@ public class ProjectFilesMenu extends GraphMenu { m_multiselection.addActionListener(e -> { Global.files_multiselection = !Global.files_multiselection; m_multiselection.setIcon(Utils_.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png")); - Current.getProject().SelectAllFiles(false); + Global.mainModule.getProject().SelectAllFiles(false); UI.getMainWindow().getProjectWindow().RefreshProjectFiles(); //- @@ -72,13 +72,13 @@ public class ProjectFilesMenu extends GraphMenu { //- m_select_all = new StableMenuItem("Выбрать всё", "/icons/SelectAll.png"); m_select_all.addActionListener(e -> { - Current.getProject().SelectAllFiles(true); + Global.mainModule.getProject().SelectAllFiles(true); tree.updateUI(); }); add(m_select_all); m_unselect_all = new StableMenuItem("Отменить всё", "/icons/UnselectAll.png"); m_unselect_all.addActionListener(e -> { - Current.getProject().SelectAllFiles(false); + Global.mainModule.getProject().SelectAllFiles(false); tree.updateUI(); }); add(m_unselect_all); diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java index 2a4e5451..d982c073 100644 --- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java +++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java @@ -20,8 +20,8 @@ public class ProjectSettingsMenu extends VisualiserMenu { add(mLanguage = new LanguagesSubmenu() { @Override public void action(LanguageName languageName) { - if (Current.getProject().UpdateLanguage(languageName)) { - Current.getSapfor().ResetAllAnalyses(); + if (Global.mainModule.getProject().UpdateLanguage(languageName)) { + Global.mainModule.getSapfor().ResetAllAnalyses(); ShowLanguage(); } } @@ -31,7 +31,7 @@ public class ProjectSettingsMenu extends VisualiserMenu { add(mStyle = new StylesSubmenu() { @Override public void action(LanguageStyle languageStyle) { - if (Current.getProject().UpdateStyle(languageStyle)) + if (Global.mainModule.getProject().UpdateStyle(languageStyle)) ShowStyle(); } }); @@ -66,9 +66,9 @@ public class ProjectSettingsMenu extends VisualiserMenu { add((Global.mainModule.getDb()).settings.get(SettingName.GCOVLimit).getMenuItem()); } public void ShowLanguage() { - mLanguage.setText("Язык: " + Current.getProject().languageName.getDescription()); + mLanguage.setText("Язык: " + Global.mainModule.getProject().languageName.getDescription()); } public void ShowStyle() { - mStyle.setText("Стиль: " + Current.getProject().style.getDescription()); + mStyle.setText("Стиль: " + Global.mainModule.getProject().style.getDescription()); } } diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java index 591eff15..1e1d1223 100644 --- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java +++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java @@ -3,6 +3,7 @@ import Common.Current_; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Menus.VisualiserMenu; import Common.Visual.Fonts.VisualiserFonts; import _VisualDVM.Visual.UI; @@ -21,7 +22,7 @@ public class ProjectViewMenu extends VisualiserMenu { setIcon(Utils_.getIcon(view.getIcon())); setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); addActionListener(e -> { - Current_.set(Current.ProjectView, view); + Global.mainModule.set(Current.ProjectView, view); UI.getMainWindow().getProjectWindow().ShowProjectView(); }); } diff --git a/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java b/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java index 6a7f83d7..6a2f59ea 100644 --- a/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java +++ b/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java @@ -5,6 +5,7 @@ import Common.Visual.Menus.VisualiserMenuItem; import Common.Visual.Selectable; import Common.Visual.Trees.DataTree; import Common.Visual.Trees.SelectableTree; +import _VisualDVM.Global; import javax.swing.*; import java.awt.event.ActionEvent; @@ -41,7 +42,7 @@ public abstract class SelectionTreeMenu extends GraphMenu { m_select_for_current.addActionListener(new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - Object o = Current_.get(tree.getCurrent()); + Object o = Global.mainModule.get(tree.getCurrent()); if (o instanceof Selectable) { ((Selectable) o).SelectAllChildren(true); } @@ -54,7 +55,7 @@ public abstract class SelectionTreeMenu extends GraphMenu { m_unselect_for_current.addActionListener(new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - Object o = Current_.get(tree.getCurrent()); + Object o = Global.mainModule.get(tree.getCurrent()); if (o instanceof Selectable) { ((Selectable) o).SelectAllChildren(false); } @@ -68,7 +69,7 @@ public abstract class SelectionTreeMenu extends GraphMenu { public abstract void SelectAll(boolean select); @Override public void CheckElementsVisibility() { - Object current = Current_.get(tree.getCurrent()); + Object current = Global.mainModule.get(tree.getCurrent()); if ((current != null) && (current.getClass().equals(getTargetClass()))) { String name = ((Selectable) current).getSelectionText(); m_select_for_current.setText("Выбрать всё для " + diff --git a/src/_VisualDVM/Visual/Menus/VersionsMenu.java b/src/_VisualDVM/Visual/Menus/VersionsMenu.java index e05a4e4e..2576b573 100644 --- a/src/_VisualDVM/Visual/Menus/VersionsMenu.java +++ b/src/_VisualDVM/Visual/Menus/VersionsMenu.java @@ -21,7 +21,7 @@ public class VersionsMenu extends GraphMenu { m_multiselection.addActionListener(e -> { Global.versions_multiselection = !Global.versions_multiselection; m_multiselection.setIcon(Utils_.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png")); - Current.getRoot().SelectAllVersions(false); + Global.mainModule.getRoot().SelectAllVersions(false); UI.getVersionsWindow().getVersionsForm().getTree().updateUI(); }); add(m_multiselection); @@ -30,13 +30,13 @@ public class VersionsMenu extends GraphMenu { //- m_select_all = new StableMenuItem("Выбрать всё, кроме резервных копий","/icons/SelectAll.png"); m_select_all.addActionListener(e -> { - Current.getRoot().SelectAllVersions(true); + Global.mainModule.getRoot().SelectAllVersions(true); tree.updateUI(); }); add(m_select_all); m_unselect_all = new StableMenuItem("Отменить всё","/icons/UnselectAll.png"); m_unselect_all.addActionListener(e -> { - Current.getRoot().SelectAllVersions(false); + Global.mainModule.getRoot().SelectAllVersions(false); tree.updateUI(); }); add(m_unselect_all); diff --git a/src/_VisualDVM/Visual/UI.java b/src/_VisualDVM/Visual/UI.java index 48a51958..5b6490cb 100644 --- a/src/_VisualDVM/Visual/UI.java +++ b/src/_VisualDVM/Visual/UI.java @@ -266,7 +266,7 @@ public class UI { tabs.setTitleAt(i, flag ? tabs.getToolTipTextAt(i) : ""); } public static void CreateVersionsWindow() { - versionsWindow = new VersionsForm(Current.getRoot()); + versionsWindow = new VersionsForm(Global.mainModule.getRoot()); } //- public static void ShowSearchForm(boolean replace) { diff --git a/src/_VisualDVM/Visual/Windows/AnalysisForm.java b/src/_VisualDVM/Visual/Windows/AnalysisForm.java index 365ce627..2423299e 100644 --- a/src/_VisualDVM/Visual/Windows/AnalysisForm.java +++ b/src/_VisualDVM/Visual/Windows/AnalysisForm.java @@ -1,5 +1,6 @@ package _VisualDVM.Visual.Windows; import _VisualDVM.Current; +import _VisualDVM.Global; import _VisualDVM.Visual.Interface.AnalysisWindow; import javax.swing.*; @@ -16,7 +17,7 @@ public class AnalysisForm implements AnalysisWindow { private JPanel regionsPanel; public AnalysisForm() { LoadSplitters(); - Current.getProject().parallelRegions.mountUI(regionsPanel); + Global.mainModule.getProject().parallelRegions.mountUI(regionsPanel); } @Override public JPanel getContent() { @@ -24,7 +25,7 @@ public class AnalysisForm implements AnalysisWindow { } @Override public void ShowProjectMaxDim() { - l_maxdim.setText("Наибольшая размерность DVM-шаблона: " + Current.getProject().maxdim); + l_maxdim.setText("Наибольшая размерность DVM-шаблона: " + Global.mainModule.getProject().maxdim); } @Override public void ShowNoProjectMaxDim() { @@ -32,9 +33,9 @@ public class AnalysisForm implements AnalysisWindow { } @Override public void ShowMetrics() { - l_lines.setText("Общее количество строк кода: " + Current.getProject().LinesCount()); - l_spf_dirs.setText("Всего объявлено SPF директив: " + Current.getProject().SPFCount()); - l_dvm_dirs.setText("Всего объявлено DVM директив: " + Current.getProject().DVMCount()); + l_lines.setText("Общее количество строк кода: " + Global.mainModule.getProject().LinesCount()); + l_spf_dirs.setText("Всего объявлено SPF директив: " + Global.mainModule.getProject().SPFCount()); + l_dvm_dirs.setText("Всего объявлено DVM директив: " + Global.mainModule.getProject().DVMCount()); } @Override public void ShowNoMetrics() { @@ -44,22 +45,22 @@ public class AnalysisForm implements AnalysisWindow { } @Override public void ShowRegions() { - Current.getProject().parallelRegions.ShowUI(); + Global.mainModule.getProject().parallelRegions.ShowUI(); } @Override public void ShowNoRegions() { - Current.getProject().parallelRegions.ClearUI(); + Global.mainModule.getProject().parallelRegions.ClearUI(); } @Override public void ShowLoopsCount() { - l_loops.setText("Общее количество циклов: " + Current.getProject().LoopsCount()); + l_loops.setText("Общее количество циклов: " + Global.mainModule.getProject().LoopsCount()); } @Override public void ShowFunctionsCount() { - l_functions.setText("Всего объявлено процедур: " + Current.getProject().FunctionsCount()); + l_functions.setText("Всего объявлено процедур: " + Global.mainModule.getProject().FunctionsCount()); } @Override public void ShowArraysCount() { - l_arrays.setText(" Всего объявлено массивов: " + Current.getProject().ArraysCount()); + l_arrays.setText(" Всего объявлено массивов: " + Global.mainModule.getProject().ArraysCount()); } } diff --git a/src/_VisualDVM/Visual/Windows/ArraysForm.java b/src/_VisualDVM/Visual/Windows/ArraysForm.java index 597a308f..a5dcbcc2 100644 --- a/src/_VisualDVM/Visual/Windows/ArraysForm.java +++ b/src/_VisualDVM/Visual/Windows/ArraysForm.java @@ -1,6 +1,7 @@ package _VisualDVM.Visual.Windows; import _VisualDVM.Current; import Common.Visual.TextField.StyledTextField; +import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray; import _VisualDVM.Visual.Interface.ArraysWindow; @@ -21,8 +22,8 @@ public class ArraysForm implements ArraysWindow { private JPanel savedArraysBackground; public ArraysForm(){ LoadSplitters(); - Current.getProject().declaratedArrays.mountUI(arraysPanel); - Current.getProject().db.savedArrays.mountUI(savedArraysPanel); + Global.mainModule.getProject().declaratedArrays.mountUI(arraysPanel); + Global.mainModule.getProject().db.savedArrays.mountUI(savedArraysPanel); //-- filterName.setText(ProjectArray.filterName); filterName.getDocument().addDocumentListener(new DocumentListener() { @@ -115,13 +116,13 @@ public class ArraysForm implements ArraysWindow { } @Override public void ShowArrays() { - Current.getProject().declaratedArrays.ShowUI(); - Current.getProject().db.savedArrays.ShowUI(); + Global.mainModule.getProject().declaratedArrays.ShowUI(); + Global.mainModule.getProject().db.savedArrays.ShowUI(); } @Override public void ShowNoArrays() { - Current.getProject().declaratedArrays.ClearUI(); - Current.getProject().db.savedArrays.ClearUI(); + Global.mainModule.getProject().declaratedArrays.ClearUI(); + Global.mainModule.getProject().db.savedArrays.ClearUI(); } private void createUIComponents() { // TODO: place custom component creation code here diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java index 3f6d8637..e1d3e1d8 100644 --- a/src/_VisualDVM/Visual/Windows/CallbackForm.java +++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java @@ -46,8 +46,8 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { } @Override public void changedUpdate(DocumentEvent e) { - if (!Current.getBugReport().state.equals(BugReportState.draft)) - Current.getBugReport().descriptionAdditionDraft = + if (!Global.mainModule.getBugReport().state.equals(BugReportState.draft)) + Global.mainModule.getBugReport().descriptionAdditionDraft = BugReportDescriptionAddition.getText(); } }; @@ -60,8 +60,8 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { } @Override public void changedUpdate(DocumentEvent e) { - if (!Current.getBugReport().state.equals(BugReportState.draft)) - Current.getBugReport().commentAdditionDraft = BugReportCommentAddition.getText(); + if (!Global.mainModule.getBugReport().state.equals(BugReportState.draft)) + Global.mainModule.getBugReport().commentAdditionDraft = BugReportCommentAddition.getText(); } }; DocumentListener descriptionListener = new DocumentListener() { @@ -73,8 +73,8 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { } @Override public void changedUpdate(DocumentEvent e) { - if (Current.getBugReport().state.equals(BugReportState.draft)) - Current.getBugReport().description = + if (Global.mainModule.getBugReport().state.equals(BugReportState.draft)) + Global.mainModule.getBugReport().description = BugReportDescription.getText(); Global.componentsServer.db.bugReports.RefreshUI(); } @@ -88,8 +88,8 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { } @Override public void changedUpdate(DocumentEvent e) { - if (Current.getBugReport().state.equals(BugReportState.draft)) - Current.getBugReport().comment = BugReportComment.getText(); + if (Global.mainModule.getBugReport().state.equals(BugReportState.draft)) + Global.mainModule.getBugReport().comment = BugReportComment.getText(); } }; //- @@ -436,10 +436,10 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { } @Override public void ShowAccount() { - lAccountName.setText(Utils_.Brackets(Current.getAccount().name)); - lAccountMail.setText(Utils_.Brackets(Current.getAccount().email)); - lAccountRole.setText(Utils_.Brackets(Current.getAccount().role.getDescription())); - switch (Current.getAccount().role) { + lAccountName.setText(Utils_.Brackets(Global.mainModule.getAccount().name)); + lAccountMail.setText(Utils_.Brackets(Global.mainModule.getAccount().email)); + lAccountRole.setText(Utils_.Brackets(Global.mainModule.getAccount().role.getDescription())); + switch (Global.mainModule.getAccount().role) { case Undefined: /// UI.Clear(accountPanel); // accountPanel.add(new CallbackWelcomeForm().content); @@ -553,7 +553,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { public void ShowCurrentBugReport() { SwitchListeners(false); // currentBugReportTabs.setSelectedIndex(0); - BugReport target = Current.getBugReport(); + BugReport target = Global.mainModule.getBugReport(); BugReportInterface.CheckSubscribers(target); Global.componentsServer.db.subscribers.ShowUI(); //- @@ -576,12 +576,12 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow { if (target.state.equals(BugReportState.draft)) { ShowDraft(); } else { - switch (Current.getAccount().role) { + switch (Global.mainModule.getAccount().role) { case User: - if (Current.getAccount().email.equalsIgnoreCase(target.sender_address)) { + if (Global.mainModule.getAccount().email.equalsIgnoreCase(target.sender_address)) { ShowSender(); //отправитель.может делать с багом все. } else { - if (Current.getAccount().email.equalsIgnoreCase(target.executor_address)) { + if (Global.mainModule.getAccount().email.equalsIgnoreCase(target.executor_address)) { ShowUserExecutor(); //исполнитель. может менять прогресс и дополнять комментарий. } else ShowUser(); //недоступно ничего. и баг ему невидим. но на всякий случай. } diff --git a/src/_VisualDVM/Visual/Windows/CombineFilesDialog.java b/src/_VisualDVM/Visual/Windows/CombineFilesDialog.java index 8625165f..b554c1ed 100644 --- a/src/_VisualDVM/Visual/Windows/CombineFilesDialog.java +++ b/src/_VisualDVM/Visual/Windows/CombineFilesDialog.java @@ -1,6 +1,7 @@ package _VisualDVM.Visual.Windows; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Text.ComboTextDialog; +import _VisualDVM.Global; import _VisualDVM.Utils; import java.util.Vector; @@ -15,7 +16,7 @@ public class CombineFilesDialog extends ComboTextDialog { String fileName = (String) fields.getSelectedItem(); // тут 2 случая. если имя файла совпадает с 1 из существующих, то все хорошо. //если нет. тогда проверяем отсуствие слешей и полная валидация имени одиночного файла. - Vector files_order = Current.getProject().files_order; + Vector files_order = Global.mainModule.getProject().files_order; if (!files_order.contains(fileName)) Utils.validateFileShortNewName(fileName, Log); } diff --git a/src/_VisualDVM/Visual/Windows/ComparisonForm.java b/src/_VisualDVM/Visual/Windows/ComparisonForm.java index e4b92941..3f69cccc 100644 --- a/src/_VisualDVM/Visual/Windows/ComparisonForm.java +++ b/src/_VisualDVM/Visual/Windows/ComparisonForm.java @@ -5,6 +5,7 @@ import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; import Common.Database.Objects.DBObject; +import _VisualDVM.Global; import _VisualDVM.Visual.Editor.BaseEditor; import _VisualDVM.Visual.Controls.ShortLabel; import _VisualDVM.Visual.Menus.VisualiserMenuBar; @@ -76,8 +77,8 @@ public abstract class ComparisonForm { public void ApplyObject() { RemoveObject(); TextLog log = new TextLog(); - if (Current_.Check(log, getCurrentObjectName())) { - object = (T) Current_.get(getCurrentObjectName()); + if (Global.mainModule.Check(log, getCurrentObjectName())) { + object = (T) Global.mainModule.get(getCurrentObjectName()); applyObject(); showObject(); } else diff --git a/src/_VisualDVM/Visual/Windows/FunctionsForm.java b/src/_VisualDVM/Visual/Windows/FunctionsForm.java index c887307f..e1d18ee7 100644 --- a/src/_VisualDVM/Visual/Windows/FunctionsForm.java +++ b/src/_VisualDVM/Visual/Windows/FunctionsForm.java @@ -2,6 +2,7 @@ package _VisualDVM.Visual.Windows; import Common.Visual.UI_; import _VisualDVM.Current; import Common.Visual.TextField.StyledTextField; +import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm; import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphUI; import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions; @@ -63,7 +64,7 @@ public class FunctionsForm implements FunctionsWindow { } @Override public void ShowCurrentFunction() { - lCurrentFunction.setText(Current.getFunction().funcName); + lCurrentFunction.setText(Global.mainModule.getFunction().funcName); } @Override public void ShowNoCurrentFunction() { @@ -74,9 +75,9 @@ public class FunctionsForm implements FunctionsWindow { ShowExternalFilter.setSelected(SPF_GetGraphFunctionPositions.showExternalFunctions); ShowUnreachableFilter.setSelected(SPF_GetGraphFunctionPositions.showUnreachableFunctions); //- - sIterations.setValue(Current.getProject().fgIterations); - sResistance.setValue(Current.getProject().fgResistance); - sScreen.setValue(Current.getProject().fgScreen); + sIterations.setValue(Global.mainModule.getProject().fgIterations); + sResistance.setValue(Global.mainModule.getProject().fgResistance); + sScreen.setValue(Global.mainModule.getProject().fgScreen); //- cbShowByCurrentFunction.setSelected(SPF_GetGraphFunctionPositions.showByCurrentFunction); ShowIn.setSelected(SPF_GetGraphFunctionPositions.showIn); @@ -103,28 +104,28 @@ public class FunctionsForm implements FunctionsWindow { Pass.passes.get(PassCode.SaveGraph).Do(); } }); - sIterations.setModel(new SpinnerNumberModel(Current.getProject().fgIterations, + sIterations.setModel(new SpinnerNumberModel(Global.mainModule.getProject().fgIterations, 100, 5000, 100 )); - sResistance.setModel(new SpinnerNumberModel(Current.getProject().fgResistance, + sResistance.setModel(new SpinnerNumberModel(Global.mainModule.getProject().fgResistance, 10, 5000, 50 )); - sScreen.setModel(new SpinnerNumberModel(Current.getProject().fgScreen, + sScreen.setModel(new SpinnerNumberModel(Global.mainModule.getProject().fgScreen, 0.25, 2.0, 0.05 )); sDepth.setModel(new SpinnerNumberModel(1, 0, 64, 1 )); UI_.MakeSpinnerRapid(sIterations, e -> { - Current.getProject().UpdatefgIterations((int) sIterations.getValue()); + Global.mainModule.getProject().UpdatefgIterations((int) sIterations.getValue()); FunctionsGraphUI.ffTimer.restart(); }); UI_.MakeSpinnerRapid(sResistance, e -> { - Current.getProject().UpdatefgResistance((int) sResistance.getValue()); + Global.mainModule.getProject().UpdatefgResistance((int) sResistance.getValue()); FunctionsGraphUI.ffTimer.restart(); }); UI_.MakeSpinnerRapid(sScreen, e -> { - Current.getProject().UpdatefgScreen((double) sScreen.getValue()); + Global.mainModule.getProject().UpdatefgScreen((double) sScreen.getValue()); FunctionsGraphUI.ffTimer.restart(); }); UI_.MakeSpinnerRapid(sDepth, e -> { diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java index b1e869a3..db6bc73a 100644 --- a/src/_VisualDVM/Visual/Windows/MainForm.java +++ b/src/_VisualDVM/Visual/Windows/MainForm.java @@ -83,9 +83,9 @@ public class MainForm extends Form implements MainWindow { } private void InstallProjectPanel() { globalTabs.insertTab("", null, - (projectForm = new ProjectForm()).content, Current.getProject().description, 0); + (projectForm = new ProjectForm()).content,Global.mainModule.getProject().description, 0); globalTabs.setTabComponentAt(0, - new TabToolBar("Проект: " + Current.getProject().name, PassCode.CloseCurrentProject) { + new TabToolBar("Проект: " + Global.mainModule.getProject().name, PassCode.CloseCurrentProject) { @Override public void leftMouseAction() { globalTabs.setSelectedIndex(0); diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java index 15e07e7d..3de65352 100644 --- a/src/_VisualDVM/Visual/Windows/ProjectForm.java +++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java @@ -123,7 +123,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { } @Override public void ShowProjectSapforLog() { - logText.setText(Current.getProject().Log); + logText.setText(Global.mainModule.getProject().Log); logText.setCaretPosition(0); } @Override @@ -154,9 +154,9 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { //filesTabs.setTabComponentAt(0, // new TabToolBar(Current.getFile().name, PassCode_2021.CloseCurrentFile)); // projectTabs.setTitleAt(0, "Файл: " + Current.getFile().name); - fileBackground.add((Current.getFile().form = new FileForm(Current.getFile())).getContent()); + fileBackground.add((Global.mainModule.getFile().form = new FileForm(Global.mainModule.getFile())).getContent()); projectTabs.setTabComponentAt(0, - new TabToolBar("Файл: " + Current.getFile().name, PassCode.CloseCurrentFile) { + new TabToolBar("Файл: " + Global.mainModule.getFile().name, PassCode.CloseCurrentFile) { @Override public void leftMouseAction() { projectTabs.setSelectedIndex(0); @@ -178,10 +178,10 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { @Override public void GotoFile(String fileName, int line, boolean focus) { if (focus) FocusFile(); - if (Current.HasFile() && Current.getFile().name.equals(fileName)) - Current.getFile().form.getEditor().gotoLine(line); - else if (Current.getProject().db.files.containsKey(fileName)) { - DBProjectFile targetFile = Current.getProject().db.files.get(fileName); + if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(fileName)) + Global.mainModule.getFile().form.getEditor().gotoLine(line); + else if (Global.mainModule.getProject().db.files.containsKey(fileName)) { + DBProjectFile targetFile = Global.mainModule.getProject().db.files.get(fileName); targetFile.UpdateLastLine(line); Pass.passes.get(PassCode.OpenCurrentFile).Do(targetFile); } @@ -229,17 +229,17 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { @Override public void RefreshProjectTreeAndMessages() { RefreshProjectFiles(); - DBProjectFile badFile = Current.getProject().getFirstBadFile(); + DBProjectFile badFile = Global.mainModule.getProject().getFirstBadFile(); if (badFile != null) { Pass.passes.get(PassCode.OpenCurrentFile).Do(badFile); UI.getMainWindow().FocusProject(); UI.getMainWindow().getProjectWindow().FocusFile(); } //- - if (Current.HasFile()) { - Current.getFile().form.ShowMessages(); - if (badFile != null && badFile.equals(Current.getFile())) - Current.getFile().form.ShowFirstError(); + if (Global.mainModule.HasFile()) { + Global.mainModule.getFile().form.ShowMessages(); + if (badFile != null && badFile.equals(Global.mainModule.getFile())) + Global.mainModule.getFile().form.ShowFirstError(); } } @Override @@ -255,7 +255,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow { @Override public void ShowProjectView() { UI_.Clear(projectViewPanel); - ProjectView view = Current.getProjectView(); + ProjectView view = Global.mainModule.getProjectView(); menuBar.getProjectViewMenu().setToolTipText(view.getDescription()); menuBar.getProjectViewMenu().setIcon(Utils_.getIcon(view.getIcon())); switch (view) { diff --git a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java index 9805f246..b56e28f3 100644 --- a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java +++ b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java @@ -3,6 +3,7 @@ import Common.Current_; import Common.Visual.UI_; import _VisualDVM.Current; import Common.Database.Objects.DBObject; +import _VisualDVM.Global; import _VisualDVM.Visual.Controls.ShortLabel; import _VisualDVM.Visual.Menus.VisualiserMenuBar; import _VisualDVM.Visual.UI; @@ -69,8 +70,8 @@ public class SapforPackagesComparisonForm { RemoveObject(); //--- TextLog log = new TextLog(); - if (Current_.Check(log, Current.SapforPackage)) { - object = Current.getSapforPackage(); + if (Global.mainModule.Check(log, Current.SapforPackage)) { + object = Global.mainModule.getSapforPackage(); if (object.isLoaded() || (Pass.passes.get(PassCode.DownloadSapforPackage).Do(object))) { showObject(); } diff --git a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java index 561e35b7..20ba183a 100644 --- a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java +++ b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java @@ -5,6 +5,7 @@ import Common.Visual.Windows.Form; import _VisualDVM.Current; import Common.Visual.TextField.StyledTextField; import Common.Visual.Trees.StyledTree; +import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Visual_DVM_2021.Passes.PassCode; import Common.Passes.Pass; @@ -172,8 +173,8 @@ public class SearchReplaceForm extends Form { DefaultMutableTreeNode selectedFile = (DefaultMutableTreeNode) getLastSelectedPathComponent(); if (selectedFile != null) { Pair info = (Pair) selectedFile.getUserObject(); - if (Current.getProject().db.files.containsKey(info.getKey())) { - Pass.passes.get(PassCode.OpenCurrentFile).Do(Current.getProject().db.files.get(info.getKey())); + if (Global.mainModule.getProject().db.files.containsKey(info.getKey())) { + Pass.passes.get(PassCode.OpenCurrentFile).Do(Global.mainModule.getProject().db.files.get(info.getKey())); //--->>> replaceOn.setSelected(false); setMode(false); @@ -195,7 +196,7 @@ public class SearchReplaceForm extends Form { super.Show(); //------->> showNoFilesMatches(); - if (lastProjectPath.equals(Current.getProject().Home.getAbsolutePath())) + if (lastProjectPath.equals(Global.mainModule.getProject().Home.getAbsolutePath())) showFilesMatches(); else dropFilesMatches(); @@ -238,8 +239,8 @@ public class SearchReplaceForm extends Form { public void actionPerformed(ActionEvent e) { try { showNoFilesMatches(); - lastProjectPath = Current.getProject().Home.getAbsolutePath(); - matches = Current.getProject().getMatches( + lastProjectPath = Global.mainModule.getProject().Home.getAbsolutePath(); + matches = Global.mainModule.getProject().getMatches( tfFind.getText(), registerOn.isSelected(), wholeWordOn.isSelected()); diff --git a/src/_VisualDVM/Visual/Windows/TestingForm.java b/src/_VisualDVM/Visual/Windows/TestingForm.java index 8bd2d84d..4dd64d8b 100644 --- a/src/_VisualDVM/Visual/Windows/TestingForm.java +++ b/src/_VisualDVM/Visual/Windows/TestingForm.java @@ -225,13 +225,13 @@ public class TestingForm implements FormWithSplitters, TestingWindow { } @Override public void ShowCurrentCompiler() { - String title = (Current.HasCompiler() && Current.getCompiler().type.equals(CompilerType.dvm)) ? - "DVM система: " + Current.getCompiler().description : "DVM система: ?"; + String title = (Global.mainModule.HasCompiler() && Global.mainModule.getCompiler().type.equals(CompilerType.dvm)) ? + "DVM система: " + Global.mainModule.getCompiler().description : "DVM система: ?"; testingTabs.setTitleAt(0, title); } @Override public void ShowCurrentServerSapfor() { - testingTabs.setTitleAt(2, "SAPFOR: " + Current.getServerSapfor().version); + testingTabs.setTitleAt(2, "SAPFOR: " + Global.mainModule.getServerSapfor().version); } @Override public void ShowNoServerSapfor() { @@ -271,7 +271,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow { testingTabs.setSelectedIndex(3); } public void RestoreLastCredentials() { - Credentials credentials = (Credentials) Current_.get(Current.Credentials); + Credentials credentials = Global.mainModule.getCredentials(); if (credentials.machine_id != CommonConstants.Nan) { if (Global.mainModule.getDb().machines.containsKey(credentials.machine_id)) { (Global.mainModule.getDb()).machines.ShowUI(credentials.machine_id); diff --git a/src/_VisualDVM/Visual/Windows/VariantsForm.java b/src/_VisualDVM/Visual/Windows/VariantsForm.java index 4c6053a6..c0edce60 100644 --- a/src/_VisualDVM/Visual/Windows/VariantsForm.java +++ b/src/_VisualDVM/Visual/Windows/VariantsForm.java @@ -2,6 +2,7 @@ package _VisualDVM.Visual.Windows; import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Visual.Trees.TreeForm; +import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionsTableForm; import _VisualDVM.ProjectData.SapforData.Arrays.UI.RulesTree; import _VisualDVM.Visual.Interface.VariantsWindow; @@ -28,13 +29,13 @@ public class VariantsForm implements VariantsWindow { //-- public VariantsForm() { LoadSplitters(); - Current.getProject().parallelVariants.mountUI(variantsPanel); + Global.mainModule.getProject().parallelVariants.mountUI(variantsPanel); //- BDistributed.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - Current.getProject().SwitchFilterDistributed(); - BDistributed.setIcon(Utils_.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png")); + Global.mainModule.getProject().SwitchFilterDistributed(); + BDistributed.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png")); ShowVariantsFilter(); ShowFilteredVariantsCount(); } @@ -42,8 +43,8 @@ public class VariantsForm implements VariantsWindow { bMultiplied.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - Current.getProject().SwitchFilterMultiplied(); - bMultiplied.setIcon(Utils_.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png")); + Global.mainModule.getProject().SwitchFilterMultiplied(); + bMultiplied.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png")); ShowVariantsFilter(); ShowFilteredVariantsCount(); } @@ -68,8 +69,8 @@ public class VariantsForm implements VariantsWindow { } @Override public void ShowVariantsFilterButtons() { - BDistributed.setIcon(Utils_.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png")); - bMultiplied.setIcon(Utils_.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png")); + BDistributed.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png")); + bMultiplied.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png")); } @Override public void ShowVariantsFilter() { @@ -81,11 +82,11 @@ public class VariantsForm implements VariantsWindow { } @Override public void ShowFilteredVariantsCount() { - VisibleVariantsCount.setText(String.valueOf(Current.getProject().getFilteredVariantsCount())); + VisibleVariantsCount.setText(String.valueOf(Global.mainModule.getProject().getFilteredVariantsCount())); } @Override public void ShowTotalVariantsCount() { - TotalVariantsCount.setText(String.valueOf(Current.getProject().getTotalVariantsCount())); + TotalVariantsCount.setText(String.valueOf(Global.mainModule.getProject().getTotalVariantsCount())); } @Override public void ShowCheckedVariantsCount() { @@ -93,15 +94,15 @@ public class VariantsForm implements VariantsWindow { } @Override public void ShowVariants() { - Current.getProject().parallelVariants.ShowUI(); + Global.mainModule.getProject().parallelVariants.ShowUI(); } @Override public void RefreshVariants() { - Current.getProject().parallelVariants.RefreshUI(); + Global.mainModule.getProject().parallelVariants.RefreshUI(); } @Override public void ShowNoVariants() { - Current.getProject().parallelVariants.ClearUI(); + Global.mainModule.getProject().parallelVariants.ClearUI(); } @Override public void ShowNoCheckedVariantsCount() {