M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-09 23:37:58 +03:00
parent eb278676cc
commit d1ffab1e70
299 changed files with 1844 additions and 1539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/_VisualDVM/Constants.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM;
import Common.Utils.Vector_;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import java.util.Vector;
public class Constants {
@@ -51,13 +51,13 @@ public class Constants {
public static final String package_json = "package_json";
public static final String results_json = "results_json";
//--
public static final Vector<PassCode_2021> startSapforCodes =
new Vector_<>(PassCode_2021.SPF_InsertIncludesPass);
public static final Vector<PassCode> startSapforCodes =
new Vector_<>(PassCode.SPF_InsertIncludesPass);
public static final Vector<PassCode_2021> terminalSapforCodes =
new Vector_<>( PassCode_2021.CreateParallelVariants,
PassCode_2021.SPF_SharedMemoryParallelization,
PassCode_2021.SPF_InsertDvmhRegions);
public static final Vector<PassCode> terminalSapforCodes =
new Vector_<>( PassCode.CreateParallelVariants,
PassCode.SPF_SharedMemoryParallelization,
PassCode.SPF_InsertDvmhRegions);
//---
public static final int parser_group = -1;
public static final int compiler_group = -2;

152
src/_VisualDVM/Current.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Machine.Machine;
@@ -24,7 +24,7 @@ import Visual_DVM_2021.Passes.UI.PassForm;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
public enum Current implements CurrentAnchestor {
public enum Current implements Current_ {
//--
DVMPackage,
SapforPackage,
@@ -205,145 +205,145 @@ public enum Current implements CurrentAnchestor {
}
//------------------------------------------------------------------------------------->>
public static boolean HasProject() {
return CurrentAnchestor.get(Project) != null;
return Current_.get(Project) != null;
}
public static boolean HasFile() {
return CurrentAnchestor.get(File) != null;
return Current_.get(File) != null;
}
public static boolean HasSelectedFile() {
return CurrentAnchestor.get(SelectedFile) != null;
return Current_.get(SelectedFile) != null;
}
public static boolean HasAccount() {
return CurrentAnchestor.get(Account) != null;
return Current_.get(Account) != null;
}
public static boolean HasMachine() {
return CurrentAnchestor.get(Machine) != null;
return Current_.get(Machine) != null;
}
public static boolean HasUser() {
return CurrentAnchestor.get(User) != null;
return Current_.get(User) != null;
}
public static boolean HasCompiler() {
return CurrentAnchestor.get(Compiler) != null;
return Current_.get(Compiler) != null;
}
public static boolean HasRemoteFile() {
return CurrentAnchestor.get(RemoteFile) != null;
return Current_.get(RemoteFile) != null;
}
public static boolean HasMakefile() {
return CurrentAnchestor.get(Makefile) != null;
return Current_.get(Makefile) != null;
}
public static boolean HasRunConfiguration() {
return CurrentAnchestor.get(RunConfiguration) != null;
return Current_.get(RunConfiguration) != null;
}
public static boolean HasCompilationTask() {
return CurrentAnchestor.get(CompilationTask) != null;
return Current_.get(CompilationTask) != null;
}
public static boolean HasRunTask() {
return CurrentAnchestor.get(RunTask) != null;
return Current_.get(RunTask) != null;
}
public static boolean HasPassForm() {
return CurrentAnchestor.get(PassForm) != null;
return Current_.get(PassForm) != null;
}
public static boolean HasProjectView() {
return CurrentAnchestor.get(ProjectView) != null;
return Current_.get(ProjectView) != null;
}
public static SapforSettings getSapforSettings() {
return (SapforSettings) CurrentAnchestor.get(SapforSettings);
return (SapforSettings) Current_.get(SapforSettings);
}
public static boolean HasSapforSettings() {
return CurrentAnchestor.get(SapforSettings) != null;
return Current_.get(SapforSettings) != null;
}
public static db_project_info getProject() {
return (db_project_info) CurrentAnchestor.get(Project);
return (db_project_info) Current_.get(Project);
}
public static DBProjectFile getFile() {
return (DBProjectFile) CurrentAnchestor.get(File);
return (DBProjectFile) Current_.get(File);
}
public static _VisualDVM.Repository.Component.Component getComponent() {
return (_VisualDVM.Repository.Component.Component) CurrentAnchestor.get(Component);
return (_VisualDVM.Repository.Component.Component) Current_.get(Component);
}
public static _VisualDVM.Repository.BugReport.BugReport getBugReport() {
return (BugReport) CurrentAnchestor.get(BugReport);
return (BugReport) Current_.get(BugReport);
}
public static db_project_info getRoot() {
return (db_project_info) CurrentAnchestor.get(Root);
return (db_project_info) Current_.get(Root);
}
public static boolean HasRoot() {
return CurrentAnchestor.get(Root) != null;
return Current_.get(Root) != null;
}
public static db_project_info getVersion() {
return (db_project_info) CurrentAnchestor.get(Version);
return (db_project_info) Current_.get(Version);
}
public static Account getAccount() {
return (Account) CurrentAnchestor.get(Account);
return (Account) Current_.get(Account);
}
public static boolean HasSubscriber() {
return CurrentAnchestor.get(Current.Subscriber) != null;
return Current_.get(Current.Subscriber) != null;
}
public static _VisualDVM.Repository.Subscribes.Subscriber getSubscriber() {
return (Subscriber) CurrentAnchestor.get(Current.Subscriber);
return (Subscriber) Current_.get(Current.Subscriber);
}
public static Machine getMachine() {
return (Machine) CurrentAnchestor.get(Current.Machine);
return (Machine) Current_.get(Current.Machine);
}
public static User getUser() {
return (User) CurrentAnchestor.get(Current.User);
return (User) Current_.get(Current.User);
}
public static Compiler getCompiler() {
return (Compiler) CurrentAnchestor.get(Current.Compiler);
return (Compiler) Current_.get(Current.Compiler);
}
public static CompilationTask getCompilationTask() {
return (CompilationTask) CurrentAnchestor.get(Current.CompilationTask);
return (CompilationTask) Current_.get(Current.CompilationTask);
}
public static RunTask getRunTask() {
return (RunTask) CurrentAnchestor.get(Current.RunTask);
return (RunTask) Current_.get(Current.RunTask);
}
public static RemoteFile getRemoteFile() {
return (RemoteFile) CurrentAnchestor.get(Current.RemoteFile);
return (RemoteFile) Current_.get(Current.RemoteFile);
}
public static Makefile getMakefile() {
return (Makefile) CurrentAnchestor.get(Current.Makefile);
return (Makefile) Current_.get(Current.Makefile);
}
public static Module getModule() {
return (Module) CurrentAnchestor.get(Current.Module);
return (Module) Current_.get(Current.Module);
}
public static RunConfiguration getRunConfiguration() {
return (RunConfiguration) CurrentAnchestor.get(Current.RunConfiguration);
return (RunConfiguration) Current_.get(Current.RunConfiguration);
}
public static _VisualDVM.Repository.Component.Sapfor.Sapfor getSapfor() {
return (_VisualDVM.Repository.Component.Sapfor.Sapfor) CurrentAnchestor.get(Current.Sapfor);
return (_VisualDVM.Repository.Component.Sapfor.Sapfor) Current_.get(Current.Sapfor);
}
public static boolean HasGroup() {
return CurrentAnchestor.get(Current.Group) != null;
return Current_.get(Current.Group) != null;
}
public static _VisualDVM.TestingSystem.Common.Group.Group getGroup() {
return (_VisualDVM.TestingSystem.Common.Group.Group) CurrentAnchestor.get(Current.Group);
return (_VisualDVM.TestingSystem.Common.Group.Group) Current_.get(Current.Group);
}
public static boolean HasConfiguration() {
return CurrentAnchestor.get(Current.DVMConfiguration) != null;
return Current_.get(Current.DVMConfiguration) != null;
}
public static DVMConfiguration getDVMConfiguration() {
return (DVMConfiguration) CurrentAnchestor.get(Current.DVMConfiguration);
return (DVMConfiguration) Current_.get(Current.DVMConfiguration);
}
public static SapforConfiguration getSapforConfiguration() {
return (_VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) CurrentAnchestor.get(Current.SapforConfiguration);
return (_VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration) Current_.get(Current.SapforConfiguration);
}
public static Test getTest() {
return (_VisualDVM.TestingSystem.Common.Test.Test) CurrentAnchestor.get(Current.Test);
return (_VisualDVM.TestingSystem.Common.Test.Test) Current_.get(Current.Test);
}
public static boolean HasTest() {
return CurrentAnchestor.get(Current.Test) != null;
return Current_.get(Current.Test) != null;
}
public static boolean HasVersion() {
return CurrentAnchestor.get(Current.Version) != null;
return Current_.get(Current.Version) != null;
}
public static RemoteFile getComponentServerBackup() {
return (RemoteFile) CurrentAnchestor.get(Current.ComponentServerBackup);
return (RemoteFile) Current_.get(Current.ComponentServerBackup);
}
public static boolean HasComponentServerBackup() {
return CurrentAnchestor.get(Current.ComponentServerBackup) != null;
return Current_.get(Current.ComponentServerBackup) != null;
}
public static DefaultMutableTreeNode getProjectNode() {
return (DefaultMutableTreeNode) CurrentAnchestor.get(Current.ProjectNode);
return (DefaultMutableTreeNode) Current_.get(Current.ProjectNode);
}
public static DefaultMutableTreeNode getProjectCurrentParentNode() {
DefaultMutableTreeNode node = Current.getProjectNode();
@@ -353,84 +353,84 @@ public enum Current implements CurrentAnchestor {
return (node.getUserObject() instanceof DBProjectFile) ? (DefaultMutableTreeNode) node.getParent() : node;
}
public static File getSelectedDirectory() {
return (File) CurrentAnchestor.get(Current.SelectedDirectory);
return (File) Current_.get(Current.SelectedDirectory);
}
public static DBProjectFile getSelectedFile() {
return (DBProjectFile) CurrentAnchestor.get(Current.SelectedFile);
return (DBProjectFile) Current_.get(Current.SelectedFile);
}
public static boolean HasBugReport() {
return CurrentAnchestor.get(Current.BugReport) != null;
return Current_.get(Current.BugReport) != null;
}
public static PassForm getPassForm() {
return (Visual_DVM_2021.Passes.UI.PassForm) CurrentAnchestor.get(Current.PassForm);
return (Visual_DVM_2021.Passes.UI.PassForm) Current_.get(Current.PassForm);
}
public static ParallelRegion getParallelRegion() {
return (ParallelRegion) CurrentAnchestor.get(Current.ParallelRegion);
return (ParallelRegion) Current_.get(Current.ParallelRegion);
}
public static boolean HasParallelRegion() {
return CurrentAnchestor.get(Current.ParallelRegion) != null;
return Current_.get(Current.ParallelRegion) != null;
}
public static boolean HasFunction() {
return CurrentAnchestor.get(Current.Function) != null;
return Current_.get(Current.Function) != null;
}
public static boolean HasSelectedFunction() {
return CurrentAnchestor.get(Current.SelectedFunction) != null;
return Current_.get(Current.SelectedFunction) != null;
}
public static FuncInfo getFunction() {
return (FuncInfo) CurrentAnchestor.get(Current.Function);
return (FuncInfo) Current_.get(Current.Function);
}
public static FuncInfo getSelectionFunction() {
return (FuncInfo) CurrentAnchestor.get(Current.SelectedFunction);
return (FuncInfo) Current_.get(Current.SelectedFunction);
}
public static boolean HasScenario() {
return CurrentAnchestor.get(Current.Scenario) != null;
return Current_.get(Current.Scenario) != null;
}
public static db_project_info getPackageVersion() {
return (db_project_info) CurrentAnchestor.get(Current.PackageVersion);
return (db_project_info) Current_.get(Current.PackageVersion);
}
public static boolean HasPackageVersion() {
return CurrentAnchestor.get(Current.PackageVersion) != null;
return Current_.get(Current.PackageVersion) != null;
}
public static boolean HasSapforConfiguration() {
return CurrentAnchestor.get(Current.SapforConfiguration) != null;
return Current_.get(Current.SapforConfiguration) != null;
}
public static _VisualDVM.ProjectData.ProjectView getProjectView() {
return (_VisualDVM.ProjectData.ProjectView) CurrentAnchestor.get(ProjectView);
return (_VisualDVM.ProjectData.ProjectView) Current_.get(ProjectView);
}
public static boolean HasSapforProfile() {
return CurrentAnchestor.get(Current.SapforProfile) != null;
return Current_.get(Current.SapforProfile) != null;
}
public static _VisualDVM.GlobalData.SapforProfile.SapforProfile getSapforProfile() {
return (_VisualDVM.GlobalData.SapforProfile.SapforProfile) CurrentAnchestor.get(Current.SapforProfile);
return (_VisualDVM.GlobalData.SapforProfile.SapforProfile) Current_.get(Current.SapforProfile);
}
public static boolean HasServerSapfor() {
return CurrentAnchestor.get(Current.ServerSapfor) != null;
return Current_.get(Current.ServerSapfor) != null;
}
public static _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor getServerSapfor() {
return (_VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) CurrentAnchestor.get(Current.ServerSapfor);
return (_VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor) Current_.get(Current.ServerSapfor);
}
public static boolean HasSubscriberWorkspace() {
return CurrentAnchestor.get(Current.SubscriberWorkspace) != null;
return Current_.get(Current.SubscriberWorkspace) != null;
}
public static _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace getSubscriberWorkspace() {
return (_VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace) CurrentAnchestor.get(Current.SubscriberWorkspace);
return (_VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace) Current_.get(Current.SubscriberWorkspace);
}
public static boolean HasDVMPackage() {
return CurrentAnchestor.get(Current.DVMPackage) != null;
return Current_.get(Current.DVMPackage) != null;
}
public static _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage getDVMPackage() {
return (_VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage) CurrentAnchestor.get(Current.DVMPackage);
return (_VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage) Current_.get(Current.DVMPackage);
}
public static boolean HasSapforPackage() {
return CurrentAnchestor.get(Current.SapforPackage) != null;
return Current_.get(Current.SapforPackage) != null;
}
public static _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage getSapforPackage() {
return (_VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage) CurrentAnchestor.get(Current.SapforPackage);
return (_VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage) Current_.get(Current.SapforPackage);
}
public static boolean HasDVMRunTask() {
return CurrentAnchestor.get(Current.DVMRunTask) != null;
return Current_.get(Current.DVMRunTask) != null;
}
public static _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask getDVMRunTask() {
return (_VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask) CurrentAnchestor.get(Current.DVMRunTask);
return (_VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask) Current_.get(Current.DVMRunTask);
}
}

24
src/_VisualDVM/Global.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Database.Tables.DataSet;
import Common.Mode;
import Common.Utils.CommonUtils;
@@ -21,8 +21,8 @@ import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.DVM.LocalDVMTestingPlanner;
import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
import _VisualDVM.Visual.UI;
import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
@@ -216,7 +216,7 @@ public class Global {
return (bad_state == 0);
}
public static void changeSetting(SettingName settingName, Object new_value) throws Exception {
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(settingName, new_value);
Pass.passes.get(PassCode.UpdateSetting).Do(settingName, new_value);
}
public static String packSapforSettings() {
Vector<String> res_ = new Vector<>();
@@ -268,13 +268,13 @@ public class Global {
messagesServer.Start();
//создание списков служебных объектов
UI.CreateAll();
Pass_2021.CreateAll();
Pass.CreateAll();
//единственное меню до остальных.
CommonUI.menuBars.put(ComponentsSet.class, new ComponentsMenuBar());
Components = new ComponentsSet();
CurrentAnchestor.set(Current.ProjectView, ProjectView.Files);
Current_.set(Current.ProjectView, ProjectView.Files);
Components.put(ComponentType.Visualiser, visualiser = new Visualiser());
Components.put(ComponentType.Sapfor_F, (Component) CurrentAnchestor.set(Current.Sapfor, new Sapfor_F()));
Components.put(ComponentType.Sapfor_F, (Component) Current_.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());
@@ -290,7 +290,7 @@ public class Global {
//light_editor.xml-------->>
//-------->>
if (properties.AutoUpdateSearch)
Pass_2021.passes.get(PassCode_2021.GetComponentsActualVersions).Do();
Pass.passes.get(PassCode.GetComponentsActualVersions).Do();
ValidateComponentsStates();
if ((need_update > 0) || (bad_state > 0)) {
boolean flag = true;
@@ -309,7 +309,7 @@ public class Global {
//---
ActivateDB(); //тут current getAccount; роль по умолчанию всегда неизвестна.
///--------------
CurrentAnchestor.set(Current.Account, new Account() {
Current_.set(Current.Account, new Account() {
{
name = "M";
email = "vmk-post@yandex.ru";
@@ -323,11 +323,11 @@ public class Global {
//в проперти их!
//-- чисто чтобы создать таблицы. соединения на стороне клиента не предвидится.
if (((GlobalDatabase) CommonUtils.db).settings.get(SettingName.AutoBugReportsLoad).toBoolean())
Pass_2021.passes.get(PassCode_2021.SynchronizeBugReports).Do();
Pass.passes.get(PassCode.SynchronizeBugReports).Do();
//--
if (((GlobalDatabase) CommonUtils.db).settings.get(SettingName.AutoTestsLoad).toBoolean())
Pass_2021.passes.get(PassCode_2021.SynchronizeTests).Do();
Pass_2021.CheckAllStats();
Pass.passes.get(PassCode.SynchronizeTests).Do();
Pass.CheckAllStats();
Current.getSapfor().refreshPid(); //без сапфора сюда это все равно не дойдет.
UI.CreateMenus();
UI.CreateWindows();

12
src/_VisualDVM/GlobalData/Compiler/CompilersMenuBar.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.GlobalData.Compiler;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class CompilersMenuBar extends DataMenuBar {
public CompilersMenuBar() {
super("компиляторы",
PassCode_2021.AddCompiler,
PassCode_2021.EditCompiler,
PassCode_2021.DeleteCompiler,
PassCode_2021.ShowCompilerVersion,
PassCode_2021.ShowCompilerHelp);
PassCode.AddCompiler,
PassCode.EditCompiler,
PassCode.DeleteCompiler,
PassCode.ShowCompilerVersion,
PassCode.ShowCompilerHelp);
}
}

6
src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
View File

@@ -6,8 +6,8 @@ import Common.Visual.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Machine.MachineType;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
@@ -36,7 +36,7 @@ public class CompilerFields implements DialogFields {
if (file != null)
dst = file.getAbsolutePath();
} else {
if (Pass_2021.passes.get(PassCode_2021.SelectRemoteFile).Do(true))
if (Pass.passes.get(PassCode.SelectRemoteFile).Do(true))
dst = Current.getRemoteFile().full_name;
}
if (dst != null)

8
src/_VisualDVM/GlobalData/DVMParameter/DVMParametersMenuBar.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.GlobalData.DVMParameter;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class DVMParametersMenuBar extends DataMenuBar {
public DVMParametersMenuBar() {
super("параметры",
PassCode_2021.AddDVMParameter,
PassCode_2021.EditDVMParameter,
PassCode_2021.DeleteDVMParameter);
PassCode.AddDVMParameter,
PassCode.EditDVMParameter,
PassCode.DeleteDVMParameter);
}
}

10
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.GlobalData.EnvironmentValue;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class EnvironmentValuesMenuBar extends DataMenuBar {
public EnvironmentValuesMenuBar() {
super("переменные окружения", PassCode_2021.AddEnvironmentValue,
PassCode_2021.EditEnvironmentValue,
PassCode_2021.DeleteEnvironmentValue,
PassCode_2021.PickCompilerEnvironments
super("переменные окружения", PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue,
PassCode.PickCompilerEnvironments
);
}
}

14
src/_VisualDVM/GlobalData/GlobalDatabase.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Database.VisualiserDatabase;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
@@ -29,7 +29,7 @@ import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
import _VisualDVM.GlobalData.User.UsersDBTable;
import _VisualDVM.Repository.Component.ComponentType;
import Visual_DVM_2021.PassStats.PassStatsDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import java.nio.file.Paths;
import java.util.Date;
@@ -84,11 +84,11 @@ public class GlobalDatabase extends VisualiserDatabase {
//---------------------------------------------------------------------------------
@Override
public void Init() throws Exception {
CurrentAnchestor.set(Current.Account,
Current_.set(Current.Account,
accounts.Data.isEmpty() ? Insert(new Account()) :
accounts.getFirstRecord()
);
CurrentAnchestor.set(Current.Credentials,
Current_.set(Current.Credentials,
credentials.Data.isEmpty() ? Insert(new Credentials()) :
credentials.getFirstRecord());
//настройки компонент
@@ -96,12 +96,12 @@ public class GlobalDatabase extends VisualiserDatabase {
runConfigurations.Patch();
}
@Override
public PassCode_2021 getSynchronizePassCode() {
public PassCode getSynchronizePassCode() {
return null;
}
public void SaveCredentials(){
try {
Credentials credentials = (Credentials) CurrentAnchestor.get(Current.Credentials);
Credentials credentials = (Credentials) Current_.get(Current.Credentials);
if (Current.HasMachine())
credentials.machine_id = Current.getMachine().id;
if (Current.HasUser())
@@ -120,7 +120,7 @@ public class GlobalDatabase extends VisualiserDatabase {
}
public void UpdateCredentials() {
try {
Update((DBObject) CurrentAnchestor.get(Current.Credentials));
Update((DBObject) Current_.get(Current.Credentials));
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
}

12
src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.Machine;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Controls.MenuBarButton;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -10,9 +10,9 @@ public class MachinesMenuBar extends DataMenuBar {
MenuBarButton bCollapse;
public MachinesMenuBar() {
super("машины",
PassCode_2021.AddMachine,
PassCode_2021.EditMachine,
PassCode_2021.DeleteMachine);
PassCode.AddMachine,
PassCode.EditMachine,
PassCode.DeleteMachine);
this.add(bCollapse = new MenuBarButton() {
{
setIcon("/icons/CollapseUp.png");
@@ -20,7 +20,7 @@ public class MachinesMenuBar extends DataMenuBar {
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do("collapseCredentials", true);
Pass.passes.get(PassCode.UpdateProperty).Do("collapseCredentials", true);
}
});
}

12
src/_VisualDVM/GlobalData/Makefile/MakefilesMenuBar.java
View File

@@ -1,14 +1,14 @@
package _VisualDVM.GlobalData.Makefile;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class MakefilesMenuBar extends DataMenuBar {
public MakefilesMenuBar() {
super("мейкфайлы",
PassCode_2021.Compile,
PassCode_2021.AddMakefile,
PassCode_2021.EditMakefile,
PassCode_2021.DeleteMakefile);
PassCode.Compile,
PassCode.AddMakefile,
PassCode.EditMakefile,
PassCode.DeleteMakefile);
addSeparator();
addPasses(PassCode_2021.ShowMakefilePreview, PassCode_2021.EditProjectCompilationMaxtime);
addPasses(PassCode.ShowMakefilePreview, PassCode.EditProjectCompilationMaxtime);
}
}

4
src/_VisualDVM/GlobalData/Module/ModulesMenuBar.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.Module;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class ModulesMenuBar extends DataMenuBar {
public ModulesMenuBar() {
super("языковые модули", PassCode_2021.EditModule);
super("языковые модули", PassCode.EditModule);
}
}

8
src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
View File

@@ -8,8 +8,8 @@ import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.Module.ModuleAnchestor;
import _VisualDVM.ProjectData.LanguageName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
@@ -31,13 +31,13 @@ public class ModuleAnchestorFields implements DialogFields {
compilers.values().forEach(compiler -> cbCompilers.addItem(compiler));
bHelp.addActionListener(e -> {
if (cbCompilers.getSelectedItem() != null) {
Pass_2021.passes.get(PassCode_2021.ShowCompilerHelp).Do(compiler, true);
Pass.passes.get(PassCode.ShowCompilerHelp).Do(compiler, true);
} else CommonUI.Info("Компилятор не выбран");
});
BPickOptions.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021<String> pass = Pass_2021.passes.get(PassCode_2021.PickCompilerOptions);
Pass<String> pass = Pass.passes.get(PassCode.PickCompilerOptions);
if (pass.Do(compiler)) {
CommonUI.TrySelect(cbFlags, pass.target);
}

4
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -40,7 +40,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
}
public void Refresh(String path) {
try {
CurrentAnchestor.set(Current.RemoteFile, null);//сброс текущего файла перед любым обновлением.
Current_.set(Current.RemoteFile, null);//сброс текущего файла перед любым обновлением.
fields.lCurrentFile.setText("?");
//-------------------------------------------------------------------
root_file = new RemoteFile(path, true);

8
src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.GlobalData.RunConfiguration;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
public class RunConfigurationsMenuBar extends DataMenuBar {
public RunConfigurationsMenuBar() {
super("конфигурации запуска", PassCode_2021.Run,
PassCode_2021.AddRunConfiguration, PassCode_2021.EditRunConfiguration, PassCode_2021.DeleteRunConfiguration);
super("конфигурации запуска", PassCode.Run,
PassCode.AddRunConfiguration, PassCode.EditRunConfiguration, PassCode.DeleteRunConfiguration);
add(new JSeparator());
addPasses(PassCode_2021.EditProjectRunMaxtime);
addPasses(PassCode.EditProjectRunMaxtime);
}
}

6
src/_VisualDVM/GlobalData/Settings/DBSetting.java
View File

@@ -3,8 +3,8 @@ import Common.Database.Objects.DBObject;
import Common.Utils.CommonUtils;
import _VisualDVM.Visual.Menus.StableMenuItem;
import _VisualDVM.Repository.Component.ComponentType;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import com.sun.org.glassfish.gmbal.Description;
import javax.swing.*;
@@ -49,7 +49,7 @@ public class DBSetting extends DBObject {
menu_item.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(Name);
Pass.passes.get(PassCode.UpdateSetting).Do(Name);
}
});
Mark();

6
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Tasks.CompilationTask;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
@@ -74,8 +74,8 @@ public class CompilationTask extends Task {
@Override
public boolean isVisible() {
return
CurrentAnchestor.matchCurrentID(Current.Machine, machine_id) &&
CurrentAnchestor.matchCurrentID(Current.User, user_id) &&
Current_.matchCurrentID(Current.Machine, machine_id) &&
Current_.matchCurrentID(Current.User, user_id) &&
Current.HasProject() &&
belongsToProject(Current.getProject());
}

6
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java
View File

@@ -9,8 +9,8 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.util.LinkedHashMap;
@@ -60,7 +60,7 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
public void CreateControl() {
super.CreateControl();
TableMenu dataTableMenu = new TableMenu(control);
dataTableMenu.add(Pass_2021.passes.get(PassCode_2021.DeleteSelectedCompilationTasks).createMenuItem());
dataTableMenu.add(Pass.passes.get(PassCode.DeleteSelectedCompilationTasks).createMenuItem());
control.setComponentPopupMenu(dataTableMenu);
}

8
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
@@ -53,9 +53,9 @@ public class RunTask extends Task {
@Override
public boolean isVisible() {
return
CurrentAnchestor.matchCurrentID(Current.Machine, machine_id) &&
CurrentAnchestor.matchCurrentID(Current.User, user_id) &&
CurrentAnchestor.matchCurrentID(Current.RunConfiguration, run_configuration_id) &&
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() &&

6
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
View File

@@ -4,8 +4,8 @@ import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import static Common.Visual.Tables.TableRenderers.RendererDate;
import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
@@ -47,7 +47,7 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
public void CreateControl() {
super.CreateControl();
TableMenu dataTableMenu = new TableMenu(control);
dataTableMenu.add(Pass_2021.passes.get(PassCode_2021.DeleteSelectedRunTasks).createMenuItem());
dataTableMenu.add(Pass.passes.get(PassCode.DeleteSelectedRunTasks).createMenuItem());
control.setComponentPopupMenu(dataTableMenu);
}
};

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/LocalTaskSupervisor.java
View File

@@ -7,7 +7,7 @@ import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.Tasks.Supervisor.TaskSupervisor;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -18,7 +18,7 @@ import java.util.Map;
import java.util.Vector;
//про mpi mpich2
//https://stackoverflow.com/questions/12983635/how-to-include-library-mpich2-in-mingw
public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor<T, Pass_2021> {
public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor<T, Pass> {
protected Process taskProcess;
protected int exitCode;
@Override

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
View File

@@ -5,10 +5,10 @@ import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import java.util.Date;
public abstract class TaskSupervisor<T extends Task, P extends Pass_2021> {
public abstract class TaskSupervisor<T extends Task, P extends Pass> {
public T task; //задача
protected db_project_info project; //проект к которому относится задача
protected P pass; //проход отвечающий за задачу

10
src/_VisualDVM/GlobalData/User/UsersMenuBar.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.GlobalData.User;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class UsersMenuBar extends DataMenuBar {
public UsersMenuBar() {
super("пользователи", PassCode_2021.AddUser,
PassCode_2021.EditUser,
PassCode_2021.InitialiseUser,
PassCode_2021.DeleteUser);
super("пользователи", PassCode.AddUser,
PassCode.EditUser,
PassCode.InitialiseUser,
PassCode.DeleteUser);
}
}

6
src/_VisualDVM/GlobalProperties.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM;
import Common.Utils.CommonUtils;
import _VisualDVM.Visual.Menus.StableMenuItem;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import com.google.gson.annotations.Expose;
import javax.swing.*;
@@ -157,7 +157,7 @@ public class GlobalProperties {
getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png");
//-
menu_item.addActionListener(e -> {
if (Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
if (Pass.passes.get(PassCode.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
menu_item.setIcon(CommonUtils.getIcon(getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
});
menu.add(menu_item);

10
src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
View File

@@ -14,8 +14,8 @@ import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
import _VisualDVM.Visual.Menus.MainEditorMenu;
import _VisualDVM.ProjectData.SapforData.Loops.Loop;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import _VisualDVM.Visual.Interface.SPFEditorInterface;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
@@ -69,7 +69,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
//текст изменился, значит M ка более не актуальна.
file.father.dropLastModification();
}
Pass_2021.passes.get(PassCode_2021.Save).Reset();
Pass.passes.get(PassCode.Save).Reset();
}
}
});
@@ -185,13 +185,13 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
}
@Override
protected void saveFont() {
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(
Pass.passes.get(PassCode.UpdateSetting).Do(
SettingName.EditorFontSize,
getFont().getSize());
}
@Override
protected void saveText() {
Pass_2021.passes.get(PassCode_2021.Save).Do();
Pass.passes.get(PassCode.Save).Do();
}
@Override
protected StyledPopupMenu createMenu() {

4
src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
@@ -23,7 +23,7 @@ public class FileGraphTree extends DataTree {
@Override
public void ShowCurrentObject() throws Exception {
Current.getFile().form.EventsOff();
Object o = CurrentAnchestor.get(getCurrent());
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();

34
src/_VisualDVM/ProjectData/Files/UI/FilesTree.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import Common.Visual.DragDrop.FileDrop;
@@ -9,8 +9,8 @@ import _VisualDVM.Visual.UI;
import Common.Visual.Trees.StyledTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;
@@ -25,18 +25,18 @@ public class FilesTree extends StyledTree {
public void keyPressed(KeyEvent e) {
switch (e.getKeyCode()) {
case KeyEvent.VK_DELETE:
forkFD(PassCode_2021.DeleteFile, PassCode_2021.DeleteDirectory);
forkFD(PassCode.DeleteFile, PassCode.DeleteDirectory);
break;
case KeyEvent.VK_ADD: //num lock +
case KeyEvent.VK_EQUALS: //+
Pass_2021.passes.get(PassCode_2021.IncludeFile).Do();
Pass.passes.get(PassCode.IncludeFile).Do();
break;
case KeyEvent.VK_SUBTRACT: //num lock -
case KeyEvent.VK_MINUS: //-
Pass_2021.passes.get(PassCode_2021.ExcludeFile).Do();
Pass.passes.get(PassCode.ExcludeFile).Do();
break;
case KeyEvent.VK_F2:
forkFD(PassCode_2021.RenameFile, PassCode_2021.RenameDirectory);
forkFD(PassCode.RenameFile, PassCode.RenameDirectory);
break;
case KeyEvent.VK_ENTER:
LeftMouseAction2();
@@ -46,14 +46,14 @@ public class FilesTree extends StyledTree {
}
);
new FileDrop(System.out, this, files -> {
Pass_2021.passes.get(PassCode_2021.ImportFiles).Do(files);
Pass.passes.get(PassCode.ImportFiles).Do(files);
});
CurrentAnchestor.set(Current.File, null);
Current_.set(Current.File, null);
}
private static void forkFD(PassCode_2021 file_pass, PassCode_2021 folder_pass) {
private static void forkFD(PassCode file_pass, PassCode folder_pass) {
DefaultMutableTreeNode node = Current.getProjectNode();
if (node != null)
Pass_2021.passes.get((node.getUserObject() instanceof DBProjectFile) ?
Pass.passes.get((node.getUserObject() instanceof DBProjectFile) ?
file_pass : folder_pass).Do();
}
@Override
@@ -67,16 +67,16 @@ public class FilesTree extends StyledTree {
@Override
public void SelectionAction(TreePath e) {
DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent();
CurrentAnchestor.set(Current.ProjectNode, node);
Current_.set(Current.ProjectNode, node);
Object o = node.getUserObject();
if (o instanceof File) {
CurrentAnchestor.set(Current.SelectedDirectory, o);
CurrentAnchestor.set(Current.SelectedFile, null);
Current_.set(Current.SelectedDirectory, o);
Current_.set(Current.SelectedFile, null);
UI.getMainWindow().getProjectWindow().ShowNoSelectedFile();
} else if (o instanceof DBProjectFile) {
CurrentAnchestor.set(Current.SelectedFile, o);
Current_.set(Current.SelectedFile, o);
File file = ((DBProjectFile) o).file;
CurrentAnchestor.set(Current.SelectedDirectory, file.getParentFile());
Current_.set(Current.SelectedDirectory, file.getParentFile());
UI.getMainWindow().getProjectWindow().ShowSelectedFile();
}
UI.getMainWindow().getProjectWindow().ShowSelectedDirectory();
@@ -89,7 +89,7 @@ public class FilesTree extends StyledTree {
//очень важно. иначе по открытии файла дерево остается в фокусе.
//и не происходит прокрутки скролла к строке!!
UI.getMainWindow().getProjectWindow().FocusFileTabs();
Pass_2021.passes.get(PassCode_2021.OpenCurrentFile).Do(o);
Pass.passes.get(PassCode.OpenCurrentFile).Do(o);
}
}
}

4
src/_VisualDVM/ProjectData/Messages/Message.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Messages;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Mode;
import Common.Utils.CommonUtils;
import _VisualDVM.Constants;
@@ -450,7 +450,7 @@ public class Message extends FileObject {
@Override
public boolean isVisible() {
if (Current.HasFile() && Current.getFile().name.equals(file)) {
Object o = CurrentAnchestor.get(Current.FileGraphElement);
Object o = Current_.get(Current.FileGraphElement);
return !(o instanceof FileObjectWithMessages) || ((FileObjectWithMessages) o).HasMessage(this);
} else return false;
}

4
src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.ProjectData.Messages.Recommendations;
import Common.Database.Objects.iDBObject;
import Common.Utils.CommonUtils;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import com.sun.org.glassfish.gmbal.Description;
public class MessageRecommendation extends iDBObject {
//рекомендация может касаться, либо настройки либо прохода. так же может быть просто текстовой.
@@ -16,7 +16,7 @@ public class MessageRecommendation extends iDBObject {
public String text = ""; //текст
public MessageRecommendation() {
}
public MessageRecommendation(PassCode_2021 passCode_in) {
public MessageRecommendation(PassCode passCode_in) {
type = RecommendationType.Transformation;
argName = passCode_in.toString();
text = "Выполните преобразование " + CommonUtils.Quotes(passCode_in.getDescription());

14
src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
View File

@@ -4,7 +4,7 @@ import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
//group=1 - настройка
//group=2 - преобразование
@@ -55,17 +55,17 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
break;
*/
case 1015:
result = new MessageRecommendation(PassCode_2021.SPF_RemoveUnusedFunctions);
result = new MessageRecommendation(PassCode.SPF_RemoveUnusedFunctions);
break;
case 1018:
result = new MessageRecommendation(PassCode_2021.SPF_LoopEndDoConverterPass);
result = new MessageRecommendation(PassCode.SPF_LoopEndDoConverterPass);
break;
case 1020:
result = new MessageRecommendation(SettingName.KEEP_DVM_DIRECTIVES, "1");
break;
case 1027:
case 1060:
result = new MessageRecommendation(PassCode_2021.SPF_CorrectCodeStylePass);
result = new MessageRecommendation(PassCode.SPF_CorrectCodeStylePass);
break;
case 1041:
case 3012:
@@ -74,13 +74,13 @@ public class RecommendationsDBTable extends iDBTable<MessageRecommendation> {
case 3015:
case 3017:
case 3018:
result = new MessageRecommendation(PassCode_2021.SPF_ResolveParallelRegionConflicts);
result = new MessageRecommendation(PassCode.SPF_ResolveParallelRegionConflicts);
break;
case 1061:
result = new MessageRecommendation(PassCode_2021.SPF_InsertIncludesPass);
result = new MessageRecommendation(PassCode.SPF_InsertIncludesPass);
break;
case 3020:
result = new MessageRecommendation(PassCode_2021.SPF_DuplicateFunctionChains);
result = new MessageRecommendation(PassCode.SPF_DuplicateFunctionChains);
break;
}
MessageRecommendation finalResult = result;

4
src/_VisualDVM/ProjectData/Project/ChangeSettingPass.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.Project;
import _VisualDVM.GlobalData.Settings.DBSetting;
import Visual_DVM_2021.Passes.Pass_2021;
public class ChangeSettingPass extends Pass_2021<DBSetting> {
import Visual_DVM_2021.Passes.Pass;
public class ChangeSettingPass extends Pass<DBSetting> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (DBSetting) args[0];

14
src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Project.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.GraphMenu;
@@ -7,8 +7,8 @@ import _VisualDVM.Visual.Menus.VersionsMenu;
import Common.Visual.Selectable;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.tree.TreePath;
import java.awt.event.KeyAdapter;
@@ -22,11 +22,11 @@ public class VersionsTree extends DataTree {
public void keyPressed(KeyEvent e) {
switch (e.getKeyCode()) {
case KeyEvent.VK_DELETE:
Pass_2021.passes.get(PassCode_2021.DeleteVersion).Do();
Pass.passes.get(PassCode.DeleteVersion).Do();
break;
case KeyEvent.VK_ENTER:
if (Current.HasVersion())
Pass_2021.passes.get(PassCode_2021.OpenCurrentProject).Do(Current.getVersion());
Pass.passes.get(PassCode.OpenCurrentProject).Do(Current.getVersion());
break;
}
}
@@ -51,7 +51,7 @@ public class VersionsTree extends DataTree {
public void LeftMouseAction1() {
if (Global.versions_multiselection) {
// только если есть режим выбора версий.
Object element = CurrentAnchestor.get(getCurrent());
Object element = Current_.get(getCurrent());
if ((element instanceof Selectable)) {
((Selectable) element).SwitchSelection();
updateUI();
@@ -60,7 +60,7 @@ public class VersionsTree extends DataTree {
}
@Override
public void LeftMouseAction2() {
Pass_2021.passes.get(PassCode_2021.OpenCurrentProject).Do(Current.getVersion());
Pass.passes.get(PassCode.OpenCurrentProject).Do(Current.getVersion());
}
@Override
protected int getStartLine() {

26
src/_VisualDVM/ProjectData/Project/db_project_info.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.Project;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Constants;
@@ -37,7 +37,7 @@ import _VisualDVM.ProjectData.SapforData.Regions.RegionsSet;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
import _VisualDVM.TestingSystem.Common.Test.ProjectFiles_json;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.PassException;
import com.mxgraph.swing.mxGraphComponent;
import com.sun.org.glassfish.gmbal.Description;
@@ -239,7 +239,7 @@ public class db_project_info extends DBObject {
return new File(Paths.get(project_home.toString(), Constants.data,
Global.properties.ProjectDBName).toString());
}
public static String recommendAnalysis(PassCode_2021 code_in) {
public static String recommendAnalysis(PassCode code_in) {
return Constants.unknown_metric + " примените анализатор \"" + code_in.getDescription() + "\"";
}
/*
@@ -435,8 +435,8 @@ public class db_project_info extends DBObject {
db.ResetAI(MessageWarning.class);
db.ResetAI(MessageRecommendation.class);
//-
CurrentAnchestor.set(Current.Function, null);
CurrentAnchestor.set(Current.SelectedFunction, null);
Current_.set(Current.Function, null);
Current_.set(Current.SelectedFunction, null);
}
public void CleanVersions() throws Exception {
node.removeAllChildren();
@@ -518,25 +518,25 @@ public class db_project_info extends DBObject {
}
}
public String LinesCount() {
return numLines == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetFileLineInfo) : String.valueOf(numLines);
return numLines == ParallelVariant.statNaN ? recommendAnalysis(PassCode.SPF_GetFileLineInfo) : String.valueOf(numLines);
}
public String SPFCount() {
return numSPF == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetFileLineInfo) : String.valueOf(numSPF);
return numSPF == ParallelVariant.statNaN ? recommendAnalysis(PassCode.SPF_GetFileLineInfo) : String.valueOf(numSPF);
}
public String DVMCount() {
return numDVM == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetFileLineInfo) : String.valueOf(numDVM);
return numDVM == ParallelVariant.statNaN ? recommendAnalysis(PassCode.SPF_GetFileLineInfo) : String.valueOf(numDVM);
}
public String ArraysCount() {
return numArrays == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetAllDeclaratedArrays) : String.valueOf(numArrays);
return numArrays == ParallelVariant.statNaN ? recommendAnalysis(PassCode.SPF_GetAllDeclaratedArrays) : String.valueOf(numArrays);
}
public String LoopsCount() {
return numLoops == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetGraphLoops) : String.valueOf(numLoops);
return numLoops == ParallelVariant.statNaN ? recommendAnalysis(PassCode.SPF_GetGraphLoops) : String.valueOf(numLoops);
}
public String FunctionsCount() {
return numFunctions == CommonConstants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetGraphFunctions) : String.valueOf(numFunctions);
return numFunctions == CommonConstants.Nan ? recommendAnalysis(PassCode.SPF_GetGraphFunctions) : String.valueOf(numFunctions);
}
public String AddictedCount() {
return numAddicted == CommonConstants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetIncludeDependencies) : String.valueOf(numAddicted);
return numAddicted == CommonConstants.Nan ? recommendAnalysis(PassCode.SPF_GetIncludeDependencies) : String.valueOf(numAddicted);
}
public boolean UpdateLinesCount() {
try {
@@ -1069,7 +1069,7 @@ public class db_project_info extends DBObject {
target.Close();
}
public void undoLastTransformation() throws Exception {
CurrentAnchestor.set(Current.Version, null);
Current_.set(Current.Version, null);
//---
UI.getVersionsWindow().getVersionsForm().getTree().RemoveNode(last_version.node);
Utils.forceDeleteWithCheck(last_version.Home);

4
src/_VisualDVM/ProjectData/ProjectDatabase.java
View File

@@ -12,7 +12,7 @@ import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatisticsDBTable;
import _VisualDVM.ProjectData.Project.ProjectInfoDBTable;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinatesDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
@@ -86,7 +86,7 @@ public class ProjectDatabase extends SQLiteDatabase {
Delete(f);
}
@Override
public PassCode_2021 getSynchronizePassCode() {
public PassCode getSynchronizePassCode() {
return null;
}
//особый проход. нужен при первичной загрузке проекта.

6
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
View File

@@ -5,8 +5,8 @@ import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.util.Vector;
@@ -78,6 +78,6 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
}
@Override
public void CheckAll(boolean flag) {
Pass_2021.passes.get(PassCode_2021.MassSelectArrays).Do(flag,new Vector(Current.getProject().declaratedArrays.Data.values()));
Pass.passes.get(PassCode.MassSelectArrays).Do(flag,new Vector(Current.getProject().declaratedArrays.Data.values()));
}
}

6
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -11,8 +11,8 @@ import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimensionState
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateLink;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.ProjectData.SapforData.Regions.UI.ArrayAlignmentBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javafx.util.Pair;
import javax.swing.*;
@@ -362,7 +362,7 @@ public class ProjectArray extends DBObject {
}
@Override
public void select(boolean flag) {
Pass_2021.passes.get(PassCode_2021.MassSelectArrays).Do(flag, this);
Pass.passes.get(PassCode.MassSelectArrays).Do(flag, this);
}
@Override
public boolean isSelected() {

8
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java
View File

@@ -1,20 +1,20 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
public class DistributionMenu extends GraphMenu {
JMenuItem mChangeDistribution;
public DistributionMenu(StyledTree tree) {
super(tree, "области распараллеливания");
mChangeDistribution = Pass_2021.passes.get(PassCode_2021.SPF_ModifyArrayDistribution).createMenuItem();
mChangeDistribution = Pass.passes.get(PassCode.SPF_ModifyArrayDistribution).createMenuItem();
add(mChangeDistribution);
}
@Override
public void CheckElementsVisibility() {
super.CheckElementsVisibility();
mChangeDistribution.setVisible(Pass_2021.passes.get(PassCode_2021.SPF_GetArrayDistribution).isDone());
mChangeDistribution.setVisible(Pass.passes.get(PassCode.SPF_GetArrayDistribution).isDone());
}
}

6
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.StyledTree;
@@ -16,7 +16,7 @@ public class RulesTree extends StyledTree {
setRootVisible(false);
expandRow(0);
ExpandAll();
CurrentAnchestor.set(Current.ParallelRegion, null);
Current_.set(Current.ParallelRegion, null);
}
@Override
protected GraphMenu createMenu() {
@@ -39,6 +39,6 @@ public class RulesTree extends StyledTree {
region = (ParallelRegion) o;
}
}
CurrentAnchestor.set(Current.ParallelRegion, region);
Current_.set(Current.ParallelRegion, region);
}
}

8
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
View File

@@ -3,8 +3,8 @@ import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class FuncCall extends FileObjectWithMessages {
public String funcName = ""; //не нужны дополнительные поля.имя функции это уже ключ.
public boolean canBeInlined = false;
@@ -29,10 +29,10 @@ public class FuncCall extends FileObjectWithMessages {
}
@Override
public void Select(boolean flag) {
if (Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
}
}
}

8
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.util.Vector;
public class FuncCallH extends FuncCall {
@@ -38,10 +38,10 @@ public class FuncCallH extends FuncCall {
}
@Override
public void Select(boolean flag) {
if (Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
}
}
}

10
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.Menus.StyledPopupMenu;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -20,10 +20,10 @@ public class FunctionsGraphMenu extends StyledPopupMenu {
@Override
public void actionPerformed(ActionEvent e) {
if (Current.HasSelectedFunction()) {
CurrentAnchestor.set(Current.Function, Current.getSelectionFunction());
Current_.set(Current.Function, Current.getSelectionFunction());
UI.getMainWindow().getProjectWindow().getFunctionsWindow().ShowCurrentFunction();
if (SPF_GetGraphFunctionPositions.showByCurrentFunction) {
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
}
}
}

12
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -7,8 +7,8 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import com.mxgraph.model.mxCell;
import com.mxgraph.model.mxGeometry;
import com.mxgraph.swing.mxGraphComponent;
@@ -35,7 +35,7 @@ public class FunctionsGraphUI extends mxGraph {
public final static Timer ffTimer = new Timer(1000, new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
Pass.passes.get(PassCode.SPF_GetGraphFunctionPositions).Do();
}
});
//---
@@ -141,7 +141,7 @@ public class FunctionsGraphUI extends mxGraph {
funcInfo = Current.getProject().allFunctions.get(name);
String vertexType = funcInfo.type.toString();
if (SPF_GetGraphFunctionPositions.showByCurrentFunction) {
FuncInfo current_fi = (FuncInfo) CurrentAnchestor.get(Current.Function);
FuncInfo current_fi = (FuncInfo) Current_.get(Current.Function);
if ((current_fi != null) && (funcInfo.funcName.equals(current_fi.funcName))) {
vertexType = "current";
}
@@ -234,7 +234,7 @@ public class FunctionsGraphUI extends mxGraph {
FuncInfo fi = Current.getProject().allFunctions.get(func_name);
switch (e.getClickCount()) {
case 1:
CurrentAnchestor.set(Current.SelectedFunction, fi);
Current_.set(Current.SelectedFunction, fi);
break;
case 2:
switch (fi.type) {

4
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree;
@@ -19,7 +19,7 @@ public class InlineTree extends SelectableTree {
}
@Override
public void ShowCurrentObject() {
Object o = CurrentAnchestor.get(getCurrent());
Object o = Current_.get(getCurrent());
if (o instanceof FileObject) {
((FileObject) o).Show(false);
}

4
src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Trees.SelectableTree;
@@ -23,7 +23,7 @@ public class InlineTree2 extends SelectableTree {
}
@Override
public void ShowCurrentObject() {
Object o = CurrentAnchestor.get(getCurrent());
Object o = Current_.get(getCurrent());
if (o instanceof FileObject) {
((FileObject) o).Show(false);
}

8
src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
View File

@@ -3,8 +3,8 @@ import _VisualDVM.Current;
import Common.Database.Tables.DBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -49,7 +49,7 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
}
@Override
public void MouseAction2() throws Exception {
Pass_2021.passes.get(PassCode_2021.OpenBugReportTestProject).Do();
Pass.passes.get(PassCode.OpenBugReportTestProject).Do();
}
@Override
public void CreateControl() {
@@ -61,7 +61,7 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
control.getActionMap().put(solve, new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.OpenBugReportTestProject).Do();
Pass.passes.get(PassCode.OpenBugReportTestProject).Do();
}
});
}

20
src/_VisualDVM/Repository/BugReport/BugReportsMenuBar.java
View File

@@ -1,17 +1,17 @@
package _VisualDVM.Repository.BugReport;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class BugReportsMenuBar extends DataMenuBar {
public BugReportsMenuBar() {
super("отчёты об ошибках",
PassCode_2021.SynchronizeBugReports,
PassCode_2021.DownloadAllBugReportsArchives,
PassCode_2021.AddBugReport,
PassCode_2021.PublishBugReport,
PassCode_2021.OpenBugReportTestProject,
PassCode_2021.OpenBugReport,
PassCode_2021.UpdateBugReportProgress,
PassCode_2021.CloseBugReport,
PassCode_2021.DeleteBugReport);
PassCode.SynchronizeBugReports,
PassCode.DownloadAllBugReportsArchives,
PassCode.AddBugReport,
PassCode.PublishBugReport,
PassCode.OpenBugReportTestProject,
PassCode.OpenBugReport,
PassCode.UpdateBugReportProgress,
PassCode.CloseBugReport,
PassCode.DeleteBugReport);
}
}

6
src/_VisualDVM/Repository/BugReportsDatabase.java
View File

@@ -5,7 +5,7 @@ import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportsDBTable;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;
import _VisualDVM.Repository.Subscribes.SubsribersDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import java.nio.file.Paths;
import java.util.Vector;
@@ -27,8 +27,8 @@ public class BugReportsDatabase extends SQLiteDatabase {
DeleteDrafts();
}
@Override
public PassCode_2021 getSynchronizePassCode() {
return PassCode_2021.SynchronizeBugReports;
public PassCode getSynchronizePassCode() {
return PassCode.SynchronizeBugReports;
}
public void DeleteDrafts() throws Exception {
Vector<BugReport> drafts = bugReports.getAllDrafts();

18
src/_VisualDVM/Repository/Component/ComponentsMenuBar.java
View File

@@ -3,8 +3,8 @@ import Common.Visual.CommonUI;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class ComponentsMenuBar extends DataMenuBar {
public ComponentsMenuBar() {
super("компоненты");
@@ -13,15 +13,15 @@ public class ComponentsMenuBar extends DataMenuBar {
"Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
{
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
add(Pass_2021.passes.get(PassCode_2021.ResurrectComponent).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.ResurrectComponentFromServer).createMenuItem());
add(Pass.passes.get(PassCode.ResurrectComponent).createMenuItem());
add(Pass.passes.get(PassCode.ResurrectComponentFromServer).createMenuItem());
}
}
);
addPasses(PassCode_2021.InstallComponentFromFolder,
PassCode_2021.UpdateSelectedComponents,
PassCode_2021.PublishComponent,
PassCode_2021.ShowComponentChangesLog);
Pass_2021.passes.get(PassCode_2021.PublishComponent).setControlsVisible(false);
addPasses(PassCode.InstallComponentFromFolder,
PassCode.UpdateSelectedComponents,
PassCode.PublishComponent,
PassCode.ShowComponentChangesLog);
Pass.passes.get(PassCode.PublishComponent).setControlsVisible(false);
}
}

202
src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
View File

@@ -14,9 +14,9 @@ import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.Repository.Component.OSDComponent;
import _VisualDVM.Repository.Component.Visualizer_2;
import _VisualDVM.TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -57,80 +57,80 @@ public abstract class Sapfor extends OSDComponent {
ex.printStackTrace();
}
}
public static PassCode_2021[] getAnalysesCodes() {
return new PassCode_2021[]{
PassCode_2021.SPF_ParseFilesWithOrder,
PassCode_2021.SPF_GetFileLineInfo,
PassCode_2021.SPF_GetArrayDistributionOnlyRegions,
PassCode_2021.SPF_GetIncludeDependencies,
PassCode_2021.SPF_GetGraphLoops,
PassCode_2021.SPF_GetGraphFunctions,
PassCode_2021.SPF_GetAllDeclaratedArrays,
PassCode_2021.SPF_GetArrayDistributionOnlyAnalysis,
PassCode_2021.SPF_GetArrayDistribution
public static PassCode[] getAnalysesCodes() {
return new PassCode[]{
PassCode.SPF_ParseFilesWithOrder,
PassCode.SPF_GetFileLineInfo,
PassCode.SPF_GetArrayDistributionOnlyRegions,
PassCode.SPF_GetIncludeDependencies,
PassCode.SPF_GetGraphLoops,
PassCode.SPF_GetGraphFunctions,
PassCode.SPF_GetAllDeclaratedArrays,
PassCode.SPF_GetArrayDistributionOnlyAnalysis,
PassCode.SPF_GetArrayDistribution
};
}
public static PassCode_2021[] getLoopsTransformationsCodes() {
return new PassCode_2021[]{
PassCode_2021.SPF_LoopEndDoConverterPass,
PassCode_2021.SPF_LoopFission,
PassCode_2021.SPF_LoopUnion,
PassCode_2021.SPF_LoopUnrolling
public static PassCode[] getLoopsTransformationsCodes() {
return new PassCode[]{
PassCode.SPF_LoopEndDoConverterPass,
PassCode.SPF_LoopFission,
PassCode.SPF_LoopUnion,
PassCode.SPF_LoopUnrolling
};
}
public static PassCode_2021[] getPrivatesTransformationsCodes() {
return new PassCode_2021[]{
PassCode_2021.SPF_PrivateShrinking,
PassCode_2021.SPF_PrivateExpansion,
PassCode_2021.SPF_PrivateRemoving,
PassCode_2021.SPF_InsertPrivateFromGUI
public static PassCode[] getPrivatesTransformationsCodes() {
return new PassCode[]{
PassCode.SPF_PrivateShrinking,
PassCode.SPF_PrivateExpansion,
PassCode.SPF_PrivateRemoving,
PassCode.SPF_InsertPrivateFromGUI
};
}
public static PassCode_2021[] getProceduresTransformationsCodes() {
return new PassCode_2021[]{
PassCode_2021.SPF_InlineProcedures,
PassCode_2021.SPF_InlineProceduresH,
PassCode_2021.SPF_DuplicateFunctionChains,
PassCode_2021.SPF_RemoveUnusedFunctions
public static PassCode[] getProceduresTransformationsCodes() {
return new PassCode[]{
PassCode.SPF_InlineProcedures,
PassCode.SPF_InlineProceduresH,
PassCode.SPF_DuplicateFunctionChains,
PassCode.SPF_RemoveUnusedFunctions
};
}
public static PassCode_2021[] getDVMTransformationsCodes() {
return new PassCode_2021[]{
PassCode_2021.SPF_RemoveDvmDirectivesToComments,
PassCode_2021.SPF_RemoveDvmDirectives,
PassCode_2021.SPF_RemoveOmpDirectives
public static PassCode[] getDVMTransformationsCodes() {
return new PassCode[]{
PassCode.SPF_RemoveDvmDirectivesToComments,
PassCode.SPF_RemoveDvmDirectives,
PassCode.SPF_RemoveOmpDirectives
};
}
public static PassCode_2021[] getIntervalsTransformationsCodes() {
return new PassCode_2021[]{
PassCode_2021.SPF_CreateIntervalsTree,
PassCode_2021.SPF_RemoveDvmIntervals
public static PassCode[] getIntervalsTransformationsCodes() {
return new PassCode[]{
PassCode.SPF_CreateIntervalsTree,
PassCode.SPF_RemoveDvmIntervals
};
}
public static PassCode_2021[] getRegionsTransformationsCodes() {
return new PassCode_2021[]{
PassCode_2021.SPF_ResolveParallelRegionConflicts,
PassCode_2021.SPF_InsertDvmhRegions
public static PassCode[] getRegionsTransformationsCodes() {
return new PassCode[]{
PassCode.SPF_ResolveParallelRegionConflicts,
PassCode.SPF_InsertDvmhRegions
};
}
public static PassCode_2021[] getPreparationTransformationsCodes() {
return new PassCode_2021[]{
PassCode_2021.SPF_RenameIncludes,
PassCode_2021.SPF_InsertIncludesPass,
PassCode_2021.SPF_CorrectCodeStylePass,
PassCode_2021.SPF_ConvertStructures,
PassCode_2021.SPF_CreateCheckpoints,
PassCode_2021.SPF_InitDeclsWithZero,
PassCode_2021.SPF_ExpressionSubstitution,
PassCode_2021.EraseBadSymbols,
PassCode_2021.SPF_RemoveComments,
PassCode_2021.SPF_RemoveDeadCode,
PassCode_2021.CombineFiles,
PassCode_2021.CopyProject,
PassCode_2021.PrepareForModulesAssembly,
PassCode_2021.DVMConvertProject,
PassCode_2021.SPF_ResolveCommonBlockConflicts,
PassCode_2021.SPF_InsertImplicitNone
public static PassCode[] getPreparationTransformationsCodes() {
return new PassCode[]{
PassCode.SPF_RenameIncludes,
PassCode.SPF_InsertIncludesPass,
PassCode.SPF_CorrectCodeStylePass,
PassCode.SPF_ConvertStructures,
PassCode.SPF_CreateCheckpoints,
PassCode.SPF_InitDeclsWithZero,
PassCode.SPF_ExpressionSubstitution,
PassCode.EraseBadSymbols,
PassCode.SPF_RemoveComments,
PassCode.SPF_RemoveDeadCode,
PassCode.CombineFiles,
PassCode.CopyProject,
PassCode.PrepareForModulesAssembly,
PassCode.DVMConvertProject,
PassCode.SPF_ResolveCommonBlockConflicts,
PassCode.SPF_InsertImplicitNone
};
}
//<editor-fold desc="компонент">
@@ -315,7 +315,7 @@ public abstract class Sapfor extends OSDComponent {
DBProjectFile cuf = null;
if (Current.HasFile()) {
cuf = Current.getFile();
Pass_2021.passes.get(PassCode_2021.CloseCurrentFile).Do();
Pass.passes.get(PassCode.CloseCurrentFile).Do();
}
if (mode) //модификация
{
@@ -339,23 +339,23 @@ public abstract class Sapfor extends OSDComponent {
} else CommonUI.Info("Сохранение файлов отсутствует.");
}
if (cuf != null)
Pass_2021.passes.get(PassCode_2021.OpenCurrentFile).Do(cuf);
Pass.passes.get(PassCode.OpenCurrentFile).Do(cuf);
}
//</editor-fold>
public Visual_DVM_2021.Passes.SapforAnalysis getAnalysisByPhase(String phase) {
for (PassCode_2021 analysis_code : getAnalysesCodes()) {
Visual_DVM_2021.Passes.SapforAnalysis analysis = (Visual_DVM_2021.Passes.SapforAnalysis) Pass_2021.passes.get(analysis_code);
for (PassCode analysis_code : getAnalysesCodes()) {
Visual_DVM_2021.Passes.SapforAnalysis analysis = (Visual_DVM_2021.Passes.SapforAnalysis) Pass.passes.get(analysis_code);
if (analysis.phase().equals(phase)) return analysis;
}
return null;
}
public void ResetAllAnalyses() {
for (PassCode_2021 code : getAnalysesCodes())
(Pass_2021.passes.get(code)).Reset();
for (PassCode code : getAnalysesCodes())
(Pass.passes.get(code)).Reset();
//------------------------------------------------------------------------------------------>>>> пакетный режим.
if (CommonUI.isActive()) {
Pass_2021.passes.get(PassCode_2021.Precompilation).Reset();
Pass_2021.passes.get(PassCode_2021.SPF_GetGCovInfo).Reset();
Pass.passes.get(PassCode.Precompilation).Reset();
Pass.passes.get(PassCode.SPF_GetGCovInfo).Reset();
}
Global.enable_text_changed = false;
Global.transformationPermission = TransformationPermission.None;
@@ -369,43 +369,43 @@ public abstract class Sapfor extends OSDComponent {
return ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
}
//----------
public static Vector<PassCode_2021> getScenariosCodes() {
Vector<PassCode_2021> res = new Vector<>();
res.add(PassCode_2021.SPF_InitDeclsWithZero);//+
res.add(PassCode_2021.SPF_ConvertStructures);//+
res.add(PassCode_2021.SPF_ExpressionSubstitution);//+
public static Vector<PassCode> getScenariosCodes() {
Vector<PassCode> res = new Vector<>();
res.add(PassCode.SPF_InitDeclsWithZero);//+
res.add(PassCode.SPF_ConvertStructures);//+
res.add(PassCode.SPF_ExpressionSubstitution);//+
//--
res.add(PassCode_2021.SPF_CreateCheckpoints); //+
res.add(PassCode_2021.SPF_CreateIntervalsTree);//+
res.add(PassCode_2021.SPF_RemoveDvmIntervals);//+
res.add(PassCode.SPF_CreateCheckpoints); //+
res.add(PassCode.SPF_CreateIntervalsTree);//+
res.add(PassCode.SPF_RemoveDvmIntervals);//+
//--
res.add(PassCode_2021.SPF_RemoveDvmDirectives); //+
res.add(PassCode_2021.SPF_RemoveDvmDirectivesToComments); //+
res.add(PassCode.SPF_RemoveDvmDirectives); //+
res.add(PassCode.SPF_RemoveDvmDirectivesToComments); //+
res.add(PassCode_2021.SPF_RemoveOmpDirectives);//+
res.add(PassCode_2021.SPF_RemoveComments);//+
res.add(PassCode_2021.SPF_RemoveDeadCode);//+
res.add(PassCode_2021.SPF_RenameIncludes);
res.add(PassCode_2021.SPF_InsertIncludesPass);//+
res.add(PassCode.SPF_RemoveOmpDirectives);//+
res.add(PassCode.SPF_RemoveComments);//+
res.add(PassCode.SPF_RemoveDeadCode);//+
res.add(PassCode.SPF_RenameIncludes);
res.add(PassCode.SPF_InsertIncludesPass);//+
//--
res.add(PassCode_2021.SPF_LoopEndDoConverterPass); //+
res.add(PassCode_2021.SPF_LoopUnion);//+
res.add(PassCode_2021.SPF_LoopFission);//+
res.add(PassCode.SPF_LoopEndDoConverterPass); //+
res.add(PassCode.SPF_LoopUnion);//+
res.add(PassCode.SPF_LoopFission);//+
//--
res.add(PassCode_2021.SPF_PrivateShrinking);//+
res.add(PassCode_2021.SPF_PrivateExpansion);//+
res.add(PassCode_2021.SPF_PrivateRemoving);//+
res.add(PassCode.SPF_PrivateShrinking);//+
res.add(PassCode.SPF_PrivateExpansion);//+
res.add(PassCode.SPF_PrivateRemoving);//+
//--
res.add(PassCode_2021.SPF_RemoveUnusedFunctions);//+
res.add(PassCode_2021.SPF_DuplicateFunctionChains);//+
res.add(PassCode.SPF_RemoveUnusedFunctions);//+
res.add(PassCode.SPF_DuplicateFunctionChains);//+
//--
res.add(PassCode_2021.SPF_ResolveParallelRegionConflicts);//+
res.add(PassCode_2021.SPF_ResolveCommonBlockConflicts);//+
res.add(PassCode.SPF_ResolveParallelRegionConflicts);//+
res.add(PassCode.SPF_ResolveCommonBlockConflicts);//+
//-
res.add(PassCode_2021.SPF_InsertDvmhRegions);//+
res.add(PassCode_2021.SPF_SharedMemoryParallelization);//+
res.add(PassCode_2021.SPF_InsertImplicitNone);//+
res.add(PassCode_2021.CreateParallelVariants); //?
res.add(PassCode.SPF_InsertDvmhRegions);//+
res.add(PassCode.SPF_SharedMemoryParallelization);//+
res.add(PassCode.SPF_InsertImplicitNone);//+
res.add(PassCode.CreateParallelVariants); //?
return res;
}
//------------------------------------------------------------------------------------------------------------------
@@ -517,7 +517,7 @@ public abstract class Sapfor extends OSDComponent {
Constants.parse_err_file)
&& (new File(workspace, "dvm.proj")).exists();
}
public static boolean analysis(File sapfor_drv, File workspace, PassCode_2021 code, String flags, Vector<String> result_lines) throws Exception {
public static boolean analysis(File sapfor_drv, File workspace, PassCode code, String flags, Vector<String> result_lines) throws Exception {
return performScript("analysis",
sapfor_drv,
workspace,
@@ -544,7 +544,7 @@ public abstract class Sapfor extends OSDComponent {
if (Sapfor.parse(sapfor, workspace, flags)
) {
Vector<String> outputLines = new Vector<>();
if (Sapfor.analysis(sapfor, workspace, PassCode_2021.SPF_GetMaxMinBlockDistribution, flags, outputLines)) {
if (Sapfor.analysis(sapfor, workspace, PassCode.SPF_GetMaxMinBlockDistribution, flags, outputLines)) {
//---
for (String line : outputLines) {
String prefix = "GET_MIN_MAX_BLOCK_DIST: ";

6
src/_VisualDVM/Repository/Component/Visualiser.java
View File

@@ -3,8 +3,8 @@ import Common.Utils.CommonUtils;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.io.File;
import java.io.IOException;
@@ -81,7 +81,7 @@ public class Visualiser extends Component {
if (workspace.exists())
return workspace;
else
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(
Pass.passes.get(PassCode.UpdateSetting).Do(
SettingName.Workspace, "");
}
return Global.ProjectsDirectory;

4
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.Repository.SubscriberWorkspace;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class SubscriberWorkspacesMenuBar extends DataMenuBar {
public SubscriberWorkspacesMenuBar() {
super("рабочие пространства", PassCode_2021.DeleteSubscriberWorkspace);
super("рабочие пространства", PassCode.DeleteSubscriberWorkspace);
}
}

12
src/_VisualDVM/Repository/Subscribes/SubscribersMenuBar.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.Repository.Subscribes;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class SubscribersMenuBar extends DataMenuBar {
public SubscribersMenuBar() {
super("Адресаты",
PassCode_2021.SaveBugReportExecutor,
PassCode_2021.SaveBugReportRecipients,
PassCode_2021.AddSubscriber,
PassCode_2021.EditSubscriber,
PassCode_2021.DeleteSubscriber);
PassCode.SaveBugReportExecutor,
PassCode.SaveBugReportRecipients,
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber);
}
}

8
src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java
View File

@@ -5,17 +5,17 @@ import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.TestingSystem.Common.Group.UI.AddGroupMenu;
import _VisualDVM.TestingSystem.Common.Group.UI.EditGroupMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
public class GroupsMenuBar extends DataMenuBar {
public GroupsMenuBar() {
super("группы",
PassCode_2021.SynchronizeTests,
PassCode_2021.ConvertCorrectnessTests
PassCode.SynchronizeTests,
PassCode.ConvertCorrectnessTests
);
addMenus(new AddGroupMenu(), new EditGroupMenu());
addPasses(PassCode_2021.DeleteGroup);
addPasses(PassCode.DeleteGroup);
add(new JSeparator());
add(new MenuBarButton() {
{

4
src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.TestingSystem.Common.Group.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class AddGroupMenu extends VisualiserMenu {
public AddGroupMenu() {
super("", "/icons/RedAdd.png");
addPasses(PassCode_2021.PublishGroup,PassCode_2021.CreateGroupFromDirectory,PassCode_2021.CreateGroupFromFiles);
addPasses(PassCode.PublishGroup, PassCode.CreateGroupFromDirectory, PassCode.CreateGroupFromFiles);
}
}

4
src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.TestingSystem.Common.Group.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class EditGroupMenu extends VisualiserMenu {
public EditGroupMenu() {
super("", "/icons/Edit.png" );
addPasses(PassCode_2021.EditGroup, PassCode_2021.ReplaceTestsFromFiles);
addPasses(PassCode.EditGroup, PassCode.ReplaceTestsFromFiles);
}
}

4
src/_VisualDVM/TestingSystem/Common/Test/TestsMenuBar.java
View File

@@ -2,11 +2,11 @@ package _VisualDVM.TestingSystem.Common.Test;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.TestingSystem.Common.Test.UI.AddTestMenu;
import _VisualDVM.TestingSystem.Common.Test.UI.EditTestMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class TestsMenuBar extends DataMenuBar {
public TestsMenuBar() {
super("тесты");
addMenus(new AddTestMenu(), new EditTestMenu());
addPasses(PassCode_2021.DownloadTest,PassCode_2021.DeleteTest);
addPasses(PassCode.DownloadTest, PassCode.DeleteTest);
}
}

12
src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class AddTestMenu extends VisualiserMenu {
public AddTestMenu() {
super("Добавление теста", "/icons/RedAdd.png", false);
add(Pass_2021.passes.get(PassCode_2021.CreateTestFromProject).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.CreateTestFromDirectory).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.CreateTestsFromFiles).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.CreateTestFromSelectedFiles).createMenuItem());
add(Pass.passes.get(PassCode.CreateTestFromProject).createMenuItem());
add(Pass.passes.get(PassCode.CreateTestFromDirectory).createMenuItem());
add(Pass.passes.get(PassCode.CreateTestsFromFiles).createMenuItem());
add(Pass.passes.get(PassCode.CreateTestFromSelectedFiles).createMenuItem());
}
}

8
src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class EditTestMenu extends VisualiserMenu {
public EditTestMenu() {
super("Редактирование теста", "/icons/Edit.png", false);
add(Pass_2021.passes.get(PassCode_2021.EditTest).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.ReplaceTestProject).createMenuItem());
add(Pass.passes.get(PassCode.EditTest).createMenuItem());
add(Pass.passes.get(PassCode.ReplaceTestProject).createMenuItem());
}
}

4
src/_VisualDVM/TestingSystem/Common/TestingBar.java
View File

@@ -5,7 +5,7 @@ import _VisualDVM.Global;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
import java.awt.*;
@@ -86,7 +86,7 @@ public class TestingBar extends VisualiserMenuBar {
});
addSeparator();
serverAdminLabel = addLabel(" управление сервером ");
addPasses(PassCode_2021.StartTestingServer, PassCode_2021.ShutdownTestingServer, PassCode_2021.PublishTestingServer);
addPasses(PassCode.StartTestingServer, PassCode.ShutdownTestingServer, PassCode.PublishTestingServer);
}
public void ShowAutoCheckTesting() {
autorefreshButton.setIcon(CommonUtils.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png"));

6
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -33,8 +33,8 @@ import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import Visual_DVM_2021.Passes.All.DownloadRepository;
import Visual_DVM_2021.Passes.All.ZipFolderPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
@@ -154,7 +154,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
public static Timer checkTimer = null;
public static void TimerOn() {
checkTimer = new Timer(Global.properties.CheckTestingIntervalSeconds * 1000, e -> {
Pass_2021.passes.get(PassCode_2021.ActualizePackages).Do();
Pass.passes.get(PassCode.ActualizePackages).Do();
});
checkTimer.start();
}

6
src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
View File

@@ -28,7 +28,7 @@ import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
import Visual_DVM_2021.Passes.All.ZipFolderPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
@@ -74,8 +74,8 @@ public class TestsDatabase extends SQLiteDatabase {
addTable(dvmSettings=new DVMSettingsDBTable());
}
@Override
public PassCode_2021 getSynchronizePassCode() {
return PassCode_2021.SynchronizeTests;
public PassCode getSynchronizePassCode() {
return PassCode.SynchronizeTests;
}
public Vector<SapforPackage> getFirstActiveSapforPackagesCopies() {
Vector<SapforPackage> res = new Vector<>();

14
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
View File

@@ -1,18 +1,18 @@
package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class DVMConfigurationsMenuBar extends DataMenuBar {
public DVMConfigurationsMenuBar() {
super("конфигурации");
addPasses(
PassCode_2021.PublishConfiguration,
PassCode.PublishConfiguration,
PassCode_2021.EditConfiguration,
PassCode_2021.ShowCurrentDVMConfigurationTests,
PassCode_2021.SaveCurrentDVMConfiguration,
PassCode_2021.DeleteConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode_2021.StartSelectedDVMConfigurations
PassCode.StartSelectedDVMConfigurations
);
}
}

6
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -6,8 +6,8 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.Visual.UI;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.util.Comparator;
import java.util.Date;
@@ -63,7 +63,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
}
@Override
public void MouseAction2() throws Exception {
Pass_2021.passes.get(PassCode_2021.DownloadDVMPackage).Do();
Pass.passes.get(PassCode.DownloadDVMPackage).Do();
}
};

12
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
View File

@@ -3,19 +3,19 @@ import Common.Utils.CommonUtils;
import _VisualDVM.Global;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Controls.MenuBarButton;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
public class DVMPackagesBar extends DataMenuBar {
public DVMPackagesBar() {
super("пакеты задач DVM");
addPasses(PassCode_2021.SynchronizeTests);
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode_2021.AbortDVMPackage );
addPasses(PassCode.AbortDVMPackage );
addSeparator();
addPasses(PassCode_2021.DownloadDVMPackage,
PassCode_2021.ExportDVMPackageToExcel,
PassCode_2021.DeleteDVMPackage);
addPasses(PassCode.DownloadDVMPackage,
PassCode.ExportDVMPackageToExcel,
PassCode.DeleteDVMPackage);
add(new JSeparator());
add(new MenuBarButton() {
{

10
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class DVMSettingsBar extends DataMenuBar {
public DVMSettingsBar() {
super("параметры тестированя",
PassCode_2021.PublishDVMSettings,
PassCode_2021.CloneDVMSettings,
PassCode_2021.EditDVMSettings,
PassCode_2021.DeleteDVMSettings
PassCode.PublishDVMSettings,
PassCode.CloneDVMSettings,
PassCode.EditDVMSettings,
PassCode.DeleteDVMSettings
);
}
}

8
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
View File

@@ -2,8 +2,8 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import _VisualDVM.Current;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.Windows.Dialog.DialogFields;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
@@ -38,7 +38,7 @@ public class DVMSettingsFields implements DialogFields {
bAddFlags.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021 pass = Pass_2021.passes.get(PassCode_2021.PickCompilerOptions);
Pass pass = Pass.passes.get(PassCode.PickCompilerOptions);
if (pass.Do(Current.getCompiler())) {
tfFlags.setText((String)pass.target);
}
@@ -47,7 +47,7 @@ public class DVMSettingsFields implements DialogFields {
bAddEnvironments.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021 pass = Pass_2021.passes.get(PassCode_2021.PickCompilerEnvironmentsForTesting);
Pass pass = Pass.passes.get(PassCode.PickCompilerEnvironmentsForTesting);
if (pass.Do(Current.getCompiler()))
tfEnvironments.setText((String)pass.target);
}

4
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class DVMRunTasksBar extends DataMenuBar {
public DVMRunTasksBar() {
super("задачи",
PassCode_2021.CompareDVMRunTasks, PassCode_2021.DownloadTaskTest);
PassCode.CompareDVMRunTasks, PassCode.DownloadTaskTest);
}
}

4
src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.SAPFOR.Json;
import Common.CommonConstants;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import com.google.gson.annotations.Expose;
import java.io.Serializable;
@@ -16,7 +16,7 @@ public class SapforConfiguration_json implements Serializable {
@Expose
public String flags = "";
@Expose
public List<PassCode_2021> codes = new Vector<>();
public List<PassCode> codes = new Vector<>();
//--
public SapforConfiguration_json() {
}

14
src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java
View File

@@ -6,8 +6,8 @@ import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json;
import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.io.File;
import java.nio.file.Paths;
@@ -15,7 +15,7 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.Vector;
public class PerformSapforTask extends Pass_2021<SapforTask> {
public class PerformSapforTask extends Pass<SapforTask> {
@Override
public String getDescription() {
return "";
@@ -59,7 +59,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
}
}
//слегка изменить подход.
protected boolean transformation(PassCode_2021 code) throws Exception {
protected boolean transformation(PassCode code) throws Exception {
task = new File(parentTask, "v1");
Utils.CheckAndCleanDirectory(task); //папка для преобразования.
//если версия пустая, это тоже результат тестирования. Поэтому должна учитываться в древе.
@@ -103,7 +103,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
target.variants.add(
new SapforVersion_json(
root.getAbsolutePath(),
file.getAbsolutePath(), PassCode_2021.SPF_CreateParallelVariant.getDescription()));
file.getAbsolutePath(), PassCode.SPF_CreateParallelVariant.getDescription()));
}
}
//-------------------------------------------------->>
@@ -113,10 +113,10 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
target.versions.add(version_json = new SapforVersion_json(target.test_description, "исходная"));
String [] data = target.codes.split(" ");
for (String code_s: data){
PassCode_2021 code = PassCode_2021.valueOf(code_s);
PassCode code = PassCode.valueOf(code_s);
//--
if (parse()) {
if (code.equals(PassCode_2021.CreateParallelVariants))
if (code.equals(PassCode.CreateParallelVariants))
variants();
else if (!transformation(code))
break;

14
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
View File

@@ -1,17 +1,17 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class SapforConfigurationsMenuBar extends DataMenuBar {
public SapforConfigurationsMenuBar() {
super("конфигурации",
PassCode_2021.PublishSapforConfiguration,
PassCode.PublishSapforConfiguration,
PassCode_2021.EditSapforConfiguration,
PassCode_2021.ShowCurrentSAPFORConfigurationTests,
PassCode_2021.SaveCurrentSAPFORConfiguration,
PassCode_2021.DeleteSapforConfiguration,
PassCode.EditSapforConfiguration,
PassCode.ShowCurrentSAPFORConfigurationTests,
PassCode.SaveCurrentSAPFORConfiguration,
PassCode.DeleteSapforConfiguration,
PassCode_2021.StartSelectedSAPFORConfigurations
PassCode.StartSelectedSAPFORConfigurations
);
}
}

6
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -4,8 +4,8 @@ import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.util.Comparator;
import java.util.Date;
@@ -46,7 +46,7 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
}
@Override
public void MouseAction2() throws Exception {
Pass_2021.passes.get(PassCode_2021.CompareSapforPackages).Do();
Pass.passes.get(PassCode.CompareSapforPackages).Do();
}
};
}

20
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
View File

@@ -5,7 +5,7 @@ import _VisualDVM.Global;
import Common.Utils.TextLog;
import _VisualDVM.TestingSystem.Common.Settings.Settings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import java.util.List;
import java.util.Vector;
@@ -50,22 +50,22 @@ public class SapforSettings extends Settings {
}
public SapforSettings() {
}
public Vector<PassCode_2021> getCodes() {
Vector<PassCode_2021> res = new Vector<>();
public Vector<PassCode> getCodes() {
Vector<PassCode> res = new Vector<>();
for (SapforSettingsCommand command : Global.testingServer.db.sapforSettingsCommands.Data.values())
if (command.sapforsettings_id == id) res.add(command.passCode);
return res;
}
public List<PassCode_2021> getCheckedCodes(){
Vector<PassCode_2021> res = getCodes();
if (!res.firstElement().equals(PassCode_2021.SPF_InsertIncludesPass))
res.insertElementAt(PassCode_2021.SPF_CorrectCodeStylePass,0); //всегда добавляется.
public List<PassCode> getCheckedCodes(){
Vector<PassCode> res = getCodes();
if (!res.firstElement().equals(PassCode.SPF_InsertIncludesPass))
res.insertElementAt(PassCode.SPF_CorrectCodeStylePass,0); //всегда добавляется.
return res;
}
@Override
public boolean validate(TextLog Log) {
boolean res = true;
Vector<PassCode_2021> codes = getCodes();
Vector<PassCode> codes = getCodes();
if (codes.size() == 0) {
Log.Writeln_("Настройки:" + id + " не содержат ни одного прохода.");
return false;
@@ -73,9 +73,9 @@ public class SapforSettings extends Settings {
//-
int first = 0;
int last = codes.size() - 1;
Vector<PassCode_2021> matches = new Vector<>();
Vector<PassCode> matches = new Vector<>();
for (int i = 0; i < codes.size(); ++i) {
PassCode_2021 code = codes.get(i);
PassCode code = codes.get(i);
if (code.isSapforStart()) {
if (i > first) {
Log.Writeln_("Неверные настройки:" + id + ": проход" +

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class SapforSettingsBar extends DataMenuBar {
public SapforSettingsBar() {
super("параметры тестирования",
PassCode_2021.PublishSapforSettings,
PassCode_2021.CloneSapforSettings,
PassCode_2021.EditSapforSettings,
PassCode_2021.DeleteSapforSettings
PassCode.PublishSapforSettings,
PassCode.CloneSapforSettings,
PassCode.EditSapforSettings,
PassCode.DeleteSapforSettings
);
}
}

6
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
View File

@@ -3,13 +3,13 @@ import Common.Visual.CommonUI;
import Common.Visual.Tables.StyledCellLabel;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
import java.awt.*;
public class SapforSettingsCommandFields implements DialogFields {
private JPanel content;
public JComboBox<PassCode_2021> cbPassCode;
public JComboBox<PassCode> cbPassCode;
@Override
public Component getContent() {
return content;
@@ -26,7 +26,7 @@ public class SapforSettingsCommandFields implements DialogFields {
return res;
});
//-
for (PassCode_2021 code : Sapfor.getScenariosCodes())
for (PassCode code : Sapfor.getScenariosCodes())
cbPassCode.addItem(code);
}
}

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java
View File

@@ -3,12 +3,12 @@ import Common.CommonConstants;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import com.sun.org.glassfish.gmbal.Description;
public class SapforSettingsCommand extends riDBObject {
@Description("DEFAULT -1")
public int sapforsettings_id = CommonConstants.Nan;
public PassCode_2021 passCode = PassCode_2021.SPF_RemoveDvmDirectives;
public PassCode passCode = PassCode.SPF_RemoveDvmDirectives;
@Override
public boolean isVisible() {
return Current.HasSapforSettings() && (Current.getSapforSettings().id == sapforsettings_id);

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class SapforSettingsCommandsBar extends DataMenuBar {
public SapforSettingsCommandsBar() {
super("команды",
PassCode_2021.PublishSapforSettingsCommand,
PassCode_2021.EditSapforSettingsCommand,
PassCode_2021.DeleteSapforSettingsCommand
PassCode.PublishSapforSettingsCommand,
PassCode.EditSapforSettingsCommand,
PassCode.DeleteSapforSettingsCommand
);
}
}

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
View File

@@ -6,7 +6,7 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import java.util.Vector;
public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsCommand> {
@@ -66,14 +66,14 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
}
@Override
public void ProcessResult() {
Result.passCode = (PassCode_2021) fields.cbPassCode.getSelectedItem();
Result.passCode = (PassCode) fields.cbPassCode.getSelectedItem();
Result.sapforsettings_id = Current.getSapforSettings().id;
}
};
}
//--
public Vector<PassCode_2021> getCodes(SapforSettings sapforSettings) {
Vector<PassCode_2021> res = new Vector<>();
public Vector<PassCode> getCodes(SapforSettings sapforSettings) {
Vector<PassCode> res = new Vector<>();
for (SapforSettingsCommand command : Data.values()) {
if (command.sapforsettings_id == sapforSettings.id)
res.add(command.passCode);

8
src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java
View File

@@ -7,7 +7,7 @@ import _VisualDVM.TestingSystem.SAPFOR.Json.*;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackageTreeNode;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTaskNode;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.VersionNode;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import com.google.gson.annotations.Expose;
import com.sun.org.glassfish.gmbal.Description;
@@ -105,7 +105,7 @@ public class SapforTask extends DBObject {
versionsLines.add(CommonUtils.Brackets(versions.get(i).description));
}
if (!variants.isEmpty()) {
versionsLines.add(CommonUtils.Brackets(PassCode_2021.CreateParallelVariants.getDescription()));
versionsLines.add(CommonUtils.Brackets(PassCode.CreateParallelVariants.getDescription()));
}
return String.join("→", versionsLines);
}
@@ -175,7 +175,7 @@ public class SapforTask extends DBObject {
String[] data = codes.split(" ");
Vector<String> strings = new Vector<>();
for (String code_s : data) {
PassCode_2021 code = PassCode_2021.valueOf(code_s);
PassCode code = PassCode.valueOf(code_s);
strings.add(CommonUtils.Brackets(code.getDescription()));
}
return String.join("→", strings);
@@ -234,7 +234,7 @@ public class SapforTask extends DBObject {
//---------------
flags = sapforConfiguration_json.flags;
Vector<String> codes_s = new Vector<>();
for (PassCode_2021 code : sapforConfiguration_json.codes)
for (PassCode code : sapforConfiguration_json.codes)
codes_s.add(code.toString());
codes = String.join(" ", codes_s);
}

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
View File

@@ -4,19 +4,19 @@ import _VisualDVM.Global;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
public class SapforPackagesBar extends DataMenuBar {
public SapforPackagesBar() {
super("пакеты задач SAPFOR");
addPasses(PassCode_2021.SynchronizeTests);
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode_2021.AbortSapforPackage);
addPasses(PassCode.AbortSapforPackage);
addSeparator();
addPasses(PassCode_2021.CompareSapforPackages);
addPasses(PassCode.CompareSapforPackages);
addSeparator();
addPasses(PassCode_2021.DeleteSapforPackage);
addPasses(PassCode.DeleteSapforPackage);
add(new JSeparator());
add(new MenuBarButton() {
{

4
src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
@@ -60,7 +60,7 @@ public class SapforTasksPackageTree extends DataTree {
//---
if (o instanceof SapforVersion_json) {
SapforVersion_json version = (SapforVersion_json) o;
CurrentAnchestor.set(current, version);
Current_.set(current, version);
if (current.equals(Current.SapforEtalonVersion))
UI.getMainWindow().getTestingWindow().ShowCurrentSapforPackageVersionEtalon();
else

10
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class ServerSapforsBar extends DataMenuBar {
public ServerSapforsBar() {
super("версии SAPFOR",
PassCode_2021.CompileServerSapfor,
PassCode_2021.ShowSapforCompilationOut,
PassCode_2021.ShowSapforCompilationErr,
PassCode_2021.DeleteServerSapfor
PassCode.CompileServerSapfor,
PassCode.ShowSapforCompilationOut,
PassCode.ShowSapforCompilationErr,
PassCode.DeleteServerSapfor
);
}
}

6
src/_VisualDVM/Visual/Controls/PassButton.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Visual.Controls;
import Common.Visual.Controls.MenuBarButton;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import java.awt.*;
public class PassButton extends MenuBarButton implements PassControl {
public PassButton(Pass_2021 pass, boolean tab) {
public PassButton(Pass pass, boolean tab) {
setText(pass.getButtonText());
setToolTipText(pass.getDescription());
if (pass.getIconPath() != null) {
@@ -20,7 +20,7 @@ public class PassButton extends MenuBarButton implements PassControl {
addActionListener(pass.getControlAction());
pass.controls.add(this);
}
public PassButton(Pass_2021 pass) {
public PassButton(Pass pass) {
this(pass, false);
}
}

6
src/_VisualDVM/Visual/Menus/AttachementsMenu.java
View File

@@ -3,8 +3,8 @@ import Common.Utils.CommonUtils;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import _VisualDVM.Current;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
@@ -13,7 +13,7 @@ public class AttachementsMenu extends StyledPopupMenu {
JMenuItem mscreenshot;
JMenuItem mExplorer;
public AttachementsMenu() {
add(mscreenshot = Pass_2021.passes.get(PassCode_2021.MakeScreenShot).createMenuItem());
add(mscreenshot = Pass.passes.get(PassCode.MakeScreenShot).createMenuItem());
addSeparator();
mExplorer = new VisualiserMenuItem("Открыть вложения в проводнике...", "/icons/Explorer.png");
mExplorer.addActionListener(

6
src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java
View File

@@ -3,8 +3,8 @@ import _VisualDVM.Current;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -20,7 +20,7 @@ public class CredentialsBar extends VisualiserMenuBar {
addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.UpdateProperty).Do("collapseCredentials", false);
Pass.passes.get(PassCode.UpdateProperty).Do("collapseCredentials", false);
}
});
}

10
src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
View File

@@ -4,14 +4,14 @@ import Common.Visual.CommonUI;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
import java.util.LinkedHashMap;
public class FastAccessMenuBar extends VisualiserMenuBar {
LinkedHashMap<PassCode_2021, JButton> passesButtons = new LinkedHashMap<>();
LinkedHashMap<PassCode, JButton> passesButtons = new LinkedHashMap<>();
public FastAccessMenuBar() {
Refresh();
}
@@ -19,7 +19,7 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
public void setSizeLimits() {
//если задавать PreffredSize 0, скролл НЕ РАБОТАЕТ. Магия!
}
public void showPass(Pass_2021 pass) {
public void showPass(Pass pass) {
JButton button = null;
if (passesButtons.containsKey(pass.code()))
button = passesButtons.get((pass.code()));
@@ -36,7 +36,7 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
public void Refresh() {
CommonUI.Clear(this);
int i = 1;
for (Pass_2021 pass : Pass_2021.FAPasses) {
for (Pass pass : Pass.FAPasses) {
if (pass.stats.HasUsages()) {
showPass(pass);
++i;

4
src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
View File

@@ -3,7 +3,7 @@ import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javax.swing.*;
import java.awt.*;
@@ -22,7 +22,7 @@ public class FileMenuBar extends VisualiserMenuBar {
addActionListener(e -> UI.ShowSearchForm());
}
});
addPasses(PassCode_2021.Save);
addPasses(PassCode.Save);
add(new MenuBarButton() {
{
setToolTipText("Увеличить шрифт(Ctrl+'+')");

20
src/_VisualDVM/Visual/Menus/MainEditorMenu.java
View File

@@ -11,8 +11,8 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
import _VisualDVM.ProjectData.SapforData.Loops.Loop;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import javax.swing.*;
@@ -41,7 +41,7 @@ public class MainEditorMenu extends TextEditorMenu {
m_gotoHeader.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.OpenCurrentFile).Do(header);
Pass.passes.get(PassCode.OpenCurrentFile).Do(header);
}
});
add(m_gotoHeader);
@@ -60,7 +60,7 @@ public class MainEditorMenu extends TextEditorMenu {
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.SPF_InlineProcedure).Do(call);
Pass.passes.get(PassCode.SPF_InlineProcedure).Do(call);
}
});
add(m_inline);
@@ -70,7 +70,7 @@ public class MainEditorMenu extends TextEditorMenu {
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.SPF_LoopUnionCurrent).Do();
Pass.passes.get(PassCode.SPF_LoopUnionCurrent).Do();
}
});
add(m_loop_union);
@@ -80,7 +80,7 @@ public class MainEditorMenu extends TextEditorMenu {
@Override
public void actionPerformed(ActionEvent e) {
try {
Pass_2021.passes.get(PassCode_2021.SPF_ChangeSpfIntervals).Do(
Pass.passes.get(PassCode.SPF_ChangeSpfIntervals).Do(
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionStart()) + 1,
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionEnd()) + 1,
1
@@ -97,7 +97,7 @@ public class MainEditorMenu extends TextEditorMenu {
@Override
public void actionPerformed(ActionEvent e) {
try {
Pass_2021.passes.get(PassCode_2021.SPF_ChangeSpfIntervals).Do(
Pass.passes.get(PassCode.SPF_ChangeSpfIntervals).Do(
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionStart()) + 1,
((RSyntaxTextArea) editor).getLineOfOffset(editor.getSelectionEnd()) + 1,
0
@@ -229,7 +229,7 @@ public class MainEditorMenu extends TextEditorMenu {
m_gotoFunction.setToolTipText(tip);
return;
}
if (!Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
if (!Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
" . Выполните проход \"Граф процедур \".");
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
@@ -277,7 +277,7 @@ public class MainEditorMenu extends TextEditorMenu {
m_gotoHeader.setText("Невозможно перейти к заголовочному файлу. В текущей строке не найдено включений.");
return;
}
if (!Pass_2021.passes.get(PassCode_2021.SPF_GetIncludeDependencies).isDone()) {
if (!Pass.passes.get(PassCode.SPF_GetIncludeDependencies).isDone()) {
m_gotoHeader.setText("Невозможно перейти к заголовочному файлу. Выполните проход \"Поиск зависимостей по включению\"");
return;
}
@@ -293,7 +293,7 @@ public class MainEditorMenu extends TextEditorMenu {
private void checkLoop() {
loop = null;
m_loop_union.setEnabled(false);
if (!Pass_2021.passes.get(PassCode_2021.SPF_GetGraphLoops).isDone()) {
if (!Pass.passes.get(PassCode.SPF_GetGraphLoops).isDone()) {
m_loop_union.setText("Невозможно объединить цикл в текущей строке со следующим. " +
"Выполните проход \"Граф циклов\"");
return;

10
src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java
View File

@@ -1,14 +1,14 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class AnalysesMenu extends VisualiserMenu {
public AnalysesMenu() {
super("Анализаторы","/icons/Analyses.png" );
for (PassCode_2021 code : Sapfor.getAnalysesCodes())
add(Pass_2021.passes.get(code).createMenuItem());
for (PassCode code : Sapfor.getAnalysesCodes())
add(Pass.passes.get(code).createMenuItem());
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.SPF_GetGCovInfo).createMenuItem());
add(Pass.passes.get(PassCode.SPF_GetGCovInfo).createMenuItem());
}
}

20
src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java
View File

@@ -1,20 +1,20 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class GlobalCleaningMenu extends VisualiserMenu {
public GlobalCleaningMenu() {
super("Очистка", "/icons/Clean.png", false);
add(Pass_2021.passes.get(PassCode_2021.DropLastProjects).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DropFastAccess).createMenuItem());
add(Pass.passes.get(PassCode.DropLastProjects).createMenuItem());
add(Pass.passes.get(PassCode.DropFastAccess).createMenuItem());
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.DeleteDownloadedBugReports).createMenuItem());
add(Pass.passes.get(PassCode.DeleteDownloadedBugReports).createMenuItem());
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.DropAnalyses).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.CleanAnalyses).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DropSavedArrays).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DeleteDebugResults).createMenuItem());
add(Pass.passes.get(PassCode.DropAnalyses).createMenuItem());
add(Pass.passes.get(PassCode.CleanAnalyses).createMenuItem());
add(Pass.passes.get(PassCode.DropSavedArrays).createMenuItem());
add(Pass.passes.get(PassCode.DeleteDebugResults).createMenuItem());
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.ResetCurrentProject).createMenuItem());
add(Pass.passes.get(PassCode.ResetCurrentProject).createMenuItem());
}
}

6
src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
View File

@@ -5,8 +5,8 @@ import _VisualDVM.Visual.Menus.VisualiserMenu;
import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import javax.swing.event.MenuEvent;
@@ -29,7 +29,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
i.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Pass_2021.passes.get(PassCode_2021.OpenCurrentProject).Do(new File(p.HomePath));
Pass.passes.get(PassCode.OpenCurrentProject).Do(new File(p.HomePath));
}
});
add(i);

26
src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
View File

@@ -6,8 +6,8 @@ import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
import _VisualDVM.Visual.UI;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
@@ -17,7 +17,7 @@ public class MainMenuBar extends VisualiserMenuBar {
MenuBarButton components;
public MainMenuBar() {
addMenus(new LastOpenedProjectsMenu());
addPasses(PassCode_2021.OpenCurrentProject, PassCode_2021.CreateEmptyProject);
addPasses(PassCode.OpenCurrentProject, PassCode.CreateEmptyProject);
addMenus(
analyses = new AnalysesMenu(),
transformations = new TransformationsMenu(),
@@ -32,7 +32,7 @@ public class MainMenuBar extends VisualiserMenuBar {
if (PerformanceAnalyzer.isActive) {
CommonUI.Info("Перед работой с компонентами закройте анализатор производительности!");
} else {
Pass_2021.passes.get(PassCode_2021.GetComponentsActualVersions).Do();
Pass.passes.get(PassCode.GetComponentsActualVersions).Do();
Global.RefreshUpdatesStatus();
UI.ShowComponentsWindow();
}
@@ -50,7 +50,7 @@ public class MainMenuBar extends VisualiserMenuBar {
}
});
*/
addPasses(PassCode_2021.ShowInstruction);
addPasses(PassCode.ShowInstruction);
//-
setPreferredSize(new Dimension(0, 30));
//---
@@ -61,7 +61,7 @@ public class MainMenuBar extends VisualiserMenuBar {
setIcon("/icons/Apply.png");
setToolTipText("Test");
addActionListener(e -> {
Pass_2021.passes.get(PassCode_2021.TestPass).Do();
Pass.passes.get(PassCode.TestPass).Do();
});
}
});
@@ -76,14 +76,14 @@ public class MainMenuBar extends VisualiserMenuBar {
public void ShowProject(boolean flag) {
analyses.setEnabled(flag);
transformations.setEnabled(flag);
Pass_2021[] cleaningPasses = new Pass_2021[]{
Pass_2021.passes.get(PassCode_2021.DropAnalyses),
Pass_2021.passes.get(PassCode_2021.DropSavedArrays),
Pass_2021.passes.get(PassCode_2021.CleanAnalyses),
Pass_2021.passes.get(PassCode_2021.DeleteDebugResults),
Pass_2021.passes.get(PassCode_2021.ResetCurrentProject)
Pass[] cleaningPasses = new Pass[]{
Pass.passes.get(PassCode.DropAnalyses),
Pass.passes.get(PassCode.DropSavedArrays),
Pass.passes.get(PassCode.CleanAnalyses),
Pass.passes.get(PassCode.DeleteDebugResults),
Pass.passes.get(PassCode.ResetCurrentProject)
};
for (Pass_2021 pass : cleaningPasses) {
for (Pass pass : cleaningPasses) {
pass.setControlsEnabled(flag);
}
}

6
src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java
View File

@@ -2,8 +2,8 @@ package _VisualDVM.Visual.Menus.MainMenuBar;
import _VisualDVM.Visual.Menus.PassesSubMenu;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class TransformationsMenu extends VisualiserMenu {
public TransformationsMenu() {
super("Преобразования", "/icons/Transformations.png");
@@ -27,7 +27,7 @@ public class TransformationsMenu extends VisualiserMenu {
Sapfor.getRegionsTransformationsCodes()
));
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.SPF_SharedMemoryParallelization).createMenuItem());
add(Pass.passes.get(PassCode.SPF_SharedMemoryParallelization).createMenuItem());
addSeparator();
add(new PassesSubMenu("Предобработка проекта", "/icons/Menu/Preprocessing.png",
Sapfor.getPreparationTransformationsCodes()

4
src/_VisualDVM/Visual/Menus/PassMenuItem.java
View File

@@ -1,14 +1,14 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.Menus.VisualiserMenuItem;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import _VisualDVM.Visual.Controls.PassControl;
public class PassMenuItem extends VisualiserMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(CommonUtils.getIcon(icon_path));
}
public PassMenuItem(Pass_2021 pass) {
public PassMenuItem(Pass pass) {
setText(pass.getDescription());
setToolTipText(pass.getDescription());
if (pass.getIconPath() != null) setIcon(pass.getIconPath());

10
src/_VisualDVM/Visual/Menus/PassesSubMenu.java
View File

@@ -2,17 +2,17 @@ package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
public class PassesSubMenu extends JMenu {
public PassesSubMenu(String title, String icon, PassCode_2021... passes) {
public PassesSubMenu(String title, String icon, PassCode... passes) {
super(title);
setIcon(CommonUtils.getIcon(icon));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
for (PassCode_2021 code : passes) {
add(Pass_2021.passes.get(code).createMenuItem());
for (PassCode code : passes) {
add(Pass.passes.get(code).createMenuItem());
}
}
}

56
src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
View File

@@ -8,8 +8,8 @@ import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.LanguageName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
import javax.swing.*;
import java.awt.*;
@@ -39,19 +39,19 @@ public class ProjectFilesMenu extends GraphMenu {
add(m);
addSeparator();
add(new PassesSubMenu("Добавить", "/icons/RedAdd.png",
PassCode_2021.AddFile,
PassCode_2021.CreateEmptyDirectory,
PassCode_2021.ImportFiles));
PassCode.AddFile,
PassCode.CreateEmptyDirectory,
PassCode.ImportFiles));
addSeparator();
add(new PassesSubMenu("Переименовать", "/icons/Menu/Rename.png",
PassCode_2021.RenameFile,
PassCode_2021.RenameDirectory));
PassCode.RenameFile,
PassCode.RenameDirectory));
add(new VisualiserMenuItem("Удалить текущий проект", "/icons/Delete.png") {
{
addActionListener(e -> {
if (Current.HasProject()) {
UI.getVersionsWindow().getVersionsForm().getTree().SelectNode(Current.getProject().node);
Pass_2021.passes.get(PassCode_2021.DeleteVersion).Do();
Pass.passes.get(PassCode.DeleteVersion).Do();
}
});
}
@@ -83,32 +83,32 @@ public class ProjectFilesMenu extends GraphMenu {
});
add(m_unselect_all);
//--------------------------------------------------
add(mLanguage = new LanguagesSubmenu(PassCode_2021.SetSelectedFilesLanguage.getDescription()) {
add(mLanguage = new LanguagesSubmenu(PassCode.SetSelectedFilesLanguage.getDescription()) {
@Override
public void action(LanguageName languageName) {
Pass_2021.passes.get(PassCode_2021.SetSelectedFilesLanguage).Do(languageName);
Pass.passes.get(PassCode.SetSelectedFilesLanguage).Do(languageName);
}
});
add(mStyle = new StylesSubmenu(PassCode_2021.SetSelectedFilesStyle.getDescription()) {
add(mStyle = new StylesSubmenu(PassCode.SetSelectedFilesStyle.getDescription()) {
@Override
public void action(LanguageStyle languageStyle) {
Pass_2021.passes.get(PassCode_2021.SetSelectedFilesStyle).Do(languageStyle);
Pass.passes.get(PassCode.SetSelectedFilesStyle).Do(languageStyle);
}
});
add(mType = new TypesSubmenu(PassCode_2021.SetSelectedFilesType.getDescription()) {
add(mType = new TypesSubmenu(PassCode.SetSelectedFilesType.getDescription()) {
@Override
public void action(FileType fileType) {
Pass_2021.passes.get(PassCode_2021.SetSelectedFilesType).Do(fileType);
Pass.passes.get(PassCode.SetSelectedFilesType).Do(fileType);
}
});
//--------------------------------------------------
add(Pass_2021.passes.get(PassCode_2021.ExcludeSelectedFiles).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.IncludeSelectedFiles).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.ExcludeFile).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.IncludeFile).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DeleteFile).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DeleteDirectory).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DeleteSelectedFiles).createMenuItem());
add(Pass.passes.get(PassCode.ExcludeSelectedFiles).createMenuItem());
add(Pass.passes.get(PassCode.IncludeSelectedFiles).createMenuItem());
add(Pass.passes.get(PassCode.ExcludeFile).createMenuItem());
add(Pass.passes.get(PassCode.IncludeFile).createMenuItem());
add(Pass.passes.get(PassCode.DeleteFile).createMenuItem());
add(Pass.passes.get(PassCode.DeleteDirectory).createMenuItem());
add(Pass.passes.get(PassCode.DeleteSelectedFiles).createMenuItem());
}
@Override
public void CheckElementsVisibility() {
@@ -118,15 +118,15 @@ public class ProjectFilesMenu extends GraphMenu {
mStyle.setVisible(Global.files_multiselection);
mType.setVisible(Global.files_multiselection);
//-
Pass_2021.passes.get(PassCode_2021.ExcludeFile).setControlsVisible(!Global.files_multiselection);
Pass_2021.passes.get(PassCode_2021.IncludeFile).setControlsVisible(!Global.files_multiselection);
Pass.passes.get(PassCode.ExcludeFile).setControlsVisible(!Global.files_multiselection);
Pass.passes.get(PassCode.IncludeFile).setControlsVisible(!Global.files_multiselection);
//-
Pass_2021.passes.get(PassCode_2021.DeleteFile).setControlsVisible(!Global.files_multiselection);
Pass_2021.passes.get(PassCode_2021.DeleteDirectory).setControlsVisible(!Global.files_multiselection);
Pass.passes.get(PassCode.DeleteFile).setControlsVisible(!Global.files_multiselection);
Pass.passes.get(PassCode.DeleteDirectory).setControlsVisible(!Global.files_multiselection);
//--
Pass_2021.passes.get(PassCode_2021.ExcludeSelectedFiles).setControlsVisible(Global.files_multiselection);
Pass_2021.passes.get(PassCode_2021.IncludeSelectedFiles).setControlsVisible(Global.files_multiselection);
Pass_2021.passes.get(PassCode_2021.DeleteSelectedFiles).setControlsVisible(Global.files_multiselection);
Pass.passes.get(PassCode.ExcludeSelectedFiles).setControlsVisible(Global.files_multiselection);
Pass.passes.get(PassCode.IncludeSelectedFiles).setControlsVisible(Global.files_multiselection);
Pass.passes.get(PassCode.DeleteSelectedFiles).setControlsVisible(Global.files_multiselection);
}
}

4
src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -21,7 +21,7 @@ public class ProjectViewMenu extends VisualiserMenu {
setIcon(CommonUtils.getIcon(view.getIcon()));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
addActionListener(e -> {
CurrentAnchestor.set(Current.ProjectView, view);
Current_.set(Current.ProjectView, view);
UI.getMainWindow().getProjectWindow().ShowProjectView();
});
}

8
src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.Selectable;
@@ -41,7 +41,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
m_select_for_current.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Object o = CurrentAnchestor.get(tree.getCurrent());
Object o = Current_.get(tree.getCurrent());
if (o instanceof Selectable) {
((Selectable) o).SelectAllChildren(true);
}
@@ -54,7 +54,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
m_unselect_for_current.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
Object o = CurrentAnchestor.get(tree.getCurrent());
Object o = Current_.get(tree.getCurrent());
if (o instanceof Selectable) {
((Selectable) o).SelectAllChildren(false);
}
@@ -68,7 +68,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
public abstract void SelectAll(boolean select);
@Override
public void CheckElementsVisibility() {
Object current = CurrentAnchestor.get(tree.getCurrent());
Object current = Current_.get(tree.getCurrent());
if ((current != null) && (current.getClass().equals(getTargetClass()))) {
String name = ((Selectable) current).getSelectionText();
m_select_for_current.setText("Выбрать всё для " +

4
src/_VisualDVM/Visual/Menus/StablePassMenuItem.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import _VisualDVM.Visual.Controls.PassControl;
public class StablePassMenuItem extends StableMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(CommonUtils.getIcon(icon_path));
}
public StablePassMenuItem(Pass_2021 pass) {
public StablePassMenuItem(Pass pass) {
setText(pass.getDescription());
setToolTipText(pass.getDescription());
if (pass.getIconPath() != null) setIcon(pass.getIconPath());

6
src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Visual.Menus.VariantsMenuBar;
import Common.Visual.Menus.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class VariantsMenuBar extends DataMenuBar {
public VariantsMenuBar() {
super("варианты");
addPasses(PassCode_2021.ShowAllParallelVariants, PassCode_2021.ShowParallelVariantsCoverage,
PassCode_2021.PredictParallelVariants, PassCode_2021.CreateParallelVariants);
addPasses(PassCode.ShowAllParallelVariants, PassCode.ShowParallelVariantsCoverage,
PassCode.PredictParallelVariants, PassCode.CreateParallelVariants);
}
}

18
src/_VisualDVM/Visual/Menus/VersionsMenu.java
View File

@@ -5,16 +5,16 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import Common.Visual.Trees.DataTree;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class VersionsMenu extends GraphMenu<DataTree> {
VisualiserMenuItem m_select_all;
VisualiserMenuItem m_unselect_all;
VisualiserMenuItem m_multiselection;
public VersionsMenu(DataTree tree) {
super(tree, "подверсии");
add(Pass_2021.passes.get(PassCode_2021.DeleteSubversions).createMenuItem());
add(Pass_2021.passes.get(PassCode_2021.DeleteLonelyM).createMenuItem());
add(Pass.passes.get(PassCode.DeleteSubversions).createMenuItem());
add(Pass.passes.get(PassCode.DeleteLonelyM).createMenuItem());
addSeparator();
m_multiselection = new VisualiserMenuItem("Массовый режим работы с версиями");
m_multiselection.setIcon(CommonUtils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
@@ -26,7 +26,7 @@ public class VersionsMenu extends GraphMenu<DataTree> {
});
add(m_multiselection);
addSeparator();
add(Pass_2021.passes.get(PassCode_2021.DeleteVersion).createMenuItem());
add(Pass.passes.get(PassCode.DeleteVersion).createMenuItem());
//-
m_select_all = new StableMenuItem("Выбрать всё, кроме резервных копий","/icons/SelectAll.png");
m_select_all.addActionListener(e -> {
@@ -40,13 +40,13 @@ public class VersionsMenu extends GraphMenu<DataTree> {
tree.updateUI();
});
add(m_unselect_all);
add(Pass_2021.passes.get(PassCode_2021.DeleteSelectedVersions).createMenuItem());
add(Pass.passes.get(PassCode.DeleteSelectedVersions).createMenuItem());
}
@Override
public void CheckElementsVisibility() {
Pass_2021.passes.get(PassCode_2021.DeleteSelectedVersions).setControlsVisible(!Global.versions_multiselection);
Pass_2021.passes.get(PassCode_2021.DeleteSelectedVersions).setControlsVisible(Global.versions_multiselection);
Pass_2021.passes.get(PassCode_2021.DeleteVersion).setControlsVisible(!Global.versions_multiselection);
Pass.passes.get(PassCode.DeleteSelectedVersions).setControlsVisible(!Global.versions_multiselection);
Pass.passes.get(PassCode.DeleteSelectedVersions).setControlsVisible(Global.versions_multiselection);
Pass.passes.get(PassCode.DeleteVersion).setControlsVisible(!Global.versions_multiselection);
m_select_all.setVisible(Global.versions_multiselection);
m_unselect_all.setVisible(Global.versions_multiselection);
}

4
src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.Visual.Menus.VersionsMenuBar;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class VersionsMenuBar extends VisualiserMenuBar {
public VersionsMenuBar(){
addPasses(PassCode_2021.CreateTestsGroupFromSelectedVersions);
addPasses(PassCode.CreateTestsGroupFromSelectedVersions);
}
}

Some files were not shown because too many files have changed in this diff Show More