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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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