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/Visual_DVM_2021/Passes/All/CloseCurrentFile.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -14,7 +14,7 @@ public class CloseCurrentFile extends Pass_2021<DBProjectFile> {
}
@Override
public Icon getTabIcon() {
return Utils.getIcon("/icons/Close_18.png");
return CommonUtils.getIcon("/icons/Close_18.png");
}
@Override
public String getButtonText() {

4
src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java
View File

@@ -1,8 +1,8 @@
package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Project.db_project_info;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -20,7 +20,7 @@ public class CloseCurrentProject extends Pass_2021<db_project_info> {
}
@Override
public Icon getTabIcon() {
return Utils.getIcon("/icons/Close_18.png");
return CommonUtils.getIcon("/icons/Close_18.png");
}
@Override
protected boolean canStart(Object... args) throws Exception {

3
src/Visual_DVM_2021/Passes/Pass_2021.java
View File

@@ -9,7 +9,6 @@ import Common_old.UI.Menus_2023.StablePassMenuItem;
import Common_old.UI.UI;
import Common.Utils.Stopwatch;
import Common.Utils.TextLog;
import Common_old.Utils.Utils;
import Visual_DVM_2021.PassStats.PassStats;
import Visual_DVM_2021.Passes.UI.PassForm;
@@ -78,7 +77,7 @@ public class Pass_2021<T> {
return null;
}
public Icon getTabIcon(){
return Utils.getTabIcon(getIconPath());
return CommonUtils.getTabIcon(getIconPath());
}
public AbstractAction getControlAction() {
return new AbstractAction() {

8
src/Visual_DVM_2021/UI/Main/MainForm.java
View File

@@ -1,4 +1,5 @@
package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import _VisualDVM.Global;
@@ -6,7 +7,6 @@ import Common_old.UI.Menus_2023.MainMenuBar.MainWindow;
import Common_old.UI.UI;
import Common_old.UI.Windows.Form;
import Common_old.UI.Windows.FormType;
import Common_old.Utils.Utils;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -101,7 +101,7 @@ public class MainForm extends Form implements MainWindow {
}
private void InstallCallbackPanel() {
globalTabs.insertTab("Обратная связь",
Utils.getIcon("/icons/Bug.png"),
CommonUtils.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("Тесты",
Utils.getIcon("/icons/Library.PNG"),
CommonUtils.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("Тестирование",
Utils.getIcon("/icons/Session.png"),
CommonUtils.getIcon("/icons/Session.png"),
testingForm.getContent(),
"Система тестирования", 3);
}

8
src/Visual_DVM_2021/UI/Main/ProjectForm.java
View File

@@ -1,4 +1,5 @@
package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import _VisualDVM.Global;
@@ -6,7 +7,6 @@ import Common_old.UI.Editor.Viewer;
import Common_old.UI.Menus_2023.ProjectMenuBar.ProjectMenuBar;
import Common_old.UI.Trees.TreeForm;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import GlobalData.Settings.SettingName;
import ProjectData.Files.DBProjectFile;
import ProjectData.Files.UI.FilesTree;
@@ -256,7 +256,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
CommonUI.Clear(projectViewPanel);
ProjectView view = Current.getProjectView();
menuBar.getProjectViewMenu().setToolTipText(view.getDescription());
menuBar.getProjectViewMenu().setIcon(Utils.getIcon(view.getIcon()));
menuBar.getProjectViewMenu().setIcon(CommonUtils.getIcon(view.getIcon()));
switch (view) {
case Files:
projectViewPanel.add(filesForm.getContent());
@@ -276,13 +276,13 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
//-
private void InstallVersionsPanel() {
projectTabs.insertTab("",
Utils.getIcon("/icons/VersionsTree.png"),
CommonUtils.getIcon("/icons/VersionsTree.png"),
UI.getVersionsWindow().getContent(),
"Версии", 5);
}
private void InstallDebugPanel() {
projectTabs.insertTab("",
Utils.getIcon("/icons/Command.png"),
CommonUtils.getIcon("/icons/Command.png"),
UI.getDebugWindow().getContent(),
"Компиляция и запуск", 6);
}

10
src/Visual_DVM_2021/UI/Main/VariantsForm.java
View File

@@ -1,7 +1,7 @@
package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common_old.UI.Trees.TreeForm;
import Common_old.Utils.Utils;
import ProjectData.SapforData.Arrays.UI.DimensionsTableForm;
import ProjectData.SapforData.Arrays.UI.RulesTree;
import Visual_DVM_2021.UI.Interface.VariantsWindow;
@@ -34,7 +34,7 @@ public class VariantsForm implements VariantsWindow {
@Override
public void actionPerformed(ActionEvent e) {
Current.getProject().SwitchFilterDistributed();
BDistributed.setIcon(Utils.getIcon(Current.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
BDistributed.setIcon(CommonUtils.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(Utils.getIcon(Current.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
bMultiplied.setIcon(CommonUtils.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(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"));
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"));
}
@Override
public void ShowVariantsFilter() {