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 18:41:02 +03:00
parent 702529147d
commit 45447f34f8
54 changed files with 200 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
.idea/workspace.xml generated
View File

@@ -7,19 +7,60 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Mode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Mode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/HyperlinksStyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/HyperlinksStyledList.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/MenuBarButton.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledList.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledProgressBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Controls/StyledProgressBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/StyledPopupMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/StyledPopupMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/VisualiserMenuItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HiddenListRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StatusEnumRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledCellLabel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledCellLabel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/StyledTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/WrapTextRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/GraphTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/GraphTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectionTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/SelectionTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UIModule_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/UI_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/UI_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogTextComboBox.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DropFastAccess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DropFastAccess.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/MessagesServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Editor/BaseEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PassesSubMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/SettingsSubmenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

18
src/Common/MainModule_.java
View File

@@ -6,6 +6,7 @@ import Common.Passes.Pass;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common.Visual.UIModule_; import Common.Visual.UIModule_;
import Common.Visual.UI_;
import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar; import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
import java.util.Comparator; import java.util.Comparator;
@@ -15,8 +16,6 @@ import java.util.Vector;
public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModule_> { public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModule_> {
public static MainModule_ instance = null; //текущий экземпляр. всегда один. public static MainModule_ instance = null; //текущий экземпляр. всегда один.
//-- //--
public FastAccessMenuBar fastAccessMenuBar = null;
//--
D db; D db;
Class<D> db_class; Class<D> db_class;
LinkedHashMap<Current_, Object> objects; //Current LinkedHashMap<Current_, Object> objects; //Current
@@ -30,15 +29,18 @@ public abstract class MainModule_<D extends VisualiserDatabase, U extends UIModu
} }
//-- //--
public MainModule_(Class<D> db_class_in, Class<U> ui_class_in) throws Exception { public MainModule_(Class<D> db_class_in, Class<U> ui_class_in) throws Exception {
objects = new LinkedHashMap<>();
db_class = db_class_in;
createPasses();
ui_class=ui_class_in; ui_class=ui_class_in;
//--- db_class = db_class_in;
if (ui_class!=null)
ui = ui_class_in.newInstance();
instance = this; instance = this;
} }
public void Init() throws Exception{
if (ui_class!=null)
ui=ui_class.newInstance();
//--
createPasses();
//-
objects = new LinkedHashMap<>();
}
//ИНТЕРФЕЙС //ИНТЕРФЕЙС
public boolean hasUI(){return ui!=null;} public boolean hasUI(){return ui!=null;}
//БАЗА ДАННЫХ И ТЕКУЩИЕ ОБЪЕКТЫ //БАЗА ДАННЫХ И ТЕКУЩИЕ ОБЪЕКТЫ

2
src/Common/Passes/Pass.java
View File

@@ -94,7 +94,7 @@ public class Pass<T> {
} catch (Exception ex) { } catch (Exception ex) {
Utils_.MainLog.PrintException(ex); Utils_.MainLog.PrintException(ex);
} }
MainModule_.instance.fastAccessMenuBar.Refresh(); //todo все бары в мейн модуль. или уи.мейн модуль MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
} }
} }
public boolean isDone() { public boolean isDone() {

3
src/Common/Visual/Controls/HyperlinksStyledList.java
View File

@@ -1,10 +1,11 @@
package Common.Visual.Controls; package Common.Visual.Controls;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
public class HyperlinksStyledList extends StyledList { public class HyperlinksStyledList extends StyledList {
@Override @Override
public void applyTheme() { public void applyTheme() {
super.applyTheme(); super.applyTheme();
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
} }
} }

5
src/Common/Visual/Controls/MenuBarButton.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Controls; package Common.Visual.Controls;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -9,7 +10,7 @@ import java.awt.*;
public class MenuBarButton extends JButton { public class MenuBarButton extends JButton {
public MenuBarButton() { public MenuBarButton() {
super(); super();
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
// //
setBorderPainted(false); setBorderPainted(false);
setContentAreaFilled(false); setContentAreaFilled(false);
@@ -30,6 +31,6 @@ public class MenuBarButton extends JButton {
setIcon(Utils_.getIcon(icon_path)); setIcon(Utils_.getIcon(icon_path));
} }
public void setFont(VisualiserFonts font_in) { public void setFont(VisualiserFonts font_in) {
setFont(UI_.getTheme().Fonts.get(font_in)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(font_in));
} }
} }

7
src/Common/Visual/Controls/StyledList.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Controls; package Common.Visual.Controls;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -6,12 +7,12 @@ import Common.Visual.UI_;
import javax.swing.*; import javax.swing.*;
public class StyledList extends JList implements ThemeElement { public class StyledList extends JList implements ThemeElement {
public StyledList() { public StyledList() {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
applyTheme(); applyTheme();
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(UI_.getTheme().table_background); setBackground(MainModule_.instance.getUI().getTheme().table_background);
setForeground(UI_.getTheme().foreground); setForeground(MainModule_.instance.getUI().getTheme().foreground);
} }
} }

5
src/Common/Visual/Controls/StyledProgressBar.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Controls; package Common.Visual.Controls;
import Common.MainModule_;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -10,7 +11,7 @@ public class StyledProgressBar extends JProgressBar implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(UI_.getTheme().bar_background); setBackground(MainModule_.instance.getUI().getTheme().bar_background);
setForeground(UI_.getTheme().bar_foreground); setForeground(MainModule_.instance.getUI().getTheme().bar_foreground);
} }
} }

9
src/Common/Visual/Menus/StyledPopupMenu.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Menus; package Common.Visual.Menus;
import Common.MainModule_;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -21,15 +22,15 @@ public class StyledPopupMenu extends JPopupMenu implements ThemeElement {
}); });
} }
private void refreshTheme_r(MenuElement element) { private void refreshTheme_r(MenuElement element) {
element.getComponent().setBackground(UI_.getTheme().background); element.getComponent().setBackground(MainModule_.instance.getUI().getTheme().background);
element.getComponent().setForeground(UI_.getTheme().foreground); element.getComponent().setForeground(MainModule_.instance.getUI().getTheme().foreground);
for (MenuElement se : element.getSubElements()) for (MenuElement se : element.getSubElements())
refreshTheme_r(se); refreshTheme_r(se);
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(UI_.getTheme().background); setBackground(MainModule_.instance.getUI().getTheme().background);
setForeground(UI_.getTheme().foreground); setForeground(MainModule_.instance.getUI().getTheme().foreground);
refreshTheme_r(this); refreshTheme_r(this);
} }
public void CheckElementsVisibility() { public void CheckElementsVisibility() {

7
src/Common/Visual/Menus/VisualiserMenuItem.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Menus; package Common.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -7,15 +8,15 @@ import javax.swing.*;
public class VisualiserMenuItem extends JMenuItem { public class VisualiserMenuItem extends JMenuItem {
public VisualiserMenuItem(String text) { public VisualiserMenuItem(String text) {
super(text, null); super(text, null);
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
} }
public VisualiserMenuItem(String text, String icon_path) { public VisualiserMenuItem(String text, String icon_path) {
super(text); super(text);
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
if (icon_path != null) if (icon_path != null)
setIcon(Utils_.getIcon(icon_path)); setIcon(Utils_.getIcon(icon_path));
} }
public VisualiserMenuItem() { public VisualiserMenuItem() {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
} }
} }

3
src/Common/Visual/Tables/HiddenListRenderer.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -12,6 +13,6 @@ public class HiddenListRenderer extends RendererCell<Vector<String>> {
@Override @Override
public void Display() { public void Display() {
setText(String.join(";", value)); setText(String.join(";", value));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
} }
} }

3
src/Common/Visual/Tables/StatusEnumRenderer.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.MainModule_;
import Common.Visual.StatusEnum; import Common.Visual.StatusEnum;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -12,7 +13,7 @@ public class StatusEnumRenderer extends RendererCell<StatusEnum> {
public void Display() { public void Display() {
if (value != null) { if (value != null) {
setText(value.getDescription()); setText(value.getDescription());
setFont(UI_.getTheme().Fonts.get(value.getFont())); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(value.getFont()));
} }
} }
} }

7
src/Common/Visual/Tables/StyledCellLabel.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -7,7 +8,7 @@ import javax.swing.*;
//наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы. //наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы.
public class StyledCellLabel extends JLabel implements ThemeElement { public class StyledCellLabel extends JLabel implements ThemeElement {
public StyledCellLabel() { public StyledCellLabel() {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
setHorizontalAlignment(SwingConstants.LEFT); setHorizontalAlignment(SwingConstants.LEFT);
setVerticalAlignment(SwingConstants.CENTER); setVerticalAlignment(SwingConstants.CENTER);
setOpaque(true); setOpaque(true);
@@ -15,7 +16,7 @@ public class StyledCellLabel extends JLabel implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(UI_.getTheme().table_background); setBackground(MainModule_.instance.getUI().getTheme().table_background);
setForeground(UI_.getTheme().foreground); setForeground(MainModule_.instance.getUI().getTheme().foreground);
} }
} }

13
src/Common/Visual/Tables/StyledTable.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.TableMenu; import Common.Visual.Menus.TableMenu;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
@@ -16,9 +17,9 @@ public abstract class StyledTable extends JTable implements ThemeElement {
setFillsViewportHeight(true); setFillsViewportHeight(true);
setAutoCreateRowSorter(dataModel.getRowCount() > 0); setAutoCreateRowSorter(dataModel.getRowCount() > 0);
Init(); Init();
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
JTableHeader header = getTableHeader(); JTableHeader header = getTableHeader();
header.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain)); header.setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
setSelectionMode(ListSelectionModel.SINGLE_SELECTION); setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
//текущий объет может определяться по первому столбцу. могут быть баги если не запретить //текущий объет может определяться по первому столбцу. могут быть баги если не запретить
@@ -77,10 +78,10 @@ public abstract class StyledTable extends JTable implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(UI_.getTheme().table_background); setBackground(MainModule_.instance.getUI().getTheme().table_background);
setForeground(UI_.getTheme().foreground); setForeground(MainModule_.instance.getUI().getTheme().foreground);
setSelectionBackground(UI_.getTheme().selection_background); setSelectionBackground(MainModule_.instance.getUI().getTheme().selection_background);
setSelectionForeground(UI_.getTheme().foreground); setSelectionForeground(MainModule_.instance.getUI().getTheme().foreground);
} }
public void SelectRow(int r) { public void SelectRow(int r) {
getSelectionModel().setSelectionInterval(r, r); getSelectionModel().setSelectionInterval(r, r);

3
src/Common/Visual/Tables/WrapTextRenderer.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -10,7 +11,7 @@ public class WrapTextRenderer extends JTextArea implements TableCellRenderer {
setLineWrap(true); setLineWrap(true);
setWrapStyleWord(true); setWrapStyleWord(true);
// setOpaque(false); // setOpaque(false);
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Distribution).deriveFont(14.0f)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Distribution).deriveFont(14.0f));
} }
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground()); setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());

5
src/Common/Visual/Trees/GraphTreeCellRenderer.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Trees; package Common.Visual.Trees;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -16,10 +17,10 @@ public class GraphTreeCellRenderer extends StyledTreeCellRenderer {
if (o instanceof FileObjectWithMessages) { if (o instanceof FileObjectWithMessages) {
FileObjectWithMessages target = (FileObjectWithMessages) o; FileObjectWithMessages target = (FileObjectWithMessages) o;
setIcon(Utils_.getIcon(target.ImageKey())); setIcon(Utils_.getIcon(target.ImageKey()));
setFont(UI_.getTheme().Fonts.get(target.getFont())); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(target.getFont()));
} else { } else {
setIcon(null); setIcon(null);
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
} }
setForeground(tree.getForeground()); setForeground(tree.getForeground());
return this; return this;

3
src/Common/Visual/Trees/SelectionTreeCellRenderer.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Trees; package Common.Visual.Trees;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Selectable; import Common.Visual.Selectable;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -17,7 +18,7 @@ public class SelectionTreeCellRenderer extends StyledTreeCellRenderer {
setText(selectable.getSelectionText()); setText(selectable.getSelectionText());
setIcon(selectable.GetSelectionIcon()); setIcon(selectable.GetSelectionIcon());
} else { } else {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setIcon(null); setIcon(null);
} }
setForeground(tree.getForeground()); setForeground(tree.getForeground());

7
src/Common/Visual/Trees/StyledTree.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Trees; package Common.Visual.Trees;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -22,7 +23,7 @@ public class StyledTree extends JTree implements ThemeElement {
super(root_in); super(root_in);
root = root_in; root = root_in;
setOpaque(true); setOpaque(true);
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
setToggleClickCount(0); //отключение сворачивание разворачивания по двойному клику setToggleClickCount(0); //отключение сворачивание разворачивания по двойному клику
//-- //--
if (!getRenderer().equals(TreeRenderers.RendererUndefined)) if (!getRenderer().equals(TreeRenderers.RendererUndefined))
@@ -86,8 +87,8 @@ public class StyledTree extends JTree implements ThemeElement {
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackground(UI_.getTheme().trees_background); setBackground(MainModule_.instance.getUI().getTheme().trees_background);
setForeground(UI_.getTheme().foreground); setForeground(MainModule_.instance.getUI().getTheme().foreground);
menu.applyTheme(); menu.applyTheme();
} }
protected GraphMenu createMenu() { protected GraphMenu createMenu() {

5
src/Common/Visual/Trees/StyledTreeCellRenderer.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Trees; package Common.Visual.Trees;
import Common.MainModule_;
import Common.Visual.Themes.ThemeElement; import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -9,7 +10,7 @@ public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements T
} }
@Override @Override
public void applyTheme() { public void applyTheme() {
setBackgroundNonSelectionColor(UI_.getTheme().trees_background); setBackgroundNonSelectionColor(MainModule_.instance.getUI().getTheme().trees_background);
setBackgroundSelectionColor(UI_.getTheme().selection_background); setBackgroundSelectionColor(MainModule_.instance.getUI().getTheme().selection_background);
} }
} }

16
src/Common/Visual/UIModule_.java
View File

@@ -1,6 +1,18 @@
package Common.Visual; package Common.Visual;
import Common.Visual.Themes.DefaultTheme;
import Common.Visual.Themes.VisualiserTheme;
import Common.Visual.Windows.PassForm; import Common.Visual.Windows.PassForm;
import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
public class UIModule_ { public class UIModule_ {
//--
VisualiserTheme theme = new DefaultTheme();
public VisualiserTheme getTheme() {
return theme;
}
public void setTheme(VisualiserTheme theme_in) {
theme = theme_in;
}
//--
PassForm passForm = null;//текущая форма прохода. нужна для PassForm passForm = null;//текущая форма прохода. нужна для
public boolean HasPassForm(){return passForm!=null;} public boolean HasPassForm(){return passForm!=null;}
public PassForm GetPassForm(){return passForm;} public PassForm GetPassForm(){return passForm;}
@@ -8,4 +20,8 @@ public class UIModule_ {
return passForm = passForm_in; return passForm = passForm_in;
} }
public void DropPassForm(){passForm=null;} public void DropPassForm(){passForm=null;}
//--
//--
FastAccessMenuBar fastAccessMenuBar = new FastAccessMenuBar();
public FastAccessMenuBar getFastAccessMenuBar(){return fastAccessMenuBar;}
} }

7
src/Common/Visual/UI_.java
View File

@@ -17,16 +17,9 @@ public class UI_ {
//--- //---
public static LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>(); public static LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
public static Stack<Component> windowsStack = new Stack<>(); public static Stack<Component> windowsStack = new Stack<>();
static VisualiserTheme theme = new DefaultTheme();
public static boolean isActive() { public static boolean isActive() {
return active; return active;
} }
public static VisualiserTheme getTheme() {
return theme;
}
public static void setTheme(VisualiserTheme theme_in) {
theme = theme_in;
}
public static Component getFrontWindow() { public static Component getFrontWindow() {
Component res = null; Component res = null;
try { try {

3
src/Common/Visual/Windows/Dialog/Dialog.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common.MainModule_;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
@@ -32,7 +33,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
setModal(true); setModal(true);
toFront(); toFront();
getContentPane().setLayout(new BorderLayout()); getContentPane().setLayout(new BorderLayout());
lTitle.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu)); lTitle.setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
if (!getIconPath().isEmpty()) { if (!getIconPath().isEmpty()) {
setIconImage(Utils_.getIcon(getIconPath()).getImage()); setIconImage(Utils_.getIcon(getIconPath()).getImage());
} }

3
src/Common/Visual/Windows/Dialog/DialogTextComboBox.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -6,7 +7,7 @@ import javax.swing.*;
import java.awt.*; import java.awt.*;
public class DialogTextComboBox extends JComboBox<String> implements DialogFields { public class DialogTextComboBox extends JComboBox<String> implements DialogFields {
public DialogTextComboBox() { public DialogTextComboBox() {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
setEditable(false); setEditable(false);
} }
@Override @Override

3
src/Common/Visual/Windows/Dialog/DialogWrapText.java
View File

@@ -1,4 +1,5 @@
package Common.Visual.Windows.Dialog; package Common.Visual.Windows.Dialog;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -8,7 +9,7 @@ public class DialogWrapText extends JTextPane implements DialogFields {
public DialogWrapText() { public DialogWrapText() {
setOpaque(true); setOpaque(true);
setBackground(Color.WHITE); setBackground(Color.WHITE);
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeBold)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeBold));
setEditable(false); setEditable(false);
} }
@Override @Override

3
src/_VisualDVM/Global.java
View File

@@ -224,8 +224,9 @@ public class Global {
public static void NormalMode(int port) throws Exception { public static void NormalMode(int port) throws Exception {
//-------------------------------->> //-------------------------------->>
UI_.active = true; UI_.active = true;
UI_.setTheme(new LightSPFEditorTheme());
mainModule = new MainModule(); mainModule = new MainModule();
mainModule.Init();
//--
CheckVisualiserDirectories(); CheckVisualiserDirectories();
CreateLogAtComponentsPath(); CreateLogAtComponentsPath();
//- //-

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

@@ -1,4 +1,5 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI; package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor; import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -7,7 +8,7 @@ import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> { public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
@Override @Override
public void Action() { public void Action() {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setText(value.value.isEmpty() ? "не задано" : value.value); setText(value.value.isEmpty() ? "не задано" : value.value);
//- //-
ComboTextDialog dialog = new ComboTextDialog() { ComboTextDialog dialog = new ComboTextDialog() {

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

@@ -1,4 +1,5 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI; package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer; import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -8,7 +9,7 @@ public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
public void Display() { public void Display() {
if (value != null) { if (value != null) {
CompilerEnvironment environment = (CompilerEnvironment) value; CompilerEnvironment environment = (CompilerEnvironment) value;
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setText(environment.value.isEmpty() ? "не задано" : environment.value); setText(environment.value.isEmpty() ? "не задано" : environment.value);
} }
} }

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

@@ -1,4 +1,5 @@
package _VisualDVM.GlobalData.CompilerOption.UI; package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer; import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -9,10 +10,10 @@ public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
if (value != null) { if (value != null) {
CompilerOption option = (CompilerOption) value; CompilerOption option = (CompilerOption) value;
if (option.hasParameter()) { if (option.hasParameter()) {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
setText(option.parameterName); setText(option.parameterName);
} else { } else {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.UnknownState));
setText("нет"); setText("нет");
} }
} }

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

@@ -1,4 +1,5 @@
package _VisualDVM.GlobalData.CompilerOption.UI; package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor; import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -8,7 +9,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
@Override @Override
public void Action() { public void Action() {
if (value.hasParameter()) { if (value.hasParameter()) {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
//- //-
setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue); setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
//- //-
@@ -22,7 +23,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue); setText(value.parameterValue.isEmpty() ? "не задано" : value.parameterValue);
} }
} else { } else {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.UnknownState));
setText("нет"); setText("нет");
} }
} }

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

@@ -1,4 +1,5 @@
package _VisualDVM.GlobalData.CompilerOption.UI; package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer; import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -9,10 +10,10 @@ public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
if (value != null) { if (value != null) {
CompilerOption option = (CompilerOption) value; CompilerOption option = (CompilerOption) value;
if (option.hasParameter()) { if (option.hasParameter()) {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setText(option.parameterValue.isEmpty() ? "не задано" : option.parameterValue); setText(option.parameterValue.isEmpty() ? "не задано" : option.parameterValue);
} else { } else {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.UnknownState)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.UnknownState));
setText("нет"); setText("нет");
} }
} }

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

@@ -1,5 +1,6 @@
package _VisualDVM.GlobalData; package _VisualDVM.GlobalData;
import Common.Database.VisualiserDatabase; import Common.Database.VisualiserDatabase;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import _VisualDVM.Current; import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -89,6 +90,8 @@ public class GlobalDatabase extends VisualiserDatabase {
//настройки компонент //настройки компонент
settings.AddAll(); settings.AddAll();
runConfigurations.Patch(); runConfigurations.Patch();
//---
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
} }
@Override @Override
public PassCode getSynchronizePassCode() { public PassCode getSynchronizePassCode() {

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

@@ -1,4 +1,5 @@
package _VisualDVM.GlobalData.RemoteFile.UI; package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer; import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -16,7 +17,7 @@ public class RemoteFileRenderer extends StyledTreeCellRenderer {
if (o instanceof RemoteFile) { if (o instanceof RemoteFile) {
RemoteFile file = (RemoteFile) o; RemoteFile file = (RemoteFile) o;
setText(file.name); setText(file.name);
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
if (file.isDirectory()) if (file.isDirectory())
setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png"))); setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
} }

1
src/_VisualDVM/MainModule.java
View File

@@ -35,6 +35,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import _VisualDVM.Visual.MainUI; import _VisualDVM.Visual.MainUI;
import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File; import java.io.File;

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

@@ -14,6 +14,6 @@ public class DropFastAccess extends Pass {
} }
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
MainModule_.instance.fastAccessMenuBar.Drop(); MainModule_.instance.getUI().getFastAccessMenuBar().Drop();
} }
} }

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

@@ -120,7 +120,7 @@ public class UpdateSetting extends Pass<DBSetting> {
break; break;
case FastAccessPassesCount: case FastAccessPassesCount:
if (Global.mainModule.HasProject()) if (Global.mainModule.HasProject())
MainModule_.instance.fastAccessMenuBar.Refresh(); MainModule_.instance.getUI().getFastAccessMenuBar().Refresh();
break; break;
case ShowFullArraysDeclarations: case ShowFullArraysDeclarations:
if (Global.mainModule.HasProject()) if (Global.mainModule.HasProject())

3
src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.ProjectData.Files.UI; package _VisualDVM.ProjectData.Files.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
import _VisualDVM.Visual.UI; import _VisualDVM.Visual.UI;
@@ -41,7 +42,7 @@ public class FilesHyperlinksPanel extends JPanel {
} }
}); });
Hyperlinks.setLayoutOrientation(JList.VERTICAL); Hyperlinks.setLayoutOrientation(JList.VERTICAL);
Hyperlinks.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); Hyperlinks.setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
add(Hyperlinks, BorderLayout.CENTER); add(Hyperlinks, BorderLayout.CENTER);
} }
} }

7
src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.ProjectData.Files.UI; package _VisualDVM.ProjectData.Files.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer; import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -23,7 +24,7 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
File dir = (File) o; File dir = (File) o;
setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png"))); setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
setText(dir.getName()); setText(dir.getName());
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
} else if (o instanceof DBProjectFile) { } else if (o instanceof DBProjectFile) {
DBProjectFile file = (DBProjectFile) o; DBProjectFile file = (DBProjectFile) o;
if (Global.files_multiselection) { if (Global.files_multiselection) {
@@ -32,8 +33,8 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
setIcon(file.GetIcon()); setIcon(file.GetIcon());
} }
setText(file.file.getName()); setText(file.file.getName());
if (file.IsMain()) setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeBold)); if (file.IsMain()) setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeBold));
else setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain)); else setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
if (file.state.equals(FileState.Excluded)) { if (file.state.equals(FileState.Excluded)) {
Map attributes = getFont().getAttributes(); Map attributes = getFont().getAttributes();
attributes.put(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON); attributes.put(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON);

3
src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.ProjectData.Project.UI; package _VisualDVM.ProjectData.Project.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Selectable; import Common.Visual.Selectable;
import Common.Visual.Trees.StyledTreeCellRenderer; import Common.Visual.Trees.StyledTreeCellRenderer;
@@ -41,7 +42,7 @@ public class VersionsTreeCellRenderer extends StyledTreeCellRenderer {
} }
} }
setForeground(tree.getForeground()); setForeground(tree.getForeground());
setFont(UI_.getTheme().Fonts.get( setFont(MainModule_.instance.getUI().getTheme().Fonts.get(
version.isNew ? VisualiserFonts.NewVersion : VisualiserFonts.TreePlain)); version.isNew ? VisualiserFonts.NewVersion : VisualiserFonts.TreePlain));
setText(version.getTitle()); setText(version.getTitle());
return this; return this;

4
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI; package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.RendererCell; import Common.Visual.Tables.RendererCell;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -14,7 +15,8 @@ public class DimensionRenderer extends RendererCell<TemplateDimension> {
public void Display() { public void Display() {
if (value != null) { if (value != null) {
setText(value.state.getMaskDescription()); setText(value.state.getMaskDescription());
setFont(value.isBlocked() ? UI_.getTheme().Fonts.get(VisualiserFonts.Disabled) : UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(value.isBlocked() ? MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Disabled) :
MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
} }
} }
} }

3
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI; package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor; import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -17,7 +18,7 @@ public class DimensionStateChanger extends DBObjectEditor<TemplateDimension> {
} }
@Override @Override
public void Action() { public void Action() {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Hyperlink));
value.SwitchState(); value.SwitchState();
setText(value.state.getMaskDescription()); setText(value.state.getMaskDescription());
UI.getVersionsWindow().getVariantsWindow().ShowFilteredVariantsCount(); UI.getVersionsWindow().getVariantsWindow().ShowFilteredVariantsCount();

5
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI; package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer; import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -14,9 +15,9 @@ public class RulesTreeCellRenderer extends StyledTreeCellRenderer {
super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus); super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
Object o = ((DefaultMutableTreeNode) value).getUserObject(); Object o = ((DefaultMutableTreeNode) value).getUserObject();
if (o instanceof String) { if (o instanceof String) {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Distribution)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Distribution));
} else if (o instanceof ParallelRegion) } else if (o instanceof ParallelRegion)
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setForeground(tree.getForeground()); setForeground(tree.getForeground());
return this; return this;
} }

3
src/_VisualDVM/Repository/Component/ComponentsMenuBar.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Repository.Component; package _VisualDVM.Repository.Component;
import Common.MainModule_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -12,7 +13,7 @@ public class ComponentsMenuBar extends DataMenuBar {
new VisualiserMenu( new VisualiserMenu(
"Восстановление предыдущей версии компонента", "/icons/Resurrect.png") { "Восстановление предыдущей версии компонента", "/icons/Resurrect.png") {
{ {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem()); add(Global.mainModule.getPass(PassCode.ResurrectComponent).createMenuItem());
add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem()); add(Global.mainModule.getPass(PassCode.ResurrectComponentFromServer).createMenuItem());
} }

3
src/_VisualDVM/TestingSystem/Common/TestingBar.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.TestingSystem.Common; package _VisualDVM.TestingSystem.Common;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton; import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
@@ -81,7 +82,7 @@ public class TestingBar extends VisualiserMenuBar {
}); });
add(new JLabel(" сек ") { add(new JLabel(" сек ") {
{ {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
} }
}); });
addSeparator(); addSeparator();

3
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI; package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
import Common.MainModule_;
import Common.Visual.Tables.StyledCellLabel; import Common.Visual.Tables.StyledCellLabel;
import Common.Visual.UI_; import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
@@ -21,7 +22,7 @@ public class SapforSettingsCommandFields implements DialogFields {
JLabel res = new StyledCellLabel(); JLabel res = new StyledCellLabel();
res.setText(value.getDescription()); res.setText(value.getDescription());
res.setBackground(isSelected ? res.setBackground(isSelected ?
UI_.getTheme().selection_background : UI_.getTheme().background MainModule_.instance.getUI().getTheme().selection_background : MainModule_.instance.getUI().getTheme().background
); );
return res; return res;
}); });

3
src/_VisualDVM/Visual/Editor/BaseEditor.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Editor; package _VisualDVM.Visual.Editor;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Menus.StyledPopupMenu; import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.TextEditorMenu; import Common.Visual.Menus.TextEditorMenu;
@@ -129,7 +130,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
@Override @Override
public void applyTheme() { public void applyTheme() {
float font_size = (float) getFont().getSize(); float font_size = (float) getFont().getSize();
((SPFEditorTheme) UI_.getTheme()).getEditorTheme().apply(this); ((SPFEditorTheme) MainModule_.instance.getUI().getTheme()).getEditorTheme().apply(this);
setFont(getFont().deriveFont(font_size)); setFont(getFont().deriveFont(font_size));
menu.applyTheme(); menu.applyTheme();
//меню связано с редактором. поэтому тема меняется только вместе с ним. //меню связано с редактором. поэтому тема меняется только вместе с ним.

5
src/_VisualDVM/Visual/MainUI.java
View File

@@ -1,4 +1,9 @@
package _VisualDVM.Visual; package _VisualDVM.Visual;
import Common.Visual.UIModule_; import Common.Visual.UIModule_;
import Common.Visual.UI_;
import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
public class MainUI extends UIModule_ { public class MainUI extends UIModule_ {
public MainUI(){
setTheme(new LightSPFEditorTheme());
}
} }

8
src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus.FastAccessMenuBar; package _VisualDVM.Visual.Menus.FastAccessMenuBar;
import Common.MainModule_;
import Common.Passes.Pass; import Common.Passes.Pass;
import Common.Visual.UI_; import Common.Visual.UI_;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -8,9 +9,6 @@ import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
public class FastAccessMenuBar extends VisualiserMenuBar { public class FastAccessMenuBar extends VisualiserMenuBar {
public FastAccessMenuBar() {
Refresh();
}
@Override @Override
public void setSizeLimits() { public void setSizeLimits() {
//если задавать PreffredSize 0, скролл НЕ РАБОТАЕТ. Магия! //если задавать PreffredSize 0, скролл НЕ РАБОТАЕТ. Магия!
@@ -26,8 +24,8 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
public void Refresh() { public void Refresh() {
Drop(); Drop();
int i = 1; int i = 1;
for (Pass pass : Global.mainModule.getFirstAccessPasses()) { for (Object pass : MainModule_.instance.getFirstAccessPasses()) {
showPass(pass); showPass((Pass) pass);
++i; ++i;
if (i > ((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32())) break; if (i > ((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
} }

3
src/_VisualDVM/Visual/Menus/PassesSubMenu.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus; package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -10,7 +11,7 @@ public class PassesSubMenu extends JMenu {
public PassesSubMenu(String title, String icon, PassCode... passes) { public PassesSubMenu(String title, String icon, PassCode... passes) {
super(title); super(title);
setIcon(Utils_.getIcon(icon)); setIcon(Utils_.getIcon(icon));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
for (PassCode code : passes) { for (PassCode code : passes) {
add(Global.mainModule.getPass(code).createMenuItem()); add(Global.mainModule.getPass(code).createMenuItem());
} }

3
src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus.ProjectMenuBar; package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -19,7 +20,7 @@ public class ProjectViewMenu extends VisualiserMenu {
JMenuItem m = new JMenuItem(view.getDescription()) { JMenuItem m = new JMenuItem(view.getDescription()) {
{ {
setIcon(Utils_.getIcon(view.getIcon())); setIcon(Utils_.getIcon(view.getIcon()));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
addActionListener(e -> { addActionListener(e -> {
Global.mainModule.set(Current.ProjectView, view); Global.mainModule.set(Current.ProjectView, view);
UI.getMainWindow().getProjectWindow().ShowProjectView(); UI.getMainWindow().getProjectWindow().ShowProjectView();

3
src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus; package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -10,7 +11,7 @@ public class PropertiesSubmenu extends JMenu {
super(title); super(title);
if (icon != null) if (icon != null)
setIcon(Utils_.getIcon(icon)); setIcon(Utils_.getIcon(icon));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
for (String name : settings) { for (String name : settings) {
Global.properties.addFlagMenuItem(this, name); Global.properties.addFlagMenuItem(this, name);
} }

3
src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus; package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -11,7 +12,7 @@ public class SettingsSubmenu extends JMenu {
super(title); super(title);
if (icon != null) if (icon != null)
setIcon(Utils_.getIcon(icon)); setIcon(Utils_.getIcon(icon));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
for (SettingName c : settings) { for (SettingName c : settings) {
add((Global.mainModule.getDb()).settings.get(c).getMenuItem()); add((Global.mainModule.getDb()).settings.get(c).getMenuItem());
} }

3
src/_VisualDVM/Visual/Menus/VisualiserMenu.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus; package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -13,7 +14,7 @@ public class VisualiserMenu extends JMenu {
setToolTipText(text); setToolTipText(text);
if (textVisible) if (textVisible)
setText(text); setText(text);
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (!iconPath.isEmpty()) if (!iconPath.isEmpty())
setIcon(Utils_.getIcon(iconPath)); setIcon(Utils_.getIcon(iconPath));
} }

3
src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus; package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_; import Common.Visual.UI_;
@@ -37,7 +38,7 @@ public class VisualiserMenuBar extends JToolBar {
public JLabel addLabel(String text_in, String icon_path_in) { public JLabel addLabel(String text_in, String icon_path_in) {
JLabel res = new JLabel(text_in) { JLabel res = new JLabel(text_in) {
{ {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic)); setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (icon_path_in != null) { if (icon_path_in != null) {
setIcon(Utils_.getIcon(icon_path_in)); setIcon(Utils_.getIcon(icon_path_in));
} }

1
src/_VisualDVM/Visual/UI.java
View File

@@ -127,7 +127,6 @@ public class UI {
testingBar = new TestingBar(); testingBar = new TestingBar();
credentialsBar = new CredentialsBar(); credentialsBar = new CredentialsBar();
versionsMenuBar = new VersionsMenuBar(); versionsMenuBar = new VersionsMenuBar();
MainModule_.instance.fastAccessMenuBar = new FastAccessMenuBar();
//---------------------------------------------------->> //---------------------------------------------------->>
UI_.menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar()); UI_.menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar());
UI_.menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar()); UI_.menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar());

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

@@ -55,7 +55,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
functionsFormPanel.add((functionsForm = new FunctionsForm()).getContent()); functionsFormPanel.add((functionsForm = new FunctionsForm()).getContent());
analysisFormPanel.add((analysisForm = new AnalysisForm()).getContent()); analysisFormPanel.add((analysisForm = new AnalysisForm()).getContent());
//- //-
FastAccessScroll = new JScrollPane(MainModule_.instance.fastAccessMenuBar) { FastAccessScroll = new JScrollPane(MainModule_.instance.getUI().getFastAccessMenuBar()) {
{ {
getHorizontalScrollBar().setPreferredSize(new Dimension(0, 10)); getHorizontalScrollBar().setPreferredSize(new Dimension(0, 10));
setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER); setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER);