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

6
src/Visual_DVM_2021/Passes/AbortTestingPackage.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -21,8 +21,8 @@ public abstract class AbortTestingPackage extends TestingSystemPass<TestingPacka
@Override
protected boolean canStart(Object... args) throws Exception {
packageToKill = null;
if (CurrentAnchestor.Check(Log, currentName())) {
target = (TestingPackage) CurrentAnchestor.get(currentName());
if (Current_.Check(Log, currentName())) {
target = (TestingPackage) Current_.get(currentName());
switch (target.state) {
case Done:
case Aborted:

12
src/Visual_DVM_2021/Passes/All/ActualizePackages.java
View File

@@ -1,15 +1,15 @@
package Visual_DVM_2021.Passes.All;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class ActualizePackages extends Pass_2021 {
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class ActualizePackages extends Pass {
@Override
protected boolean needsAnimation() {
return false;
}
@Override
protected void body() throws Exception {
passes.get(PassCode_2021.ActualizeDVMPackages).Do();
passes.get(PassCode_2021.ActualizeSapforPackages).Do();
passes.get(PassCode_2021.ActualizeServerSapfors).Do();
passes.get(PassCode.ActualizeDVMPackages).Do();
passes.get(PassCode.ActualizeSapforPackages).Do();
passes.get(PassCode.ActualizeServerSapfors).Do();
}
}

8
src/Visual_DVM_2021/Passes/All/ActualizeServerSapfors.java
View File

@@ -1,14 +1,14 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Global;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class ActualizeServerSapfors extends Pass_2021 {
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class ActualizeServerSapfors extends Pass {
@Override
protected boolean canStart(Object... args) throws Exception {
return Global.testingServer.db.hasActiveSapfors();
}
@Override
protected void body() throws Exception {
passes.get(PassCode_2021.SynchronizeTests).Do();
passes.get(PassCode.SynchronizeTests).Do();
}
}

4
src/Visual_DVM_2021/Passes/All/AddBugReport.java
View File

@@ -11,7 +11,7 @@ import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Component.ComponentType;
import Visual_DVM_2021.Passes.AddObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import java.io.File;
import java.nio.file.Files;
@@ -81,7 +81,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
Files.copy(file.toPath(), Paths.get(attachementsDir.getAbsolutePath(), file.getName()), StandardCopyOption.REPLACE_EXISTING);
}
//запаковка рута
passes.get(PassCode_2021.ZipFolderPass).Do(Current.getRoot().Home.getAbsolutePath(), BugReportInterface.getArchiveFile(target).getAbsolutePath());
passes.get(PassCode.ZipFolderPass).Do(Current.getRoot().Home.getAbsolutePath(), BugReportInterface.getArchiveFile(target).getAbsolutePath());
}
}
@Override

4
src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java
View File

@@ -4,8 +4,8 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
import Visual_DVM_2021.Passes.Pass_2021;
public class AddDVMParameterForTesting extends Pass_2021<String> {
import Visual_DVM_2021.Passes.Pass;
public class AddDVMParameterForTesting extends Pass<String> {
@Override
protected boolean canStart(Object... args) throws Exception {
DBObjectDialog<DVMParameter, DVMParameterFields> dialog =

4
src/Visual_DVM_2021/Passes/All/AddSubscriber.java
View File

@@ -3,7 +3,7 @@ import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.Subscribes.Subscriber;
import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class AddSubscriber extends ComponentsRepositoryPass<Subscriber> {
@Override
public String getIconPath() {
@@ -28,7 +28,7 @@ public class AddSubscriber extends ComponentsRepositoryPass<Subscriber> {
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeBugReports).Do();
passes.get(PassCode.SynchronizeBugReports).Do();
}
@Override
protected void showDone() throws Exception {

4
src/Visual_DVM_2021/Passes/All/AddUser.java
View File

@@ -7,7 +7,7 @@ import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.User.User;
import Visual_DVM_2021.Passes.AddObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class AddUser extends AddObjectPass<User> {
public AddUser() {
super(User.class);
@@ -35,6 +35,6 @@ public class AddUser extends AddObjectPass<User> {
@Override
protected void showDone() throws Exception {
super.showDone();
passes.get(PassCode_2021.InitialiseUser).Do();
passes.get(PassCode.InitialiseUser).Do();
}
}

8
src/Visual_DVM_2021/Passes/All/AppendBugReportField.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
@@ -9,7 +9,7 @@ import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import javafx.util.Pair;
import java.util.Date;
@@ -31,7 +31,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (CurrentAnchestor.Check(Log, Current.BugReport)) {
if (Current_.Check(Log, Current.BugReport)) {
target = Current.getBugReport();
if (!BugReportInterface.CheckNotDraft(target,Log))
return false;
@@ -83,7 +83,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
message_text = target.comment;
break;
}
passes.get(PassCode_2021.Email).Do(
passes.get(PassCode.Email).Do(
new EmailMessage(
message_header + " " + CommonUtils.Brackets(Current.getAccount().name),
message_text,

12
src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java
View File

@@ -1,13 +1,13 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Repository.BugReport.BugReport;
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;
public class ApplyBugReportSettings extends Pass_2021<BugReport> {
public class ApplyBugReportSettings extends Pass<BugReport> {
@Override
public String getIconPath() {
return "/icons/Apply.png";
@@ -22,7 +22,7 @@ public class ApplyBugReportSettings extends Pass_2021<BugReport> {
}
@Override
protected boolean canStart(Object... args) {
if (CurrentAnchestor.Check(Log, Current.BugReport)) {
if (Current_.Check(Log, Current.BugReport)) {
target = Current.getBugReport();
long vv = target.visualiser_version;
if (vv < 500) {
@@ -49,7 +49,7 @@ public class ApplyBugReportSettings extends Pass_2021<BugReport> {
//--
//само применение.
for (SettingName settingName : to_apply.keySet())
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(
Pass.passes.get(PassCode.UpdateSetting).Do(
settingName,
to_apply.get(settingName));
//сохранить настройки бага как профиль

14
src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java
View File

@@ -1,16 +1,16 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
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.Vector;
public class ApplyCurrentFunction extends Pass_2021 {
public class ApplyCurrentFunction extends Pass {
@Override
public String getIconPath() {
return "/icons/Apply.png";
@@ -21,7 +21,7 @@ public class ApplyCurrentFunction extends Pass_2021 {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
if (passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
ComboTextDialog ff = new ComboTextDialog();
Vector<String> names = new Vector<>(Current.getProject().allFunctions.keySet());
names.sort(Comparator.naturalOrder());
@@ -29,7 +29,7 @@ public class ApplyCurrentFunction extends Pass_2021 {
String func_name = ff.Result;
if (Current.getProject().allFunctions.containsKey(func_name)) {
FuncInfo fi = Current.getProject().allFunctions.get(func_name);
CurrentAnchestor.set(Current.Function, fi);
Current_.set(Current.Function, fi);
return true;
} else {
Log.Writeln_("Проект не содержит процедуры с именем " + CommonUtils.Brackets(func_name));
@@ -42,7 +42,7 @@ public class ApplyCurrentFunction extends Pass_2021 {
protected void showDone() throws Exception {
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();
}
}
}

14
src/Visual_DVM_2021/Passes/All/ApplyProfile.java
View File

@@ -1,15 +1,15 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
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 ApplyProfile extends Pass_2021<SapforProfile> {
public class ApplyProfile extends Pass<SapforProfile> {
@Override
public String getIconPath() {
return "/icons/Apply.png";
@@ -24,8 +24,8 @@ public class ApplyProfile extends Pass_2021<SapforProfile> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (CurrentAnchestor.Check(Log, Current.SapforProfile)) {
target = (SapforProfile) CurrentAnchestor.get(Current.SapforProfile);
if (Current_.Check(Log, Current.SapforProfile)) {
target = (SapforProfile) Current_.get(Current.SapforProfile);
return true;
}
return false;
@@ -39,7 +39,7 @@ public class ApplyProfile extends Pass_2021<SapforProfile> {
//--
for (SapforProfileSetting setting : settings)
if (((GlobalDatabase)CommonUtils.db).settings.containsKey(setting.name))
passes.get(PassCode_2021.UpdateSetting).Do(setting.name, setting.value);
passes.get(PassCode.UpdateSetting).Do(setting.name, setting.value);
//--
}
}

6
src/Visual_DVM_2021/Passes/All/BuildComponent.java
View File

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Utils;
import _VisualDVM.Repository.Component.Component;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.ProcessPass;
@@ -10,8 +10,8 @@ import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
public class BuildComponent extends ProcessPass<Component> {
@Override
protected PassCode_2021 necessary() {
return PassCode_2021.DownloadRepository;
protected PassCode necessary() {
return PassCode.DownloadRepository;
}
@Override
protected boolean resetsNecessary() {

14
src/Visual_DVM_2021/Passes/All/CheckAccount.java
View File

@@ -1,9 +1,9 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class CheckAccount extends Pass_2021<Boolean> {
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class CheckAccount extends Pass<Boolean> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = false;
@@ -47,9 +47,9 @@ public class CheckAccount extends Pass_2021<Boolean> {
//временно. оффлайн проверка по почте
target = Current.getAccount().email.equals("?") ?
(Pass_2021.passes.get(PassCode_2021.EditAccount).Do() &&
Pass_2021.passes.get(PassCode_2021.CheckRegistrationOnServer).Do()) :
(Pass_2021.passes.get(PassCode_2021.CheckRegistrationOnServer).Do());
(Pass.passes.get(PassCode.EditAccount).Do() &&
Pass.passes.get(PassCode.CheckRegistrationOnServer).Do()) :
(Pass.passes.get(PassCode.CheckRegistrationOnServer).Do());
}
@Override
protected boolean validate() {
@@ -63,7 +63,7 @@ public class CheckAccount extends Pass_2021<Boolean> {
UI.getMainWindow().getCallbackWindow().ShowCurrentBugReport();
}
if (Current.getAccount().isAdmin())
Pass_2021.passes.get(PassCode_2021.PublishComponent).setControlsVisible(true);
Pass.passes.get(PassCode.PublishComponent).setControlsVisible(true);
setControlsVisible(false); //если проверка успешна, кнопку больше не показывать.
}
}

4
src/Visual_DVM_2021/Passes/All/CloneCurrentDVMConfiguration.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import Visual_DVM_2021.Passes.Pass_2021;
public class CloneCurrentDVMConfiguration extends Pass_2021<DVMConfiguration> {
import Visual_DVM_2021.Passes.Pass;
public class CloneCurrentDVMConfiguration extends Pass<DVMConfiguration> {
}

8
src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -22,7 +22,7 @@ import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage_json;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import Visual_DVM_2021.Passes.AddObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.util.Vector;
@@ -140,7 +140,7 @@ public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
return false;
}
//-
if (!CurrentAnchestor.Check(Log, Current.Machine, Current.User, Current.Compiler))
if (!Current_.Check(Log, Current.Machine, Current.User, Current.Compiler))
return false;
//---
if (!Current.getMachine().type.equals(MachineType.Server)) {
@@ -156,7 +156,7 @@ public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
return false;
}
if (!Current.getCompiler().versionLoaded)
passes.get(PassCode_2021.ShowCompilerVersion).Do(Current.getCompiler(), false);
passes.get(PassCode.ShowCompilerVersion).Do(Current.getCompiler(), false);
//-
for (DVMPackage dvmPackage : Global.testingServer.db.dvmPackages.Data.values()) {
if (dvmPackage.state.equals(TasksPackageState.Draft)) {

4
src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -82,7 +82,7 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
if (!Current.getAccount().CheckRegistered(Log))
return false;
//--
if (!CurrentAnchestor.Check(Log, Current.ServerSapfor))
if (!Current_.Check(Log, Current.ServerSapfor))
return false;
if (!Current.getServerSapfor().state.equals(ServerSapforState.Done)) {
Log.Writeln_("Выбранная версия SAPFOR не собрана!");

6
src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java
View File

@@ -7,7 +7,7 @@ import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Server.CloneServerObject;
//автоматической
import java.util.Vector;
@@ -22,9 +22,9 @@ public class CloneSapforSettings extends CloneServerObject<TestingServer, Sapfor
@Override
protected void ServerAction() throws Exception {
super.ServerAction();
Vector<PassCode_2021> codes = src.getCodes();
Vector<PassCode> codes = src.getCodes();
Vector<DBObject> new_commands = new Vector<>();
for (PassCode_2021 code : codes) {
for (PassCode code : codes) {
SapforSettingsCommand command = new SapforSettingsCommand();
command.sapforsettings_id = (int) pk;
command.passCode = code;

20
src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
View File

@@ -1,14 +1,14 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
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.*;
public class CloseCurrentFile extends Pass_2021<DBProjectFile> {
public class CloseCurrentFile extends Pass<DBProjectFile> {
@Override
public String getIconPath() {
return "/icons/Close.png";
@@ -30,18 +30,18 @@ public class CloseCurrentFile extends Pass_2021<DBProjectFile> {
//действия по закрытию. сохранение и т д.
target.form.SaveSplitters();
target.UpdateLastLine(target.form.getEditor().getCurrentLine());
passes.get(PassCode_2021.Save).Do();
passes.get(PassCode.Save).Do();
UI.getSearchReplaceWindow().ClearMarkers();
target.form = null;
}
@Override
protected void performDone() throws Exception {
CurrentAnchestor.set(Current.File, null);
CurrentAnchestor.set(Current.FileGraphElement, null);
Current_.set(Current.File, null);
Current_.set(Current.FileGraphElement, null);
//-
CurrentAnchestor.set(Current.Notes, null);
CurrentAnchestor.set(Current.Warnings, null);
CurrentAnchestor.set(Current.Errors, null);
Current_.set(Current.Notes, null);
Current_.set(Current.Warnings, null);
Current_.set(Current.Errors, null);
//-
}
@Override

32
src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
View File

@@ -1,15 +1,15 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Project.db_project_info;
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 CloseCurrentProject extends Pass_2021<db_project_info> {
public class CloseCurrentProject extends Pass<db_project_info> {
@Override
public String getButtonText() {
return "";
@@ -28,7 +28,7 @@ public class CloseCurrentProject extends Pass_2021<db_project_info> {
}
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode_2021.CloseCurrentFile).Do();
passes.get(PassCode.CloseCurrentFile).Do();
}
@Override
protected void body() throws Exception {
@@ -41,18 +41,18 @@ public class CloseCurrentProject extends Pass_2021<db_project_info> {
//--
Current.getSapfor().ResetAllAnalyses();
Current.getSapfor().cd(CommonUtils.getHomeDirectory());
CurrentAnchestor.set(Current.Project, null);
CurrentAnchestor.set(Current.File, null);
CurrentAnchestor.set(Current.Function, null);
CurrentAnchestor.set(Current.SelectedFunction,null);
CurrentAnchestor.set(Current.ProjectNode, null);
CurrentAnchestor.set(Current.SelectedFile, null);
CurrentAnchestor.set(Current.SelectedDirectory, null);
Current_.set(Current.Project, null);
Current_.set(Current.File, null);
Current_.set(Current.Function, null);
Current_.set(Current.SelectedFunction,null);
Current_.set(Current.ProjectNode, null);
Current_.set(Current.SelectedFile, null);
Current_.set(Current.SelectedDirectory, null);
//-мб перестраховка. мб и нет.
CurrentAnchestor.set(Current.ParallelVariant, null);
CurrentAnchestor.set(Current.Dimensions, null);
CurrentAnchestor.set(Current.Array, null);
CurrentAnchestor.set(Current.DBArray, null);
Current_.set(Current.ParallelVariant, null);
Current_.set(Current.Dimensions, null);
Current_.set(Current.Array, null);
Current_.set(Current.DBArray, null);
//-
}
@Override

8
src/Visual_DVM_2021/Passes/All/CloseProject.java
View File

@@ -1,10 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.Pass_2021;
public class CloseProject extends Pass_2021<db_project_info> {
import Visual_DVM_2021.Passes.Pass;
public class CloseProject extends Pass<db_project_info> {
@Override
protected boolean canStart(Object... args) throws Exception {
return (target = Current.getProject()) != null;
@@ -17,7 +17,7 @@ public class CloseProject extends Pass_2021<db_project_info> {
protected void performDone() throws Exception {
Current.getSapfor().ResetAllAnalyses();
Current.getSapfor().cd(CommonUtils.getHomeDirectory());
CurrentAnchestor.set(Current.Project, null);
Current_.set(Current.Project, null);
//-
}
}

6
src/Visual_DVM_2021/Passes/All/CombineFiles.java
View File

@@ -5,7 +5,7 @@ import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Transformation;
import _VisualDVM.Visual.Windows.CombineFilesDialog;
import org.apache.commons.io.FileUtils;
@@ -19,8 +19,8 @@ public class CombineFiles extends Transformation {
ComboTextDialog fd = null;
protected File result = null;
@Override
protected PassCode_2021 necessary() {
return PassCode_2021.SPF_GetIncludeDependencies;
protected PassCode necessary() {
return PassCode.SPF_GetIncludeDependencies;
}
@Override
protected boolean canStart(Object... args) throws Exception {

4
src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java
View File

@@ -5,10 +5,10 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import java.util.Vector;
public class CompareDVMRunTasks extends Pass_2021<Vector<DVMRunTask>> {
public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {
DVMRunTask master;
DVMRunTask slave;
@Override

4
src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java
View File

@@ -5,10 +5,10 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import java.util.Vector;
public class CompareSapforPackages extends Pass_2021<Vector<SapforPackage>> {
public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
SapforPackage master;
SapforPackage slave;
@Override

22
src/Visual_DVM_2021/Passes/All/Compile.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
@@ -10,15 +10,15 @@ import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.GlobalData.User.UserState;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.Project.db_project_info;
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;
public class Compile extends Pass_2021<db_project_info> {
Pass_2021 subpass = null;
import Visual_DVM_2021.Passes.Pass;
public class Compile extends Pass<db_project_info> {
Pass subpass = null;
CompilationTask compilationTask = null;
@Override
protected PassCode_2021 necessary() {
return Current.getProject().languageName.equals(LanguageName.fortran) ? PassCode_2021.SPF_ParseFilesWithOrder : null;
protected PassCode necessary() {
return Current.getProject().languageName.equals(LanguageName.fortran) ? PassCode.SPF_ParseFilesWithOrder : null;
}
@Override
public String getIconPath() {
@@ -30,7 +30,7 @@ public class Compile extends Pass_2021<db_project_info> {
}
@Override
protected boolean canStart(Object... args) {
if (CurrentAnchestor.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile)) {
if (Current_.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile)) {
target = Current.getProject();
subpass = null;
compilationTask = null;
@@ -67,15 +67,15 @@ public class Compile extends Pass_2021<db_project_info> {
switch (Current.getMachine().type) {
case Local:
if (CommonUtils.isWindows()) {
subpass = passes.get(PassCode_2021.WindowsLocalCompilation);
subpass = passes.get(PassCode.WindowsLocalCompilation);
} else
subpass = passes.get(PassCode_2021.LinuxLocalCompilation);
subpass = passes.get(PassCode.LinuxLocalCompilation);
break;
case Undefined:
case MVS_cluster:
throw new PassException("Компиляция не реализована для типа машины " + CommonUtils.DQuotes(Current.getMachine().type));
default:
subpass = passes.get(PassCode_2021.RemoteCompilation);
subpass = passes.get(PassCode.RemoteCompilation);
break;
}
subpass.Do(Current.getCompilationTask(), Current.getProject());

14
src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java
View File

@@ -1,11 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.io.File;
@@ -28,7 +28,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
Log.Writeln_("Вы не являетесь администратором");
return false;
}
if (!CurrentAnchestor.Check(Log, Current.ServerSapfor)){
if (!Current_.Check(Log, Current.ServerSapfor)){
return false;
}
return CommonUI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.");
@@ -39,9 +39,9 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
}
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode_2021.CloseCurrentProject);
CurrentAnchestor.set(Current.Root, null);
CurrentAnchestor.set(Current.Version, null);
passes.get(PassCode.CloseCurrentProject);
Current_.set(Current.Root, null);
Current_.set(Current.Version, null);
}
@Override
protected void showPreparation() throws Exception {
@@ -54,7 +54,7 @@ public class ConvertCorrectnessTests extends TestingSystemPass<File> {
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeTests).Do();
passes.get(PassCode.SynchronizeTests).Do();
}
}

6
src/Visual_DVM_2021/Passes/All/CopyProject.java
View File

@@ -5,7 +5,7 @@ import _VisualDVM.Global;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Utils;
import Visual_DVM_2021.Passes.CurrentProjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.UI.CopyProjectFields;
import org.apache.commons.io.FileUtils;
@@ -63,8 +63,8 @@ public class CopyProject extends CurrentProjectPass {
@Override
protected void performDone() throws Exception {
if (CommonUI.Question("копия текущего проекта успешно создана по адресу\n" + dstFile.getAbsolutePath() + "\nОткрыть её")) {
passes.get(PassCode_2021.CloseCurrentProject).Do();
passes.get(PassCode_2021.OpenCurrentProject).Do(dstFile);
passes.get(PassCode.CloseCurrentProject).Do();
passes.get(PassCode.OpenCurrentProject).Do(dstFile);
}
}
}

4
src/Visual_DVM_2021/Passes/All/CreateDVMPackageFromCurrentProject.java
View File

@@ -1,4 +1,4 @@
package Visual_DVM_2021.Passes.All;
import Visual_DVM_2021.Passes.Pass_2021;
public class CreateDVMPackageFromCurrentProject extends Pass_2021 {
import Visual_DVM_2021.Passes.Pass;
public class CreateDVMPackageFromCurrentProject extends Pass {
}

8
src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java
View File

@@ -3,13 +3,13 @@ import Common.Utils.CommonUtils;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import Common.Visual.Windows.Dialog.Text.FileNameForm;
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 java.io.File;
import java.nio.file.Paths;
public class CreateEmptyProject extends Pass_2021<File> {
public class CreateEmptyProject extends Pass<File> {
String project_name;
FileNameForm ff = new FileNameForm();
@Override
@@ -41,6 +41,6 @@ public class CreateEmptyProject extends Pass_2021<File> {
}
@Override
protected void performDone() throws Exception {
passes.get(PassCode_2021.OpenCurrentProject).Do(target);
passes.get(PassCode.OpenCurrentProject).Do(target);
}
}

12
src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
View File

@@ -5,8 +5,8 @@ import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Utils;
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.util.Arrays;
@@ -18,8 +18,8 @@ public class CreateGroupFromDirectory extends PublishTests {
return "/icons/OpenProject.png";
}
@Override
protected PassCode_2021 getCreateTestCode() {
return PassCode_2021.CreateTestFromDirectory;
protected PassCode getCreateTestCode() {
return PassCode.CreateTestFromDirectory;
}
@Override
protected String getNoFilesMessage() {
@@ -58,12 +58,12 @@ public class CreateGroupFromDirectory extends PublishTests {
Log.Writeln_("В выбранной папке не найдено ни одной папки");
return false;
}
if (passes.get(PassCode_2021.PublishGroup).Do(dir.getName().toUpperCase())) {
if (passes.get(PassCode.PublishGroup).Do(dir.getName().toUpperCase())) {
group = Current.getGroup();
} else return false;
//---------------
Vector<File> files = new Vector<>(Arrays.asList(files_));
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, directoryChooser.getCurrentDirectory());
Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, directoryChooser.getCurrentDirectory());
return super.canStart(files, group);
}
}

12
src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java
View File

@@ -6,8 +6,8 @@ import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.TestingSystem.Common.Group.Group;
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.util.Vector;
@@ -16,8 +16,8 @@ public class CreateGroupFromFiles extends PublishTests{
VFileChooser fileChooser = new VFileChooser("Выберите файлы для создания тестов");
@Override
protected PassCode_2021 getCreateTestCode() {
return PassCode_2021.CreateTestFromFile;
protected PassCode getCreateTestCode() {
return PassCode.CreateTestFromFile;
}
@Override
protected String getNoFilesMessage() {
@@ -32,7 +32,7 @@ public class CreateGroupFromFiles extends PublishTests{
return false;
}
File dir = fileChooser.getCurrentDirectory();
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
//---------------
if (dir.getName().equals(Constants.data)) {
Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
@@ -44,7 +44,7 @@ public class CreateGroupFromFiles extends PublishTests{
+ CommonUtils.printAllForbiddenCharacters() + ", или кириллицу.");
return false;
}
if (passes.get(PassCode_2021.PublishGroup).Do(dir.getName().toUpperCase())) {
if (passes.get(PassCode.PublishGroup).Do(dir.getName().toUpperCase())) {
group = Current.getGroup();
} else return false;
//--

6
src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.VariantsMassPass;
public class CreateParallelVariants extends VariantsMassPass {
@Override
@@ -13,8 +13,8 @@ public class CreateParallelVariants extends VariantsMassPass {
return "";
}
@Override
public PassCode_2021 getSubPassCode() {
return PassCode_2021.SPF_CreateParallelVariant;
public PassCode getSubPassCode() {
return PassCode.SPF_CreateParallelVariant;
}
@Override
protected void FocusResult() {

14
src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Constants;
import _VisualDVM.Current;
@@ -11,15 +11,15 @@ import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.TestingSystem.Common.Group.Group;
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;
import java.util.Arrays;
import java.util.Vector;
public class CreateTestFromDirectory extends Pass_2021<Test> {
public class CreateTestFromDirectory extends Pass<Test> {
@Override
public String getIconPath() {
return "/icons/OpenProject.png";
@@ -37,7 +37,7 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
boolean from_files_chooser = false;
//--
void saveDirectory() {
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory,
Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory,
(dir.getParentFile() == null) ? dir.getAbsolutePath() : dir.getParent()
);
}
@@ -71,7 +71,7 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
if (args.length == 0) {
//--
from_files_chooser = true;
if (!CurrentAnchestor.Check(Log, Current.Group))
if (!Current_.Check(Log, Current.Group))
return false;
group = Current.getGroup();
if (!selectFiles())
@@ -214,6 +214,6 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
protected void performDone() throws Exception {
super.performDone();
if (from_files_chooser)
passes.get(PassCode_2021.PublishTest).Do(target);
passes.get(PassCode.PublishTest).Do(target);
}
}

4
src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
View File

@@ -9,11 +9,11 @@ import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
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;
public class CreateTestFromFile extends Pass_2021<Test> {
public class CreateTestFromFile extends Pass<Test> {
//----
Group group;
ProjectFile projectFile;

4
src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.ProjectFile;
@@ -15,7 +15,7 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
@Override
protected boolean canStart(Object... args) throws Exception {
if (args.length == 0) {
if (CurrentAnchestor.Check(Log, Current.Group, Current.Project)) {
if (Current_.Check(Log, Current.Group, Current.Project)) {
project = Current.getProject();
if (super.canStart(Current.getProject().Home, Current.getGroup())){
from_files_chooser = true; //чтобы опубликовал.

14
src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java
View File

@@ -1,19 +1,19 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Utils;
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.util.Vector;
public class CreateTestsFromFiles extends PublishTests {
VFileChooser fileChooser = new VFileChooser("Выберите файлы для создания тестов");
@Override
protected PassCode_2021 getCreateTestCode() {
return PassCode_2021.CreateTestFromFile;
protected PassCode getCreateTestCode() {
return PassCode.CreateTestFromFile;
}
@Override
protected String getNoFilesMessage() {
@@ -21,14 +21,14 @@ public class CreateTestsFromFiles extends PublishTests {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (CurrentAnchestor.Check(Log, Current.Group)){
if (Current_.Check(Log, Current.Group)){
Utils.RestoreSelectedDirectory(fileChooser);
Vector<File> files = fileChooser.ShowMultiDialog();
if (files.isEmpty()){
Log.Writeln_("Не выбрано ни одного файла.");
return false;
}
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, fileChooser.getCurrentDirectory());
Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, fileChooser.getCurrentDirectory());
return super.canStart(files, Current.getGroup());
}
return false;

14
src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
View File

@@ -1,12 +1,12 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.TestingSystem.Common.Test.Test;
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 CreateTestsGroupFromSelectedVersions extends PublishTests {
@@ -15,14 +15,14 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
return "/icons/Publish.png";
}
@Override
protected PassCode_2021 getCreateTestCode() {
return PassCode_2021.CreateTestFromProject;
protected PassCode getCreateTestCode() {
return PassCode.CreateTestFromProject;
}
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
//---
if (CurrentAnchestor.Check(Log, Current.Group)) {
if (Current_.Check(Log, Current.Group)) {
group = Current.getGroup();
} else
return false;
@@ -34,7 +34,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
return false;
}
//---
Pass_2021 createTestPass = passes.get(getCreateTestCode());
Pass createTestPass = passes.get(getCreateTestCode());
//---
for (db_project_info version : versions) {
if (createTestPass.Do(version, group))

10
src/Visual_DVM_2021/Passes/All/DVMConvertProject.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -13,7 +13,7 @@ import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import org.apache.commons.io.FileUtils;
import javax.swing.*;
@@ -41,7 +41,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
version = null;
badFiles = "";
//--
if (CurrentAnchestor.Check(Log, Current.Project)) {
if (Current_.Check(Log, Current.Project)) {
target = Current.getProject();
programsToConvert = target.getPrograms().get(target.languageName);
programsNames = new Vector<>();
@@ -61,7 +61,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
FileUtils.forceMkdir(cleanCopy);
archive = Paths.get(workspace.getAbsolutePath(), target.name + ".zip").toFile();
target.Clone(cleanCopy, false);
if (!passes.get(PassCode_2021.ZipFolderPass).Do(cleanCopy.getAbsolutePath(), archive.getAbsolutePath())) {
if (!passes.get(PassCode.ZipFolderPass).Do(cleanCopy.getAbsolutePath(), archive.getAbsolutePath())) {
Log.Writeln_("Не удалось создать архив проекта!");
return false;
}
@@ -107,7 +107,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
versionArchive = new File(workspace, target.name + "_result.zip");
response.Unpack(versionArchive);
File result = new File(workspace, "result");
if (passes.get(PassCode_2021.UnzipFolderPass).Do(versionArchive.getAbsolutePath(), result.getAbsolutePath())) {
if (passes.get(PassCode.UnzipFolderPass).Do(versionArchive.getAbsolutePath(), result.getAbsolutePath())) {
if (target.last_modification == null) {
target.last_modification = new db_project_info(target,
"m",

4
src/Visual_DVM_2021/Passes/All/DeleteBugReport.java
View File

@@ -4,7 +4,7 @@ import Common.Database.Database;
import _VisualDVM.Global;
import _VisualDVM.Repository.BugReport.BugReport;
import Visual_DVM_2021.Passes.DeleteObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class DeleteBugReport extends DeleteObjectPass<BugReport> {
public DeleteBugReport() {
super(BugReport.class);
@@ -16,7 +16,7 @@ public class DeleteBugReport extends DeleteObjectPass<BugReport> {
@Override
protected void performDone() throws Exception {
super.performDone();
passes.get(PassCode_2021.DeleteBugReportFromServer).Do(target);
passes.get(PassCode.DeleteBugReportFromServer).Do(target);
}
@Override
protected Database getDb() {

10
src/Visual_DVM_2021/Passes/All/DeleteDirectory.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -7,7 +7,7 @@ import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.ChangeFilePass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.PassException;
import org.apache.commons.io.FileUtils;
@@ -36,7 +36,7 @@ public class DeleteDirectory extends ChangeFilePass {
@Override
protected void performPreparation() throws Exception {
if (Current.HasFile() && (Utils.isAnchestor(Current.getFile().file, target_dir)))
passes.get(PassCode_2021.CloseCurrentFile).Do();
passes.get(PassCode.CloseCurrentFile).Do();
}
@Override
protected void body() throws Exception {
@@ -56,7 +56,7 @@ public class DeleteDirectory extends ChangeFilePass {
}
@Override
protected void performDone() throws Exception {
CurrentAnchestor.set(Current.SelectedDirectory, null);
CurrentAnchestor.set(Current.ProjectNode, null);
Current_.set(Current.SelectedDirectory, null);
Current_.set(Current.ProjectNode, null);
}
}

12
src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java
View File

@@ -8,11 +8,11 @@ import _VisualDVM.GlobalData.FileObject.DirInfo;
import _VisualDVM.GlobalData.FileObject.DirInfosDataSet;
import _VisualDVM.GlobalData.FileObject.DirInfosFields;
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.*;
public class DeleteDownloadedBugReports extends Pass_2021<DirInfosDataSet> {
public class DeleteDownloadedBugReports extends Pass<DirInfosDataSet> {
@Override
protected boolean needsAnimation() {
return true;
@@ -20,8 +20,8 @@ public class DeleteDownloadedBugReports extends Pass_2021<DirInfosDataSet> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = null;
if (passes.get(PassCode_2021.GetOldBugReports).Do()){
target = (DirInfosDataSet) passes.get(PassCode_2021.GetOldBugReports).target;
if (passes.get(PassCode.GetOldBugReports).Do()){
target = (DirInfosDataSet) passes.get(PassCode.GetOldBugReports).target;
if (target.Data.isEmpty()){
Log.Writeln_("Не найдено отчетов, не использовавшихся " +
((GlobalDatabase) CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).toInt32() +
@@ -58,7 +58,7 @@ public class DeleteDownloadedBugReports extends Pass_2021<DirInfosDataSet> {
@Override
protected void performPreparation() throws Exception {
if (Current.HasProject())
passes.get(PassCode_2021.CloseCurrentProject).Do();
passes.get(PassCode.CloseCurrentProject).Do();
}
@Override
protected void body() throws Exception {

12
src/Visual_DVM_2021/Passes/All/DeleteFile.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -7,7 +7,7 @@ import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.ChangeFilePass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class DeleteFile extends ChangeFilePass<DBProjectFile> {
@Override
public String getIconPath() {
@@ -16,14 +16,14 @@ public class DeleteFile extends ChangeFilePass<DBProjectFile> {
@Override
protected boolean canStart(Object... args) {
resetArgs();
return (CurrentAnchestor.Check(Log, Current.SelectedFile)) &&
return (Current_.Check(Log, Current.SelectedFile)) &&
CommonUI.Warning("Удалить файл "
+ CommonUtils.Brackets((target = Current.getSelectedFile()).name));
}
@Override
protected void performPreparation() throws Exception {
if (Current.HasFile() && (Current.getFile().file.equals(target.file)))
passes.get(PassCode_2021.CloseCurrentFile).Do();
passes.get(PassCode.CloseCurrentFile).Do();
}
@Override
protected void body() throws Exception {
@@ -33,7 +33,7 @@ public class DeleteFile extends ChangeFilePass<DBProjectFile> {
}
@Override
protected void performDone() throws Exception {
CurrentAnchestor.set(Current.SelectedFile, null);
CurrentAnchestor.set(Current.ProjectNode, null);
Current_.set(Current.SelectedFile, null);
Current_.set(Current.ProjectNode, null);
}
}

12
src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java
View File

@@ -1,15 +1,15 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Project.db_project_info;
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 DeleteLonelyM extends Pass_2021<db_project_info> {
public class DeleteLonelyM extends Pass<db_project_info> {
@Override
protected boolean canStart(Object... args) throws Exception {
if (CurrentAnchestor.Check(Log, Current.Root)) {
if (Current_.Check(Log, Current.Root)) {
target = Current.getRoot();
return true;
}
@@ -19,7 +19,7 @@ public class DeleteLonelyM extends Pass_2021<db_project_info> {
protected void body() throws Exception {
Vector<db_project_info> targets = target.getLonelyM();
for (db_project_info m : targets) {
passes.get(PassCode_2021.DeleteVersion).Do(m);
passes.get(PassCode.DeleteVersion).Do(m);
}
}
}

4
src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java
View File

@@ -4,10 +4,10 @@ import _VisualDVM.Utils;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import java.util.Vector;
public class DeleteSelectedCompilationTasks extends Pass_2021<Vector<CompilationTask>> {
public class DeleteSelectedCompilationTasks extends Pass<Vector<CompilationTask>> {
@Override
public String getIconPath() {
return "/icons/Delete.png";

14
src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java
View File

@@ -1,13 +1,13 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class DeleteSelectedFiles extends Pass_2021 {
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class DeleteSelectedFiles extends Pass {
@Override
public String getIconPath() {
return "/icons/Delete.png";
@@ -33,10 +33,10 @@ public class DeleteSelectedFiles extends Pass_2021 {
}
}
if (hasCurrent)
passes.get(PassCode_2021.CloseCurrentFile).Do();
passes.get(PassCode.CloseCurrentFile).Do();
if (hasSelected) {
CurrentAnchestor.set(Current.SelectedFile, null);
CurrentAnchestor.set(Current.ProjectNode, null);
Current_.set(Current.SelectedFile, null);
Current_.set(Current.ProjectNode, null);
}
}
@Override

4
src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java
View File

@@ -3,10 +3,10 @@ import Common.Utils.CommonUtils;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import java.util.Vector;
public class DeleteSelectedRunTasks extends Pass_2021<Vector<RunTask>> {
public class DeleteSelectedRunTasks extends Pass<Vector<RunTask>> {
@Override
public String getIconPath() {
return "/icons/Delete.png";

12
src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java
View File

@@ -1,14 +1,14 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.db_project_info;
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 DeleteSelectedVersions extends Pass_2021<Vector<db_project_info>> {
public class DeleteSelectedVersions extends Pass<Vector<db_project_info>> {
boolean has_current_project;
@Override
public String getButtonText() {
@@ -27,7 +27,7 @@ public class DeleteSelectedVersions extends Pass_2021<Vector<db_project_info>> {
Log.Writeln_("Нажмите правую клавишу мыши, и перейдите в режим выбора версий.");
return false;
}
if (!CurrentAnchestor.Check(Log, Current.Root)) {
if (!Current_.Check(Log, Current.Root)) {
return false;
}
Vector<db_project_info> allVersions = new Vector<>();
@@ -50,6 +50,6 @@ public class DeleteSelectedVersions extends Pass_2021<Vector<db_project_info>> {
@Override
protected void body() throws Exception {
for (db_project_info version : target)
passes.get(PassCode_2021.DeleteVersion).Do(version);
passes.get(PassCode.DeleteVersion).Do(version);
}
}

4
src/Visual_DVM_2021/Passes/All/DeleteSubversions.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.CurrentProjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import java.util.Vector;
public class DeleteSubversions extends CurrentProjectPass {
@@ -13,7 +13,7 @@ public class DeleteSubversions extends CurrentProjectPass {
protected void body() throws Exception {
Vector<db_project_info> targets = new Vector<>(target.versions.values());
for (db_project_info m : targets) {
passes.get(PassCode_2021.DeleteVersion).Do(m);
passes.get(PassCode.DeleteVersion).Do(m);
}
}
}

14
src/Visual_DVM_2021/Passes/All/DeleteVersion.java
View File

@@ -1,14 +1,14 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class DeleteVersion extends Pass_2021<db_project_info> {
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class DeleteVersion extends Pass<db_project_info> {
db_project_info parent;
boolean current;
@Override
@@ -38,7 +38,7 @@ public class DeleteVersion extends Pass_2021<db_project_info> {
target.parent.checkLastModification(target);
if (Current.HasProject()) {
if ((Current.getProject().Home.getAbsolutePath().startsWith(target.Home.getAbsolutePath())))
passes.get(PassCode_2021.CloseCurrentProject).Do();
passes.get(PassCode.CloseCurrentProject).Do();
}
if (CommonUI.isActive()) {
UI.getVersionsWindow().RemoveVersionFromComparison(target);
@@ -52,11 +52,11 @@ public class DeleteVersion extends Pass_2021<db_project_info> {
protected void performDone() throws Exception {
parent = target.parent;
if (current)
CurrentAnchestor.set(Current.Version, null);
Current_.set(Current.Version, null);
if (parent != null) {
UI.getVersionsWindow().getVersionsForm().getTree().RemoveNode(target.node);
parent.versions.remove(target.name);
} else
CurrentAnchestor.set(Current.Root, null);
Current_.set(Current.Root, null);
}
}

10
src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java
View File

@@ -1,12 +1,12 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -22,8 +22,8 @@ public class DownloadAllBugReportsArchives extends ComponentsRepositoryPass<File
}
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode_2021.CloseCurrentProject).Do();
CurrentAnchestor.set(Current.Root, null); //чтобы гарантированно не существовало корня.
passes.get(PassCode.CloseCurrentProject).Do();
Current_.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Utils.CleanDirectory(Global.BugReportsDirectory);
}
@Override
@@ -43,7 +43,7 @@ public class DownloadAllBugReportsArchives extends ComponentsRepositoryPass<File
protected void performDone() throws Exception {
File tempFolder = Utils.getTempFileName("bugsBuffer");
//-
passes.get(PassCode_2021.UnzipFolderPass).Do(
passes.get(PassCode.UnzipFolderPass).Do(
target.getAbsolutePath(),
tempFolder.getAbsolutePath()
);

4
src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -15,7 +15,7 @@ public class DownloadDVMPackage extends DownloadDVMPackages {
}
DVMPackage dvmPackage;
protected boolean canStart(Object... args) throws Exception {
if (CurrentAnchestor.Check(Log, Current.DVMPackage)) {
if (Current_.Check(Log, Current.DVMPackage)) {
//--
dvmPackage = Current.getDVMPackage();
//--

8
src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java
View File

@@ -6,8 +6,8 @@ import _VisualDVM.Utils;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
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 Visual_DVM_2021.Passes.Server.TestingSystemPass;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
@@ -15,7 +15,7 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.util.Date;
import java.util.Vector;
public class DownloadDVMPackages extends Pass_2021<Vector<Integer>> {
public class DownloadDVMPackages extends Pass<Vector<Integer>> {
Vector<Pair<Integer, Pair<byte[], byte[]>>> packed_packages;
@Override
public String getIconPath() {
@@ -69,7 +69,7 @@ public class DownloadDVMPackages extends Pass_2021<Vector<Integer>> {
//---
CommonUtils.bytesToFile(packed_package.getKey(), results_zip);
CommonUtils.bytesToFile(packed_package.getValue(), dvmPackage.getJsonFile());
passes.get(PassCode_2021.UnzipFolderPass).Do(results_zip.getAbsolutePath(), workspace.getAbsolutePath());
passes.get(PassCode.UnzipFolderPass).Do(results_zip.getAbsolutePath(), workspace.getAbsolutePath());
FileUtils.writeStringToFile(loaded, new Date().toString());
}
}

12
src/Visual_DVM_2021/Passes/All/DownloadProject.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -7,7 +7,7 @@ import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass;
@@ -42,21 +42,21 @@ public class DownloadProject extends CurrentConnectionPass {
} else throw new PassException("Размер проекта превышает " + maxSize + " KB.\n");
} else {
//диалога не вышло, сбрасываем файл.
CurrentAnchestor.set(Current.RemoteFile, null);
Current_.set(Current.RemoteFile, null);
}
}
@Override
protected boolean validate() {
CurrentAnchestor.Check(Log, Current.RemoteFile);
Current_.Check(Log, Current.RemoteFile);
return (Log.isEmpty());
}
@Override
protected void performDone() throws Exception {
File project = Paths.get(Global.visualiser.getWorkspace().getAbsolutePath(),
CommonUtils.getDateName(src.name)).toFile();
if (passes.get(PassCode_2021.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) {
if (passes.get(PassCode.UnzipFolderPass).Do(local_archive.getAbsolutePath(), project.getAbsolutePath())) {
if (CommonUI.Question("Проект " + CommonUtils.Brackets(src.name) + " успешно загружен. Открыть его"))
passes.get(PassCode_2021.OpenCurrentProject).Do(project);
passes.get(PassCode.OpenCurrentProject).Do(project);
}
}
}

10
src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java
View File

@@ -6,14 +6,14 @@ import _VisualDVM.Utils;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
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 Visual_DVM_2021.Passes.Server.TestingSystemPass;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.util.Date;
public class DownloadSapforPackage extends Pass_2021<SapforPackage> {
public class DownloadSapforPackage extends Pass<SapforPackage> {
@Override
protected boolean needsAnimation() {
return true;
@@ -30,7 +30,7 @@ public class DownloadSapforPackage extends Pass_2021<SapforPackage> {
int id = target.id;
loaded = new File(target.getLocalWorkspace(), Constants.LOADED);
if (!loaded.exists()){
Pass_2021 pass = new TestingSystemPass() {
Pass pass = new TestingSystemPass() {
@Override
public String getDescription() {
return "Скачивание";
@@ -51,7 +51,7 @@ public class DownloadSapforPackage extends Pass_2021<SapforPackage> {
Utils.forceDeleteWithCheck(workspace);
File archive = Utils.getTempFileName(String.valueOf(target.id));
CommonUtils.bytesToFile(packed,archive);
passes.get(PassCode_2021.UnzipFolderPass).Do(archive.getAbsolutePath(), Global.SapforPackagesDirectory.getAbsolutePath());
passes.get(PassCode.UnzipFolderPass).Do(archive.getAbsolutePath(), Global.SapforPackagesDirectory.getAbsolutePath());
FileUtils.writeStringToFile(loaded, new Date().toString());
}
}

4
src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -11,7 +11,7 @@ public class DownloadTaskTest extends DownloadTest {
@Override
protected boolean canStart(Object... args) throws Exception {
target = null;
if (Current.getAccount().CheckRegistered(Log) && CurrentAnchestor.Check(Log, Current.DVMRunTask)) {
if (Current.getAccount().CheckRegistered(Log) && Current_.Check(Log, Current.DVMRunTask)) {
DVMRunTask task = Current.getDVMRunTask();
//-- квазиобъект, нам от него нужно только имя.
target = new Test();

14
src/Visual_DVM_2021/Passes/All/DownloadTest.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -8,7 +8,7 @@ import _VisualDVM.Utils;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class DownloadTest extends TestingSystemPass<Test> {
@Override
@@ -21,7 +21,7 @@ public class DownloadTest extends TestingSystemPass<Test> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (Current.getAccount().CheckRegistered(Log) && CurrentAnchestor.Check(Log, Current.Test)) {
if (Current.getAccount().CheckRegistered(Log) && Current_.Check(Log, Current.Test)) {
target = Current.getTest();
return true;
}
@@ -29,8 +29,8 @@ public class DownloadTest extends TestingSystemPass<Test> {
}
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode_2021.CloseCurrentProject).Do();
CurrentAnchestor.set(Current.Root, null); //чтобы гарантированно не существовало корня.
passes.get(PassCode.CloseCurrentProject).Do();
Current_.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Utils.forceDeleteWithCheck(target.getArchive());
Utils.forceDeleteWithCheck(target.getHomePath());
}
@@ -46,14 +46,14 @@ public class DownloadTest extends TestingSystemPass<Test> {
@Override
protected void performDone() throws Exception {
super.performDone();
if (passes.get(PassCode_2021.UnzipFolderPass).Do(
if (passes.get(PassCode.UnzipFolderPass).Do(
target.getArchive().getAbsolutePath(),
Global.visualiser.getWorkspace().getAbsolutePath(), false
))
if (CommonUI.Question("Тестовый проект успешно загружен под именем\n" +
CommonUtils.Brackets(target.getHomePath().getName()) +
"\nОткрыть его"))
passes.get(PassCode_2021.OpenCurrentProject).Do(target.getHomePath());
passes.get(PassCode.OpenCurrentProject).Do(target.getHomePath());
}
}

6
src/Visual_DVM_2021/Passes/All/DropFastAccess.java
View File

@@ -1,15 +1,15 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.Pass_2021;
public class DropFastAccess extends Pass_2021 {
import Visual_DVM_2021.Passes.Pass;
public class DropFastAccess extends Pass {
@Override
public String getButtonText() {
return "";
}
@Override
protected void body() throws Exception {
for (Pass_2021 pass : Pass_2021.FAPasses) {
for (Pass pass : Pass.FAPasses) {
pass.stats.Drop();
CommonUtils.db.Update(pass.stats);
}

4
src/Visual_DVM_2021/Passes/All/DropLastProjects.java
View File

@@ -1,8 +1,8 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils;
import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
import Visual_DVM_2021.Passes.Pass_2021;
public class DropLastProjects extends Pass_2021 {
import Visual_DVM_2021.Passes.Pass;
public class DropLastProjects extends Pass {
@Override
protected void body() throws Exception {
CommonUtils.db.DeleteAll(DBLastProject.class);

8
src/Visual_DVM_2021/Passes/All/ExcludeFile.java
View File

@@ -1,11 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
import Visual_DVM_2021.Passes.Pass_2021;
public class ExcludeFile extends Pass_2021<DBProjectFile> {
import Visual_DVM_2021.Passes.Pass;
public class ExcludeFile extends Pass<DBProjectFile> {
@Override
public String getIconPath() {
return "/icons/Exclude.png";
@@ -16,7 +16,7 @@ public class ExcludeFile extends Pass_2021<DBProjectFile> {
target = (DBProjectFile) args[0];
return !target.state.equals(FileState.Excluded);
}
return CurrentAnchestor.Check(Log, Current.SelectedFile)
return Current_.Check(Log, Current.SelectedFile)
&& !(target = Current.getSelectedFile()).state.equals(FileState.Excluded);
}
@Override

8
src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java
View File

@@ -2,11 +2,11 @@ package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
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 java.util.Vector;
public class ExcludeSelectedFiles extends Pass_2021<Vector<DBProjectFile>> {
public class ExcludeSelectedFiles extends Pass<Vector<DBProjectFile>> {
@Override
public String getIconPath() {
return "/icons/Exclude.png";
@@ -30,6 +30,6 @@ public class ExcludeSelectedFiles extends Pass_2021<Vector<DBProjectFile>> {
@Override
protected void body() throws Exception {
for (DBProjectFile file : target)
passes.get(PassCode_2021.ExcludeFile).Do(file);
passes.get(PassCode.ExcludeFile).Do(file);
}
}

12
src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Constants;
@@ -12,8 +12,8 @@ import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
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.apache.commons.io.FileUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.util.HSSFColor;
@@ -25,7 +25,7 @@ import java.awt.*;
import java.io.File;
import java.io.FileOutputStream;
import java.util.Vector;
public class ExportDVMPackageToExcel extends Pass_2021<Vector<DVMPackage>> {
public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
//https://tproger.ru/translations/how-to-read-write-excel-file-java-poi-example
File dir;
File res;
@@ -62,7 +62,7 @@ public class ExportDVMPackageToExcel extends Pass_2021<Vector<DVMPackage>> {
if (Global.testingServer.db.dvmPackages.getCheckedCount() > 0) {
target = Global.testingServer.db.dvmPackages.getCheckedItems();
} else {
if (CurrentAnchestor.Check(Log, Current.DVMPackage)) {
if (Current_.Check(Log, Current.DVMPackage)) {
target = new Vector<>();
target.add(Current.getDVMPackage());
} else return false;
@@ -78,7 +78,7 @@ public class ExportDVMPackageToExcel extends Pass_2021<Vector<DVMPackage>> {
}
}
}
if (!passes.get(PassCode_2021.DownloadDVMPackages).Do(packagesToDownload))
if (!passes.get(PassCode.DownloadDVMPackages).Do(packagesToDownload))
{
return false;
}

4
src/Visual_DVM_2021/Passes/All/ExtractRecipients.java
View File

@@ -1,8 +1,8 @@
package Visual_DVM_2021.Passes.All;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import java.util.Vector;
public class ExtractRecipients extends Pass_2021 {
public class ExtractRecipients extends Pass {
Vector<String> new_recipients = new Vector<>();
@Override
public boolean needsConfirmations() {

4
src/Visual_DVM_2021/Passes/All/FinishApplication.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Visual_DVM_2021.Passes.Pass_2021;
public class FinishApplication extends Pass_2021 {
import Visual_DVM_2021.Passes.Pass;
public class FinishApplication extends Pass {
@Override
protected void body() throws Exception {
}

6
src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java
View File

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Visual.CommonUI;
import _VisualDVM.Visual.UI;
import Visual_DVM_2021.Passes.CurrentProjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import java.math.BigInteger;
public class GenerateParallelVariants extends CurrentProjectPass {
@@ -12,8 +12,8 @@ public class GenerateParallelVariants extends CurrentProjectPass {
return "/icons/ParallelVariants.png";
}
@Override
protected PassCode_2021 necessary() {
return PassCode_2021.SPF_GetArrayDistribution;
protected PassCode necessary() {
return PassCode.SPF_GetArrayDistribution;
}
@Override
protected void FocusBeforeStart() {

4
src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -11,7 +11,7 @@ public class GetComponentsBackupsFromServer extends ComponentsRepositoryPass<Vec
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
return (CurrentAnchestor.Check(Log, Current.Component));
return (Current_.Check(Log, Current.Component));
}
@Override
protected void ServerAction() throws Exception {

4
src/Visual_DVM_2021/Passes/All/GetOldBugReports.java
View File

@@ -6,13 +6,13 @@ import _VisualDVM.Utils;
import _VisualDVM.GlobalData.FileObject.DirInfo;
import _VisualDVM.GlobalData.FileObject.DirInfosDataSet;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Pass;
import java.io.File;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
public class GetOldBugReports extends Pass_2021<DirInfosDataSet> {
public class GetOldBugReports extends Pass<DirInfosDataSet> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = new DirInfosDataSet();

8
src/Visual_DVM_2021/Passes/All/ImportFiles.java
View File

@@ -1,12 +1,12 @@
package Visual_DVM_2021.Passes.All;
import Common.Visual.Windows.Dialog.VFileChooser;
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.util.Arrays;
import java.util.Vector;
public class ImportFiles extends Pass_2021<Vector<File>> {
public class ImportFiles extends Pass<Vector<File>> {
VFileChooser fileChooser =
new VFileChooser("Выберите файлы для добавления");
@Override
@@ -21,6 +21,6 @@ public class ImportFiles extends Pass_2021<Vector<File>> {
@Override
protected void body() throws Exception {
for (File file : target)
passes.get(PassCode_2021.AddFile).Do(file);
passes.get(PassCode.AddFile).Do(file);
}
}

8
src/Visual_DVM_2021/Passes/All/IncludeFile.java
View File

@@ -1,11 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
import Visual_DVM_2021.Passes.Pass_2021;
public class IncludeFile extends Pass_2021<DBProjectFile> {
import Visual_DVM_2021.Passes.Pass;
public class IncludeFile extends Pass<DBProjectFile> {
@Override
public String getIconPath() {
return "/icons/Include.png";
@@ -16,7 +16,7 @@ public class IncludeFile extends Pass_2021<DBProjectFile> {
target = (DBProjectFile) args[0];
return target.state.equals(FileState.Excluded);
}
return CurrentAnchestor.Check(Log, Current.SelectedFile)
return Current_.Check(Log, Current.SelectedFile)
&& (target = Current.getSelectedFile()).state.equals(FileState.Excluded);
}
@Override

8
src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java
View File

@@ -2,11 +2,11 @@ package Visual_DVM_2021.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
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 java.util.Vector;
public class IncludeSelectedFiles extends Pass_2021<Vector<DBProjectFile>> {
public class IncludeSelectedFiles extends Pass<Vector<DBProjectFile>> {
@Override
public String getIconPath() {
return "/icons/Include.png";
@@ -29,6 +29,6 @@ public class IncludeSelectedFiles extends Pass_2021<Vector<DBProjectFile>> {
@Override
protected void body() throws Exception {
for (DBProjectFile file : target)
passes.get(PassCode_2021.IncludeFile).Do(file);
passes.get(PassCode.IncludeFile).Do(file);
}
}

22
src/Visual_DVM_2021/Passes/All/InitialiseUser.java
View File

@@ -1,15 +1,15 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.User.UserState;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
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;
public class InitialiseUser extends Pass_2021 {
import Visual_DVM_2021.Passes.Pass;
public class InitialiseUser extends Pass {
@Override
public String getIconPath() {
return "/icons/InitializeUser.png";
@@ -20,27 +20,27 @@ public class InitialiseUser extends Pass_2021 {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return CurrentAnchestor.Check(Log, Current.Machine, Current.User);
return Current_.Check(Log, Current.Machine, Current.User);
}
@Override
protected void body() throws Exception {
switch (Current.getMachine().type) {
case Local:
passes.get(PassCode_2021.LocalInitaliseUser).Do();
passes.get(PassCode.LocalInitaliseUser).Do();
break;
case Server:
case MVS_cluster:
if (passes.get(PassCode_2021.CheckRemoteWorkspace).Do()) {
SubscriberWorkspace workspace = (SubscriberWorkspace) passes.get(PassCode_2021.CheckRemoteWorkspace).target;
if (passes.get(PassCode.CheckRemoteWorkspace).Do()) {
SubscriberWorkspace workspace = (SubscriberWorkspace) passes.get(PassCode.CheckRemoteWorkspace).target;
if (workspace == null) {
if (passes.get(PassCode_2021.RemoteInitialiseUser).Do()){
if (passes.get(PassCode.RemoteInitialiseUser).Do()){
workspace = new SubscriberWorkspace();
workspace.email=Current.getAccount().email;
workspace.URL=Current.getMachine().getURL();
workspace.login=Current.getUser().login;
workspace.path=((RemoteFile) passes.get(PassCode_2021.RemoteInitialiseUser).target).full_name;
workspace.path=((RemoteFile) passes.get(PassCode.RemoteInitialiseUser).target).full_name;
//---
if (passes.get(PassCode_2021.PublishRemoteWorkspace).Do(workspace)) {
if (passes.get(PassCode.PublishRemoteWorkspace).Do(workspace)) {
Current.getUser().workspace = workspace.path;
Current.getUser().state = UserState.ready_to_work;
CommonUtils.db.Update(Current.getUser());

4
src/Visual_DVM_2021/Passes/All/MassSelectArrays.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.ProjectData.SapforData.Arrays.ArrayState;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.SapforModification;
import java.util.Vector;
@@ -40,7 +40,7 @@ public class MassSelectArrays extends SapforModification {
states.add(String.valueOf(new_state.ordinal()));
}
}
if (passes.get(PassCode_2021.SPF_ParseFilesWithOrder).isDone()) {
if (passes.get(PassCode.SPF_ParseFilesWithOrder).isDone()) {
needs_sapfor = true;
addOpt1 = String.join("|", keys);
addOpt2 = String.join("|", states);

22
src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java
View File

@@ -1,16 +1,16 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
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;
public class OpenBugReportTestProject extends Pass_2021<BugReport> {
public class OpenBugReportTestProject extends Pass<BugReport> {
File root = null;
File project = null;
@Override
@@ -23,7 +23,7 @@ public class OpenBugReportTestProject extends Pass_2021<BugReport> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (CurrentAnchestor.Check(Log, Current.BugReport) &&
if (Current_.Check(Log, Current.BugReport) &&
(BugReportInterface.CheckNotDraft(target=Current.getBugReport(),Log))) {
if (!target.project_version.isEmpty()) {
@@ -42,15 +42,15 @@ public class OpenBugReportTestProject extends Pass_2021<BugReport> {
}
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode_2021.CloseCurrentProject).Do();
CurrentAnchestor.set(Current.Root, null); //чтобы гарантированно не существовало корня.
passes.get(PassCode.CloseCurrentProject).Do();
Current_.set(Current.Root, null); //чтобы гарантированно не существовало корня.
}
@Override
protected void body() throws Exception {
//попытка скачки. проверка существования архива уже там.
passes.get(PassCode_2021.DownloadBugReport).Do(target);
passes.get(PassCode.DownloadBugReport).Do(target);
if (BugReportInterface.getArchiveFile(target).exists()) {
passes.get(PassCode_2021.UnzipFolderPass).Do(
passes.get(PassCode.UnzipFolderPass).Do(
BugReportInterface.getArchiveFile(target).getAbsolutePath(),
root.getAbsolutePath()
);
@@ -67,7 +67,7 @@ public class OpenBugReportTestProject extends Pass_2021<BugReport> {
}
@Override
protected void performDone() throws Exception {
if (passes.get(PassCode_2021.OpenCurrentProject).Do(project))
passes.get(PassCode_2021.ApplyBugReportSettings).Do();
if (passes.get(PassCode.OpenCurrentProject).Do(project))
passes.get(PassCode.ApplyBugReportSettings).Do();
}
}

12
src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java
View File

@@ -1,11 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class OpenCurrentFile extends Pass_2021<DBProjectFile> {
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class OpenCurrentFile extends Pass<DBProjectFile> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (args.length > 0) ? (DBProjectFile) args[0] : null;
@@ -14,14 +14,14 @@ public class OpenCurrentFile extends Pass_2021<DBProjectFile> {
@Override
protected void performPreparation() throws Exception {
//закрыть старый текущий файл.
passes.get(PassCode_2021.CloseCurrentFile).Do();
passes.get(PassCode.CloseCurrentFile).Do();
}
@Override
protected void body() throws Exception {
}
@Override
protected void performDone() throws Exception {
CurrentAnchestor.set(Current.File, target);
Current_.set(Current.File, target);
}
@Override
protected void showDone() throws Exception {

22
src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Constants;
import _VisualDVM.Current;
@@ -12,11 +12,11 @@ import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
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;
public class OpenCurrentProject extends Pass_2021<db_project_info> {
public class OpenCurrentProject extends Pass<db_project_info> {
Mode mode = Mode.Undefined;
File dir = null;
boolean root_changes;
@@ -72,7 +72,7 @@ public class OpenCurrentProject extends Pass_2021<db_project_info> {
}
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode_2021.CloseCurrentProject).Do();
passes.get(PassCode.CloseCurrentProject).Do();
}
@Override
protected void body() throws Exception {
@@ -105,12 +105,12 @@ public class OpenCurrentProject extends Pass_2021<db_project_info> {
}
@Override
protected void performDone() throws Exception {
CurrentAnchestor.set(Current.Project, target);
CurrentAnchestor.set(Current.ProjectView, ProjectView.Files);
Current_.set(Current.Project, target);
Current_.set(Current.ProjectView, ProjectView.Files);
if (root_changes)
CurrentAnchestor.set(Current.Root, new_root);
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir.getParent());
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(
Current_.set(Current.Root, new_root);
Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir.getParent());
Pass.passes.get(PassCode.UpdateSetting).Do(
SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0")
;
DBLastProject lastProject;
@@ -133,7 +133,7 @@ public class OpenCurrentProject extends Pass_2021<db_project_info> {
//-
UI.getMainWindow().ShowProject();
//криво. но при тихом режиме открытие файлов все равно не понадобится.
passes.get(PassCode_2021.OpenCurrentFile).Do(target.getLastOpenedFile());
passes.get(PassCode.OpenCurrentFile).Do(target.getLastOpenedFile());
}
@Override
protected void FocusResult() {

12
src/Visual_DVM_2021/Passes/All/OpenProject.java
View File

@@ -1,10 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class OpenProject extends Pass_2021<db_project_info> {
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Pass;
public class OpenProject extends Pass<db_project_info> {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (db_project_info) args[0];
@@ -12,7 +12,7 @@ public class OpenProject extends Pass_2021<db_project_info> {
}
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode_2021.CloseProject).Do();
passes.get(PassCode.CloseProject).Do();
}
@Override
protected void body() throws Exception {
@@ -21,7 +21,7 @@ public class OpenProject extends Pass_2021<db_project_info> {
}
@Override
protected void performDone() throws Exception {
CurrentAnchestor.set(Current.Project, target);
Current_.set(Current.Project, target);
/*
пока непонятно надо
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(

12
src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All;
import Common.CommonConstants;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.Dialog;
@@ -11,12 +11,12 @@ import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsFields;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
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.util.LinkedHashMap;
public class PickCompilerEnvironments extends Pass_2021<String> {
public class PickCompilerEnvironments extends Pass<String> {
Compiler compiler = null;
@Override
public String getIconPath() {
@@ -29,7 +29,7 @@ public class PickCompilerEnvironments extends Pass_2021<String> {
//-
@Override
protected boolean canStart(Object... args) throws Exception {
if (CurrentAnchestor.Check(Log, Current.RunConfiguration)) {
if (Current_.Check(Log, Current.RunConfiguration)) {
RunConfiguration configuration = Current.getRunConfiguration();
if (configuration.compiler_id == CommonConstants.Nan) {
Log.Writeln_("Отсутвует DVM компилятор, связанный с текущей конфигурацией запуска.\n" +
@@ -44,7 +44,7 @@ public class PickCompilerEnvironments extends Pass_2021<String> {
return false;
}
//-
if (!(compiler.helpLoaded || passes.get(PassCode_2021.ShowCompilerHelp).Do(compiler, false)))
if (!(compiler.helpLoaded || passes.get(PassCode.ShowCompilerHelp).Do(compiler, false)))
return false;
//-
Dialog<String, CompilerEnvironmentsFields> dialog =

8
src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java
View File

@@ -6,12 +6,12 @@ import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsFields;
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.util.Vector;
public class PickCompilerEnvironmentsForTesting extends Pass_2021<String> {
public class PickCompilerEnvironmentsForTesting extends Pass<String> {
Compiler compiler = null;
//-
@Override
@@ -26,7 +26,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass_2021<String> {
Log.Writeln_("Выбор переменных окружения возможен только для DVM компилятора,");
return false;
}
if (!(compiler.helpLoaded || passes.get(PassCode_2021.ShowCompilerHelp).Do(compiler, false)))
if (!(compiler.helpLoaded || passes.get(PassCode.ShowCompilerHelp).Do(compiler, false)))
return false;
Dialog<String, CompilerEnvironmentsFields> dialog =
new Dialog<String, CompilerEnvironmentsFields>(CompilerEnvironmentsFields.class) {

8
src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java
View File

@@ -4,12 +4,12 @@ import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionsFields;
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.util.Vector;
public class PickCompilerOptions extends Pass_2021<String> {
public class PickCompilerOptions extends Pass<String> {
Compiler compiler = null;
//-
@Override
@@ -23,7 +23,7 @@ public class PickCompilerOptions extends Pass_2021<String> {
Log.Writeln_("Выбор опций возможен только для DVM компилятора,");
return false;
}
if (!(compiler.helpLoaded || passes.get(PassCode_2021.ShowCompilerHelp).Do(compiler, false)))
if (!(compiler.helpLoaded || passes.get(PassCode.ShowCompilerHelp).Do(compiler, false)))
return false;
Dialog<String, CompilerOptionsFields> dialog = new Dialog<String, CompilerOptionsFields>(CompilerOptionsFields.class) {
@Override

12
src/Visual_DVM_2021/Passes/All/Precompilation.java
View File

@@ -16,9 +16,9 @@ import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.Project.db_project_info;
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.BufferedReader;
@@ -28,7 +28,7 @@ import java.io.InputStreamReader;
import java.nio.file.Paths;
import java.util.LinkedHashMap;
import java.util.Vector;
public class Precompilation extends Pass_2021<db_project_info> {
public class Precompilation extends Pass<db_project_info> {
protected static String name_to_kill = "";
protected static boolean killed = false;
protected String makepath;
@@ -57,14 +57,14 @@ public class Precompilation extends Pass_2021<db_project_info> {
Log.Writeln_("Не задан путь к make.exe.\n " +
"Укажите его в меню глобальных настроек." +
"\nПредварительная компиляция будет отключена.");
passes.get(PassCode_2021.UpdateSetting).Do(SettingName.Precompilation, "0");
passes.get(PassCode.UpdateSetting).Do(SettingName.Precompilation, "0");
return false;
}
if (!(new File(makepath).exists())) {
Log.Writeln_("Файла по пути к make.exe не существует.\n" +
"Проверьте правильность его указания в глобальных настройках."+
"\nПредварительная компиляция будет отключена.");
passes.get(PassCode_2021.UpdateSetting).Do(SettingName.Precompilation, "0");
passes.get(PassCode.UpdateSetting).Do(SettingName.Precompilation, "0");
return false;
}
//--
@@ -89,7 +89,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
protected void performPreparation() throws Exception {
target.CleanInterruptFile();
//-
passes.get(PassCode_2021.Save).Do(); //---->
passes.get(PassCode.Save).Do(); //---->
prepareForParse(); //---->
//-
performanceTime = 0;

6
src/Visual_DVM_2021/Passes/All/PredictParallelVariants.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.VariantsMassPass;
public class PredictParallelVariants extends VariantsMassPass {
@Override
@@ -11,7 +11,7 @@ public class PredictParallelVariants extends VariantsMassPass {
return "";
}
@Override
public PassCode_2021 getSubPassCode() {
return PassCode_2021.SPF_PredictParallelVariant;
public PassCode getSubPassCode() {
return PassCode.SPF_PredictParallelVariant;
}
}

6
src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java
View File

@@ -4,7 +4,7 @@ import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Transformation;
import org.apache.commons.io.FileUtils;
@@ -14,8 +14,8 @@ import java.nio.file.Paths;
import java.util.Vector;
public class PrepareForModulesAssembly extends Transformation {
@Override
protected PassCode_2021 necessary() {
return PassCode_2021.SPF_GetIncludeDependencies;
protected PassCode necessary() {
return PassCode.SPF_GetIncludeDependencies;
}
@Override
protected boolean canStart(Object... args) throws Exception {

14
src/Visual_DVM_2021/Passes/All/PublishBugReport.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Current;
@@ -9,12 +9,12 @@ import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.EmailMessage;
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.util.Date;
public class PublishBugReport extends Pass_2021<BugReport> {
public class PublishBugReport extends Pass<BugReport> {
@Override
public String getIconPath() {
return "/icons/Publish.png";
@@ -25,7 +25,7 @@ public class PublishBugReport extends Pass_2021<BugReport> {
}
@Override
protected boolean canStart(Object... args) {
if (CurrentAnchestor.Check(Log, Current.BugReport)) {
if (Current_.Check(Log, Current.BugReport)) {
target = Current.getBugReport();
if (!target.state.equals(BugReportState.draft)) {
Log.Writeln_("Отчёт об ошибке " + target.id + " уже опубликован!");
@@ -53,7 +53,7 @@ public class PublishBugReport extends Pass_2021<BugReport> {
@Override
protected void performDone() throws Exception {
//2 - Отправка на сервер, с активным состоянием?
passes.get(PassCode_2021.SendBugReport).Do();
passes.get(PassCode.SendBugReport).Do();
Global.componentsServer.db.Update(target);
//3- рассылка
EmailMessage message = new EmailMessage("Обнаружена ошибка " + CommonUtils.Brackets(target.id),
@@ -68,7 +68,7 @@ public class PublishBugReport extends Pass_2021<BugReport> {
message.addAttachement(screen);
}
}
passes.get(PassCode_2021.Email).Do(message);
passes.get(PassCode.Email).Do(message);
}
@Override
protected void showDone() throws Exception {

12
src/Visual_DVM_2021/Passes/All/PublishComponent.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -13,8 +13,8 @@ import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
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.Date;
import java.util.Vector;
@@ -44,7 +44,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
Log.Writeln_("Вы не являетесь администратором");
}
;
if (CurrentAnchestor.Check(Log, Current.Component)) {
if (Current_.Check(Log, Current.Component)) {
target = Current.getComponent();
target.needs_update_minimal_version = false;
f.fields.cbUpdateMinimalVersion.setSelected(false);
@@ -112,12 +112,12 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
new Vector<>(Global.componentsServer.db.subscribers.Data.keySet()));
if (f.fields.cbForceMail.isSelected())
message.addAttachement(target.getFile());
Pass_2021.passes.get(PassCode_2021.Email).Do(message);
Pass.passes.get(PassCode.Email).Do(message);
//---
if (target.getComponentType().equals(ComponentType.Sapfor_F) && f.fields.cbAssemblyOnServer.isSelected()) {
UI.getMainWindow().FocusTesting();
UI.getMainWindow().getTestingWindow().FocusSapforTesting();
passes.get(PassCode_2021.CompileServerSapfor).Do();
passes.get(PassCode.CompileServerSapfor).Do();
}
}
}

8
src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass;
@@ -24,9 +24,9 @@ public class PublishComponentsServer extends RepositoryServerSSHPass {
//3. запустить сервер.
@Override
protected void ServerAction() throws Exception {
if (passes.get(PassCode_2021.PingComponentsServer).Do(true))
if (passes.get(PassCode.PingComponentsServer).Do(true))
ShutdownServer();
if (passes.get(PassCode_2021.PingComponentsServer).Do(true)) {
if (passes.get(PassCode.PingComponentsServer).Do(true)) {
throw new PassException("Не удалось остановить сервер.");
}
File src = Global.visualiser.getFile();
@@ -40,7 +40,7 @@ public class PublishComponentsServer extends RepositoryServerSSHPass {
@Override
protected boolean validate() {
if (!passes.get(PassCode_2021.PingComponentsServer).Do(true)) {
if (!passes.get(PassCode.PingComponentsServer).Do(true)) {
Log.Writeln_("Не удалось запустить сервер.");
}
return true;

4
src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.Common.TestingServer;
@@ -16,6 +16,6 @@ public class PublishSapforSettingsCommand extends PublishServerObject<TestingSer
}
@Override
protected boolean canStart(Object... args) throws Exception {
return CurrentAnchestor.Check(Log, Current.SapforSettings)&&super.canStart(args);
return Current_.Check(Log, Current.SapforSettings)&&super.canStart(args);
}
}

8
src/Visual_DVM_2021/Passes/All/PublishTestingServer.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass;
@@ -24,9 +24,9 @@ public class PublishTestingServer extends RepositoryServerSSHPass {
//3. запустить сервер.
@Override
protected void ServerAction() throws Exception {
if (passes.get(PassCode_2021.PingTestingServer).Do(true))
if (passes.get(PassCode.PingTestingServer).Do(true))
ShutdownServer();
if (passes.get(PassCode_2021.PingTestingServer).Do(true)) {
if (passes.get(PassCode.PingTestingServer).Do(true)) {
throw new PassException("Не удалось остановить сервер.");
}
File src = Global.visualiser.getFile();
@@ -41,7 +41,7 @@ public class PublishTestingServer extends RepositoryServerSSHPass {
@Override
protected boolean validate() {
if (!passes.get(PassCode_2021.PingTestingServer).Do(true)) {
if (!passes.get(PassCode.PingTestingServer).Do(true)) {
Log.Writeln_("Не удалось запустить сервер.");
}
return true;

10
src/Visual_DVM_2021/Passes/All/PublishTests.java
View File

@@ -6,8 +6,8 @@ import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
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 Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.io.File;
@@ -34,14 +34,14 @@ public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeTests).Do();
passes.get(PassCode.SynchronizeTests).Do();
}
@Override
protected void FocusResult() {
UI.getMainWindow().FocusTests();
}
//--
protected abstract PassCode_2021 getCreateTestCode();
protected abstract PassCode getCreateTestCode();
protected String getNoFilesMessage(){return "";};
//--
@Override
@@ -55,7 +55,7 @@ public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
return false;
}
//---
Pass_2021 createTestPass = passes.get(getCreateTestCode());
Pass createTestPass = passes.get(getCreateTestCode());
//---
for (File file : files) {
if (createTestPass.Do(file, group))

4
src/Visual_DVM_2021/Passes/All/RefreshDVMTests.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class RefreshDVMTests extends TestingSystemPass<Object>{
@Override
@@ -19,7 +19,7 @@ public class RefreshDVMTests extends TestingSystemPass<Object>{
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeTests).Do();
passes.get(PassCode.SynchronizeTests).Do();
}
//todo будет реализован когда наладится запуск сапфора на сервере тестирования.

4
src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Constants;
import _VisualDVM.Current;
@@ -16,7 +16,7 @@ public class RemoteInitialiseUser extends ConnectionPass<RemoteFile> {
}
@Override
protected boolean canStart(Object... args) {
return CurrentAnchestor.Check(Log, Current.User);
return Current_.Check(Log, Current.User);
}
@Override
protected void Connect() throws Exception {

10
src/Visual_DVM_2021/Passes/All/RenameDirectory.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
@@ -7,7 +7,7 @@ import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.ChangeFilePass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.PassException;
import org.apache.commons.io.FileUtils;
@@ -50,7 +50,7 @@ public class RenameDirectory extends ChangeFilePass {
@Override
protected void performPreparation() throws Exception {
if (current)
passes.get(PassCode_2021.CloseCurrentFile).Do();
passes.get(PassCode.CloseCurrentFile).Do();
}
@Override
protected void body() throws Exception {
@@ -81,9 +81,9 @@ public class RenameDirectory extends ChangeFilePass {
@Override
protected void performDone() throws Exception {
Current.getSapfor().ResetAllAnalyses();
CurrentAnchestor.set(Current.SelectedDirectory, dst);
Current_.set(Current.SelectedDirectory, dst);
if (current && new_current_file != null)
passes.get(PassCode_2021.OpenCurrentFile).Do(new_current_file);
passes.get(PassCode.OpenCurrentFile).Do(new_current_file);
}
@Override
protected void showDone() throws Exception {

12
src/Visual_DVM_2021/Passes/All/RenameFile.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
@@ -7,7 +7,7 @@ import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
import Visual_DVM_2021.Passes.ChangeFilePass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.PassException;
import java.io.File;
@@ -19,7 +19,7 @@ public class RenameFile extends ChangeFilePass<DBProjectFile> {
protected boolean canStart(Object... args) {
resetArgs();
current = false;
if (CurrentAnchestor.Check(Log, Current.SelectedFile)) {
if (Current_.Check(Log, Current.SelectedFile)) {
old = Current.getSelectedFile();
current = Current.HasFile() && Current.getFile().file.equals(old.file);
if ((ff = new FileNameForm()).ShowDialog("Введите новое имя файла", old.file.getName())) {
@@ -44,7 +44,7 @@ public class RenameFile extends ChangeFilePass<DBProjectFile> {
@Override
protected void performPreparation() throws Exception {
if (current)
passes.get(PassCode_2021.CloseCurrentFile).Do();
passes.get(PassCode.CloseCurrentFile).Do();
}
@Override
protected void body() throws Exception {
@@ -59,9 +59,9 @@ public class RenameFile extends ChangeFilePass<DBProjectFile> {
@Override
protected void performDone() throws Exception {
Current.getSapfor().ResetAllAnalyses();
CurrentAnchestor.set(Current.SelectedFile, target);
Current_.set(Current.SelectedFile, target);
if (current)
passes.get(PassCode_2021.OpenCurrentFile).Do(target);
passes.get(PassCode.OpenCurrentFile).Do(target);
}
@Override
protected void showDone() throws Exception {

8
src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java
View File

@@ -1,9 +1,9 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.io.Serializable;
@@ -30,11 +30,11 @@ public class ReplaceTestProject extends CreateTestFromProject {
}
};
testingSystemPass.Do(target);
passes.get(PassCode_2021.SynchronizeTests).Do();
passes.get(PassCode.SynchronizeTests).Do();
}
@Override
protected boolean initTarget() throws Exception {
if (CurrentAnchestor.Check(Log, Current.Test)) {
if (Current_.Check(Log, Current.Test)) {
target = Current.getTest();
return true;

14
src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Constants;
@@ -11,8 +11,8 @@ import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
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 Visual_DVM_2021.Passes.Server.TestingSystemPass;
import java.io.File;
@@ -33,7 +33,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
//-
@Override
protected boolean canStart(Object... args) throws Exception {
if (!CurrentAnchestor.Check(Log, Current.Group))
if (!Current_.Check(Log, Current.Group))
return false;
group = Current.getGroup();
//--->>>
@@ -42,7 +42,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
//---------------------------------------------------------------
//--
File dir = fileChooser.getCurrentDirectory();
Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
Pass.passes.get(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir);
//---------------
if (dir.getName().equals(Constants.data)) {
Log.Writeln_(CommonUtils.Brackets(dir) + "\nявляется служебной папкой визуализатора!");
@@ -98,7 +98,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
"Продолжить"
)) {
replaceTests = new Vector<>();
Pass_2021 createTestPass = passes.get(PassCode_2021.CreateTestFromFile);
Pass createTestPass = passes.get(PassCode.CreateTestFromFile);
for (Test old_test : oldTests.values()) {
File file = filesByNames.get(old_test.description);
if (createTestPass.Do(file, group)) {
@@ -132,6 +132,6 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
@Override
protected void performFinish() throws Exception {
super.performFinish();
passes.get(PassCode_2021.SynchronizeTests).Do();
passes.get(PassCode.SynchronizeTests).Do();
}
}

12
src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java
View File

@@ -1,15 +1,15 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import Visual_DVM_2021.Passes.CurrentProjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
public class ResetCurrentProject extends CurrentProjectPass {
@Override
protected void performPreparation() throws Exception {
passes.get(PassCode_2021.DeleteDebugResults).Do();
passes.get(PassCode_2021.CloseCurrentProject).Do();
CurrentAnchestor.set(Current.Root, null);
passes.get(PassCode.DeleteDebugResults).Do();
passes.get(PassCode.CloseCurrentProject).Do();
Current_.set(Current.Root, null);
}
@Override
protected void body() throws Exception {
@@ -19,6 +19,6 @@ public class ResetCurrentProject extends CurrentProjectPass {
}
@Override
protected void performDone() throws Exception {
passes.get(PassCode_2021.OpenCurrentProject).Do(target.Home);
passes.get(PassCode.OpenCurrentProject).Do(target.Home);
}
}

10
src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.PassMenuItem;
@@ -35,9 +35,9 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
protected boolean canStart(Object... args) throws Exception {
remoteFile = null;
localFile = null;
if (super.canStart() && passes.get(PassCode_2021.GetComponentsBackupsFromServer).Do()) {
if (super.canStart() && passes.get(PassCode.GetComponentsBackupsFromServer).Do()) {
//1. Получить список бекапов.
backups = (Vector<RemoteFile>) passes.get(PassCode_2021.GetComponentsBackupsFromServer).target;
backups = (Vector<RemoteFile>) passes.get(PassCode.GetComponentsBackupsFromServer).target;
backups.sort((o1, o2) -> o2.name.compareTo(o1.name));
Dialog d = new Dialog(null) {
@Override
@@ -78,7 +78,7 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
content = tree;
}
};
if (d.ShowDialog("Выбор версии для восстановления")&& CurrentAnchestor.Check(Log, Current.ComponentServerBackup)){
if (d.ShowDialog("Выбор версии для восстановления")&& Current_.Check(Log, Current.ComponentServerBackup)){
remoteFile = Current.getComponentServerBackup();
return true;
};
@@ -88,7 +88,7 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
@Override
protected void body() throws Exception {
//1. Скачать файл.
Pass_2021 receivePass = new ComponentsRepositoryPass() {
Pass receivePass = new ComponentsRepositoryPass() {
@Override
public String getDescription() {
return "Скачивание файла с сервера";

20
src/Visual_DVM_2021/Passes/All/Run.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import Common.Utils.CommonUtils;
import _VisualDVM.Current;
import _VisualDVM.Visual.UI;
@@ -9,13 +9,13 @@ import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ProjectData.Project.db_project_info;
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 java.util.Vector;
public class Run extends Pass_2021<db_project_info> {
Pass_2021 subpass = null;
public class Run extends Pass<db_project_info> {
Pass subpass = null;
Vector<RunTask> runTasks;
@Override
public String getIconPath() {
@@ -40,7 +40,7 @@ public class Run extends Pass_2021<db_project_info> {
@Override
protected boolean canStart(Object... args) {
subpass = null;
if (CurrentAnchestor.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile, Current.RunConfiguration,
if (Current_.Check(Log, Current.Project, Current.Machine, Current.User, Current.Makefile, Current.RunConfiguration,
Current.CompilationTask)) {
//-
target = Current.getProject();
@@ -61,9 +61,9 @@ public class Run extends Pass_2021<db_project_info> {
switch (Current.getMachine().type) {
case Local:
if (CommonUtils.isWindows()) {
subpass = passes.get(PassCode_2021.WindowsLocalRun);
subpass = passes.get(PassCode.WindowsLocalRun);
} else
subpass = passes.get(PassCode_2021.LinuxLocalRun);
subpass = passes.get(PassCode.LinuxLocalRun);
break;
case Undefined:
case MVS_cluster:
@@ -74,7 +74,7 @@ public class Run extends Pass_2021<db_project_info> {
break;
*/
default:
subpass = passes.get(PassCode_2021.ServerRun);
subpass = passes.get(PassCode.ServerRun);
break;
}
int i = 1;
@@ -95,7 +95,7 @@ public class Run extends Pass_2021<db_project_info> {
task_completed = true;
if (task.hasDvmSts) {
Utils.CheckAndCleanDirectory(Current.getProject().getStatisticDirectory());
Pass_2021.passes.get(PassCode_2021.SPF_StatisticAnalyzer).Do(task);
Pass.passes.get(PassCode.SPF_StatisticAnalyzer).Do(task);
}
break;
case Finished:

4
src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.Passes.All;
import Common.CurrentAnchestor;
import Common.Current_;
import _VisualDVM.Current;
import Visual_DVM_2021.Passes.SapforFilesModification;
public class SPF_ChangeSpfIntervals extends SapforFilesModification {
@@ -9,7 +9,7 @@ public class SPF_ChangeSpfIntervals extends SapforFilesModification {
int mod;
@Override
protected boolean canStart(Object... args) throws Exception {
if (super.canStart(args) && CurrentAnchestor.Check(Log, Current.File)) {
if (super.canStart(args) && Current_.Check(Log, Current.File)) {
start = (int) args[0];
end = (int) args[1];
mod = (int) args[2];

6
src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java
View File

@@ -2,7 +2,7 @@ package Visual_DVM_2021.Passes.All;
import Common.Visual.CommonUI;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.SapforTransformation;
import _VisualDVM.Global;
public class SPF_CreateParallelVariant extends SapforTransformation {
@@ -36,8 +36,8 @@ public class SPF_CreateParallelVariant extends SapforTransformation {
return variant.getDescription();
}
@Override
protected PassCode_2021 necessary() {
return PassCode_2021.SPF_GetArrayDistribution;
protected PassCode necessary() {
return PassCode.SPF_GetArrayDistribution;
}
@Override
protected void performPreparation() throws Exception {

6
src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java
View File

@@ -4,13 +4,13 @@ import Common.Visual.CommonUI;
import _VisualDVM.Visual.UI;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.SapforAnalysis;
public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalysis {
@Override
protected void performDone() throws Exception {
super.performDone();
SapforAnalysis code_analysis = (SapforAnalysis) passes.get(PassCode_2021.SPF_GetArrayDistributionOnlyAnalysis);
SapforAnalysis code_analysis = (SapforAnalysis) passes.get(PassCode.SPF_GetArrayDistributionOnlyAnalysis);
if (!code_analysis.isDone()) {
code_analysis.setDone();
code_analysis.MarkAsDone();
@@ -33,7 +33,7 @@ public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalys
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.MPI_PROGRAM).toBoolean()) {
CommonUI.Info("Включена настройка SAPFOR 'MPI программа'." +
"\nПостроение распределения данных невозможно.");
passes.get(PassCode_2021.SPF_SharedMemoryParallelization).Do();
passes.get(PassCode.SPF_SharedMemoryParallelization).Do();
return false;
}
return super.canStart(args);

6
src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
View File

@@ -6,7 +6,7 @@ import Common.Utils.Index;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.SapforAnalysis;
import java.util.Collections;
@@ -14,8 +14,8 @@ import java.util.Comparator;
import java.util.Vector;
public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis {
@Override
protected Vector<PassCode_2021> getForbiddenPhases() {
return new Vector<>(Collections.singletonList(PassCode_2021.SPF_GetArrayDistributionOnlyRegions));
protected Vector<PassCode> getForbiddenPhases() {
return new Vector<>(Collections.singletonList(PassCode.SPF_GetArrayDistributionOnlyRegions));
}
@Override
public String phase() {

4
src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java
View File

@@ -5,7 +5,7 @@ import _VisualDVM.Global;
import Visual_DVM_2021.Passes.PassState;
import _VisualDVM.Visual.Controls.PassControl;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.SilentSapforPass;
public class SPF_GetGCovInfo extends SilentSapforPass {
@Override
@@ -23,7 +23,7 @@ public class SPF_GetGCovInfo extends SilentSapforPass {
protected boolean canStart(Object... args) throws Exception {
if (CommonUI.Question("Все анализы будут сброшены.Продолжить")) {
SPF_ParseFilesWithOrder.silent = true;
return super.canStart(args) && passes.get(PassCode_2021.GCOV).Do()&&passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do();
return super.canStart(args) && passes.get(PassCode.GCOV).Do()&&passes.get(PassCode.SPF_ParseFilesWithOrder).Do();
}
return false;
}

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