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

упраздение лишних енумов в оформлении таблиц и деревьев.

Browse Source
This commit is contained in:
02090095
2024-10-15 15:13:57 +03:00
parent b7b82e54c6
commit 5e2a9848da
146 changed files with 565 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/_VisualDVM/Visual/Windows/CallbackForm.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -283,7 +283,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
}
@Override
public void SwitchScreen(boolean small) {
UI_.Clear(descriptionPanel);
UI.Clear(descriptionPanel);
//------------------------------------------------------------------
descriptionInterface = small ? descriptionTabs : descriptionFields;
descriptionInterface.setEditorScroll(bugDescriptionScroll);
@@ -293,7 +293,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
descriptionPanel.revalidate();
descriptionPanel.repaint();
//---------
UI_.Clear(commentPanel);
UI.Clear(commentPanel);
//------------------------------------------------------------------
commentInterface = small ? commentTabs : commentFields;
commentInterface.setEditorScroll(bugCommentScroll);
@@ -363,7 +363,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
settingsTools = new VisualiserMenuBar();
}
public void EnableBugreports() {
UI_.Clear(accountPanel);
UI.Clear(accountPanel);
accountPanel.add(SC10);
Global.mainModule.getUI().getMainWindow().SwitchTestingTabs(true);
}

9
src/_VisualDVM/Visual/Windows/ComparisonForm.java
View File

@@ -6,9 +6,10 @@ import Common.Utils.TextLog;
import Common.Utils.Utils_;
import Common.Visual.Controls.ShortLabel;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Editor.BaseEditor;
import javafx.util.Pair;
@@ -149,7 +150,7 @@ public abstract class ComparisonForm<T> {
applyObject();
showObject();
} else
UI_.Info(log.toString());
UI.Info(log.toString());
}
public void ApplyObject(DBObject object_in) {
RemoveObject();
@@ -232,8 +233,8 @@ public abstract class ComparisonForm<T> {
slave.Body.getLineStartOffset(colors.get(diff_num).getKey()),
slave.Body.getLineEndOffset(colors.get(diff_num).getKey()),
colors.get(diff_num).getValue() ?
UI_.GreenTextPainter :
UI_.RedTextPainter
SPFEditor.GreenTextPainter :
SPFEditor.RedTextPainter
);
}
if (colors.size() > 0) current_diff_line = 0;

14
src/_VisualDVM/Visual/Windows/FileForm.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.Visual.Trees.TreeForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -192,7 +192,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
@Override
public void RefreshTabsNames() {
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
UI_.ShowTabsNames(graphsTabs, flag);
UI.ShowTabsNames(graphsTabs, flag);
//--
ShowNotesCount();
ShowWarningsCount();
@@ -213,7 +213,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
}
@Override
public void ShowText() {
UI_.Clear(editorPanel);
UI.Clear(editorPanel);
editorPanel.add(new RTextScrollPane(Body = new SPFEditor(file)));
Global.mainModule.getUI().getSearchReplaceWindow().updateEditor(Body);
}
@@ -365,12 +365,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
@Override
public void CollapseGraphs() {
Global.mainModule.getDb().splitters.get("SC12").position = SC12.getDividerLocation();
UI_.Clear(editorBackground);
UI.Clear(editorBackground);
editorBackground.add(editorPanel);
}
@Override
public void ExpandGraphs() {
UI_.Clear(editorBackground);
UI.Clear(editorBackground);
SC12.setRightComponent(editorPanel);
editorBackground.add(SC12);
//--
@@ -380,12 +380,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
@Override
public void CollapseMessages() {
Global.mainModule.getDb().splitters.get("SC1").position = SC1.getDividerLocation();
UI_.Clear(content);
UI.Clear(content);
content.add(editorBackground);
}
@Override
public void ExpandMessages() {
UI_.Clear(content);
UI.Clear(content);
SC1.setLeftComponent(editorBackground);
content.add(SC1);
SC1.setDividerLocation(Global.mainModule.getDb().splitters.get("SC1").position);

10
src/_VisualDVM/Visual/Windows/FunctionsForm.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions;
import _VisualDVM.Passes.PassCode;
@@ -72,19 +72,19 @@ public class FunctionsForm implements FunctionsWindow {
sDepth.setModel(new SpinnerNumberModel(1,
0, 64, 1
));
UI_.MakeSpinnerRapid(sIterations, e -> {
UI.MakeSpinnerRapid(sIterations, e -> {
Global.mainModule.getProject().UpdatefgIterations((int) sIterations.getValue());
FunctionsGraphUI.ffTimer.restart();
});
UI_.MakeSpinnerRapid(sResistance, e -> {
UI.MakeSpinnerRapid(sResistance, e -> {
Global.mainModule.getProject().UpdatefgResistance((int) sResistance.getValue());
FunctionsGraphUI.ffTimer.restart();
});
UI_.MakeSpinnerRapid(sScreen, e -> {
UI.MakeSpinnerRapid(sScreen, e -> {
Global.mainModule.getProject().UpdatefgScreen((double) sScreen.getValue());
FunctionsGraphUI.ffTimer.restart();
});
UI_.MakeSpinnerRapid(sDepth, e -> {
UI.MakeSpinnerRapid(sDepth, e -> {
SPF_GetGraphFunctionPositions.depth = (int) sDepth.getValue();
FunctionsGraphUI.ffTimer.restart();
});

10
src/_VisualDVM/Visual/Windows/ProjectForm.java
View File

@@ -3,7 +3,7 @@ import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Controls.TabToolBar;
import Common.Visual.Trees.TreeForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
@@ -170,7 +170,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
projectTabs.setSelectedIndex(0);
}
});
UI_.Clear(fileBackground);
UI.Clear(fileBackground);
//filesTabs.removeAll();
}
@Override
@@ -222,7 +222,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
}
@Override
public void RefreshTabsNames() {
UI_.ShowTabsNames(projectTabs, 1, Global.mainModule.getDb().settings.get(SettingName.ShowFullTabsNames).toBoolean());
UI.ShowTabsNames(projectTabs, 1, Global.mainModule.getDb().settings.get(SettingName.ShowFullTabsNames).toBoolean());
}
@Override
public void RefreshProjectTreeAndMessages() {
@@ -252,7 +252,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
}
@Override
public void ShowProjectView() {
UI_.Clear(projectViewPanel);
UI.Clear(projectViewPanel);
ProjectView view = Global.mainModule.getProjectView();
menuBar.getProjectViewMenu().setToolTipText(view.getDescription());
menuBar.getProjectViewMenu().setIcon(Utils_.getIcon(view.getIcon()));
@@ -294,7 +294,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
public void CollapseProjectTrees() {
Global.mainModule.getDb().splitters.get("SC3").position = SC3.getDividerLocation();
//---
UI_.Clear(projectBackground);
UI.Clear(projectBackground);
projectBackground.add(fileBackground);
}
@Override

6
src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java
View File

@@ -4,7 +4,7 @@ import Common.Passes.Pass;
import Common.Utils.TextLog;
import Common.Visual.Controls.ShortLabel;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -102,7 +102,7 @@ public class SapforPackagesComparisonForm {
showObject();
}
} else
UI_.Info(log.toString());
UI.Info(log.toString());
}
public void ApplyObject(DBObject object_in) {
RemoveObject();
@@ -143,7 +143,7 @@ public class SapforPackagesComparisonForm {
}
//---
public void showNoTree() {
UI_.Clear(treePanel);
UI.Clear(treePanel);
}
public void showObject() {
lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : ""));

4
src/_VisualDVM/Visual/Windows/SearchReplaceForm.java
View File

@@ -2,7 +2,7 @@ package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.Trees.StyledTree;
import Common.Visual.UI_;
import Common.Visual.UI;
import Common.Visual.Windows.Form;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -193,7 +193,7 @@ public class SearchReplaceForm extends Form {
}
public void showNoFilesMatches() {
lFilesMatchesCount.setText("—");
UI_.Clear(filesTreePanel);
UI.Clear(filesTreePanel);
}
public void showFilesMatches() {
long total = 0;

6
src/_VisualDVM/Visual/Windows/TestingForm.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.CompilerType;
@@ -311,7 +311,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
@Override
public void CollapseCredentials() {
Global.mainModule.getDb().splitters.get("SC71").position = SC71.getDividerLocation();
UI_.Clear(credentialsPanel);
UI.Clear(credentialsPanel);
credentialsPanel.add(Global.mainModule.getUI().getCredentialsMenuBar());
SC71.setDividerLocation(30);
SC71.setDividerSize(0);
@@ -320,7 +320,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
}
@Override
public void ExpandCredentials() {
UI_.Clear(credentialsPanel);
UI.Clear(credentialsPanel);
credentialsPanel.add(SC18);
SC71.setDividerLocation(200);
SC71.setDividerSize(3);

4
src/_VisualDVM/Visual/Windows/VersionsForm.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Visual.Trees.TreeForm;
import Common.Visual.UI_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.UI.VersionsTree;
import _VisualDVM.ProjectData.Project.db_project_info;
@@ -51,7 +51,7 @@ public class VersionsForm implements FormWithSplitters, VersionsWindow {
}
@Override
public void ShowNoProjectVariants() {
UI_.Clear(variantsFormPanel);
UI.Clear(variantsFormPanel);
versionsTabs.setEnabledAt(0, false);
}
@Override