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-14 15:19:13 +03:00
parent 8eef367bd4
commit 5e09fb44ea
634 changed files with 3751 additions and 3263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/_VisualDVM/Constants.java
View File

@@ -4,7 +4,7 @@ import Common.Utils.Vector_;
import java.util.Vector;
public class Constants {
public static final int planner_version = 3;
public static final int testingMaxKernels= 64; //вообще говоря, это параметр машины.
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
//--
public static final String ComponentsDirectoryName = "Components";
public static final String DataDirectoryName = "Data";
@@ -106,7 +106,6 @@ public class Constants {
"Text.h",
"Utils.h",
"version.h"
};
//пробный коммит. изменение комментария.++
//кронтаб и перезагрузка
@@ -456,8 +455,7 @@ public class Constants {
//</editor-fold>
};
public static Vector<String> admins_mails = new Vector_<>(
"vmk-post@yandex.ru"
// "79854210702@ya.ru"
// "79854210702@ya.ru"
);
}

1
src/_VisualDVM/Current.java
View File

@@ -40,7 +40,6 @@ public enum Current implements Current_ {
SelectedFile,
//текущий выбранный удаленный файл
RemoteFile,
PassForm, //текущее окно анимации. нужно для сообщений сапфора по сокету.
RunStsRecord,
//только для того, чтобы закодировать таблицу.
Array,

4
src/_VisualDVM/Global.java
View File

@@ -4,11 +4,11 @@ import Common.Mode;
import Common.Utils.Loggable;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.GlobalData.Settings.DBSetting;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.*;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
@@ -226,7 +226,7 @@ public class Global {
//-------------------------------->>
UI_.active = true;
UI_.setTheme(new LightSPFEditorTheme());
mainModule= new MainModule();
mainModule = new MainModule();
CheckVisualiserDirectories();
CreateLogAtComponentsPath();
//-

6
src/_VisualDVM/GlobalData/Account/Account.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.Account;
import Common.Database.Objects.DBObject;
import _VisualDVM.Visual.UI;
import Common.Utils.TextLog;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
public class Account extends DBObject {
@Description("PRIMARY KEY,NOT NULL")
@@ -55,8 +55,8 @@ public class Account extends DBObject {
public boolean isAdmin() {
return role.equals(AccountRole.Admin);
}
public boolean CheckAdmin(TextLog log){
if (!isAdmin()){
public boolean CheckAdmin(TextLog log) {
if (!isAdmin()) {
log.Writeln_("Вы не являетесь администратором!");
return false;
}

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

@@ -1,14 +1,14 @@
package _VisualDVM.GlobalData.Compiler;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
import _VisualDVM.Validators.DVMHelpParser;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironmentsSet;
import _VisualDVM.GlobalData.CompilerOption.CompilerOptionsSet;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Validators.DVMHelpParser;
import com.sun.org.glassfish.gmbal.Description;
public class Compiler extends iDBObject {
public int machine_id = -1;
@@ -72,8 +72,8 @@ public class Compiler extends iDBObject {
public void ParseVersion() {
switch (type) {
case dvm:
String [] lines = versionText.split("\n");
if (lines.length>=3) {
String[] lines = versionText.split("\n");
if (lines.length >= 3) {
String[] data = lines[2].split(" ");
if (data.length >= 4)
version = data[3].replace(",", "");
@@ -188,7 +188,7 @@ public class Compiler extends iDBObject {
public String getVersionCommand() {
return Utils_.DQuotes(call_command) + " " + version_command;
}
public String getVersionInfo(){
return "v="+version+" r="+revision;
public String getVersionInfo() {
return "v=" + version + " r=" + revision;
}
}

22
src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -1,22 +1,22 @@
package _VisualDVM.GlobalData.Compiler;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Utils;
import _VisualDVM.Validators.PathValidator;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.UI.CompilerFields;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Utils;
import _VisualDVM.Validators.PathValidator;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
public class CompilersDBTable extends iDBTable<Compiler> {
@@ -79,7 +79,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
//самое опасное место. теоретически тут можно ввести любую команду ОС, в том числе rm -rf
if (call_command.contains(" "))
Log.Writeln("Прямая команда вызова не может содержать пробелы");
if (!call_command.contains("+")&& Utils_.ContainsForbiddenName(call_command))
if (!call_command.contains("+") && Utils_.ContainsForbiddenName(call_command))
Log.Writeln("Прямая команда вызова содержит запрещённые символы");
else {
if (Utils.isLinuxSystemCommand(call_command))
@@ -118,7 +118,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);

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

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Compiler.UI;
import Common.Visual.UI_;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Global;
@@ -35,7 +35,7 @@ public class CompilerFields implements DialogFields {
if (file != null)
dst = file.getAbsolutePath();
} else {
if ( Global.mainModule.getPass(PassCode.SelectRemoteFile).Do(true))
if (Global.mainModule.getPass(PassCode.SelectRemoteFile).Do(true))
dst = Global.mainModule.getRemoteFile().full_name;
}
if (dst != null)

4
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {

4
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
@Override

4
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
@Override

4
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> {

4
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
@Override

12
src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
View File

@@ -1,14 +1,13 @@
package _VisualDVM.GlobalData.DVMParameter;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Utils;
public class DVMParameterDBTable extends iDBTable<DVMParameter> {
public DVMParameterDBTable() {
super(DVMParameter.class);
@@ -41,12 +40,11 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
};
}
@Override

2
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.EnvironmentValue;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
public class EnvironmentValue extends iDBObject {
public String name = "";

12
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
View File

@@ -1,14 +1,13 @@
package _VisualDVM.GlobalData.EnvironmentValue;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Utils;
public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
public EnvironmentValuesDBTable() {
super(EnvironmentValue.class);
@@ -66,12 +65,11 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
};
}
@Override

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

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

2
src/_VisualDVM/GlobalData/FileObject/DirInfo.java
View File

@@ -17,7 +17,7 @@ public class DirInfo extends DBObject {
public Date getDate() {
return new Date(mdate);
}
public File getFile(){
public File getFile() {
return dir;
}
}

8
src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
View File

@@ -2,22 +2,22 @@ package _VisualDVM.GlobalData.FileObject;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import static Common.Visual.Tables.TableRenderers.*;
import static Common.Visual.Tables.TableRenderers.RendererDate;
public class DirInfosDataSet extends DataSet<String, DirInfo> {
public DirInfosDataSet() {
super(String.class, DirInfo.class);
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(1).setRenderer(RendererDate);
columns.get(1).setRenderer(RendererDate);
}
};
}
@Override
public String[] getUIColumnNames(){
public String[] getUIColumnNames() {
return new String[]{
"дата изменения"};
}

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

@@ -25,8 +25,8 @@ import _VisualDVM.GlobalData.Settings.SettingsDBTable;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
import _VisualDVM.GlobalData.User.UsersDBTable;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.ComponentType;
import java.nio.file.Paths;
import java.util.Date;
@@ -94,7 +94,7 @@ public class GlobalDatabase extends VisualiserDatabase {
public PassCode getSynchronizePassCode() {
return null;
}
public void SaveCredentials(){
public void SaveCredentials() {
try {
Credentials credentials = Global.mainModule.getCredentials();
if (Global.mainModule.HasMachine())
@@ -108,8 +108,7 @@ public class GlobalDatabase extends VisualiserDatabase {
if (Global.mainModule.HasRunConfiguration())
credentials.runconfiguration_id = Global.mainModule.getRunConfiguration().id;
Update(credentials);
}
catch (Exception ex){
} catch (Exception ex) {
ex.printStackTrace();
}
}

1
src/_VisualDVM/GlobalData/Grid/TableVisualData.java
View File

@@ -8,7 +8,6 @@ import java.util.stream.Collectors;
public class TableVisualData extends DBObject {
@Description("PRIMARY KEY, UNIQUE") //имя таблицы
public String name = null;
//todo запаковать в json (?)
@Description("DEFAULT ''")
public String sizes = ""; //ширины столбцов запакованные через |. вводить объекты ради них нецелесообразно.

2
src/_VisualDVM/GlobalData/Machine/Machine.java
View File

@@ -24,7 +24,7 @@ public class Machine extends iDBObject {
}
public String getFullDescription() {
return //this.equals(Constants.repository_machine) ? "Репозиторий визуализатора" :
"Машина по адресу " + Utils_.Brackets(getURL());
"Машина по адресу " + Utils_.Brackets(getURL());
}
public LinkedHashMap<Integer, Compiler> getCompilers() {
return Global.mainModule.getDb().getMapByFKi(this, Compiler.class);

11
src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
View File

@@ -1,14 +1,13 @@
package _VisualDVM.GlobalData.Machine;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
@@ -19,6 +18,7 @@ import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
public class MachinesDBTable extends iDBTable<Machine> {
@@ -63,7 +63,6 @@ public class MachinesDBTable extends iDBTable<Machine> {
public void SetEditLimits() {
fields.cbMachineType.setEnabled(false);
}
};
}
@Override

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

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.Machine;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

4
src/_VisualDVM/GlobalData/Makefile/Makefile.java
View File

@@ -1,9 +1,8 @@
package _VisualDVM.GlobalData.Makefile;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Utils.TextLog;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Machine.Machine;
@@ -12,6 +11,7 @@ import _VisualDVM.GlobalData.Module.ModuleAnchestor;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Utils;
import java.util.LinkedHashMap;
import java.util.Vector;

7
src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.GlobalData.Makefile;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
@@ -43,7 +43,6 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
};
}
@Override

2
src/_VisualDVM/GlobalData/Makefile/UI/MakefilePreviewForm.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Makefile.UI;
import _VisualDVM.Visual.Editor.Viewer;
import Common.Visual.Windows.Dialog.Text.TextDialog;
import _VisualDVM.Visual.Editor.Viewer;
public class MakefilePreviewForm extends TextDialog<Viewer> {
public MakefilePreviewForm() {
super(Viewer.class);

2
src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.Module;
import Common.CommonConstants;
import Common.Utils.Utils_;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
public class ModuleAnchestor extends iDBObject {

2
src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.GlobalData.Module;
import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
public class ModulesDBTable extends iDBTable<Module> {
public ModulesDBTable() {

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

@@ -1,15 +1,15 @@
package _VisualDVM.GlobalData.Module.UI;
import Common.Visual.UI_;
import Common.Passes.Pass;
import Common.Visual.Controls.StyledTextComboBox;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.Module.ModuleAnchestor;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.ProjectData.LanguageName;
import javax.swing.*;
import java.awt.*;
@@ -37,7 +37,7 @@ public class ModuleAnchestorFields implements DialogFields {
BPickOptions.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass<String> pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
Pass<String> pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(compiler)) {
UI_.TrySelect(cbFlags, pass.target);
}

3
src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.Module.UI;
import Common.CommonConstants;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -38,7 +37,7 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
if (Result instanceof Makefile) {
//могут быть только flink/clink
if (!command.equals("flink") && !command.equals("clink")
&&
&&
!command.equals("f") && !command.equals("c")
) {
Log.Writeln("При линковке DVM системой допустимы\n" +

2
src/_VisualDVM/GlobalData/RemoteFile/RemoteFile.java
View File

@@ -20,7 +20,7 @@ public class RemoteFile implements Serializable {
name = name_in;
isDirectory = isDirectory_in;
}
public RemoteFile(RemoteFile parent_in, String name_in){
public RemoteFile(RemoteFile parent_in, String name_in) {
this(parent_in.full_name, name_in);
}
public RemoteFile(String parent_in, String name_in) {

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

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.SSH.ConnectionPass;

2
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.Visual.Trees.TreeForm;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

2
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import javax.swing.*;

2
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import _VisualDVM.Current;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class RemoteFilesTree extends DataTree {

6
src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java
View File

@@ -1,9 +1,10 @@
package _VisualDVM.GlobalData.RunConfiguration;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import Common.Passes.PassException;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Objects.iDBObject;
import Common.Utils.TextLog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
@@ -12,7 +13,6 @@ import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ProjectData.Project.db_project_info;
import Common.Passes.PassException;
import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap;

11
src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -1,21 +1,19 @@
package _VisualDVM.GlobalData.RunConfiguration;
import Common.CommonConstants;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.RunConfiguration.UI.MatrixBar;
import _VisualDVM.GlobalData.RunConfiguration.UI.RunConfigurationFields;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
@@ -123,7 +121,6 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
};
}
@Override

2
src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java
View File

@@ -5,5 +5,5 @@ public class SapforProfile extends iDBObject {
@Description("DEFAULT ''")
public String description = "";
@Description("DEFAULT 0")
public long creationDate= 0;
public long creationDate = 0;
}

6
src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.GlobalData.SapforProfile;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.SapforProfile.UI.SapforProfileFields;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;

2
src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfileFields.java
View File

@@ -5,8 +5,8 @@ import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;
public class SapforProfileFields implements DialogFields {
private JPanel content;
public JTextField tfDescription;
private JPanel content;
@Override
public Component getContent() {
return content;

2
src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.SapforProfileSetting;
import Common.CommonConstants;
import _VisualDVM.Current;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import com.sun.org.glassfish.gmbal.Description;

4
src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSettingsDBTable.java
View File

@@ -1,14 +1,14 @@
package _VisualDVM.GlobalData.SapforProfileSetting;
import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
public class SapforProfileSettingsDBTable extends iDBTable<SapforProfileSetting> {
public SapforProfileSettingsDBTable() {
super(SapforProfileSetting.class);
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);

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

@@ -1,10 +1,10 @@
package _VisualDVM.GlobalData.Settings;
import Common.Database.Objects.DBObject;
import Common.Utils.Utils_;
import _VisualDVM.Passes.PassCode;
import Common.Visual.Controls.StableMenuItem;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Visual.Menus.StableMenuItem;
import com.sun.org.glassfish.gmbal.Description;
import javax.swing.*;
@@ -32,7 +32,7 @@ public class DBSetting extends DBObject {
Owner = owner_in;
Visible = Visible_in;
}
public DBSetting (SettingName Name_, String Value_){
public DBSetting(SettingName Name_, String Value_) {
Name = Name_;
Value = Value_;
}
@@ -70,7 +70,7 @@ public class DBSetting extends DBObject {
getMenuItem().setText(Name.getDescription() + " : " + this + "%");
break;
case StringField:
String valueToShow = Value.isEmpty()? "не задано": Utils_.Quotes(toString());
String valueToShow = Value.isEmpty() ? "не задано" : Utils_.Quotes(toString());
getMenuItem().setText(Name.getDescription() + " : " + valueToShow);
break;
case IntField:

3
src/_VisualDVM/GlobalData/Settings/SettingName.java
View File

@@ -68,8 +68,7 @@ public enum SettingName {
IGNORE_IO_SAPFOR,
KEEP_SPF_DIRECTIVES_AMONG_TRANSFORMATIONS,
PARSE_FOR_INLINE,
EMPTY_OPTION
;
EMPTY_OPTION;
public static SettingName getByDescription(String desc) {
SettingName[] all = SettingName.values();
for (SettingName settingName : all)

4
src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.Settings;
import Common.Database.Tables.DBTable;
import Common.Utils.Utils_;
import _VisualDVM.Utils;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Utils;
import java.util.Vector;
import java.util.stream.Collectors;
@@ -34,7 +34,7 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
AddSetting(new DBSetting(SettingName.ProjectsSearchDirectory, "", SettingType.StringField, ComponentType.Visualiser, false));
AddSetting(new DBSetting(SettingName.EditorFontSize, "14", SettingType.StringField, ComponentType.Visualiser, false));
AddSetting(new DBSetting(SettingName.DarkThemeOn, 0, SettingType.SapforFlag, ComponentType.Visualiser, false));
// AddSetting(new DBSetting(SettingName.FocusPassesResult, 1, SettingType.SapforFlag, ComponentType.Visualiser));
// AddSetting(new DBSetting(SettingName.FocusPassesResult, 1, SettingType.SapforFlag, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.FastAccessPassesCount, 5, SettingType.IntField, ComponentType.Visualiser));

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

@@ -1,9 +1,7 @@
package _VisualDVM.GlobalData.Tasks.CompilationTask;
import Common.CommonConstants;
import Common.Current_;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;

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

@@ -6,10 +6,10 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
@@ -60,10 +60,9 @@ public class CompilationTasksDBTable extends iDBTable<CompilationTask> {
public void CreateControl() {
super.CreateControl();
TableMenu dataTableMenu = new TableMenu(control);
dataTableMenu.add( Global.mainModule.getPass(PassCode.DeleteSelectedCompilationTasks).createMenuItem());
dataTableMenu.add(Global.mainModule.getPass(PassCode.DeleteSelectedCompilationTasks).createMenuItem());
control.setComponentPopupMenu(dataTableMenu);
}
};
}
@Override

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

@@ -1,16 +1,16 @@
package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.CommonConstants;
import Common.Utils.StringTemplate;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import Common.Utils.StringTemplate;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Utils;
import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils;

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

@@ -2,9 +2,9 @@ package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.TableMenu;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import static Common.Visual.Tables.TableRenderers.RendererDate;
@@ -47,7 +47,7 @@ public class RunTasksDBTable extends iDBTable<RunTask> {
public void CreateControl() {
super.CreateControl();
TableMenu dataTableMenu = new TableMenu(control);
dataTableMenu.add( Global.mainModule.getPass(PassCode.DeleteSelectedRunTasks).createMenuItem());
dataTableMenu.add(Global.mainModule.getPass(PassCode.DeleteSelectedRunTasks).createMenuItem());
control.setComponentPopupMenu(dataTableMenu);
}
};

1
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalRunSupervisor.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;

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

@@ -1,12 +1,12 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.Supervisor.Local.LocalTaskSupervisor;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.GlobalData.User.User;
import Common.Passes.PassException;
import _VisualDVM.Utils;
import java.io.File;
import java.nio.file.Files;

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

@@ -1,13 +1,13 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local;
import Common.CommonConstants;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.Tasks.Supervisor.TaskSupervisor;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
import Common.Passes.Pass;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -102,5 +102,7 @@ public abstract class LocalTaskSupervisor<T extends Task> extends TaskSupervisor
FileUtils.write(par_text, String.join("\n", rTask.getRunConfiguration().getParList()));
}
}
protected String getCoupDeGrace(){return "";}
protected String getCoupDeGrace() {
return "";
}
}

1
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;

5
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.Tasks.QueueSystem.MVS;
@@ -48,11 +47,11 @@ public class MVSRunSupervisor extends ServerRunSupervisor {
}
@Override
protected void CheckTask() throws Exception {
// mvs.checkTask(pass.ShellCommand(mvs.getCheckTaskCommand(task)), task);
// mvs.checkTask(pass.ShellCommand(mvs.getCheckTaskCommand(task)), task);
}
@Override
protected void AbortTask() throws Exception {
// pass.ShellCommand(mvs.getCancelTaskCommand(task));
// pass.ShellCommand(mvs.getCancelTaskCommand(task));
}
@Override
protected void CalculatePerformanceTime() throws Exception {

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import Common.Utils.Utils_;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Utils;
import java.io.File;
public class RemoteCompilationSupervisor extends RemoteTaskSupervisor<CompilationTask> {
@@ -30,7 +30,7 @@ public class RemoteCompilationSupervisor extends RemoteTaskSupervisor<Compilatio
}
@Override
protected void StartTask() throws Exception {
task.PID = pass.user.connection.startShellProcess(getRemoteProject(), "PID",getStartCommand());
task.PID = pass.user.connection.startShellProcess(getRemoteProject(), "PID", getStartCommand());
task.state = TaskState.Running;
}
@Override

1
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
View File

@@ -73,7 +73,6 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
public String getLauncher() {
return String.join("/", pass.user.workspace, "modules", "launcher");
}
protected String getStartCommand() {
String res =
String.join(" ",

5
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
View File

@@ -1,10 +1,9 @@
package _VisualDVM.GlobalData.Tasks.Supervisor.Remote;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Utils;
import com.jcraft.jsch.ChannelSftp;
import java.io.ByteArrayInputStream;
@@ -18,7 +17,7 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
String env = String.join(" ", Global.mainModule.getRunConfiguration().getEnvList());
if (!env.isEmpty()) res = env + " " + res;
//--
task.PID = pass.user.connection.startShellProcess(getRemoteProject(),"PID",
task.PID = pass.user.connection.startShellProcess(getRemoteProject(), "PID",
"ulimit -s unlimited", res);
task.state = TaskState.Running;
}

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

@@ -1,11 +1,11 @@
package _VisualDVM.GlobalData.Tasks.Supervisor;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.Task;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ProjectData.Project.db_project_info;
import Common.Passes.PassException;
import Common.Passes.Pass;
import java.util.Date;
public abstract class TaskSupervisor<T extends Task, P extends Pass> {
@@ -13,9 +13,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
protected db_project_info project; //проект к которому относится задача
protected P pass; //проход отвечающий за задачу
protected int performanceTime; //сколько задача уже выполняется.
public void ShowTaskState(){
public void ShowTaskState() {
Global.mainModule.getDb().tables.get(task.getClass()).ShowUI(task.getPK());
}
public void Init(T task_in, P pass_in, db_project_info project_in) {
@@ -49,7 +47,7 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
protected void CheckTask() throws Exception {
}
protected void CheckIfNeedAbort() {
if (project.getInterruptFile().exists()){
if (project.getInterruptFile().exists()) {
task.state = TaskState.AbortingByUser;
ShowTaskState();
}
@@ -57,11 +55,11 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
//досрочное прерывание задачи
protected void AbortTask() throws Exception {
}
protected String getCoupDeGrace(){
protected String getCoupDeGrace() {
return "";
}
//добивание задачи после ее завершения по таймауту. не всегда нужно
// protected void CoupDeGraceTask() throws Exception {}
// protected void CoupDeGraceTask() throws Exception {}
//получить результаты выполнения задачи. в случае локальной машины, очевидно, пустая функция
protected void AchieveResults() throws Exception {
}

5
src/_VisualDVM/GlobalData/Tasks/Task.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.GlobalData.Tasks;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Utils;
import com.sun.org.glassfish.gmbal.Description;
import java.io.File;
@@ -88,7 +88,6 @@ public abstract class Task extends iDBObject {
public void MaximizeTime() {
Time = maxtime + 1;
}
public void UpdateState(TaskState state_in) {
if (state != state_in) {
state = state_in;

2
src/_VisualDVM/GlobalData/Tasks/TaskState.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Tasks;
import Common.Visual.StatusEnum;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.StatusEnum;
public enum TaskState implements StatusEnum {
Inactive,
//--

9
src/_VisualDVM/GlobalData/User/User.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.User;
import Common.CommonConstants;
import _VisualDVM.Current;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.TestingSystem.DVM.UserConnection;
@@ -16,6 +16,9 @@ public class User extends iDBObject {
public UserAuthentication authentication = UserAuthentication.password;
public String workspace = ""; //рабочая папка визуализатора пользователя на машине. полный путь.
public UserState state = UserState.initial;
//-
@Description("IGNORE")
public UserConnection connection = null;
/*
@Description("DEFAULT '?'")
public String email = "?";
@@ -58,7 +61,6 @@ public class User extends iDBObject {
public File getLocalModulesDir() {
return Paths.get(workspace, "modules").toFile();
}
public File getHeaderCodeFile() {
return Paths.get(workspace, "modules", "Process_r.h").toFile();
}
@@ -74,7 +76,4 @@ public class User extends iDBObject {
public File getLauncherFile() {
return Paths.get(workspace, "modules", "launcher").toFile();
}
//-
@Description("IGNORE")
public UserConnection connection = null;
}

2
src/_VisualDVM/GlobalData/User/UserState.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.User;
import Common.Visual.StatusEnum;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.StatusEnum;
public enum UserState implements StatusEnum {
initial, //на пользователя еще не заходили.
ready, //рудимент.

19
src/_VisualDVM/GlobalData/User/UsersDBTable.java
View File

@@ -1,19 +1,19 @@
package _VisualDVM.GlobalData.User;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.UI.UserFields;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
public class UsersDBTable extends iDBTable<User> {
@@ -59,7 +59,7 @@ public class UsersDBTable extends iDBTable<User> {
}
@Override
public void ProcessResult() {
Result.machine_id =Global.mainModule.getMachine().id;
Result.machine_id = Global.mainModule.getMachine().id;
Result.login = fields.tfLogin.getText();
Result.authentication = UserAuthentication.password;
Result.password = new String(fields.tfPassword.getPassword());
@@ -81,16 +81,15 @@ public class UsersDBTable extends iDBTable<User> {
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
// UI.getMainWindow().ShowCurrentCompiler();
// UI.getMainWindow().ShowCurrentCompiler();
UI.credentialsBar.ShowUser();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
// UI.getMainWindow().ShowCurrentCompiler();
// UI.getMainWindow().ShowCurrentCompiler();
UI.credentialsBar.ShowNoUser();
}
};
}
@Override

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

@@ -3,7 +3,7 @@ import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class UsersMenuBar extends DataMenuBar {
public UsersMenuBar() {
super("пользователи", PassCode.AddUser,
super("пользователи", PassCode.AddUser,
PassCode.EditUser,
PassCode.InitialiseUser,
PassCode.DeleteUser);

53
src/_VisualDVM/GlobalProperties.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Menus.StableMenuItem;
import Common.Visual.Controls.StableMenuItem;
import _VisualDVM.Passes.PassCode;
import com.google.gson.annotations.Expose;
@@ -85,27 +85,6 @@ public class GlobalProperties {
public boolean EmailOnTestingProgress = false; //включено ли оповещение по email о результатах тестирования.
@Expose
public boolean eraseTestingWorkspaces = true; //удалять ли рабочее пространство пакетов тестирования после его завершения
//-----------------
public String getFieldDescription(String fieldName) {
switch (fieldName) {
case "ShowPassesDone":
return "Сообщать об успешном выполнении проходов";
case "ConfirmPassesStart":
return "Запрашивать подтверждения начала выполнения проходов";
case "FocusPassesResult":
return "Переходить на результирующую вкладку проходов по их завершении";
case "collapseCredentials":
return "Свернуть раздел машин";
case "collapseFileGraphs":
return "Свернуть раздел графов файла";
case "collapseFileMessages":
return "Свернуть раздел сообщений файла";
case "collapseProjectTrees":
return "Свернуть раздел деревьев проекта";
default:
return "?";
}
}
public GlobalProperties(GlobalProperties p) {
super();
Mode = p.Mode;
@@ -147,13 +126,37 @@ public class GlobalProperties {
EmailOnTestingProgress = p.EmailOnTestingProgress;
eraseTestingWorkspaces = p.eraseTestingWorkspaces;
}
//--
public GlobalProperties() {
}
//-----------------
public String getFieldDescription(String fieldName) {
switch (fieldName) {
case "ShowPassesDone":
return "Сообщать об успешном выполнении проходов";
case "ConfirmPassesStart":
return "Запрашивать подтверждения начала выполнения проходов";
case "FocusPassesResult":
return "Переходить на результирующую вкладку проходов по их завершении";
case "collapseCredentials":
return "Свернуть раздел машин";
case "collapseFileGraphs":
return "Свернуть раздел графов файла";
case "collapseFileMessages":
return "Свернуть раздел сообщений файла";
case "collapseProjectTrees":
return "Свернуть раздел деревьев проекта";
default:
return "?";
}
}
//-----------------
public void addFlagMenuItem(JMenu menu, String fieldName) {
JMenuItem menu_item = new StableMenuItem(getFieldDescription(fieldName),
getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png");
//-
menu_item.addActionListener(e -> {
if ( Global.mainModule.getPass(PassCode.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
if (Global.mainModule.getPass(PassCode.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
menu_item.setIcon(Utils_.getIcon(getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
});
menu.add(menu_item);
@@ -216,11 +219,7 @@ public class GlobalProperties {
exception.printStackTrace();
}
}
public File getFile() {
return Paths.get(System.getProperty("user.dir"), "properties").toFile();
}
//--
public GlobalProperties() {
}
}

51
src/_VisualDVM/MainModule.java
View File

@@ -1,8 +1,6 @@
package _VisualDVM;
import Common.Utils.Vector_;
import Common.MainModule_;
import _VisualDVM.Passes.PassCode;
import Common.Visual.Windows.PassForm;
import Common.Utils.Vector_;
import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Credentials.Credentials;
@@ -16,6 +14,7 @@ import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
@@ -40,6 +39,26 @@ import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;
import java.util.Vector;
public class MainModule extends MainModule_<GlobalDatabase> {
//--
Vector<PassCode> accountRoleDependentPasses = new Vector_<>(
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber,
PassCode.DeleteSubscriberWorkspace,
//--
PassCode.DownloadAllBugReportsArchives,
//--
PassCode.CompileServerSapfor,
PassCode.DeleteServerSapfor,
//
PassCode.ShutdownComponentsServer,
PassCode.StartComponentsServer,
PassCode.PublishComponentsServer,
//
PassCode.ShutdownTestingServer,
PassCode.StartTestingServer,
PassCode.PublishTestingServer
);
public MainModule() {
super(GlobalDatabase.class);
}
@@ -296,36 +315,16 @@ public class MainModule extends MainModule_<GlobalDatabase> {
set(Current.Array, null);
set(Current.DBArray, null);
}
//--
Vector<PassCode> accountRoleDependentPasses = new Vector_<>(
PassCode.AddSubscriber,
PassCode.EditSubscriber,
PassCode.DeleteSubscriber,
PassCode.DeleteSubscriberWorkspace,
//--
PassCode.DownloadAllBugReportsArchives,
//--
PassCode.CompileServerSapfor,
PassCode.DeleteServerSapfor,
//
PassCode.ShutdownComponentsServer,
PassCode.StartComponentsServer,
PassCode.PublishComponentsServer,
//
PassCode.ShutdownTestingServer,
PassCode.StartTestingServer,
PassCode.PublishTestingServer
);
public void SetUserPassesAccess() {
for (PassCode code: accountRoleDependentPasses)
for (PassCode code : accountRoleDependentPasses)
getPass(code).setControlsVisible(false);
}
public void SetDeveloperPassesAccess() {
SetUserPassesAccess();
getPass(PassCode.DownloadAllBugReportsArchives).setControlsVisible(true);
}
public void SetAdminPassesAccess(){
for (PassCode code: accountRoleDependentPasses)
public void SetAdminPassesAccess() {
for (PassCode code : accountRoleDependentPasses)
getPass(code).setControlsVisible(true);
}
}

1
src/_VisualDVM/Passes/All/AbortDVMPackage.java
View File

@@ -10,5 +10,4 @@ public class AbortDVMPackage extends AbortTestingPackage {
public int getAbortType() {
return 0;
}
}

2
src/_VisualDVM/Passes/All/ActualizeDVMPackages.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Testing.ActualizeTestingPackages;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.Passes.Testing.ActualizeTestingPackages;
public class ActualizeDVMPackages extends ActualizeTestingPackages<DVMPackage> {
public ActualizeDVMPackages() {
super(DVMPackage.class);

2
src/_VisualDVM/Passes/All/ActualizePackages.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
public class ActualizePackages extends Pass {
@Override
protected boolean needsAnimation() {

2
src/_VisualDVM/Passes/All/ActualizeSapforPackages.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Testing.ActualizeTestingPackages;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.Passes.Testing.ActualizeTestingPackages;
public class ActualizeSapforPackages extends ActualizeTestingPackages<SapforPackage> {
public ActualizeSapforPackages() {
super(SapforPackage.class);

2
src/_VisualDVM/Passes/All/ActualizeServerSapfors.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
public class ActualizeServerSapfors extends Pass {
@Override
protected boolean canStart(Object... args) throws Exception {

8
src/_VisualDVM/Passes/All/AddBugReport.java
View File

@@ -1,15 +1,15 @@
package _VisualDVM.Passes.All;
import Common.Database.Database;
import Common.Passes.AddObjectPass;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Database.Database;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.Component.ComponentType;
import Common.Passes.AddObjectPass;
import _VisualDVM.Passes.PassCode;
import java.io.File;
import java.nio.file.Files;
@@ -46,7 +46,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
target.project_version = "";
target.visualiser_version = Global.visualiser.version;
target.sapfor_version = Global.Components.get(ComponentType.Sapfor_F).version;
target.sapfor_settings =(Global.mainModule.getDb()).settings.getSapforSettingsText();
target.sapfor_settings = (Global.mainModule.getDb()).settings.getSapforSettingsText();
target.percentage = 0;
target.description = "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'";
target.date = new Date().getTime();

2
src/_VisualDVM/Passes/All/AddCompiler.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import Common.Database.Objects.DBObject;
import Common.Passes.AddObjectPass;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Machine.Machine;
import Common.Passes.AddObjectPass;
public class AddCompiler extends AddObjectPass<Compiler> {
public AddCompiler() {
super(Compiler.class);

2
src/_VisualDVM/Passes/All/AddDVMParameter.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import Common.Database.Objects.DBObject;
import Common.Passes.AddObjectPass;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import Common.Passes.AddObjectPass;
public class AddDVMParameter extends AddObjectPass<DVMParameter> {
public AddDVMParameter() {
super(DVMParameter.class);

52
src/_VisualDVM/Passes/All/AddDVMParameterForTesting.java
View File

@@ -1,38 +1,38 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
import Common.Passes.Pass;
import _VisualDVM.Utils;
public class AddDVMParameterForTesting extends Pass<String> {
@Override
protected boolean canStart(Object... args) throws Exception {
DBObjectDialog<DVMParameter, DVMParameterFields> dialog =
new DBObjectDialog<DVMParameter, DVMParameterFields>(DVMParameterFields.class) {
@Override
public void fillFields() {
}
@Override
public void validateFields() {
String name = (String) fields.cbName.getSelectedItem();
String value = fields.tfValue.getText();
if (name.isEmpty())
Log.Writeln("Имя параметра DVM системы не может быть пустым.");
if (Utils.isLinuxSystemCommand(name))
Log.Writeln(Utils_.DQuotes(name) + " является системной командой Linux");
if (Utils.isLinuxSystemCommand(value))
Log.Writeln(Utils_.DQuotes(value) + " является системной командой Linux");
}
@Override
public void ProcessResult() {
target = fields.cbName.getSelectedItem() +"="+fields.tfValue.getText();
}
@Override
public int getDefaultHeight() {
return 200;
}
};
new DBObjectDialog<DVMParameter, DVMParameterFields>(DVMParameterFields.class) {
@Override
public void fillFields() {
}
@Override
public void validateFields() {
String name = (String) fields.cbName.getSelectedItem();
String value = fields.tfValue.getText();
if (name.isEmpty())
Log.Writeln("Имя параметра DVM системы не может быть пустым.");
if (Utils.isLinuxSystemCommand(name))
Log.Writeln(Utils_.DQuotes(name) + " является системной командой Linux");
if (Utils.isLinuxSystemCommand(value))
Log.Writeln(Utils_.DQuotes(value) + " является системной командой Linux");
}
@Override
public void ProcessResult() {
target = fields.cbName.getSelectedItem() + "=" + fields.tfValue.getText();
}
@Override
public int getDefaultHeight() {
return 200;
}
};
return dialog.ShowDialog("Добавление параметра DVM системы", new DVMParameter());
}
}

12
src/_VisualDVM/Passes/All/AddFile.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.Utils;
import _VisualDVM.Global;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import javax.swing.tree.DefaultMutableTreeNode;
@@ -31,7 +31,7 @@ public class AddFile extends ChangeFilePass<DBProjectFile> {
if (Utils_.ContainsForbiddenName(fileName)) {
Log.Writeln_("Имя файла " + Utils_.Brackets(fileName)
+ " содержит запрещенные символы." +
"\n" + Utils_.printAllForbiddenCharacters());
"\n" + Utils_.printAllForbiddenCharacters());
return false;
}
} else {
@@ -65,7 +65,7 @@ public class AddFile extends ChangeFilePass<DBProjectFile> {
project.db.Insert(target);
UI.getMainWindow().getProjectWindow().getFilesTreeForm().getTree().AddNode(parent_node,
dst_node = target.node = new DefaultMutableTreeNode(target)
);
);
}
enum Mode {
Dialog,

2
src/_VisualDVM/Passes/All/AddMachine.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Passes.AddObjectPass;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.User.User;
import Common.Passes.AddObjectPass;
public class AddMachine extends AddObjectPass<Machine> {
public AddMachine() {
super(Machine.class);

2
src/_VisualDVM/Passes/All/AddRunConfiguration.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import Common.Database.Objects.DBObject;
import Common.Passes.AddObjectPass;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import Common.Passes.AddObjectPass;
public class AddRunConfiguration extends AddObjectPass<RunConfiguration> {
public AddRunConfiguration() {
super(RunConfiguration.class);

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

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.Subscribes.Subscriber;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.PassCode;
public class AddSubscriber extends ComponentsRepositoryPass<Subscriber> {
@Override
public String getIconPath() {

2
src/_VisualDVM/Passes/All/AddUser.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Database.Objects.DBObject;
import Common.Passes.AddObjectPass;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.User.User;
import Common.Passes.AddObjectPass;
import _VisualDVM.Passes.PassCode;
public class AddUser extends AddObjectPass<User> {
public AddUser() {

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

@@ -2,14 +2,14 @@ package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import java.util.Date;
@@ -33,7 +33,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
protected boolean canStart(Object... args) throws Exception {
if (Global.mainModule.Check(Log, Current.BugReport)) {
target = Global.mainModule.getBugReport();
if (!BugReportInterface.CheckNotDraft(target,Log))
if (!BugReportInterface.CheckNotDraft(target, Log))
return false;
fieldName = (String) args[0];
addition = (String) args[1];

8
src/_VisualDVM/Passes/All/ApplyBugReportSettings.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Repository.BugReport.BugReport;
import java.util.LinkedHashMap;
public class ApplyBugReportSettings extends Pass<BugReport> {
@@ -45,7 +45,7 @@ public class ApplyBugReportSettings extends Pass<BugReport> {
to_apply.put(settingName, settingValue);
}
//сохранить текущие настройки как профиль
// Global.db.rewriteProfileByDescription("Saved Profile");
// Global.db.rewriteProfileByDescription("Saved Profile");
//--
//само применение.
for (SettingName settingName : to_apply.keySet())
@@ -53,6 +53,6 @@ public class ApplyBugReportSettings extends Pass<BugReport> {
settingName,
to_apply.get(settingName));
//сохранить настройки бага как профиль
// Global.db.rewriteProfileByDescription(target.id);
// Global.db.rewriteProfileByDescription(target.id);
}
}

10
src/_VisualDVM/Passes/All/ApplyCurrentFunction.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.Visual.UI;
import java.util.Comparator;
import java.util.Vector;
@@ -21,7 +21,7 @@ public class ApplyCurrentFunction extends Pass {
}
@Override
protected boolean canStart(Object... args) throws Exception {
if ( Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
if (Global.mainModule.getPass(PassCode.SPF_GetGraphFunctions).isDone()) {
ComboTextDialog ff = new ComboTextDialog();
Vector<String> names = new Vector<>(Global.mainModule.getProject().allFunctions.keySet());
names.sort(Comparator.naturalOrder());

2
src/_VisualDVM/Passes/All/ApplyProfile.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
import java.util.Vector;
public class ApplyProfile extends Pass<SapforProfile> {

4
src/_VisualDVM/Passes/All/BuildComponent.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Repository.Component.Component;
import _VisualDVM.Passes.PassCode;
import Common.Passes.PassException;
import _VisualDVM.Passes.ProcessPass;
import _VisualDVM.Repository.Component.Component;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;

12
src/_VisualDVM/Passes/All/CheckAccount.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
public class CheckAccount extends Pass<Boolean> {
@Override
protected boolean canStart(Object... args) throws Exception {
@@ -43,13 +43,11 @@ public class CheckAccount extends Pass<Boolean> {
break;
}
*/
//временно. оффлайн проверка по почте
target = Global.mainModule.getAccount().email.equals("?") ?
( Global.mainModule.getPass(PassCode.EditAccount).Do() &&
(Global.mainModule.getPass(PassCode.EditAccount).Do() &&
Global.mainModule.getPass(PassCode.CheckRegistrationOnServer).Do()) :
( Global.mainModule.getPass(PassCode.CheckRegistrationOnServer).Do());
(Global.mainModule.getPass(PassCode.CheckRegistrationOnServer).Do());
}
@Override
protected boolean validate() {

2
src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.Subscribes.Subscriber;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
public class CheckRegistrationOnServer extends ComponentsRepositoryPass<Subscriber> {
@Override
protected void ServerAction() throws Exception {

6
src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
public class CheckRemoteWorkspace extends ComponentsRepositoryPass<SubscriberWorkspace> {
@Override
protected boolean canStart(Object... args) throws Exception {
target=null;
target = null;
return Global.mainModule.getAccount().CheckRegistered(Log);
}
@Override
@@ -16,7 +16,7 @@ public class CheckRemoteWorkspace extends ComponentsRepositoryPass<SubscriberWor
String machineURL = Global.mainModule.getMachine().getURL();
String login = Global.mainModule.getUser().login;
Command(new ServerExchangeUnit_2021(ServerCode.CheckURLRegistered,
email+"\n"+machineURL+"\n"+login));
email + "\n" + machineURL + "\n" + login));
target = (SubscriberWorkspace) response.object;
}
}

2
src/_VisualDVM/Passes/All/CleanAnalyses.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.Visual.UI;
public class CleanAnalyses extends CurrentProjectPass {
@Override
protected boolean canStart(Object... args) throws Exception {

2
src/_VisualDVM/Passes/All/CloneCurrentDVMConfiguration.java
View File

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

2
src/_VisualDVM/Passes/All/CloneDVMSettings.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.CloneServerObject;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import _VisualDVM.Passes.Server.CloneServerObject;
public class CloneDVMSettings extends CloneServerObject<TestingServer, DVMSettings> {
public CloneDVMSettings() {
super(Global.testingServer, DVMSettings.class);

10
src/_VisualDVM/Passes/All/CloneSapforSettings.java
View File

@@ -1,15 +1,15 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.CloneServerObject;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.CloneServerObject;
//автоматической
import java.util.Vector;
public class CloneSapforSettings extends CloneServerObject<TestingServer, SapforSettings> {
public CloneSapforSettings() {
@@ -30,6 +30,6 @@ public class CloneSapforSettings extends CloneServerObject<TestingServer, Sapfor
command.passCode = code;
new_commands.add(command);
}
Command(new ServerExchangeUnit_2021(ServerCode.PublishObjects,null, new_commands));
Command(new ServerExchangeUnit_2021(ServerCode.PublishObjects, null, new_commands));
}
}

2
src/_VisualDVM/Passes/All/CloseCurrentFile.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;

6
src/_VisualDVM/Passes/All/CloseCurrentProject.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class CloseCurrentProject extends Pass<db_project_info> {

2
src/_VisualDVM/Passes/All/CloseProject.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.db_project_info;
import Common.Passes.Pass;
public class CloseProject extends Pass<db_project_info> {
@Override
protected boolean canStart(Object... args) throws Exception {

12
src/_VisualDVM/Passes/All/CombineFiles.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.Utils;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.Transformation;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.CombineFilesDialog;
import org.apache.commons.io.FileUtils;
@@ -16,8 +16,8 @@ import java.nio.file.Paths;
import java.util.List;
import java.util.Vector;
public class CombineFiles extends Transformation {
ComboTextDialog fd = null;
protected File result = null;
ComboTextDialog fd = null;
@Override
protected PassCode necessary() {
return PassCode.SPF_GetIncludeDependencies;
@@ -78,7 +78,7 @@ public class CombineFiles extends Transformation {
if (file.relativeHeaders.containsKey(header))
result_lines.add(" include " + Utils_.Quotes(
Utils_.toU(
file.relativeHeaders.get(header).name)));
file.relativeHeaders.get(header).name)));
} else
result_lines.add(line);
}

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

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import Common.Passes.Pass;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {

6
src/_VisualDVM/Passes/All/CompareSapforPackages.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import Common.Passes.Pass;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
@@ -39,7 +39,7 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
slave = null;
return UI_.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));
} else if ((target.size() == 0) && (Global.mainModule.HasSapforPackage())) {
master =Global.mainModule.getSapforPackage();
master = Global.mainModule.getSapforPackage();
slave = null;
return UI_.Question("Отобразить пакет " + Utils_.Brackets(master.getPK()));
} else {

15
src/_VisualDVM/Passes/All/Compile.java
View File

@@ -1,16 +1,16 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.GlobalData.User.UserState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Passes.PassCode;
import Common.Passes.PassException;
import Common.Passes.Pass;
import _VisualDVM.Visual.UI;
public class Compile extends Pass<db_project_info> {
Pass subpass = null;
CompilationTask compilationTask = null;
@@ -61,19 +61,18 @@ public class Compile extends Pass<db_project_info> {
}
@Override
protected void body() throws Exception {
switch (Global.mainModule.getMachine().type) {
case Local:
if (Utils_.isWindows()) {
subpass = Global.mainModule.getPass(PassCode.WindowsLocalCompilation);
subpass = Global.mainModule.getPass(PassCode.WindowsLocalCompilation);
} else
subpass = Global.mainModule.getPass(PassCode.LinuxLocalCompilation);
subpass = Global.mainModule.getPass(PassCode.LinuxLocalCompilation);
break;
case Undefined:
case MVS_cluster:
throw new PassException("Компиляция не реализована для типа машины " + Utils_.DQuotes(Global.mainModule.getMachine().type));
default:
subpass = Global.mainModule.getPass(PassCode.RemoteCompilation);
subpass = Global.mainModule.getPass(PassCode.RemoteCompilation);
break;
}
subpass.Do(Global.mainModule.getCompilationTask(), Global.mainModule.getProject());

4
src/_VisualDVM/Passes/All/CompileServerSapfor.java
View File

@@ -1,16 +1,16 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.PublishServerObject;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import _VisualDVM.Passes.Server.PublishServerObject;
public class CompileServerSapfor extends PublishServerObject<TestingServer, ServerSapfor> {
public CompileServerSapfor() {
super(Global.testingServer, ServerSapfor.class);
}
@Override
public boolean fillObjectFields() throws Exception {
target.state= ServerSapforState.Queued;
target.state = ServerSapforState.Queued;
return true;
}
}

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