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-11 00:00:30 +03:00
parent a11b7711f7
commit f317ab1aa1
341 changed files with 1866 additions and 1688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Editor;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.TextEditorMenu;
import Common.Visual.Themes.ThemeElement;
@@ -45,7 +45,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
//todo переход в нужную строку по ctrl+g?
case KeyEvent.VK_Z:
if (getText().equals(startText)) {
CommonUI.Info("Начальная версия текста достигнута.");
UI_.Info("Начальная версия текста достигнута.");
e.consume();
}
break;
@@ -115,8 +115,8 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
setSelectionEnd(getLineStartOffset(LineNum));
}
} catch (Exception ex) {
CommonUtils.MainLog.Print("Не удалось перейти на строку " + LineNum);
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.Print("Не удалось перейти на строку " + LineNum);
Utils_.MainLog.PrintException(ex);
}
}
//------------------------------------------
@@ -129,7 +129,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
@Override
public void applyTheme() {
float font_size = (float) getFont().getSize();
((SPFEditorTheme)CommonUI.getTheme()).getEditorTheme().apply(this);
((SPFEditorTheme) UI_.getTheme()).getEditorTheme().apply(this);
setFont(getFont().deriveFont(font_size));
menu.applyTheme();
//меню связано с редактором. поэтому тема меняется только вместе с ним.

4
src/_VisualDVM/Visual/Editor/CaretInfo.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Editor;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
public class CaretInfo {
@@ -22,7 +22,7 @@ public class CaretInfo {
prefix_word = SPFEditor.getLastWord(before, ' ', ',', ':', '.', '(', ')');
suffix_word = SPFEditor.getFirstWord(after, ' ', ',', ':', '.', '(', ')');
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
public CaretInfo() {

6
src/_VisualDVM/Visual/Interface/FormWithSplitters.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Visual.Interface;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
public interface FormWithSplitters {
default void LoadSplitters() {
CommonUtils.db.splitters.Load(this);
Utils_.db.splitters.Load(this);
}
default void SaveSplitters() {
CommonUtils.db.splitters.Save(this);
Utils_.db.splitters.Save(this);
}
}

4
src/_VisualDVM/Visual/Menus/AttachementsMenu.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import _VisualDVM.Current;
@@ -23,7 +23,7 @@ public class AttachementsMenu extends StyledPopupMenu {
try {
Desktop.getDesktop().open(Current.getProject().getAttachmentsDirectory());
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
});

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Menus.FastAccessMenuBar;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
@@ -34,17 +34,17 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
repaint();
}
public void Refresh() {
CommonUI.Clear(this);
UI_.Clear(this);
int i = 1;
for (Pass pass : Pass.FAPasses) {
if (pass.stats.HasUsages()) {
showPass(pass);
++i;
if (i > (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
if (i > (((GlobalDatabase) Utils_.db).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
}
}
}
public void Drop(){
CommonUI.Clear(this);
UI_.Clear(this);
}
}

4
src/_VisualDVM/Visual/Menus/LanguagesSubmenu.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.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(CommonUtils.getIcon(li));
languageItem.setIcon(Utils_.getIcon(li));
languageItem.addActionListener(
new AbstractAction() {
@Override

38
src/_VisualDVM/Visual/Menus/MainEditorMenu.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Visual.Menus.TextEditorMenu;
import Common.Visual.Menus.VisualiserMenuItem;
import _VisualDVM.Current;
@@ -86,7 +86,7 @@ public class MainEditorMenu extends TextEditorMenu {
1
);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
});
@@ -103,7 +103,7 @@ public class MainEditorMenu extends TextEditorMenu {
0
);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
});
@@ -191,7 +191,7 @@ public class MainEditorMenu extends TextEditorMenu {
try {
Current.getSapfor().UpdateProjectFiles(false);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
});
@@ -220,9 +220,9 @@ public class MainEditorMenu extends TextEditorMenu {
if (!Utils.isFunctionName(selectedText)) {
String tip = "Имя процедуры может содержать только английские буквы, цифры и подчеркивания, и не может начинаться с цифры.";
//-
m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
m_inline.setText("Невозможно подставить вызов процедуры " + Utils_.Brackets(selectedText) +
" . Выделено некорректное имя.");
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils_.Brackets(selectedText) +
" . Выделено некорректное имя.");
//-
m_inline.setToolTipText(tip);
@@ -230,40 +230,40 @@ public class MainEditorMenu extends TextEditorMenu {
return;
}
if (!Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
m_inline.setText("Невозможно подставить вызов процедуры " + Utils_.Brackets(selectedText) +
" . Выполните проход \"Граф процедур \".");
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils_.Brackets(selectedText) +
" . Выполните проход \"Граф процедур \"");
return;
}
if (Current.getSapfor().isIntrinsic(selectedText)) {
m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
m_inline.setText("Невозможно подставить вызов процедуры " + Utils_.Brackets(selectedText) +
" . Процедура является стандартной.");
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils_.Brackets(selectedText) +
" . Процедура является стандартной.");
return;
}
call = Current.getFile().find_func_call(selectedText);
if (call == null) {
m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
m_inline.setText("Невозможно подставить вызов процедуры " + Utils_.Brackets(selectedText) +
" . Вызов не найден в текущей строке.");
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils_.Brackets(selectedText) +
" . Объявление процедуры уже находится в текущей строке.");
return;
}
decl = Current.getProject().allFunctions.get(call.funcName);
if (decl.type.equals(FunctionType.NotFound)) {
m_inline.setText("Невозможно подставить вызов процедуры " + CommonUtils.Brackets(selectedText) +
m_inline.setText("Невозможно подставить вызов процедуры " + Utils_.Brackets(selectedText) +
" . Объявление процедуры не найдено в проекте.");
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText) +
m_gotoFunction.setText("Невозможно перейти к объявлению процедуры " + Utils_.Brackets(selectedText) +
" . Объявление процедуры не найдено в проекте.");
return;
}
//---
m_inline.setEnabled(true);
m_gotoFunction.setEnabled(true);
m_inline.setText("Подставить вызов процедуры " + CommonUtils.Brackets(selectedText));
m_gotoFunction.setText("Перейти к объявлению процедуры " + CommonUtils.Brackets(selectedText));
m_inline.setText("Подставить вызов процедуры " + Utils_.Brackets(selectedText));
m_gotoFunction.setText("Перейти к объявлению процедуры " + Utils_.Brackets(selectedText));
//--
}
private void checkHeader() {
@@ -282,11 +282,11 @@ public class MainEditorMenu extends TextEditorMenu {
return;
}
if (!Current.getFile().relativeHeaders.containsKey(header_)) {
m_gotoHeader.setText("Невозможно перейти к заголовочному файлу " + CommonUtils.Brackets(header_) + " . Файл не найден среди включений текущего файла.");
m_gotoHeader.setText("Невозможно перейти к заголовочному файлу " + Utils_.Brackets(header_) + " . Файл не найден среди включений текущего файла.");
return;
}
header = Current.getFile().relativeHeaders.get(header_);
m_gotoHeader.setText("Переход к заголовочному файлу " + CommonUtils.Brackets(header_));
m_gotoHeader.setText("Переход к заголовочному файлу " + Utils_.Brackets(header_));
m_gotoHeader.setEnabled(true);
}
}
@@ -304,7 +304,7 @@ public class MainEditorMenu extends TextEditorMenu {
return;
}
m_loop_union.setEnabled(true);
m_loop_union.setText("Объединить цикл в строке " + CommonUtils.Brackets(loop.line) + " со следующим");
m_loop_union.setText("Объединить цикл в строке " + Utils_.Brackets(loop.line) + " со следующим");
}
@Override
public void CheckElementsVisibility() {

6
src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Visual.Menus.VisualiserMenuItem;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import _VisualDVM.GlobalData.DBLastProject.DBLastProject;
@@ -21,7 +21,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
@Override
public void menuSelected(MenuEvent e) {
removeAll();
Vector<DBLastProject> projects = ((GlobalDatabase)CommonUtils.db).lastProjects.getOrdered();
Vector<DBLastProject> projects = ((GlobalDatabase) Utils_.db).lastProjects.getOrdered();
int k = 1;
for (DBLastProject p : projects) {
if (new File(p.HomePath).exists() && p.lastOpened != 0) {
@@ -34,7 +34,7 @@ public class LastOpenedProjectsMenu extends VisualiserMenu {
});
add(i);
++k;
if (k > (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LastOpenedProjectsCount).toInt32())) break;
if (k > (((GlobalDatabase) Utils_.db).settings.get(SettingName.LastOpenedProjectsCount).toInt32())) break;
}
}
}

4
src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import _VisualDVM.Global;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
@@ -30,7 +30,7 @@ public class MainMenuBar extends VisualiserMenuBar {
setIcon("/icons/ComponentsActual.png");
addActionListener(e -> {
if (PerformanceAnalyzer.isActive) {
CommonUI.Info("Перед работой с компонентами закройте анализатор производительности!");
UI_.Info("Перед работой с компонентами закройте анализатор производительности!");
} else {
Pass.passes.get(PassCode.GetComponentsActualVersions).Do();
Global.RefreshUpdatesStatus();

8
src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Menus.PropertiesSubmenu;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
import _VisualDVM.Visual.Menus.VisualiserMenu;
@@ -15,7 +15,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
"FocusPassesResult"
));
add(new CompactnessSettingsMenu());
if (CommonUtils.isWindows()) {
if (Utils_.isWindows()) {
add(new SettingsSubmenu("Компиляция на локальной машине", null,
SettingName.LocalMakePathWindows,
SettingName.Kernels
@@ -37,7 +37,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
SettingName.FortranWrapsOn,
SettingName.ComparsionDiffMergeOn
));
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Workspace).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.BugReportsAgeLimit).getMenuItem());
add(((GlobalDatabase) Utils_.db).settings.get(SettingName.Workspace).getMenuItem());
add(((GlobalDatabase) Utils_.db).settings.get(SettingName.BugReportsAgeLimit).getMenuItem());
}
}

4
src/_VisualDVM/Visual/Menus/PassMenuItem.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Passes.Pass;
import _VisualDVM.Visual.Controls.PassControl;
public class PassMenuItem extends VisualiserMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(CommonUtils.getIcon(icon_path));
setIcon(Utils_.getIcon(icon_path));
}
public PassMenuItem(Pass pass) {
setText(pass.getDescription());

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
@@ -9,8 +9,8 @@ import javax.swing.*;
public class PassesSubMenu extends JMenu {
public PassesSubMenu(String title, String icon, PassCode... passes) {
super(title);
setIcon(CommonUtils.getIcon(icon));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
setIcon(Utils_.getIcon(icon));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
for (PassCode code : passes) {
add(Pass.passes.get(code).createMenuItem());
}

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

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Visual.Menus.VisualiserMenuItem;
import _VisualDVM.Current;
import _VisualDVM.Global;
@@ -32,7 +32,7 @@ public class ProjectFilesMenu extends GraphMenu {
try {
Desktop.getDesktop().open(Current.getProject().Home);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
});
@@ -58,10 +58,10 @@ public class ProjectFilesMenu extends GraphMenu {
});
addSeparator();
m_multiselection = new VisualiserMenuItem("Массовый режим работы с файлами");
m_multiselection.setIcon(CommonUtils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.setIcon(Utils_.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.addActionListener(e -> {
Global.files_multiselection = !Global.files_multiselection;
m_multiselection.setIcon(CommonUtils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.setIcon(Utils_.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
Current.getProject().SelectAllFiles(false);
UI.getMainWindow().getProjectWindow().RefreshProjectFiles();

8
src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.LanguagesSubmenu;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
@@ -60,9 +60,9 @@ public class ProjectSettingsMenu extends VisualiserMenu {
SettingName.SaveModifications
));
addSeparator();
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.TRANSLATE_MESSAGES).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.DEBUG_PRINT_ON).getMenuItem());
add(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.GCOVLimit).getMenuItem());
add(((GlobalDatabase) Utils_.db).settings.get(SettingName.TRANSLATE_MESSAGES).getMenuItem());
add(((GlobalDatabase) Utils_.db).settings.get(SettingName.DEBUG_PRINT_ON).getMenuItem());
add(((GlobalDatabase) Utils_.db).settings.get(SettingName.GCOVLimit).getMenuItem());
}
public void ShowLanguage() {
mLanguage.setText("Язык: " + Current.getProject().languageName.getDescription());

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

@@ -1,7 +1,7 @@
package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Visual.Fonts.VisualiserFonts;
@@ -18,8 +18,8 @@ public class ProjectViewMenu extends VisualiserMenu {
for (ProjectView view : ProjectView.values()) {
JMenuItem m = new JMenuItem(view.getDescription()) {
{
setIcon(CommonUtils.getIcon(view.getIcon()));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setIcon(Utils_.getIcon(view.getIcon()));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
addActionListener(e -> {
Current_.set(Current.ProjectView, view);
UI.getMainWindow().getProjectWindow().ShowProjectView();

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Global;
import Common.Visual.Fonts.VisualiserFonts;
@@ -9,8 +9,8 @@ public class PropertiesSubmenu extends JMenu {
public PropertiesSubmenu(String title, String icon, String... settings) {
super(title);
if (icon != null)
setIcon(CommonUtils.getIcon(icon));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
setIcon(Utils_.getIcon(icon));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
for (String name : settings) {
Global.properties.addFlagMenuItem(this, name);
}

6
src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Menus;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.Selectable;
import Common.Visual.Trees.DataTree;
@@ -72,9 +72,9 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
if ((current != null) && (current.getClass().equals(getTargetClass()))) {
String name = ((Selectable) current).getSelectionText();
m_select_for_current.setText("Выбрать всё для " +
CommonUtils.Brackets(name));
Utils_.Brackets(name));
m_unselect_for_current.setText("Отменить выбор всех для " +
CommonUtils.Brackets(name));
Utils_.Brackets(name));
//-
m_select_for_current.setVisible(true);
m_unselect_for_current.setVisible(true);

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.GlobalDatabase;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.GlobalData.Settings.SettingName;
@@ -10,10 +10,10 @@ public class SettingsSubmenu extends JMenu {
public SettingsSubmenu(String title, String icon, SettingName... settings) {
super(title);
if (icon != null)
setIcon(CommonUtils.getIcon(icon));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
setIcon(Utils_.getIcon(icon));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
for (SettingName c : settings) {
add(((GlobalDatabase)CommonUtils.db).settings.get(c).getMenuItem());
add(((GlobalDatabase) Utils_.db).settings.get(c).getMenuItem());
}
}
}

12
src/_VisualDVM/Visual/Menus/StableMenuItem.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Menus.VisualiserMenuItem;
import javax.swing.*;
@@ -15,15 +15,15 @@ class StableItemUI extends BasicMenuItemUI {
@Override
protected void doClick(MenuSelectionManager msm) {
menuItem.doClick(0);
if (CommonUI.last_menu_path != null)
MenuSelectionManager.defaultManager().setSelectedPath(CommonUI.last_menu_path);
if (UI_.last_menu_path != null)
MenuSelectionManager.defaultManager().setSelectedPath(UI_.last_menu_path);
}
}
public class StableMenuItem extends VisualiserMenuItem {
{
getModel().addChangeListener(e -> {
if (getModel().isArmed() && isShowing())
CommonUI.last_menu_path = MenuSelectionManager.defaultManager().getSelectedPath();
UI_.last_menu_path = MenuSelectionManager.defaultManager().getSelectedPath();
});
}
public StableMenuItem(String text) {
@@ -32,7 +32,7 @@ public class StableMenuItem extends VisualiserMenuItem {
}
public StableMenuItem(String text, String icon_path) {
super(text);
setIcon(CommonUtils.getIcon(icon_path));
setIcon(Utils_.getIcon(icon_path));
setUI(new StableItemUI());
}
public StableMenuItem() {

4
src/_VisualDVM/Visual/Menus/StablePassMenuItem.java
View File

@@ -1,11 +1,11 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Passes.Pass;
import _VisualDVM.Visual.Controls.PassControl;
public class StablePassMenuItem extends StableMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(CommonUtils.getIcon(icon_path));
setIcon(Utils_.getIcon(icon_path));
}
public StablePassMenuItem(Pass pass) {
setText(pass.getDescription());

6
src/_VisualDVM/Visual/Menus/VersionsMenu.java
View File

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

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
@@ -13,9 +13,9 @@ public class VisualiserMenu extends JMenu {
setToolTipText(text);
if (textVisible)
setText(text);
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (!iconPath.isEmpty())
setIcon(CommonUtils.getIcon(iconPath));
setIcon(Utils_.getIcon(iconPath));
}
public VisualiserMenu(String text, String iconPath) {
this(text, iconPath, false);

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
@@ -34,9 +34,9 @@ public class VisualiserMenuBar extends JToolBar {
public JLabel addLabel(String text_in, String icon_path_in) {
JLabel res = new JLabel(text_in) {
{
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (icon_path_in != null) {
setIcon(CommonUtils.getIcon(icon_path_in));
setIcon(Utils_.getIcon(icon_path_in));
}
}
};

4
src/_VisualDVM/Visual/Syntax/SPFEditorTheme.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Syntax;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Visual.Themes.VisualiserTheme;
import org.fife.ui.rsyntaxtextarea.Theme;
public abstract class SPFEditorTheme extends VisualiserTheme {
@@ -11,7 +11,7 @@ public abstract class SPFEditorTheme extends VisualiserTheme {
try {
res = Theme.load(getClass().getResourceAsStream(getEditorThemePath()));
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
return res;
}

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

@@ -1,7 +1,7 @@
package _VisualDVM.Visual;
import Common.Database.Tables.DataSet;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsBar;
@@ -135,44 +135,44 @@ public class UI {
versionsMenuBar = new VersionsMenuBar();
fastAccessMenuBar = new FastAccessMenuBar();
//---------------------------------------------------->>
CommonUI.menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar());
CommonUI.menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar());
UI_.menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar());
UI_.menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar());
//---------------------------------------------------->>
CommonUI.menuBars.put(GroupsDBTable.class, new GroupsMenuBar());
CommonUI.menuBars.put(TestDBTable.class, new TestsMenuBar());
CommonUI.menuBars.put(DVMConfigurationDBTable.class, new DVMConfigurationsMenuBar());
CommonUI.menuBars.put(DVMPackageDBTable.class, new DVMPackagesBar());
CommonUI.menuBars.put(SapforPackageDBTable.class, new SapforPackagesBar());
CommonUI.menuBars.put(DVMRunTasksSet.class, new DVMRunTasksBar());
UI_.menuBars.put(GroupsDBTable.class, new GroupsMenuBar());
UI_.menuBars.put(TestDBTable.class, new TestsMenuBar());
UI_.menuBars.put(DVMConfigurationDBTable.class, new DVMConfigurationsMenuBar());
UI_.menuBars.put(DVMPackageDBTable.class, new DVMPackagesBar());
UI_.menuBars.put(SapforPackageDBTable.class, new SapforPackagesBar());
UI_.menuBars.put(DVMRunTasksSet.class, new DVMRunTasksBar());
//--->>>
CommonUI.menuBars.put(MachinesDBTable.class, new MachinesMenuBar());
CommonUI.menuBars.put(UsersDBTable.class, new UsersMenuBar());
CommonUI.menuBars.put(CompilersDBTable.class, new CompilersMenuBar());
CommonUI.menuBars.put(MakefilesDBTable.class, new MakefilesMenuBar());
CommonUI.menuBars.put(ModulesDBTable.class, new ModulesMenuBar());
CommonUI.menuBars.put(RunConfigurationsDBTable.class, new RunConfigurationsMenuBar());
CommonUI.menuBars.put(EnvironmentValuesDBTable.class, new EnvironmentValuesMenuBar());
CommonUI.menuBars.put(DVMParameterDBTable.class, new DVMParametersMenuBar());
CommonUI.menuBars.put(CompilationTasksDBTable.class, new DataMenuBar("задачи на компиляцию"));
CommonUI.menuBars.put(RunTasksDBTable.class, new DataMenuBar("задачи на запуск"));
UI_.menuBars.put(MachinesDBTable.class, new MachinesMenuBar());
UI_.menuBars.put(UsersDBTable.class, new UsersMenuBar());
UI_.menuBars.put(CompilersDBTable.class, new CompilersMenuBar());
UI_.menuBars.put(MakefilesDBTable.class, new MakefilesMenuBar());
UI_.menuBars.put(ModulesDBTable.class, new ModulesMenuBar());
UI_.menuBars.put(RunConfigurationsDBTable.class, new RunConfigurationsMenuBar());
UI_.menuBars.put(EnvironmentValuesDBTable.class, new EnvironmentValuesMenuBar());
UI_.menuBars.put(DVMParameterDBTable.class, new DVMParametersMenuBar());
UI_.menuBars.put(CompilationTasksDBTable.class, new DataMenuBar("задачи на компиляцию"));
UI_.menuBars.put(RunTasksDBTable.class, new DataMenuBar("задачи на запуск"));
//---->>
CommonUI.menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
UI_.menuBars.put(SapforConfigurationDBTable.class, new SapforConfigurationsMenuBar());
//---->>
CommonUI.menuBars.put(RegionsSet.class, new DataMenuBar("области распараллеливания"));
CommonUI.menuBars.put(ArraysSet.class, new DataMenuBar("массивы"));
CommonUI.menuBars.put(ArraysDBTable.class, new DataMenuBar("сохранённые состояния") {
UI_.menuBars.put(RegionsSet.class, new DataMenuBar("области распараллеливания"));
UI_.menuBars.put(ArraysSet.class, new DataMenuBar("массивы"));
UI_.menuBars.put(ArraysDBTable.class, new DataMenuBar("сохранённые состояния") {
@Override
public void createSelectionButtons(DataSet dataSet) {
//не нужны.
}
});
CommonUI.menuBars.put(VariantsSet.class, new VariantsMenuBar());
CommonUI.menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
CommonUI.menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode.SaveProfile, PassCode.EditProfile, PassCode.ApplyProfile, PassCode.DeleteProfile));
CommonUI.menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
CommonUI.menuBars.put(SapforSettingsDBTable.class, new SapforSettingsBar());
CommonUI.menuBars.put(SapforSettingsCommandsDBTable.class, new SapforSettingsCommandsBar());
CommonUI.menuBars.put(DVMSettingsDBTable.class, new DVMSettingsBar());
UI_.menuBars.put(VariantsSet.class, new VariantsMenuBar());
UI_.menuBars.put(SubsribersDBTable.class, new SubscribersMenuBar());
UI_.menuBars.put(SapforProfilesDBTable.class, new DataMenuBar("профили", PassCode.SaveProfile, PassCode.EditProfile, PassCode.ApplyProfile, PassCode.DeleteProfile));
UI_.menuBars.put(ServerSapforsDBTable.class, new ServerSapforsBar());
UI_.menuBars.put(SapforSettingsDBTable.class, new SapforSettingsBar());
UI_.menuBars.put(SapforSettingsCommandsDBTable.class, new SapforSettingsCommandsBar());
UI_.menuBars.put(DVMSettingsDBTable.class, new DVMSettingsBar());
//---->>
}
public static void CreateWindows() {
@@ -260,7 +260,7 @@ public class UI {
ShowTabsNames(tabs, 0);
}
public static void ShowTabsNames(JTabbedPane tabs, int startIndex) {
boolean flag = ((GlobalDatabase) CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
for (int i = startIndex; i < tabs.getTabCount(); ++i)
tabs.setTitleAt(i, flag ? tabs.getToolTipTextAt(i) : "");
}

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
@@ -163,7 +163,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
BugReportCommentAddition.setWrapStyleWord(true);
//----------------------------------------------
//тут развилка на то вкладки или поля.
SwitchScreen(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SmallScreen).toBoolean());
SwitchScreen(((GlobalDatabase) Utils_.db).settings.get(SettingName.SmallScreen).toBoolean());
//-
Global.componentsServer.db.bugReports.mountUI(bugReportsPanel);
Global.componentsServer.db.subscribers.mountUI(subscribersPanel);
@@ -287,7 +287,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
CommentFields commentFields = new CommentFields();
@Override
public void SwitchScreen(boolean small) {
CommonUI.Clear(descriptionPanel);
UI_.Clear(descriptionPanel);
//------------------------------------------------------------------
descriptionInterface = small ? descriptionTabs : descriptionFields;
descriptionInterface.setEditorScroll(bugDescriptionScroll);
@@ -297,7 +297,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
descriptionPanel.revalidate();
descriptionPanel.repaint();
//---------
CommonUI.Clear(commentPanel);
UI_.Clear(commentPanel);
//------------------------------------------------------------------
commentInterface = small ? commentTabs : commentFields;
commentInterface.setEditorScroll(bugCommentScroll);
@@ -367,7 +367,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
settingsTools = new VisualiserMenuBar();
}
public void EnableBugreports() {
CommonUI.Clear(accountPanel);
UI_.Clear(accountPanel);
accountPanel.add(SC10);
UI.getMainWindow().SwitchTestingTabs(true);
}
@@ -436,9 +436,9 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
}
@Override
public void ShowAccount() {
lAccountName.setText(CommonUtils.Brackets(Current.getAccount().name));
lAccountMail.setText(CommonUtils.Brackets(Current.getAccount().email));
lAccountRole.setText(CommonUtils.Brackets(Current.getAccount().role.getDescription()));
lAccountName.setText(Utils_.Brackets(Current.getAccount().name));
lAccountMail.setText(Utils_.Brackets(Current.getAccount().email));
lAccountRole.setText(Utils_.Brackets(Current.getAccount().role.getDescription()));
switch (Current.getAccount().role) {
case Undefined:
/// UI.Clear(accountPanel);

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

@@ -1,8 +1,8 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import _VisualDVM.Visual.Editor.BaseEditor;
@@ -81,7 +81,7 @@ public abstract class ComparisonForm<T> {
applyObject();
showObject();
} else
CommonUI.Info(log.toString());
UI_.Info(log.toString());
}
public void ApplyObject(DBObject object_in){
RemoveObject();
@@ -254,7 +254,7 @@ public abstract class ComparisonForm<T> {
int master_lineNum = Body.getCaretLineNumber();
slave.Body.setCaretPosition(slave.Body.getLineStartOffset(master_lineNum));
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
});

24
src/_VisualDVM/Visual/Windows/DebugForm.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.FormWithSplitters;
@@ -68,22 +68,22 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
//-
@Override
public void ShowAll() {
((GlobalDatabase)CommonUtils.db).makefiles.ShowUI();
((GlobalDatabase)CommonUtils.db).runConfigurations.ShowUI();
((GlobalDatabase)CommonUtils.db).compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
((GlobalDatabase)CommonUtils.db).runTasks.ShowUI();
((GlobalDatabase) Utils_.db).makefiles.ShowUI();
((GlobalDatabase) Utils_.db).runConfigurations.ShowUI();
((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
((GlobalDatabase) Utils_.db).runTasks.ShowUI();
}
public DebugForm(){
LoadSplitters();
//--
((GlobalDatabase)CommonUtils.db).makefiles.mountUI(makefilesPanel);
((GlobalDatabase)CommonUtils.db).modules.mountUI(modulesPanel);
((GlobalDatabase)CommonUtils.db).runConfigurations.mountUI(runConfigurationsPanel);
((GlobalDatabase)CommonUtils.db).environmentValues.mountUI(environmentsPanel);
((GlobalDatabase)CommonUtils.db).dvmParameters.mountUI(dvmParametersPanel);
((GlobalDatabase) Utils_.db).makefiles.mountUI(makefilesPanel);
((GlobalDatabase) Utils_.db).modules.mountUI(modulesPanel);
((GlobalDatabase) Utils_.db).runConfigurations.mountUI(runConfigurationsPanel);
((GlobalDatabase) Utils_.db).environmentValues.mountUI(environmentsPanel);
((GlobalDatabase) Utils_.db).dvmParameters.mountUI(dvmParametersPanel);
//-
((GlobalDatabase)CommonUtils.db).compilationTasks.mountUI(compilationTasksPanel);
((GlobalDatabase)CommonUtils.db).runTasks.mountUI(runTasksPanel);
((GlobalDatabase) Utils_.db).compilationTasks.mountUI(compilationTasksPanel);
((GlobalDatabase) Utils_.db).runTasks.mountUI(runTasksPanel);
//--
singleCompilationTaskMaster = new CompilationTasksComparisonForm(singleCompilationTaskSlave = new CompilationTasksComparisonForm(null));
singleRunTaskMaster = new RunTasksComparisonForm(singleRunTaskSlave = new RunTasksComparisonForm(null));

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

@@ -1,7 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import _VisualDVM.Visual.Editor.Viewer;
@@ -173,29 +173,29 @@ public class FileForm implements FileWindow, FormWithSplitters {
//----
@Override
public void ShowWarningsCount() {
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(1, (flag ? "Предупреждения: " : "") + file.father.db.warnings.getVisibleKeys().size());
}
@Override
public void ShowErrorsCount() {
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(2, (flag ? "Ошибки: " : "") + file.father.db.errors.getVisibleKeys().size());
}
@Override
public void ShowNotesCount() {
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(0, (flag ? "Примечания: " : "") + file.father.db.notes.getVisibleKeys().size());
}
@Override
public void ShowRecommendationsCount() {
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(3, (flag ? "Рекомендации: " : "") + file.father.db.recommendations.getVisibleKeys().size());
}
//---
@Override
public void RefreshTabsNames() {
UI.ShowTabsNames(graphsTabs);
boolean flag = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
//--
ShowNotesCount();
ShowWarningsCount();
@@ -216,7 +216,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
}
@Override
public void ShowText() {
CommonUI.Clear(editorPanel);
UI_.Clear(editorPanel);
editorPanel.add(new RTextScrollPane(Body = new SPFEditor(file)));
UI.getSearchReplaceWindow().updateEditor(Body);
}
@@ -235,7 +235,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
}
@Override
public void ShowNoMessages() {
boolean full_tiles = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean full_tiles = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
file.father.db.notes.ClearUI();
file.father.db.warnings.ClearUI();
file.father.db.errors.ClearUI();
@@ -367,31 +367,31 @@ public class FileForm implements FileWindow, FormWithSplitters {
//--
@Override
public void CollapseGraphs() {
CommonUtils.db.splitters.get("SC12").position = SC12.getDividerLocation();
CommonUI.Clear(editorBackground);
Utils_.db.splitters.get("SC12").position = SC12.getDividerLocation();
UI_.Clear(editorBackground);
editorBackground.add(editorPanel);
}
@Override
public void ExpandGraphs() {
CommonUI.Clear(editorBackground);
UI_.Clear(editorBackground);
SC12.setRightComponent(editorPanel);
editorBackground.add(SC12);
//--
SC12.setDividerLocation(CommonUtils.db.splitters.get("SC12").position);
SC12.setDividerLocation(Utils_.db.splitters.get("SC12").position);
SC12.updateUI();
}
@Override
public void CollapseMessages() {
CommonUtils.db.splitters.get("SC1").position = SC1.getDividerLocation();
CommonUI.Clear(content);
Utils_.db.splitters.get("SC1").position = SC1.getDividerLocation();
UI_.Clear(content);
content.add(editorBackground);
}
@Override
public void ExpandMessages() {
CommonUI.Clear(content);
UI_.Clear(content);
SC1.setLeftComponent(editorBackground);
content.add(SC1);
SC1.setDividerLocation(CommonUtils.db.splitters.get("SC1").position);
SC1.setDividerLocation(Utils_.db.splitters.get("SC1").position);
SC1.updateUI();
}
}

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

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.TextField.StyledTextField;
import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
@@ -115,19 +115,19 @@ public class FunctionsForm implements FunctionsWindow {
sDepth.setModel(new SpinnerNumberModel(1,
0, 64, 1
));
CommonUI.MakeSpinnerRapid(sIterations, e -> {
UI_.MakeSpinnerRapid(sIterations, e -> {
Current.getProject().UpdatefgIterations((int) sIterations.getValue());
FunctionsGraphUI.ffTimer.restart();
});
CommonUI.MakeSpinnerRapid(sResistance, e -> {
UI_.MakeSpinnerRapid(sResistance, e -> {
Current.getProject().UpdatefgResistance((int) sResistance.getValue());
FunctionsGraphUI.ffTimer.restart();
});
CommonUI.MakeSpinnerRapid(sScreen, e -> {
UI_.MakeSpinnerRapid(sScreen, e -> {
Current.getProject().UpdatefgScreen((double) sScreen.getValue());
FunctionsGraphUI.ffTimer.restart();
});
CommonUI.MakeSpinnerRapid(sDepth, e -> {
UI_.MakeSpinnerRapid(sDepth, e -> {
SPF_GetGraphFunctionPositions.depth = (int) sDepth.getValue();
FunctionsGraphUI.ffTimer.restart();
});

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
@@ -61,7 +61,7 @@ public class MainForm extends Form implements MainWindow {
if (UI.getDebugWindow() != null)
((FormWithSplitters) UI.getDebugWindow()).SaveSplitters();
//--
((GlobalDatabase)CommonUtils.db).SaveCredentials();
((GlobalDatabase) Utils_.db).SaveCredentials();
//--
Global.FinishApplication();
}
@@ -101,7 +101,7 @@ public class MainForm extends Form implements MainWindow {
}
private void InstallCallbackPanel() {
globalTabs.insertTab("Обратная связь",
CommonUtils.getIcon("/icons/Bug.png"),
Utils_.getIcon("/icons/Bug.png"),
(callbackForm = new CallbackForm()).getContent(),
"Журнал ошибок и связь с разработчиками", 1);
}
@@ -113,7 +113,7 @@ public class MainForm extends Form implements MainWindow {
}
private void InstallTestsPanel() {
globalTabs.insertTab("Тесты",
CommonUtils.getIcon("/icons/Library.PNG"),
Utils_.getIcon("/icons/Library.PNG"),
(testsForm = new TestsForm()).getContent(),
"Библиотека тестов на сервере", 2);
}
@@ -126,7 +126,7 @@ public class MainForm extends Form implements MainWindow {
private void InstallTestingPanel() {
testingForm = new TestingForm();
globalTabs.insertTab("Тестирование",
CommonUtils.getIcon("/icons/Session.png"),
Utils_.getIcon("/icons/Session.png"),
testingForm.getContent(),
"Система тестирования", 3);
}
@@ -235,7 +235,7 @@ public class MainForm extends Form implements MainWindow {
getTestsWindow().ShowAll();
if (getTestingWindow() != null)
getTestingWindow().ShowAll();
CommonUI.windowsStack.push(this);
UI_.windowsStack.push(this);
super.Show();
}
@Override

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

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Visual.Interface.FormWithSplitters;
@@ -16,7 +16,7 @@ public class ProfilesFields implements DialogFields, FormWithSplitters {
return content;
}
public ProfilesFields(){
((GlobalDatabase)CommonUtils.db).sapforProfiles.mountUI(profilesPanel);
((GlobalDatabase)CommonUtils.db).sapforProfilesSettings.mountUI(settingsPanel);
((GlobalDatabase) Utils_.db).sapforProfiles.mountUI(profilesPanel);
((GlobalDatabase) Utils_.db).sapforProfilesSettings.mountUI(settingsPanel);
}
}

18
src/_VisualDVM/Visual/Windows/ProfilesForm.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Dialog;
import Common.Database.Objects.DBForm.DBForm;
import _VisualDVM.GlobalData.GlobalDatabase;
@@ -18,13 +18,13 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
}
@Override
public void Init(Object... params) {
if (((GlobalDatabase)CommonUtils.db).sapforProfiles.size() > 0) {
for (Object key : ((GlobalDatabase)CommonUtils.db).sapforProfiles.Data.keySet()) {
((GlobalDatabase)CommonUtils.db).sapforProfiles.ShowUI(key);
if (((GlobalDatabase) Utils_.db).sapforProfiles.size() > 0) {
for (Object key : ((GlobalDatabase) Utils_.db).sapforProfiles.Data.keySet()) {
((GlobalDatabase) Utils_.db).sapforProfiles.ShowUI(key);
return;
}
} else {
((GlobalDatabase)CommonUtils.db).sapforProfiles.ShowUI();
((GlobalDatabase) Utils_.db).sapforProfiles.ShowUI();
}
}
@Override
@@ -58,8 +58,8 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
return "Profiles"; //можно было бы через имя класса
}
public void LoadWindowParameters() throws Exception {
if (((GlobalDatabase)CommonUtils.db).forms.Data.containsKey(getFormKey())) {
info = ((GlobalDatabase)CommonUtils.db).forms.Data.get(getFormKey());
if (((GlobalDatabase) Utils_.db).forms.Data.containsKey(getFormKey())) {
info = ((GlobalDatabase) Utils_.db).forms.Data.get(getFormKey());
info.Apply(this);
return;
}
@@ -68,8 +68,8 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
public void SaveWindowParameters() throws Exception {
if (info != null) {
info.Init(this);
CommonUtils.db.Update(info);
Utils_.db.Update(info);
} else
CommonUtils.db.Insert(new DBForm(getFormKey(), this));
Utils_.db.Insert(new DBForm(getFormKey(), this));
}
}

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
@@ -84,7 +84,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
UI.getDebugWindow().ShowAll();
ShowAllAnalyses();
ShowProjectView();
SwitchScreen(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SmallScreen).toBoolean());
SwitchScreen(((GlobalDatabase) Utils_.db).settings.get(SettingName.SmallScreen).toBoolean());
RefreshTabsNames();
//--
if (Global.properties.collapseProjectTrees)
@@ -172,7 +172,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
projectTabs.setSelectedIndex(0);
}
});
CommonUI.Clear(fileBackground);
UI_.Clear(fileBackground);
//filesTabs.removeAll();
}
@Override
@@ -254,10 +254,10 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
}
@Override
public void ShowProjectView() {
CommonUI.Clear(projectViewPanel);
UI_.Clear(projectViewPanel);
ProjectView view = Current.getProjectView();
menuBar.getProjectViewMenu().setToolTipText(view.getDescription());
menuBar.getProjectViewMenu().setIcon(CommonUtils.getIcon(view.getIcon()));
menuBar.getProjectViewMenu().setIcon(Utils_.getIcon(view.getIcon()));
switch (view) {
case Files:
projectViewPanel.add(filesForm.getContent());
@@ -277,13 +277,13 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
//-
private void InstallVersionsPanel() {
projectTabs.insertTab("",
CommonUtils.getIcon("/icons/VersionsTree.png"),
Utils_.getIcon("/icons/VersionsTree.png"),
UI.getVersionsWindow().getContent(),
"Версии", 5);
}
private void InstallDebugPanel() {
projectTabs.insertTab("",
CommonUtils.getIcon("/icons/Command.png"),
Utils_.getIcon("/icons/Command.png"),
UI.getDebugWindow().getContent(),
"Компиляция и запуск", 6);
}
@@ -294,16 +294,16 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
//--
@Override
public void CollapseProjectTrees() {
CommonUtils.db.splitters.get("SC3").position = SC3.getDividerLocation();
Utils_.db.splitters.get("SC3").position = SC3.getDividerLocation();
//---
CommonUI.Clear(projectBackground);
UI_.Clear(projectBackground);
projectBackground.add(fileBackground);
}
@Override
public void ExpandProjectTrees() {
SC3.setLeftComponent(fileBackground);
projectBackground.add(SC3);
SC3.setDividerLocation(CommonUtils.db.splitters.get("SC3").position);
SC3.setDividerLocation(Utils_.db.splitters.get("SC3").position);
SC3.updateUI();
}
}

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

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.VFileChooser_;
import _VisualDVM.Constants;
@@ -12,7 +12,7 @@ public class ProjectsChooser extends VFileChooser_ {
@Override
public boolean accept(File f) {
return
!CommonUtils.ContainsCyrillic(f.getAbsolutePath()) &&
!Utils_.ContainsCyrillic(f.getAbsolutePath()) &&
!f.getName().equalsIgnoreCase(Constants.data)
;
}

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Current_;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import _VisualDVM.Visual.Controls.ShortLabel;
@@ -75,7 +75,7 @@ public class SapforPackagesComparisonForm {
showObject();
}
} else
CommonUI.Info(log.toString());
UI_.Info(log.toString());
}
public void ApplyObject(DBObject object_in) {
RemoveObject();
@@ -116,7 +116,7 @@ public class SapforPackagesComparisonForm {
}
//---
public void showNoTree() {
CommonUI.Clear(treePanel);
UI_.Clear(treePanel);
}
public void showObject() {
lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : ""));

18
src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import Common.Visual.Controls.MenuBarButton;
@@ -82,10 +82,10 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
} else {
if (isReady()) {
if (getMaster().isReady()) {
boolean ExtensionsOn = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean();
String name1 = ExtensionsOn ? getMaster().file.file.getName() : CommonUtils.getFileNameWithoutExtension(getMaster().file.file);
String name2 = ExtensionsOn ? file.file.getName() : CommonUtils.getFileNameWithoutExtension(file.file);
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
boolean ExtensionsOn = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean();
String name1 = ExtensionsOn ? getMaster().file.file.getName() : Utils_.getFileNameWithoutExtension(getMaster().file.file);
String name2 = ExtensionsOn ? file.file.getName() : Utils_.getFileNameWithoutExtension(file.file);
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (name1.equalsIgnoreCase(name2))
master.DoComparePass(true);
} else
@@ -113,7 +113,7 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
@Override
protected void showObject() {
lObjectName.setText(object.toString());
lObjectName.setToolTipText(object.Home.getName() + " : " + CommonUtils.Brackets(object.description));
lObjectName.setToolTipText(object.Home.getName() + " : " + Utils_.Brackets(object.description));
cbFile.removeAllItems();
for (ProjectFile file : object.files.values())
cbFile.addItem(file);
@@ -155,15 +155,15 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
cbFile.setSelectedIndex(-1);
for (int i = 0; i < cbFile.getItemCount(); ++i) {
ProjectFile projectFile = cbFile.getItemAt(i);
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
//если учитываем расширения, ищем полное совпадение
if (projectFile.file.getName().equals(file_name)) {
cbFile.setSelectedIndex(i);
return true;
}
} else {
if (CommonUtils.getNameWithoutExtension(projectFile.file.getName()).equals(
CommonUtils.getNameWithoutExtension(file_name))) {
if (Utils_.getNameWithoutExtension(projectFile.file.getName()).equals(
Utils_.getNameWithoutExtension(file_name))) {
cbFile.setSelectedIndex(i);
return true;
}

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Windows.Form;
import _VisualDVM.Current;
import Common.Visual.TextField.StyledTextField;
@@ -104,8 +104,8 @@ public class SearchReplaceForm extends Form {
}
}
public void applyParams() {
String toFind = CommonUtils.hideRegularMetasymbols(tfFind.getText());
String toReplace = CommonUtils.hideRegularMetasymbols(tfReplace.getText());
String toFind = Utils_.hideRegularMetasymbols(tfFind.getText());
String toReplace = Utils_.hideRegularMetasymbols(tfReplace.getText());
context.setSearchFor(toFind);
context.setMatchCase(registerOn.isSelected());
context.setWholeWord(wholeWordOn.isSelected());
@@ -148,7 +148,7 @@ public class SearchReplaceForm extends Form {
}
public void showNoFilesMatches() {
lFilesMatchesCount.setText("—");
CommonUI.Clear(filesTreePanel);
UI_.Clear(filesTreePanel);
}
public void showFilesMatches() {
long total = 0;

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

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Database.Objects.DBObject;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
@@ -29,7 +29,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
//в отличие от комбо боксов, тут события нажатия на кнопку, нет.
if (isReady()) {
if (slave.isReady()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
DoComparePass(true);
} else
DoShowPass(true);
@@ -40,7 +40,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
} else {
if (isReady()) {
if (master.isReady()) {
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
master.DoComparePass(true);
} else
master.DoShowPass(true);

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

@@ -1,8 +1,8 @@
package _VisualDVM.Visual.Windows;
import Common.CommonConstants;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
@@ -130,9 +130,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
SC65.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc65Listener);
SC66.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc66Listener);
//-
((GlobalDatabase)CommonUtils.db).machines.mountUI(machinesPanel);
((GlobalDatabase)CommonUtils.db).users.mountUI(usersPanel);
((GlobalDatabase)CommonUtils.db).compilers.mountUI(compilersPanel);
((GlobalDatabase) Utils_.db).machines.mountUI(machinesPanel);
((GlobalDatabase) Utils_.db).users.mountUI(usersPanel);
((GlobalDatabase) Utils_.db).compilers.mountUI(compilersPanel);
//-
Global.testingServer.db.dvm_configurations.mountUI(configurationsPanel);
Global.testingServer.db.dvmPackages.mountUI(dvmPackagesPanel);
@@ -150,7 +150,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
//-
@Override
public void ShowAll() {
((GlobalDatabase)CommonUtils.db).machines.ShowUI();
((GlobalDatabase) Utils_.db).machines.ShowUI();
Global.testingServer.db.dvm_configurations.ShowUI();
Global.testingServer.db.dvmPackages.ShowUI();
Global.testingServer.db.sapforPackages.ShowUI();
@@ -273,33 +273,33 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public void RestoreLastCredentials() {
Credentials credentials = (Credentials) Current_.get(Current.Credentials);
if (credentials.machine_id != CommonConstants.Nan) {
if (((GlobalDatabase)CommonUtils.db).machines.containsKey(credentials.machine_id)) {
((GlobalDatabase)CommonUtils.db).machines.ShowUI(credentials.machine_id);
if (((GlobalDatabase)CommonUtils.db).users.containsKey(credentials.user_id)) {
((GlobalDatabase)CommonUtils.db).users.ShowUI(credentials.user_id);
if (((GlobalDatabase) Utils_.db).machines.containsKey(credentials.machine_id)) {
((GlobalDatabase) Utils_.db).machines.ShowUI(credentials.machine_id);
if (((GlobalDatabase) Utils_.db).users.containsKey(credentials.user_id)) {
((GlobalDatabase) Utils_.db).users.ShowUI(credentials.user_id);
} else {
credentials.user_id = CommonConstants.Nan;
((GlobalDatabase)CommonUtils.db).UpdateCredentials();
((GlobalDatabase) Utils_.db).UpdateCredentials();
}
if (((GlobalDatabase)CommonUtils.db).compilers.containsKey(credentials.compiler_id)) {
((GlobalDatabase)CommonUtils.db).compilers.ShowUI(credentials.compiler_id);
if (((GlobalDatabase) Utils_.db).compilers.containsKey(credentials.compiler_id)) {
((GlobalDatabase) Utils_.db).compilers.ShowUI(credentials.compiler_id);
} else {
credentials.compiler_id = CommonConstants.Nan;
((GlobalDatabase)CommonUtils.db).UpdateCredentials();
((GlobalDatabase) Utils_.db).UpdateCredentials();
}
//-
if (((GlobalDatabase)CommonUtils.db).makefiles.containsKey(credentials.makefile_id)) {
((GlobalDatabase)CommonUtils.db).makefiles.ShowUI(credentials.makefile_id);
if (((GlobalDatabase) Utils_.db).makefiles.containsKey(credentials.makefile_id)) {
((GlobalDatabase) Utils_.db).makefiles.ShowUI(credentials.makefile_id);
} else {
credentials.makefile_id = CommonConstants.Nan;
((GlobalDatabase)CommonUtils.db).UpdateCredentials();
((GlobalDatabase) Utils_.db).UpdateCredentials();
}
//-
if (((GlobalDatabase)CommonUtils.db).runConfigurations.containsKey(credentials.runconfiguration_id)) {
((GlobalDatabase)CommonUtils.db).runConfigurations.ShowUI(credentials.runconfiguration_id);
if (((GlobalDatabase) Utils_.db).runConfigurations.containsKey(credentials.runconfiguration_id)) {
((GlobalDatabase) Utils_.db).runConfigurations.ShowUI(credentials.runconfiguration_id);
} else {
credentials.runconfiguration_id = CommonConstants.Nan;
((GlobalDatabase)CommonUtils.db).UpdateCredentials();
((GlobalDatabase) Utils_.db).UpdateCredentials();
}
} else {
credentials.machine_id = CommonConstants.Nan;
@@ -308,14 +308,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
credentials.remotesapfor_id = CommonConstants.Nan;
credentials.makefile_id = CommonConstants.Nan;
credentials.runconfiguration_id = CommonConstants.Nan;
((GlobalDatabase)CommonUtils.db).UpdateCredentials();
((GlobalDatabase) Utils_.db).UpdateCredentials();
}
}
}
@Override
public void CollapseCredentials() {
CommonUtils.db.splitters.get("SC71").position = SC71.getDividerLocation();
CommonUI.Clear(credentialsPanel);
Utils_.db.splitters.get("SC71").position = SC71.getDividerLocation();
UI_.Clear(credentialsPanel);
credentialsPanel.add(UI.credentialsBar);
SC71.setDividerLocation(30);
SC71.setDividerSize(0);
@@ -324,7 +324,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
}
@Override
public void ExpandCredentials() {
CommonUI.Clear(credentialsPanel);
UI_.Clear(credentialsPanel);
credentialsPanel.add(SC18);
SC71.setDividerLocation(200);
SC71.setDividerSize(3);

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

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Visual.Trees.TreeForm;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionsTableForm;
@@ -34,7 +34,7 @@ public class VariantsForm implements VariantsWindow {
@Override
public void actionPerformed(ActionEvent e) {
Current.getProject().SwitchFilterDistributed();
BDistributed.setIcon(CommonUtils.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
BDistributed.setIcon(Utils_.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
ShowVariantsFilter();
ShowFilteredVariantsCount();
}
@@ -43,7 +43,7 @@ public class VariantsForm implements VariantsWindow {
@Override
public void actionPerformed(ActionEvent e) {
Current.getProject().SwitchFilterMultiplied();
bMultiplied.setIcon(CommonUtils.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
bMultiplied.setIcon(Utils_.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
ShowVariantsFilter();
ShowFilteredVariantsCount();
}
@@ -68,8 +68,8 @@ public class VariantsForm implements VariantsWindow {
}
@Override
public void ShowVariantsFilterButtons() {
BDistributed.setIcon(CommonUtils.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
bMultiplied.setIcon(CommonUtils.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
BDistributed.setIcon(Utils_.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
bMultiplied.setIcon(Utils_.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
}
@Override
public void ShowVariantsFilter() {

18
src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.GlobalDatabase;
@@ -35,10 +35,10 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
} else {
if (isReady()) {
if (getMaster().isReady()) {
boolean ExtensionsOn = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean();
String name1 = ExtensionsOn ? getMaster().file.file.getName() : CommonUtils.getFileNameWithoutExtension(getMaster().file.file);
String name2 = ExtensionsOn ? file.file.getName() : CommonUtils.getFileNameWithoutExtension(file.file);
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
boolean ExtensionsOn = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean();
String name1 = ExtensionsOn ? getMaster().file.file.getName() : Utils_.getFileNameWithoutExtension(getMaster().file.file);
String name2 = ExtensionsOn ? file.file.getName() : Utils_.getFileNameWithoutExtension(file.file);
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (name1.equalsIgnoreCase(name2))
master.DoComparePass(true);
} else
@@ -83,15 +83,15 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
cbFile.setSelectedIndex(-1);
for (int i = 0; i < cbFile.getItemCount(); ++i) {
ProjectFile projectFile = cbFile.getItemAt(i);
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
//если учитываем расширения, ищем полное совпадение
if (projectFile.file.getName().equals(file_in.file.getName())) {
cbFile.setSelectedIndex(i);
return true;
}
} else {
if (CommonUtils.getNameWithoutExtension(projectFile.file.getName()).equals(
CommonUtils.getNameWithoutExtension(file_in.file.getName()))) {
if (Utils_.getNameWithoutExtension(projectFile.file.getName()).equals(
Utils_.getNameWithoutExtension(file_in.file.getName()))) {
cbFile.setSelectedIndex(i);
return true;
}
@@ -106,6 +106,6 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
}
@Override
protected boolean fortranWrapsOn() {
return ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FortranWrapsOn).toBoolean();
return ((GlobalDatabase) Utils_.db).settings.get(SettingName.FortranWrapsOn).toBoolean();
}
}

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

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