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

продолжение рефакторинга и проверка на занятость файлов

Browse Source
This commit is contained in:
02090095
2024-10-07 20:04:11 +03:00
parent e7f661f7ad
commit 7fac84740d
41 changed files with 164 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common_old/UI/Menus/PassesSubMenu.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -9,7 +9,7 @@ import javax.swing.*;
public class PassesSubMenu extends JMenu {
public PassesSubMenu(String title, String icon, PassCode_2021... passes) {
super(title);
setIcon(Utils.getIcon(icon));
setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
for (PassCode_2021 code : passes) {
add(Pass_2021.passes.get(code).createMenuItem());

6
src/Common_old/UI/Menus/ProjectFilesMenu.java
View File

@@ -1,4 +1,5 @@
package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.LanguagesSubmenu;
@@ -7,7 +8,6 @@ import Common_old.UI.Menus_2023.StylesSubmenu;
import Common_old.UI.Menus_2023.TypesSubmenu;
import Common_old.UI.Trees.StyledTree;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Files.FileType;
import ProjectData.Files.LanguageStyle;
import ProjectData.LanguageName;
@@ -61,10 +61,10 @@ public class ProjectFilesMenu extends GraphMenu {
});
addSeparator();
m_multiselection = new VisualiserMenuItem("Массовый режим работы с файлами");
m_multiselection.setIcon(Utils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.setIcon(CommonUtils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.addActionListener(e -> {
Global.files_multiselection = !Global.files_multiselection;
m_multiselection.setIcon(Utils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.setIcon(CommonUtils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
Current.getProject().SelectAllFiles(false);
UI.getMainWindow().getProjectWindow().RefreshProjectFiles();

4
src/Common_old/UI/Menus/PropertiesSubmenu.java
View File

@@ -1,15 +1,15 @@
package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import javax.swing.*;
public class PropertiesSubmenu extends JMenu {
public PropertiesSubmenu(String title, String icon, String... settings) {
super(title);
if (icon != null)
setIcon(Utils.getIcon(icon));
setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
for (String name : settings) {
Global.properties.addFlagMenuItem(this, name);

6
src/Common_old/UI/Menus/VersionsMenu.java
View File

@@ -1,10 +1,10 @@
package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.StableMenuItem;
import Common_old.UI.Trees.DataTree;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class VersionsMenu extends GraphMenu<DataTree> {
@@ -17,10 +17,10 @@ public class VersionsMenu extends GraphMenu<DataTree> {
add(Pass_2021.passes.get(PassCode_2021.DeleteLonelyM).createMenuItem());
addSeparator();
m_multiselection = new VisualiserMenuItem("Массовый режим работы с версиями");
m_multiselection.setIcon(Utils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.setIcon(CommonUtils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.addActionListener(e -> {
Global.versions_multiselection = !Global.versions_multiselection;
m_multiselection.setIcon(Utils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.setIcon(CommonUtils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
Current.getRoot().SelectAllVersions(false);
UI.getVersionsWindow().getVersionsForm().getTree().updateUI();
});

4
src/Common_old/UI/Menus/VisualiserMenuItem.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import javax.swing.*;
public class VisualiserMenuItem extends JMenuItem {
@@ -13,7 +13,7 @@ public class VisualiserMenuItem extends JMenuItem {
super(text);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
if (icon_path != null)
setIcon(Utils.getIcon(icon_path));
setIcon(CommonUtils.getIcon(icon_path));
}
public VisualiserMenuItem(){
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));

4
src/Common_old/UI/Menus_2023/LanguagesSubmenu.java
View File

@@ -1,5 +1,5 @@
package Common_old.UI.Menus_2023;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import ProjectData.LanguageName;
import javax.swing.*;
@@ -18,7 +18,7 @@ public abstract class LanguagesSubmenu extends VisualiserMenu {
JMenuItem languageItem = new StableMenuItem(languageName.getDescription());
String li = languageName.getIcon();
if (!li.isEmpty())
languageItem.setIcon(Utils.getIcon(li));
languageItem.setIcon(CommonUtils.getIcon(li));
languageItem.addActionListener(
new AbstractAction() {
@Override

4
src/Common_old/UI/Menus_2023/MenuBarButton.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import javax.swing.*;
import java.awt.*;
@@ -27,7 +27,7 @@ public class MenuBarButton extends JButton {
super.paintComponent(g);
}
public void setIcon(String icon_path) {
setIcon(Utils.getIcon(icon_path));
setIcon(CommonUtils.getIcon(icon_path));
}
public void setFont(VisualiserFonts font_in){
setFont(Current.getTheme().Fonts.get(font_in));

4
src/Common_old/UI/Menus_2023/PassMenuItem.java
View File

@@ -1,11 +1,11 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus.VisualiserMenuItem;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.Pass_2021;
public class PassMenuItem extends VisualiserMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(Utils.getIcon(icon_path));
setIcon(CommonUtils.getIcon(icon_path));
}
public PassMenuItem(Pass_2021 pass) {
setText(pass.getDescription());

4
src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java
View File

@@ -1,9 +1,9 @@
package Common_old.UI.Menus_2023.ProjectMenuBar;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common_old.UI.Menus_2023.VisualiserMenu;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.ProjectView;
import javax.swing.*;
@@ -16,7 +16,7 @@ public class ProjectViewMenu extends VisualiserMenu {
for (ProjectView view : ProjectView.values()) {
JMenuItem m = new JMenuItem(view.getDescription()) {
{
setIcon(Utils.getIcon(view.getIcon()));
setIcon(CommonUtils.getIcon(view.getIcon()));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
addActionListener(e -> {
Current.set(Current.ProjectView, view);

4
src/Common_old/UI/Menus_2023/SettingsSubmenu.java
View File

@@ -1,8 +1,8 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import GlobalData.Settings.SettingName;
import javax.swing.*;
@@ -10,7 +10,7 @@ public class SettingsSubmenu extends JMenu {
public SettingsSubmenu(String title, String icon, SettingName... settings) {
super(title);
if (icon != null)
setIcon(Utils.getIcon(icon));
setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
for (SettingName c : settings) {
add(Global.db.settings.get(c).getMenuItem());

4
src/Common_old/UI/Menus_2023/StableMenuItem.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus.VisualiserMenuItem;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import javax.swing.*;
import javax.swing.plaf.ComponentUI;
@@ -32,7 +32,7 @@ public class StableMenuItem extends VisualiserMenuItem {
}
public StableMenuItem(String text, String icon_path) {
super(text);
setIcon(Utils.getIcon(icon_path));
setIcon(CommonUtils.getIcon(icon_path));
setUI(new StableItemUI());
}
public StableMenuItem() {

4
src/Common_old/UI/Menus_2023/StablePassMenuItem.java
View File

@@ -1,10 +1,10 @@
package Common_old.UI.Menus_2023;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import Visual_DVM_2021.Passes.Pass_2021;
public class StablePassMenuItem extends StableMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(Utils.getIcon(icon_path));
setIcon(CommonUtils.getIcon(icon_path));
}
public StablePassMenuItem(Pass_2021 pass) {
setText(pass.getDescription());

4
src/Common_old/UI/Menus_2023/VisualiserMenu.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -15,7 +15,7 @@ public class VisualiserMenu extends JMenu {
setText(text);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (!iconPath.isEmpty())
setIcon(Utils.getIcon(iconPath));
setIcon(CommonUtils.getIcon(iconPath));
}
public VisualiserMenu(String text, String iconPath) {
this(text, iconPath, false);

4
src/Common_old/UI/Menus_2023/VisualiserMenuBar.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -36,7 +36,7 @@ public class VisualiserMenuBar extends JToolBar {
{
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (icon_path_in != null) {
setIcon(Utils.getIcon(icon_path_in));
setIcon(CommonUtils.getIcon(icon_path_in));
}
}
};

4
src/Common_old/UI/Tables/ColumnFilter.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Tables;
import Common.Database.Tables.DataSet;
import Common.Utils.CommonUtils;
import Common_old.UI.TextField.StyledTextField;
import Common_old.Utils.Utils;
import javax.swing.*;
import javax.swing.border.MatteBorder;
@@ -47,7 +47,7 @@ public class ColumnFilter {
//--
dataSet.getUi().control.getColumnModel().getColumn(columnIndex).setHeaderRenderer((table, value, isSelected, hasFocus, row, column1) -> new JLabel() {
{
setIcon(Utils.getIcon("/icons/Filter.png"));
setIcon(CommonUtils.getIcon("/icons/Filter.png"));
setForeground(dataSet.getUi().control.getTableHeader().getForeground());
setBackground(dataSet.getUi().control.getTableHeader().getBackground());
setFont(dataSet.getUi().control.getTableHeader().getFont());

4
src/Common_old/UI/Trees/GraphTreeCellRenderer.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Trees;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import ProjectData.SapforData.FileObjectWithMessages;
import javax.swing.*;
@@ -15,7 +15,7 @@ public class GraphTreeCellRenderer extends StyledTreeCellRenderer {
Object o = ((DefaultMutableTreeNode) value).getUserObject();
if (o instanceof FileObjectWithMessages) {
FileObjectWithMessages target = (FileObjectWithMessages) o;
setIcon(Utils.getIcon(target.ImageKey()));
setIcon(CommonUtils.getIcon(target.ImageKey()));
setFont(Current.getTheme().Fonts.get(target.getFont()));
} else {
setIcon(null);

4
src/Common_old/UI/Windows/Dialog/Dialog.java
View File

@@ -1,4 +1,5 @@
package Common_old.UI.Windows.Dialog;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import _VisualDVM.Global;
@@ -6,7 +7,6 @@ import _VisualDVM.Syntax.ThemeElement;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.UI;
import Common.Utils.TextLog;
import Common_old.Utils.Utils;
import javax.swing.*;
import java.awt.*;
@@ -40,7 +40,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
getContentPane().setLayout(new BorderLayout());
lTitle.setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
if (!getIconPath().isEmpty()) {
setIconImage(Utils.getIcon(getIconPath()).getImage());
setIconImage(CommonUtils.getIcon(getIconPath()).getImage());
}
//делаем титульную надпись в самом окне чтобы не зависеть от языковой политики ОС
getContentPane().add(lTitle, BorderLayout.NORTH);