no message

This commit is contained in:
2024-10-15 13:35:33 +03:00
parent e4d907e4a3
commit b7b82e54c6
121 changed files with 204 additions and 280 deletions

View File

@@ -19,7 +19,6 @@ import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.DVM.LocalDVMTestingPlanner;
import _VisualDVM.TestingSystem.DVM.RemoteDVMTestingPlanner;
import _VisualDVM.TestingSystem.SAPFOR.PackageModeSupervisor;
import _VisualDVM.Visual.UI;
import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
@@ -241,8 +240,6 @@ public class Global {
}
messagesServer = new MessagesServer();
messagesServer.Start();
//создание списков служебных объектов
UI.CreateAll();
Components = new ComponentsSet();
mainModule.set(Current.ProjectView, ProjectView.Files);
Components.put(ComponentType.Visualiser, visualiser = new Visualiser());

View File

@@ -3,7 +3,6 @@ import Common.Database.Objects.DBObject;
import Common.Utils.TextLog;
import _VisualDVM.Global;
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")

View File

@@ -16,7 +16,6 @@ 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> {

View File

@@ -91,7 +91,7 @@ public class GlobalDatabase extends VisualiserDatabase {
settings.AddAll();
runConfigurations.Patch();
//---
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
}
@Override
public PassCode getSynchronizePassCode() {

View File

@@ -19,7 +19,6 @@ 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> {

View File

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

View File

@@ -3,7 +3,6 @@ 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 {
public RemoteFilesTree() {
super(Global.mainModule.getUI().getRemoteFileChooser().root);

View File

@@ -10,7 +10,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;

View File

@@ -5,7 +5,6 @@ import Common.Visual.Menus.TableMenu;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import static Common.Visual.Tables.TableRenderers.RendererDate;
import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;

View File

@@ -13,7 +13,6 @@ 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> {

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import javax.swing.tree.DefaultMutableTreeNode;

View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class AppendBugReportComment extends AppendBugReportField {
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class AppendBugReportDescription extends AppendBugReportField {
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -9,7 +9,6 @@ import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import java.util.Date;

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.Visual.UI;
import java.util.Comparator;
import java.util.Vector;

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
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 {

View File

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

View File

@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class CloseCurrentFile extends Pass<DBProjectFile> {

View File

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

View File

@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class CompareDVMRunTasks extends Pass<Vector<DVMRunTask>> {

View File

@@ -4,7 +4,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {

View File

@@ -10,7 +10,6 @@ import _VisualDVM.GlobalData.User.UserState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.UI;
public class Compile extends Pass<db_project_info> {
Pass subpass = null;
CompilationTask compilationTask = null;

View File

@@ -5,7 +5,6 @@ import Common.Visual.Windows.Dialog.Text.FileNameForm;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.Visual.UI;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File;

View File

@@ -3,7 +3,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.VariantsMassPass;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.UI;
public class CreateParallelVariants extends VariantsMassPass {
@Override
public String getIconPath() {

View File

@@ -12,7 +12,6 @@ import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import javax.swing.*;

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Testing.DeleteTestingPackages;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.Visual.UI;
import java.io.File;
public class DeleteDVMPackage extends DeleteTestingPackages<DVMPackage> {

View File

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import java.io.File;

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
public class DeleteFile extends ChangeFilePass<DBProjectFile> {
@Override
public String getIconPath() {

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Passes.Testing.DeleteTestingPackages;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.Visual.UI;
import java.io.File;
public class DeleteSapforPackage extends DeleteTestingPackages<SapforPackage> {

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
public class DeleteSelectedFiles extends Pass {
@Override
public String getIconPath() {

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.UI;
public class DeleteVersion extends Pass<db_project_info> {
db_project_info parent;
boolean current;

View File

@@ -3,7 +3,6 @@ import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.Visual.UI;
import java.io.File;
import java.util.Vector;

View File

@@ -8,7 +8,6 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.SSH.CurrentConnectionPass;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import java.io.File;
import java.nio.file.Paths;

View File

@@ -4,7 +4,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.Visual.UI;
public class ExcludeFile extends Pass<DBProjectFile> {
@Override
public String getIconPath() {

View File

@@ -3,7 +3,6 @@ import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.Visual.UI;
import java.math.BigInteger;
public class GenerateParallelVariants extends CurrentProjectPass {

View File

@@ -4,7 +4,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.Visual.UI;
public class IncludeFile extends Pass<DBProjectFile> {
@Override
public String getIconPath() {

View File

@@ -4,7 +4,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
public class OpenCurrentFile extends Pass<DBProjectFile> {
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -12,7 +12,6 @@ import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import java.io.File;
public class OpenCurrentProject extends Pass<db_project_info> {

View File

@@ -16,7 +16,6 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import java.io.BufferedReader;

View File

@@ -9,7 +9,6 @@ import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Visual.UI;
import java.io.File;
import java.util.Date;

View File

@@ -12,7 +12,6 @@ import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.RepositoryServer;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Visual.UI;
import java.util.Date;
import java.util.Vector;

View File

@@ -9,7 +9,6 @@ import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.Visual.UI;
import java.io.File;
import java.util.Vector;

View File

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import javax.swing.tree.DefaultMutableTreeNode;

View File

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Project.ChangeFilePass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.Visual.UI;
import java.io.File;
import java.nio.file.Paths;

View File

@@ -9,7 +9,6 @@ import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class Run extends Pass<db_project_info> {

View File

@@ -4,7 +4,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.Visual.UI;
import java.math.BigInteger;
public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {

View File

@@ -4,7 +4,6 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.Visual.UI;
public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalysis {
@Override
protected void performDone() throws Exception {

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.Visual.UI;
import java.util.Comparator;
import java.util.Vector;

View File

@@ -3,7 +3,6 @@ import Common.Utils.Index;
import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.Visual.UI;
public class SPF_GetArrayDistributionOnlyRegions extends SapforAnalysis {
@Override
public String phase() {

View File

@@ -3,7 +3,6 @@ import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
public class SPF_GetFileLineInfo extends SapforAnalysis {
@Override
public String phase() {

View File

@@ -6,7 +6,6 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import java.util.Vector;
@@ -125,7 +124,7 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
return res;
}
public String packFgSettings() {
Pair<Integer, Integer> screenDims = Global.mainModule.getUI().getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphPanelSizes();
Pair<Integer, Integer> screenDims = Global.mainModule.getUI().getMainWindow().getProjectWindow().getFunctionsWindow().getFunctionsGraphPanelSizes();
int x = (int) (screenDims.getKey() * target.fgScreen);
int y = (int) (screenDims.getValue() * target.fgScreen);
Vector<String> visibleFuncNames = new Vector<>();

View File

@@ -9,7 +9,6 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
import java.util.Vector;

View File

@@ -5,7 +5,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Loops.Loop;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class SPF_GetGraphLoops extends SapforAnalysis {

View File

@@ -10,7 +10,6 @@ import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo;
import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import javax.swing.tree.DefaultMutableTreeNode;
public class SPF_GetIncludeDependencies extends SapforAnalysis {

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class SPF_InlineProcedures extends SapforTransformation {

View File

@@ -5,7 +5,6 @@ import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
import _VisualDVM.Visual.UI;
import java.util.Vector;
public class SPF_InlineProceduresH extends SapforTransformation {

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo;
import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
import _VisualDVM.Visual.UI;
import java.util.Vector;
import java.util.stream.Collectors;

View File

@@ -9,7 +9,6 @@ import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.ProjectData.SapforData.Regions.UI.ArrayAlignmentBar;
import _VisualDVM.ProjectData.SapforData.Regions.UI.ParallelRegionFields;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

View File

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import java.util.Vector;

View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class SaveBugReportComment extends UpdateBugReportField {
@Override
public String getIconPath() {

View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class SaveBugReportDescription extends UpdateBugReportField {
@Override
public String getIconPath() {
@@ -12,6 +11,6 @@ public class SaveBugReportDescription extends UpdateBugReportField {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart("description", Global.mainModule.getUI().getMainWindow().getCallbackWindow().getBugReportDescriptionText());
return super.canStart("description", Global.mainModule.getUI().getMainWindow().getCallbackWindow().getBugReportDescriptionText());
}
}

View File

@@ -3,7 +3,6 @@ import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
import _VisualDVM.Visual.UI;
public class SaveFunctionsGraphCoordinates extends Pass {
FunctionsGraphForm graphForm = null;
@Override

View File

@@ -5,7 +5,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
import _VisualDVM.Visual.UI;
import com.mxgraph.io.mxCodec;
import com.mxgraph.util.mxCellRenderer;
import com.mxgraph.util.mxXmlUtils;

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.SSH.CurrentConnectionPass;
import _VisualDVM.Visual.UI;
public class SelectRemoteFile extends CurrentConnectionPass {
boolean dialogOK;
boolean needs_directory = false;

View File

@@ -5,7 +5,6 @@ import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import java.io.File;

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.Server.TestingSystemPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import javax.swing.*;

View File

@@ -11,7 +11,6 @@ import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import java.io.Serializable;

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.GlobalProperties;
import _VisualDVM.Visual.UI;
import java.lang.reflect.Field;
public class UpdateProperty extends Pass<Object> {
@@ -39,7 +38,7 @@ public class UpdateProperty extends Pass<Object> {
if (Global.mainModule.HasProject()) {
if ((boolean) newValue)
Global.mainModule.getUI().getMainWindow().getProjectWindow().CollapseProjectTrees();
else Global.mainModule.getUI().getMainWindow().getProjectWindow().ExpandProjectTrees();
else Global.mainModule.getUI().getMainWindow().getProjectWindow().ExpandProjectTrees();
}
break;
case "collapseFileGraphs":

View File

@@ -5,9 +5,9 @@ import Common.Visual.Windows.Dialog.*;
import Common.Visual.Windows.Dialog.Text.TextFieldDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.DBSetting;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.io.File;
@@ -120,7 +120,7 @@ public class UpdateSetting extends Pass<DBSetting> {
break;
case FastAccessPassesCount:
if (Global.mainModule.HasProject())
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
break;
case ShowFullArraysDeclarations:
if (Global.mainModule.HasProject())

View File

@@ -2,7 +2,6 @@ package _VisualDVM.Passes.Project;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
public abstract class FilesMassPass<T> extends Pass<T> {
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -6,7 +6,6 @@ import Common.Visual.Controls.PassMenuItem;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.event.ActionEvent;

View File

@@ -1,7 +1,6 @@
package _VisualDVM.Passes.Sapfor;
import Common.Passes.PassException;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class SapforPass extends SilentSapforPass {
//отличается наличием журнала и сообщений
@Override

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class SapforTransformation extends SapforPass {

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class Transformation extends CurrentProjectPass {

View File

@@ -5,7 +5,6 @@ import _VisualDVM.Passes.Project.CurrentProjectPass;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Visual.UI;
public abstract class VariantsMassPass extends CurrentProjectPass {
int count;
public abstract PassCode getSubPassCode();

View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.DBArray;
import Common.Database.Tables.DataSet;
import Common.Visual.Menus.DataMenuBar;
public class DBArraysMenuBar extends DataMenuBar{
public class DBArraysMenuBar extends DataMenuBar {
public DBArraysMenuBar() {
super("сохранённые состояния");
}

View File

@@ -13,7 +13,6 @@ import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.Editor.CaretInfo;
import _VisualDVM.Visual.Interface.SPFEditorInterface;
import _VisualDVM.Visual.Menus.MainEditorMenu;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;

View File

@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.Files.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

View File

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.Menus.GraphMenu;
import _VisualDVM.Visual.Menus.ProjectFilesMenu;
import _VisualDVM.Visual.UI;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;

View File

@@ -36,7 +36,6 @@ import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet;
import _VisualDVM.TestingSystem.Common.Test.ProjectFiles_json;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import com.mxgraph.swing.mxGraphComponent;
import com.sun.org.glassfish.gmbal.Description;
import javafx.util.Pair;

View File

@@ -4,7 +4,6 @@ import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class DimensionStateChanger extends DBObjectEditor<TemplateDimension> {

View File

@@ -1,4 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.MainModule_;
import Common.Visual.ControlForm;
import Common.Visual.Tables.Grid.GridAnchestor;
import Common.Visual.Tables.StyledTable;
@@ -6,7 +7,6 @@ import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
import _VisualDVM.Visual.UI;
import java.awt.*;
import java.util.Vector;
@@ -48,8 +48,8 @@ public class DimensionsTableForm extends ControlForm<StyledTable> {
}) {
@Override
public void Init() {
setDefaultRenderer(TemplateDimension.class, UI.TableRenderers.get(RendererDimension));
setDefaultEditor(TemplateDimension.class, UI.TableEditors.get(EditorDimension));
setDefaultRenderer(TemplateDimension.class, MainModule_.instance.getUI().getTableRenderer(RendererDimension));
setDefaultEditor(TemplateDimension.class, MainModule_.instance.getUI().getTableEditor(EditorDimension));
}
};
}

View File

@@ -3,7 +3,6 @@ import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
//объект принадлежащий файлу и относящийся к его строке.
public abstract class FileObject extends iDBObject {

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.event.ActionEvent;

View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Loops;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Visual.UI;
import Common.Visual.UI_;
import javax.swing.text.Highlighter;
public enum LoopState {
@@ -29,9 +29,9 @@ public enum LoopState {
public Highlighter.HighlightPainter getPainter() {
switch (this) {
case GoodLoop:
return UI.GoodLoopPainter;
return UI_.GreenTextPainter;
case BadLoop:
return UI.BadLoopPainter;
return UI_.RedTextPainter;
default:
return null;
}

View File

@@ -5,7 +5,6 @@ import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatistics_2021;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
import _VisualDVM.Visual.UI;
import javafx.util.Pair;
import java.io.File;

View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.event.ActionEvent;

View File

@@ -14,7 +14,6 @@ import _VisualDVM.Repository.Component.OSDComponent;
import _VisualDVM.Repository.Component.Visualizer_2;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import org.apache.commons.io.FileUtils;
import java.io.File;

View File

@@ -9,7 +9,6 @@ import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import _VisualDVM.Utils;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap;

View File

@@ -13,7 +13,6 @@ import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.RepositoryRefuseException;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils;

View File

@@ -6,7 +6,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.Visual.UI;
import java.util.Comparator;
import java.util.Date;

View File

@@ -4,7 +4,6 @@ import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json;
import _VisualDVM.Visual.UI;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;

View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import java.util.Comparator;
public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {

View File

@@ -1,7 +1,6 @@
package _VisualDVM.Visual.Interface;
import Common.Visual.Trees.TreeForm;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public interface ProjectWindow {
//-
ArraysWindow getArraysWindow();

View File

@@ -1,9 +1,26 @@
package _VisualDVM.Visual;
import Common.Visual.Tables.ConfigurationAutoRenderer;
import Common.Visual.Tables.ConfigurationAutoSwitcher;
import Common.Visual.Tables.VectorEditor;
import Common.Visual.Trees.GraphTreeCellRenderer;
import Common.Visual.UIModule_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueEditor;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileChooser;
import _VisualDVM.GlobalData.RemoteFile.UI.RemoteFileRenderer;
import _VisualDVM.ProjectData.Files.UI.FilesTreeCellRenderer;
import _VisualDVM.ProjectData.Project.UI.VersionsTreeCellRenderer;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionRenderer;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionStateChanger;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.RulesTreeCellRenderer;
import _VisualDVM.ProjectData.SapforData.Variants.UI.VariantRankRenderer;
import _VisualDVM.Repository.Component.UI.ComponentsForm;
import _VisualDVM.TestingSystem.Common.TestingMenuBar;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.VersionsWindow;
import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsMenuBar;
@@ -11,19 +28,47 @@ import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
import _VisualDVM.Visual.Menus.VersionsMenuBar.VersionsMenuBar;
import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
import _VisualDVM.Visual.Windows.*;
import static Common.Visual.Tables.TableEditors.*;
import static Common.Visual.Tables.TableRenderers.*;
import static Common.Visual.Trees.TreeRenderers.*;
public class MainUI extends UIModule_ {
public MainWindow mainWindow = null;
ComponentsForm componentsWindow = null;
public SearchReplaceForm searchReplaceWindow = null;
public ProfilesForm profilesWindow = null;
public VersionsWindow versionsWindow = null;
public DebugWindow debugWindow = null;
public RemoteFileChooser remoteFileChooser = null;
ComponentsForm componentsWindow = null;
//-
TestingMenuBar testingMenuBar = null;
CredentialsMenuBar credentialsMenuBar = null;
VersionsMenuBar versionsMenuBar = null;
//-
//-
public MainUI() {
setTheme(new LightSPFEditorTheme());
tableRenderers.put(RendererDimension, new DimensionRenderer());
tableRenderers.put(RendererVariantRank, new VariantRankRenderer());
tableRenderers.put(RendererCompilerOptionParameterValue, new CompilerOptionParameterValueRenderer());
tableRenderers.put(RendererCompilerOptionParameterName, new CompilerOptionParameterNameRenderer());
tableRenderers.put(RendererCompilerEnvironmentValue, new CompilerEnvironmentValueRenderer());
tableRenderers.put(RendererAutoConfiguration, new ConfigurationAutoRenderer());
//--
tableEditors.put(EditorHyperlinks, new VectorEditor());
tableEditors.put(EditorDimension, new DimensionStateChanger());
tableEditors.put(EditorCompilerOptionParameterValue, new CompilerOptionParameterValueEditor());
tableEditors.put(EditorCompilerEnvironmentValue, new CompilerEnvironmentValueEditor());
tableEditors.put(EditorAutoConfiguration, new ConfigurationAutoSwitcher());
//--
treeRenderers.put(RendererGraph, new GraphTreeCellRenderer());
treeRenderers.put(RendererRemoteFile, new RemoteFileRenderer());
treeRenderers.put(RendererFile, new FilesTreeCellRenderer());
treeRenderers.put(RendererVersion, new VersionsTreeCellRenderer());
treeRenderers.put(RendererSapforVersion, new SapforVersionsTreeCellRenderer());
treeRenderers.put(RendererRule, new RulesTreeCellRenderer());
}
//-
public TestingMenuBar getTestingMenuBar() {
if (testingMenuBar == null)
testingMenuBar = new TestingMenuBar();
@@ -39,11 +84,6 @@ public class MainUI extends UIModule_ {
credentialsMenuBar = new CredentialsMenuBar();
return credentialsMenuBar;
}
//-
//-
public MainUI() {
setTheme(new LightSPFEditorTheme());
}
public MainWindow getMainWindow() {
if (mainWindow == null)
mainWindow = new MainForm();

View File

@@ -1,36 +0,0 @@
package _VisualDVM.Visual.Menus.FastAccessMenuBar;
import Common.MainModule_;
import Common.Passes.Pass;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import javax.swing.*;
import java.awt.*;
public class FastAccessMenuBar extends VisualiserMenuBar {
@Override
public void setSizeLimits() {
//если задавать PreffredSize 0, скролл НЕ РАБОТАЕТ. Магия!
}
public void showPass(Pass pass) {
JButton button = pass.createButton();
add(button);
Dimension d = button.getPreferredSize();
button.setPreferredSize(new Dimension(d.width, 30));
revalidate();
repaint();
}
public void Refresh() {
Drop();
int i = 1;
for (Object pass : MainModule_.instance.getFirstAccessPasses()) {
showPass((Pass) pass);
++i;
if (i > ((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
}
}
public void Drop() {
UI_.Clear(this);
}
}

View File

@@ -4,7 +4,6 @@ import Common.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

View File

@@ -7,7 +7,6 @@ import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Visual.Menus.LanguagesSubmenu;
import _VisualDVM.Visual.Menus.StylesSubmenu;
import _VisualDVM.Visual.Menus.TypesSubmenu;
import _VisualDVM.Visual.UI;
import javax.swing.*;
public class FileSettingsMenu extends VisualiserMenu {

View File

@@ -7,7 +7,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
import _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

View File

@@ -8,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

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