упраздение лишних енумов в оформлении таблиц и деревьев.
This commit is contained in:
@@ -4,7 +4,7 @@ import Common.Utils.Utils_;
|
||||
import Common.Visual.Menus.StyledPopupMenu;
|
||||
import Common.Visual.Menus.TextEditorMenu;
|
||||
import Common.Visual.Themes.ThemeElement;
|
||||
import Common.Visual.UI_;
|
||||
import Common.Visual.UI;
|
||||
import Common.Visual.Windows.Dialog.DialogFields;
|
||||
import _VisualDVM.Visual.Syntax.SPFEditorTheme;
|
||||
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
|
||||
@@ -46,7 +46,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
|
||||
//todo переход в нужную строку по ctrl+g?
|
||||
case KeyEvent.VK_Z:
|
||||
if (getText().equals(startText)) {
|
||||
UI_.Info("Начальная версия текста достигнута.");
|
||||
UI.Info("Начальная версия текста достигнута.");
|
||||
e.consume();
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -1,26 +1,9 @@
|
||||
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;
|
||||
@@ -28,10 +11,6 @@ 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;
|
||||
public SearchReplaceForm searchReplaceWindow = null;
|
||||
@@ -48,26 +27,9 @@ public class MainUI extends UIModule_ {
|
||||
//-
|
||||
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)
|
||||
|
||||
@@ -2,7 +2,7 @@ package _VisualDVM.Visual.Menus.MainMenuBar;
|
||||
import Common.Passes.Pass;
|
||||
import Common.Visual.Controls.MenuBarButton;
|
||||
import Common.Visual.Menus.VisualiserMenuBar;
|
||||
import Common.Visual.UI_;
|
||||
import Common.Visual.UI;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
|
||||
@@ -29,7 +29,7 @@ public class MainMenuBar extends VisualiserMenuBar {
|
||||
setIcon("/icons/ComponentsActual.png");
|
||||
addActionListener(e -> {
|
||||
if (PerformanceAnalyzer.isActive) {
|
||||
UI_.Info("Перед работой с компонентами закройте анализатор производительности!");
|
||||
UI.Info("Перед работой с компонентами закройте анализатор производительности!");
|
||||
} else {
|
||||
Global.mainModule.getPass(PassCode.GetComponentsActualVersions).Do();
|
||||
Global.RefreshUpdatesStatus();
|
||||
|
||||
89
src/_VisualDVM/Visual/Tables/EditorFilesHyperlinks.java
Normal file
89
src/_VisualDVM/Visual/Tables/EditorFilesHyperlinks.java
Normal file
@@ -0,0 +1,89 @@
|
||||
package _VisualDVM.Visual.Tables;
|
||||
import _VisualDVM.ProjectData.Files.UI.FilesHyperlinksPanel;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.event.CellEditorListener;
|
||||
import javax.swing.event.ChangeEvent;
|
||||
import javax.swing.table.TableCellEditor;
|
||||
import java.awt.*;
|
||||
import java.util.EventObject;
|
||||
import java.util.Objects;
|
||||
import java.util.Vector;
|
||||
public class EditorFilesHyperlinks extends FilesHyperlinksPanel implements TableCellEditor {
|
||||
protected transient ChangeEvent changeEvent;
|
||||
@Override
|
||||
public Component getTableCellEditorComponent(
|
||||
JTable table, Object value, boolean isSelected, int row, int column) {
|
||||
if (value instanceof Vector) {
|
||||
UpdateByCell((Vector) value);
|
||||
this.Hyperlinks.setBackground(table.getSelectionBackground());
|
||||
Hyperlinks.setSelectionBackground(table.getSelectionBackground());
|
||||
Hyperlinks.setSelectionForeground(table.getSelectionForeground());
|
||||
}
|
||||
return this;
|
||||
}
|
||||
@Override
|
||||
public Object getCellEditorValue() {
|
||||
return links;
|
||||
}
|
||||
//Copied from AbstractCellEditor
|
||||
//protected EventListenerList listenerList = new EventListenerList();
|
||||
@Override
|
||||
public boolean isCellEditable(EventObject e) {
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public boolean shouldSelectCell(EventObject anEvent) {
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public boolean stopCellEditing() {
|
||||
fireEditingStopped();
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public void cancelCellEditing() {
|
||||
fireEditingCanceled();
|
||||
}
|
||||
@Override
|
||||
public void addCellEditorListener(CellEditorListener l) {
|
||||
listenerList.add(CellEditorListener.class, l);
|
||||
}
|
||||
@Override
|
||||
public void removeCellEditorListener(CellEditorListener l) {
|
||||
listenerList.remove(CellEditorListener.class, l);
|
||||
}
|
||||
public CellEditorListener[] getCellEditorListeners() {
|
||||
return listenerList.getListeners(CellEditorListener.class);
|
||||
}
|
||||
protected void fireEditingStopped() {
|
||||
// Guaranteed to return a non-null array
|
||||
Object[] listeners = listenerList.getListenerList();
|
||||
// Process the listeners last to first, notifying
|
||||
// those that are interested in this event
|
||||
for (int i = listeners.length - 2; i >= 0; i -= 2) {
|
||||
if (listeners[i] == CellEditorListener.class) {
|
||||
// Lazily create the event:
|
||||
if (Objects.isNull(changeEvent)) {
|
||||
changeEvent = new ChangeEvent(this);
|
||||
}
|
||||
((CellEditorListener) listeners[i + 1]).editingStopped(changeEvent);
|
||||
}
|
||||
}
|
||||
}
|
||||
protected void fireEditingCanceled() {
|
||||
// Guaranteed to return a non-null array
|
||||
Object[] listeners = listenerList.getListenerList();
|
||||
// Process the listeners last to first, notifying
|
||||
// those that are interested in this event
|
||||
for (int i = listeners.length - 2; i >= 0; i -= 2) {
|
||||
if (listeners[i] == CellEditorListener.class) {
|
||||
// Lazily create the event:
|
||||
if (Objects.isNull(changeEvent)) {
|
||||
changeEvent = new ChangeEvent(this);
|
||||
}
|
||||
((CellEditorListener) listeners[i + 1]).editingCanceled(changeEvent);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
11
src/_VisualDVM/Visual/Tables/RendererConfigurationAuto.java
Normal file
11
src/_VisualDVM/Visual/Tables/RendererConfigurationAuto.java
Normal file
@@ -0,0 +1,11 @@
|
||||
package _VisualDVM.Visual.Tables;
|
||||
import Common.Visual.Tables.RendererDBObject;
|
||||
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
||||
public class RendererConfigurationAuto extends RendererDBObject {
|
||||
@Override
|
||||
public void Display() {
|
||||
if (value != null) {
|
||||
setIcon(((Configuration) value).GetAutoIcon());
|
||||
}
|
||||
}
|
||||
}
|
||||
15
src/_VisualDVM/Visual/Tables/RendererHyperlinks.java
Normal file
15
src/_VisualDVM/Visual/Tables/RendererHyperlinks.java
Normal file
@@ -0,0 +1,15 @@
|
||||
package _VisualDVM.Visual.Tables;
|
||||
import Common.Visual.Controls.HyperlinksStyledList;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.table.TableCellRenderer;
|
||||
import java.awt.*;
|
||||
import java.util.Vector;
|
||||
public class RendererHyperlinks extends HyperlinksStyledList implements TableCellRenderer {
|
||||
@Override
|
||||
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
|
||||
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());
|
||||
setListData((Vector) value);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
39
src/_VisualDVM/Visual/Tables/SwitcherConfigurationAuto.java
Normal file
39
src/_VisualDVM/Visual/Tables/SwitcherConfigurationAuto.java
Normal file
@@ -0,0 +1,39 @@
|
||||
package _VisualDVM.Visual.Tables;
|
||||
import Common.Passes.Pass;
|
||||
import Common.Visual.Tables.EditorDBObject;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.Server.EditServerObject;
|
||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
||||
import _VisualDVM.TestingSystem.Common.TestingServer;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
|
||||
public class SwitcherConfigurationAuto extends EditorDBObject<Configuration> {
|
||||
@Override
|
||||
public void Action() {
|
||||
value.SwitchAuto();
|
||||
setIcon(value.GetAutoIcon());
|
||||
///-
|
||||
Pass pass = new EditServerObject<TestingServer, Configuration>(Global.testingServer, Configuration.class) {
|
||||
@Override
|
||||
protected boolean canStart(Object... args) throws Exception {
|
||||
target = (Configuration) args[0];
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return "Обновить флаг автоматического тестирования";
|
||||
}
|
||||
@Override
|
||||
protected void showDone() throws Exception {
|
||||
VisualCaches.RefreshCache(target);
|
||||
if (target instanceof SapforConfiguration)
|
||||
Global.testingServer.db.sapforConfigurations.ShowUI(target.id);
|
||||
}
|
||||
};
|
||||
pass.Do(value);
|
||||
}
|
||||
@Override
|
||||
public Object getCellEditorValue() {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
});
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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() ? "(эталон)" : ""));
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user