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-07 17:46:38 +03:00
parent 6537eebe09
commit e7f661f7ad
87 changed files with 279 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
.idea/workspace.xml generated
View File

@@ -7,7 +7,93 @@
</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 beforePath="$PROJECT_DIR$/src/Common_old/UI/VisualiserStringList.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/1.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Objects/DBObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/CommonUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/StringTemplate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/StringTemplate.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/CommonUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/SelectionTreeMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextComboBoxMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus/TextComboBoxMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/DataMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Selectable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Selectable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/StatusEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/StatusEnum.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Tables/StatusEnumRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Tables/StatusEnumRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectableTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectableTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/SelectionTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Trees/TreeForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Trees/TreeForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/Dialog/Dialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/UI/Windows/SearchReplaceForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common_old/Utils/Validators/DVMHelpParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common_old/Utils/Validators/DVMHelpParser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParameterDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParameterDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParametersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParametersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Module/ModulesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModulesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorFields.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/UI/ModuleAnchestorForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/TaskState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/TaskState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/User/UserState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UserState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/UI/VersionsTreeCellRenderer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Component.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/ComponentState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/SubscribersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubscribersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/UI/SubscriberForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/FilterWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/FilterInterface.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.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" />
@@ -107,10 +193,10 @@
</key> </key>
<key name="MoveMembersDialog.RECENTS_KEY"> <key name="MoveMembersDialog.RECENTS_KEY">
<recent name="Common.Utils.CommonUtils" /> <recent name="Common.Utils.CommonUtils" />
<recent name="Common.Visual.CommonUI" />
<recent name="Common.CommonConstants" /> <recent name="Common.CommonConstants" />
<recent name="Common_old.Constants" /> <recent name="Common_old.Constants" />
<recent name="Common.Constants" /> <recent name="Common.Constants" />
<recent name="Common.Utils.Utils" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Syntax" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Syntax" />

0
src/Common/1.txt
View File

2
src/Common/Database/Objects/DBObject.java
View File

@@ -1,6 +1,6 @@
package Common.Database.Objects; package Common.Database.Objects;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common_old.UI.Selectable; import Common.Visual.Selectable;
import Common.Utils.Index; import Common.Utils.Index;
import com.sun.org.glassfish.gmbal.Description; import com.sun.org.glassfish.gmbal.Description;

10
src/Common/Database/Tables/DataSet.java
View File

@@ -2,7 +2,7 @@ package Common.Database.Tables;
import Common_old.Current; import Common_old.Current;
import Common.Visual.DataSetFilter; import Common.Visual.DataSetFilter;
import Common_old.UI.DataSetControlForm; import Common_old.UI.DataSetControlForm;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Common_old.UI.Tables.ColumnFilter; import Common_old.UI.Tables.ColumnFilter;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common_old.UI.Windows.Dialog.DBObjectDialog;
@@ -10,7 +10,7 @@ import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Visual.CommonUI; import Common.Visual.CommonUI;
import Visual_DVM_2021.UI.Interface.FilterWindow; import Common.Visual.FilterInterface;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@@ -28,7 +28,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
//- //-
public DataSetControlForm ui_; public DataSetControlForm ui_;
protected FilterWindow f_ui; // отображение количества объектов protected FilterInterface f_ui; // отображение количества объектов
//- //-
public LinkedHashMap<Integer, ColumnFilter> columnsFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов public LinkedHashMap<Integer, ColumnFilter> columnsFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
//-- //--
@@ -42,7 +42,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
Name = d.getSimpleName(); Name = d.getSimpleName();
} }
public void mountUI(JPanel content_in) { public void mountUI(JPanel content_in) {
UI.Clear(content_in); CommonUI.Clear(content_in);
//--> //-->
ui_ = createUI(); ui_ = createUI();
ui_.setContent(content_in); ui_.setContent(content_in);
@@ -66,7 +66,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public DataSetControlForm getUi() { public DataSetControlForm getUi() {
return ui_; return ui_;
} }
public void setFilterUI(FilterWindow ui_in) { public void setFilterUI(FilterInterface ui_in) {
f_ui = ui_in; f_ui = ui_in;
} }
public void ClearUI() { public void ClearUI() {

13
src/Common/Utils/CommonUtils.java
View File

@@ -6,6 +6,9 @@ import org.apache.commons.io.FileUtils;
import java.io.File; import java.io.File;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.Vector;
import java.util.stream.Collectors;
public class CommonUtils { public class CommonUtils {
//JSON //JSON
//-- //--
@@ -243,6 +246,16 @@ public class CommonUtils {
} }
return (cc == 0); return (cc == 0);
} }
public static String removeRedundantSpaces(String s_in) {
return String.join(" ",
Arrays.stream(s_in.split(" ")).filter(d -> !d.isEmpty()).collect(Collectors.toCollection(Vector::new)));
}
public static String removeCharacters(String string, String... to_remove) {
String res = string;
for (String c : to_remove)
res = res.replace(c, "");
return res;
}
//ФАЙЛЫ //ФАЙЛЫ
public static String getExtension(File file) { public static String getExtension(File file) {
String fn = file.getName(); String fn = file.getName();

2
src/Visual_DVM_2021/UI/Interface/Loggable.java → src/Common/Utils/Loggable.java
View File

@@ -1,4 +1,4 @@
package Visual_DVM_2021.UI.Interface; package Common.Utils;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.DebugPrintLevel; import Common_old.UI.DebugPrintLevel;

6
src/Common/Utils/StringTemplate.java
View File

@@ -1,6 +1,4 @@
package Common.Utils; package Common.Utils;
import Common_old.Utils.Utils;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class StringTemplate { public class StringTemplate {
@@ -13,8 +11,8 @@ public class StringTemplate {
public String pattern = ""; public String pattern = "";
//------------------------------------------------------------------ //------------------------------------------------------------------
public StringTemplate(String p, String s) { public StringTemplate(String p, String s) {
prefix = Utils.pack(p); prefix = CommonUtils.removeRedundantSpaces(p);
suffix = Utils.pack(s); suffix = CommonUtils.removeRedundantSpaces(s);
String[] prefix_words = prefix.split(" "); String[] prefix_words = prefix.split(" ");
String[] suffix_words = suffix.split(" "); String[] suffix_words = suffix.split(" ");
//настраиваем регулярное выражение---------- //настраиваем регулярное выражение----------

34
src/Common/Visual/CommonUI.java
View File

@@ -1,8 +1,40 @@
package Common.Visual; package Common.Visual;
import Common_old.UI.Menus_2023.DataMenuBar;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import javax.swing.*;
import java.awt.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Stack;
public class CommonUI { public class CommonUI {
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 void Clear(Container container) {
container.removeAll();
container.repaint();
container.revalidate();
}
// http://java-online.ru/swing-joptionpane.xhtml
public static <T> void TrySelect(JComboBox box, T value_in) {
if (value_in != null) {
for (int i = 0; i < box.getItemCount(); ++i) {
T value = (T) box.getItemAt(i);
if (value.equals(value_in)) {
box.setSelectedIndex(i);
return;
}
}
box.addItem(value_in);
box.setSelectedIndex(box.getItemCount() - 1);
}
}
public static void TrySelect_s(JComboBox box, String value_string_in) {
for (int i = 0; i < box.getItemCount(); ++i) {
Object value = box.getItemAt(i);
if (value.toString().equals(value_string_in)) {
box.setSelectedIndex(i);
return;
}
}
}
} }

8
src/Common_old/UI/Menus_2023/DataMenuBar.java → src/Common/Visual/DataMenuBar.java
View File

@@ -1,5 +1,7 @@
package Common_old.UI.Menus_2023; package Common.Visual;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.UI.Menus_2023.VisualiserMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*; import javax.swing.*;
@@ -24,7 +26,7 @@ public class DataMenuBar extends VisualiserMenuBar {
if (selectAllButton == null) { if (selectAllButton == null) {
add(selectAllButton = new MenuBarButton() { add(selectAllButton = new MenuBarButton() {
{ {
setIcon("/icons/SelectAll.png"); setIcon("/Common/icons/SelectAll.png");
setToolTipText("Выбрать всё"); setToolTipText("Выбрать всё");
setPreferredSize(d); setPreferredSize(d);
setMinimumSize(d); setMinimumSize(d);
@@ -35,7 +37,7 @@ public class DataMenuBar extends VisualiserMenuBar {
if (unselectAllButton == null) { if (unselectAllButton == null) {
add(unselectAllButton = new MenuBarButton() { add(unselectAllButton = new MenuBarButton() {
{ {
setIcon("/icons/UnselectAll.png"); setIcon("/Common/icons/UnselectAll.png");
setToolTipText("Отменить всё"); setToolTipText("Отменить всё");
setPreferredSize(d); setPreferredSize(d);
setMinimumSize(d); setMinimumSize(d);

4
src/Visual_DVM_2021/UI/Interface/FilterWindow.java → src/Common/Visual/FilterInterface.java
View File

@@ -1,5 +1,5 @@
package Visual_DVM_2021.UI.Interface; package Common.Visual;
public interface FilterWindow extends VisualizerForm { public interface FilterInterface {
void ShowMatchesCount(int count); void ShowMatchesCount(int count);
default void ShowNoMatches() { default void ShowNoMatches() {
ShowMatchesCount(0); ShowMatchesCount(0);

2
src/Common_old/UI/Selectable.java → src/Common/Visual/Selectable.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI; package Common.Visual;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import javax.swing.*; import javax.swing.*;

2
src/Common_old/UI/StatusEnum.java → src/Common/Visual/StatusEnum.java
View File

@@ -1,4 +1,4 @@
package Common_old.UI; package Common.Visual;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
public interface StatusEnum { public interface StatusEnum {
default String getDescription() { default String getDescription() {

3
src/Common_old/UI/DataSetControlForm.java
View File

@@ -1,5 +1,6 @@
package Common_old.UI; package Common_old.UI;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable; import Common.Database.Tables.DBTable;
@@ -53,7 +54,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
@Override @Override
public void Clear() { public void Clear() {
super.Clear(); super.Clear();
UI.Clear(dataPanel); CommonUI.Clear(dataPanel);
} }
public DataSet getDataSource() { public DataSet getDataSource() {
return dataSource; return dataSource;

2
src/Common_old/UI/Menus/SelectionTreeMenu.java
View File

@@ -2,7 +2,7 @@ package Common_old.UI.Menus;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.Menus_2023.StableMenuItem; import Common_old.UI.Menus_2023.StableMenuItem;
import Common_old.UI.Selectable; import Common.Visual.Selectable;
import Common_old.UI.Trees.DataTree; import Common_old.UI.Trees.DataTree;
import Common_old.UI.Trees.SelectableTree; import Common_old.UI.Trees.SelectableTree;

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

@@ -1,5 +1,5 @@
package Common_old.UI.Menus; package Common_old.UI.Menus;
import Common_old.UI.UI; import Common.Visual.CommonUI;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import javax.swing.*; import javax.swing.*;
@@ -27,7 +27,7 @@ public class TextComboBoxMenu extends StyledPopupMenu {
new AbstractAction() { new AbstractAction() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
UI.TrySelect(box, Utils.getFromClipboard()); CommonUI.TrySelect(box, Utils.getFromClipboard());
} }
}); });
add(m_paste); add(m_paste);

6
src/Common_old/UI/Menus_2023/FastAccessMenuBar/FastAccessMenuBar.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023.FastAccessMenuBar; package Common_old.UI.Menus_2023.FastAccessMenuBar;
import Common.Visual.CommonUI;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Menus_2023.VisualiserMenuBar; import Common_old.UI.Menus_2023.VisualiserMenuBar;
import Common_old.UI.UI;
import GlobalData.Settings.SettingName; import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
@@ -33,7 +33,7 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
repaint(); repaint();
} }
public void Refresh() { public void Refresh() {
UI.Clear(this); CommonUI.Clear(this);
int i = 1; int i = 1;
for (Pass_2021 pass : Pass_2021.FAPasses) { for (Pass_2021 pass : Pass_2021.FAPasses) {
if (pass.stats.HasUsages()) { if (pass.stats.HasUsages()) {
@@ -44,6 +44,6 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
} }
} }
public void Drop(){ public void Drop(){
UI.Clear(this); CommonUI.Clear(this);
} }
} }

2
src/Common_old/UI/Menus_2023/VariantsMenuBar/VariantsMenuBar.java
View File

@@ -1,5 +1,5 @@
package Common_old.UI.Menus_2023.VariantsMenuBar; package Common_old.UI.Menus_2023.VariantsMenuBar;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class VariantsMenuBar extends DataMenuBar { public class VariantsMenuBar extends DataMenuBar {
public VariantsMenuBar() { public VariantsMenuBar() {

2
src/Common_old/UI/Tables/StatusEnumRenderer.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Tables; package Common_old.UI.Tables;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.StatusEnum; import Common.Visual.StatusEnum;
import javax.swing.*; import javax.swing.*;
public class StatusEnumRenderer extends RendererCell<StatusEnum> { public class StatusEnumRenderer extends RendererCell<StatusEnum> {

2
src/Common_old/UI/Trees/SelectableTree.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Trees; package Common_old.UI.Trees;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.Selectable; import Common.Visual.Selectable;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
public class SelectableTree extends DataTree { public class SelectableTree extends DataTree {

2
src/Common_old/UI/Trees/SelectionTreeCellRenderer.java
View File

@@ -1,6 +1,6 @@
package Common_old.UI.Trees; package Common_old.UI.Trees;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.Selectable; import Common.Visual.Selectable;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import javax.swing.*; import javax.swing.*;

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

@@ -1,6 +1,6 @@
package Common_old.UI.Trees; package Common_old.UI.Trees;
import Common.Visual.CommonUI;
import Common_old.UI.ControlForm; import Common_old.UI.ControlForm;
import Common_old.UI.UI;
import java.awt.*; import java.awt.*;
public class TreeForm<C extends StyledTree> extends ControlForm<C> { public class TreeForm<C extends StyledTree> extends ControlForm<C> {
@@ -25,6 +25,6 @@ public class TreeForm<C extends StyledTree> extends ControlForm<C> {
@Override @Override
public void Clear() { public void Clear() {
super.Clear(); super.Clear();
UI.Clear(content); CommonUI.Clear(content);
} }
} }

78
src/Common_old/UI/UI.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI; package Common_old.UI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.Menus_2023.CredentialsBar.CredentialsBar; import Common_old.UI.Menus_2023.CredentialsBar.CredentialsBar;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Common_old.UI.Menus_2023.FastAccessMenuBar.FastAccessMenuBar; import Common_old.UI.Menus_2023.FastAccessMenuBar.FastAccessMenuBar;
import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar; import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar;
import Common_old.UI.Menus_2023.MainMenuBar.MainMenuBar; import Common_old.UI.Menus_2023.MainMenuBar.MainMenuBar;
@@ -105,7 +105,6 @@ import javax.swing.text.Highlighter;
import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreeCellRenderer;
import java.awt.*; import java.awt.*;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Stack;
import java.util.Vector; import java.util.Vector;
import static Common_old.UI.Tables.TableEditors.*; import static Common_old.UI.Tables.TableEditors.*;
@@ -130,36 +129,6 @@ public class UI {
public static LinkedHashMap<Common_old.UI.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>(); public static LinkedHashMap<Common_old.UI.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>();
public static LinkedHashMap<VisualiserThemeName, VisualiserTheme> themes = new LinkedHashMap<>(); public static LinkedHashMap<VisualiserThemeName, VisualiserTheme> themes = new LinkedHashMap<>();
public static LinkedHashMap<FormType, ThemeElement> windows = new LinkedHashMap<>(); public static LinkedHashMap<FormType, ThemeElement> windows = new LinkedHashMap<>();
public static Stack<Component> windowsStack = new Stack<>();
//-----
public static void Clear(Container container) {
container.removeAll();
container.repaint();
container.revalidate();
}
// http://java-online.ru/swing-joptionpane.xhtml
public static <T> void TrySelect(JComboBox box, T value_in) {
if (value_in != null) {
for (int i = 0; i < box.getItemCount(); ++i) {
T value = (T) box.getItemAt(i);
if (value.equals(value_in)) {
box.setSelectedIndex(i);
return;
}
}
box.addItem(value_in);
box.setSelectedIndex(box.getItemCount() - 1);
}
}
public static void TrySelect_s(JComboBox box, String value_string_in) {
for (int i = 0; i < box.getItemCount(); ++i) {
Object value = box.getItemAt(i);
if (value.toString().equals(value_string_in)) {
box.setSelectedIndex(i);
return;
}
}
}
public static RemoteFileChooser getRemoteFileChooser() { public static RemoteFileChooser getRemoteFileChooser() {
return (RemoteFileChooser) windows.get(FormType.RemoteFileChooser); return (RemoteFileChooser) windows.get(FormType.RemoteFileChooser);
} }
@@ -172,49 +141,6 @@ public class UI {
public static SearchReplaceForm getSearchReplaceForm() { public static SearchReplaceForm getSearchReplaceForm() {
return (SearchReplaceForm) windows.get(FormType.SearchReplace); return (SearchReplaceForm) windows.get(FormType.SearchReplace);
} }
public static void refreshTheme() {
Current.set(Current.Theme, themes.get(Global.db.settings.get(SettingName.DarkThemeOn).toBoolean() ? VisualiserThemeName.Dark : VisualiserThemeName.Light));
// refreshTheme_r(Visualiser.getMainWindow().MainPanel);
/* Открыть
refreshTheme_r(Visualiser.searchReplaceForm.MainPanel);
refreshTheme_r(Visualiser.ComponentsWindow.fields.MainPanel);
refreshTheme_r(Visualiser.remoteFileChooser.fields.MainPanel);
refreshTheme_r(Visualiser.runStatisticForm.fields.MainPanel);
//-----------------------------------------------------------------
UIManager.put("ToolTip.background", Current.getTheme().background);
UIManager.put("ToolTip.foreground", Current.getTheme().foreground);
UIManager.put("Panel.background", Current.getTheme().background);
UIManager.put("Panel.foreground", Current.getTheme().foreground);
UIManager.put("TextPane.background", Current.getTheme().background);
UIManager.put("TextPane.foreground", Current.getTheme().foreground);
UIManager.put("Label.background", Current.getTheme().background);
UIManager.put("Label.foreground", Current.getTheme().foreground);
UIManager.put("ToolBar.background", Current.getTheme().background);
UIManager.put("ToolBar.foreground", Current.getTheme().foreground);
for (TableCellRenderer renderer : TableRenderers.values()) {
if (renderer instanceof WindowControl) {
((WindowControl) renderer).applyTheme();
}
}
for (TreeCellRenderer renderer : TreeRenderers.values()) {
if (renderer instanceof WindowControl) {
((WindowControl) renderer).applyTheme();
}
}
//для текущего файла отдельно
/// if (Current.HasFile())
// Current.getFile().form.Body.applyTheme();
//------------
// UIManager.put("TabbedPane.unselectedForeground", Color.red);
// UIManager.put("TabbedPane.selectedBackground", Color.black);
//----------------------------
*/
}
public static void CreateMenus() { public static void CreateMenus() {
mainMenuBar = new MainMenuBar(); mainMenuBar = new MainMenuBar();
testingBar = new TestingBar(); testingBar = new TestingBar();
@@ -362,7 +288,7 @@ public class UI {
public static Component getFrontWindow() { public static Component getFrontWindow() {
Component res = null; Component res = null;
try { try {
res = windowsStack.peek(); res = CommonUI.windowsStack.peek();
} catch (Exception ignored){ } catch (Exception ignored){
} }

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

@@ -1,4 +1,5 @@
package Common_old.UI.Windows.Dialog; package Common_old.UI.Windows.Dialog;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Syntax.ThemeElement; import _VisualDVM.Syntax.ThemeElement;
@@ -53,7 +54,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() { addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) { public void windowClosing(WindowEvent e) {
UI.windowsStack.pop(); CommonUI.windowsStack.pop();
onCancel(); onCancel();
onClose(); onClose();
} }
@@ -119,7 +120,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
Init(params); Init(params);
ShowTitle(); ShowTitle();
setAlwaysOnTop(isOnTop()); setAlwaysOnTop(isOnTop());
UI.windowsStack.push(this); CommonUI.windowsStack.push(this);
setVisible(true); setVisible(true);
return OK; return OK;
} }

3
src/Common_old/UI/Windows/SearchReplaceForm.java
View File

@@ -1,5 +1,6 @@
package Common_old.UI.Windows; package Common_old.UI.Windows;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.TextField.StyledTextField; import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Trees.StyledTree; import Common_old.UI.Trees.StyledTree;
@@ -144,7 +145,7 @@ public class SearchReplaceForm extends Form {
} }
public void showNoFilesMatches() { public void showNoFilesMatches() {
lFilesMatchesCount.setText("—"); lFilesMatchesCount.setText("—");
UI.Clear(filesTreePanel); CommonUI.Clear(filesTreePanel);
} }
public void showFilesMatches() { public void showFilesMatches() {
long total = 0; long total = 0;

17
src/Common_old/Utils/Utils.java
View File

@@ -37,7 +37,6 @@ import java.util.*;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
public class Utils { public class Utils {
public static boolean isLinuxSystemCommand(String text) { public static boolean isLinuxSystemCommand(String text) {
@@ -211,16 +210,6 @@ public class Utils {
public static String getRelativeAddress(File file, File anchestor) { public static String getRelativeAddress(File file, File anchestor) {
return file.getAbsolutePath().substring(anchestor.getAbsolutePath().length() + 1); return file.getAbsolutePath().substring(anchestor.getAbsolutePath().length() + 1);
} }
public static String pack(String s_in) {
return String.join(" ",
Arrays.stream(s_in.split(" ")).filter(d -> !d.isEmpty()).collect(Collectors.toCollection(Vector::new)));
}
public static String remove(String string, String... to_remove) {
String res = string;
for (String c : to_remove)
res = res.replace(c, "");
return res;
}
//для переименования/добавления новых файлов. //для переименования/добавления новых файлов.
public static boolean validateFileShortNewName(String name, TextLog Log) { public static boolean validateFileShortNewName(String name, TextLog Log) {
boolean res = true; boolean res = true;
@@ -556,7 +545,7 @@ public class Utils {
try { try {
for (String line : FileUtils.readLines(test, Charset.defaultCharset())) { for (String line : FileUtils.readLines(test, Charset.defaultCharset())) {
// #pragma dvm array distribute[block][block], не важно // #pragma dvm array distribute[block][block], не важно
String packedLine = remove(pack(line).toLowerCase(), "\n", "\r", "\t"); String packedLine = CommonUtils.removeCharacters(CommonUtils.removeRedundantSpaces(line).toLowerCase(), "\n", "\r", "\t");
if (packedLine.startsWith(prefix)) { if (packedLine.startsWith(prefix)) {
packedLine = packedLine.substring(prefix.length()); packedLine = packedLine.substring(prefix.length());
boolean bracketOpen = false; boolean bracketOpen = false;
@@ -942,8 +931,8 @@ public class Utils {
line2 = line2.toUpperCase(); line2 = line2.toUpperCase();
} }
if (!Global.db.settings.get(SettingName.SpacesOn).toBoolean()) { if (!Global.db.settings.get(SettingName.SpacesOn).toBoolean()) {
line1 = remove(line1, " ", "\t"); line1 = CommonUtils.removeCharacters(line1, " ", "\t");
line2 = remove(line2, " ", "\t"); line2 = CommonUtils.removeCharacters(line2, " ", "\t");
} }
return line1.equals(line2); return line1.equals(line2);
} }

4
src/Common_old/Utils/Validators/DVMHelpParser.java
View File

@@ -1,5 +1,5 @@
package Common_old.Utils.Validators; package Common_old.Utils.Validators;
import Common_old.Utils.Utils; import Common.Utils.CommonUtils;
import GlobalData.Compiler.Compiler; import GlobalData.Compiler.Compiler;
import GlobalData.CompilerEnvironment.CompilerEnvironment; import GlobalData.CompilerEnvironment.CompilerEnvironment;
import GlobalData.CompilerOption.CompilerOption; import GlobalData.CompilerOption.CompilerOption;
@@ -75,7 +75,7 @@ public class DVMHelpParser {
state = HelpParserState.Search; state = HelpParserState.Search;
for (String line_ : lines) { for (String line_ : lines) {
line = line_; //нужна для окружения. там пробелы нужно считать сразу. line = line_; //нужна для окружения. там пробелы нужно считать сразу.
t_line = Utils.remove(line_.trim(), "\r"); t_line = CommonUtils.removeCharacters(line_.trim(), "\r");
switch (state) { switch (state) {
case Search: case Search:
switch (t_line) { switch (t_line) {

3
src/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -1,5 +1,6 @@
package GlobalData.Compiler; package GlobalData.Compiler;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.DataSetControlForm; import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI; import Common_old.UI.UI;
@@ -95,7 +96,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
fields.tfHelpCommand.setText(Result.help_command); fields.tfHelpCommand.setText(Result.help_command);
fields.tfVersionCommand.setText(Result.version_command); fields.tfVersionCommand.setText(Result.version_command);
fields.tfHome.setText(Result.home_path); fields.tfHome.setText(Result.home_path);
UI.TrySelect(fields.cbCompilerType, Result.type); CommonUI.TrySelect(fields.cbCompilerType, Result.type);
fields.events_on = true; fields.events_on = true;
} }
@Override @Override

2
src/GlobalData/Compiler/CompilersMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.Compiler; package GlobalData.Compiler;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class CompilersMenuBar extends DataMenuBar { public class CompilersMenuBar extends DataMenuBar {
public CompilersMenuBar() { public CompilersMenuBar() {

4
src/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
View File

@@ -1,8 +1,8 @@
package GlobalData.CompilerEnvironment.UI; package GlobalData.CompilerEnvironment.UI;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.Tables.DBObjectEditor; import Common_old.UI.Tables.DBObjectEditor;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.Text.ComboTextDialog; import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
import GlobalData.CompilerEnvironment.CompilerEnvironment; import GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> { public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {
@@ -21,7 +21,7 @@ public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvir
}; };
dialog.fields.setEditable(value.valueVariants.isEmpty()); dialog.fields.setEditable(value.valueVariants.isEmpty());
if (!value.value.isEmpty()) if (!value.value.isEmpty())
UI.TrySelect(dialog.fields, value.value); CommonUI.TrySelect(dialog.fields, value.value);
if (dialog.ShowDialog("Изменить значение опции " + value.name, if (dialog.ShowDialog("Изменить значение опции " + value.name,
value.valueVariants value.valueVariants
)) { )) {

4
src/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
View File

@@ -1,8 +1,8 @@
package GlobalData.CompilerOption.UI; package GlobalData.CompilerOption.UI;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.Tables.DBObjectEditor; import Common_old.UI.Tables.DBObjectEditor;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.Text.ComboTextDialog; import Common_old.UI.Windows.Dialog.Text.ComboTextDialog;
import GlobalData.CompilerOption.CompilerOption; import GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> { public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> {
@@ -15,7 +15,7 @@ public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerO
//- //-
ComboTextDialog dialog = new ComboTextDialog(); ComboTextDialog dialog = new ComboTextDialog();
if (!value.parameterValue.isEmpty()) if (!value.parameterValue.isEmpty())
UI.TrySelect(dialog.fields, value.parameterValue); CommonUI.TrySelect(dialog.fields, value.parameterValue);
dialog.fields.setEditable(value.parameterVariants.isEmpty()); dialog.fields.setEditable(value.parameterVariants.isEmpty());
if (dialog.ShowDialog("Изменить значение опции " + value.name, if (dialog.ShowDialog("Изменить значение опции " + value.name,
value.parameterVariants)) { value.parameterVariants)) {

4
src/GlobalData/DVMParameter/DVMParameterDBTable.java
View File

@@ -1,10 +1,10 @@
package GlobalData.DVMParameter; package GlobalData.DVMParameter;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.DataSetControlForm; import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import GlobalData.DVMParameter.UI.DVMParameterFields; import GlobalData.DVMParameter.UI.DVMParameterFields;
@@ -53,7 +53,7 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
return new DBObjectDialog<DVMParameter, DVMParameterFields>(DVMParameterFields.class) { return new DBObjectDialog<DVMParameter, DVMParameterFields>(DVMParameterFields.class) {
@Override @Override
public void fillFields() { public void fillFields() {
UI.TrySelect(fields.cbName, Result.name); CommonUI.TrySelect(fields.cbName, Result.name);
fields.tfValue.setText(Result.value); fields.tfValue.setText(Result.value);
} }
//https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java //https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java

2
src/GlobalData/DVMParameter/DVMParametersMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.DVMParameter; package GlobalData.DVMParameter;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class DVMParametersMenuBar extends DataMenuBar { public class DVMParametersMenuBar extends DataMenuBar {
public DVMParametersMenuBar() { public DVMParametersMenuBar() {

4
src/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
View File

@@ -1,10 +1,10 @@
package GlobalData.EnvironmentValue; package GlobalData.EnvironmentValue;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.DataSetControlForm; import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import GlobalData.EnvironmentValue.UI.EnvironmentValueFields; import GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
@@ -25,7 +25,7 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
return new DBObjectDialog<EnvironmentValue, EnvironmentValueFields>(EnvironmentValueFields.class) { return new DBObjectDialog<EnvironmentValue, EnvironmentValueFields>(EnvironmentValueFields.class) {
@Override @Override
public void fillFields() { public void fillFields() {
UI.TrySelect(fields.cbName, Result.name); CommonUI.TrySelect(fields.cbName, Result.name);
fields.tfValue.setText(Result.value); fields.tfValue.setText(Result.value);
} }
//https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java //https://javarush.ru/groups/posts/regulyarnye-vyrazheniya-v-java

2
src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.EnvironmentValue; package GlobalData.EnvironmentValue;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class EnvironmentValuesMenuBar extends DataMenuBar { public class EnvironmentValuesMenuBar extends DataMenuBar {
public EnvironmentValuesMenuBar() { public EnvironmentValuesMenuBar() {

3
src/GlobalData/Machine/MachinesDBTable.java
View File

@@ -1,4 +1,5 @@
package GlobalData.Machine; package GlobalData.Machine;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.DataSetControlForm; import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI; import Common_old.UI.UI;
@@ -49,7 +50,7 @@ public class MachinesDBTable extends iDBTable<Machine> {
fields.tfName.setText(Result.name); fields.tfName.setText(Result.name);
fields.tfAddress.setText(Result.address); fields.tfAddress.setText(Result.address);
fields.sPort.setValue(Result.port); fields.sPort.setValue(Result.port);
UI.TrySelect(fields.cbMachineType, Result.type); CommonUI.TrySelect(fields.cbMachineType, Result.type);
} }
@Override @Override
public void ProcessResult() { public void ProcessResult() {

2
src/GlobalData/Machine/MachinesMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.Machine; package GlobalData.Machine;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Common_old.UI.Menus_2023.MenuBarButton; import Common_old.UI.Menus_2023.MenuBarButton;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;

2
src/GlobalData/Makefile/MakefilesMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.Makefile; package GlobalData.Makefile;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class MakefilesMenuBar extends DataMenuBar { public class MakefilesMenuBar extends DataMenuBar {
public MakefilesMenuBar() { public MakefilesMenuBar() {

2
src/GlobalData/Module/ModulesMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.Module; package GlobalData.Module;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class ModulesMenuBar extends DataMenuBar { public class ModulesMenuBar extends DataMenuBar {
public ModulesMenuBar() { public ModulesMenuBar() {

5
src/GlobalData/Module/UI/ModuleAnchestorFields.java
View File

@@ -1,4 +1,5 @@
package GlobalData.Module.UI; package GlobalData.Module.UI;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.ComboBox.StyledTextComboBox; import Common_old.UI.ComboBox.StyledTextComboBox;
import Common_old.UI.UI; import Common_old.UI.UI;
@@ -39,7 +40,7 @@ public class ModuleAnchestorFields implements DialogFields {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Pass_2021<String> pass = Pass_2021.passes.get(PassCode_2021.PickCompilerOptions); Pass_2021<String> pass = Pass_2021.passes.get(PassCode_2021.PickCompilerOptions);
if (pass.Do(compiler)) { if (pass.Do(compiler)) {
UI.TrySelect(cbFlags, pass.target); CommonUI.TrySelect(cbFlags, pass.target);
} }
} }
}); });
@@ -58,7 +59,7 @@ public class ModuleAnchestorFields implements DialogFields {
cbCompilers.addActionListener(e -> { cbCompilers.addActionListener(e -> {
if (cbCompilers.getSelectedItem() instanceof Compiler) { if (cbCompilers.getSelectedItem() instanceof Compiler) {
Compiler compiler = ((Compiler) cbCompilers.getSelectedItem()); Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
UI.TrySelect(cbCommands, CommonUI.TrySelect(cbCommands,
linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName)); linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName));
} }
}); });

8
src/GlobalData/Module/UI/ModuleAnchestorForm.java
View File

@@ -1,7 +1,7 @@
package GlobalData.Module.UI; package GlobalData.Module.UI;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common_old.UI.Windows.Dialog.DBObjectDialog;
import GlobalData.Compiler.Compiler; import GlobalData.Compiler.Compiler;
import GlobalData.Compiler.CompilerType; import GlobalData.Compiler.CompilerType;
@@ -93,9 +93,9 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
} }
@Override @Override
public void fillFields() { public void fillFields() {
UI.TrySelect(fields.cbFlags, Result.flags); CommonUI.TrySelect(fields.cbFlags, Result.flags);
UI.TrySelect(fields.cbCommands, Result.command); CommonUI.TrySelect(fields.cbCommands, Result.command);
UI.TrySelect(fields.cbCompilers, Result.getCompiler()); CommonUI.TrySelect(fields.cbCompilers, Result.getCompiler());
//-------------------------------------------- //--------------------------------------------
fields.setListeners(Result); fields.setListeners(Result);
} }

8
src/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -1,9 +1,9 @@
package GlobalData.RunConfiguration; package GlobalData.RunConfiguration;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.DataSetControlForm; import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKBehaviour;
@@ -43,14 +43,14 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
if (compiler.isVisible() && compiler.type.equals(CompilerType.dvm)) if (compiler.isVisible() && compiler.type.equals(CompilerType.dvm))
fields.cbLauncherCall.addItem(compiler); fields.cbLauncherCall.addItem(compiler);
} }
UI.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall); CommonUI.TrySelect_s(fields.cbLauncherCall, Result.LauncherCall);
UI.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions); CommonUI.TrySelect(fields.cbLaunchOptions, Result.LauncherOptions);
fields.tfArgs.setText(Result.args); fields.tfArgs.setText(Result.args);
fields.cbLauncherCall.addActionListener(new ActionListener() { fields.cbLauncherCall.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) { if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
UI.TrySelect(fields.cbLaunchOptions, "run"); CommonUI.TrySelect(fields.cbLaunchOptions, "run");
} }
} }
}); });

2
src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.RunConfiguration; package GlobalData.RunConfiguration;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*; import javax.swing.*;

2
src/GlobalData/Tasks/TaskState.java
View File

@@ -1,5 +1,5 @@
package GlobalData.Tasks; package GlobalData.Tasks;
import Common_old.UI.StatusEnum; import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
public enum TaskState implements StatusEnum { public enum TaskState implements StatusEnum {
Inactive, Inactive,

2
src/GlobalData/User/UserState.java
View File

@@ -1,5 +1,5 @@
package GlobalData.User; package GlobalData.User;
import Common_old.UI.StatusEnum; import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
public enum UserState implements StatusEnum { public enum UserState implements StatusEnum {
initial, //на пользователя еще не заходили. initial, //на пользователя еще не заходили.

2
src/GlobalData/User/UsersMenuBar.java
View File

@@ -1,5 +1,5 @@
package GlobalData.User; package GlobalData.User;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class UsersMenuBar extends DataMenuBar { public class UsersMenuBar extends DataMenuBar {
public UsersMenuBar() { public UsersMenuBar() {

6
src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java
View File

@@ -1,5 +1,5 @@
package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives; package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
import Common_old.Utils.Utils; import Common.Utils.CommonUtils;
import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider; import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
public class IntervalDirective extends BaseDirective { public class IntervalDirective extends BaseDirective {
protected String prefix; protected String prefix;
@@ -19,9 +19,9 @@ public class IntervalDirective extends BaseDirective {
} }
@Override @Override
public String getReplacementText() { public String getReplacementText() {
prefix = Utils.pack(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length())); prefix = CommonUtils.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
word = name.getText(); word = name.getText();
suffix = Utils.pack(getCaretInfo().after.substring(getCaretInfo().suffix_word.length())); suffix = CommonUtils.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
String pp = prefix.replace(" ", ""); String pp = prefix.replace(" ", "");
String ps = suffix.replace(" ", ""); String ps = suffix.replace(" ", "");
if ((!ps.isEmpty()) && (ps.charAt(0) != ',')) if ((!ps.isEmpty()) && (ps.charAt(0) != ','))

6
src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java
View File

@@ -1,5 +1,5 @@
package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives; package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
import Common_old.Utils.Utils; import Common.Utils.CommonUtils;
import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider; import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
//промежуточный тип. относится ко всем директивам со скобками и требующим запятых. //промежуточный тип. относится ко всем директивам со скобками и требующим запятых.
public class SpecDirective extends BaseDirective { public class SpecDirective extends BaseDirective {
@@ -16,9 +16,9 @@ public class SpecDirective extends BaseDirective {
} }
@Override @Override
public String getReplacementText() { public String getReplacementText() {
prefix = Utils.pack(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length())); prefix = CommonUtils.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
word = get_word(); word = get_word();
suffix = Utils.pack(getCaretInfo().after.substring(getCaretInfo().suffix_word.length())); suffix = CommonUtils.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
String pp = prefix.replace(" ", ""); String pp = prefix.replace(" ", "");
String ps = suffix.replace(" ", ""); String ps = suffix.replace(" ", "");
if (!pp.isEmpty() && (pp.charAt(pp.length() - 1) != ',') && (pp.charAt(pp.length() - 1) != '(')) if (!pp.isEmpty() && (pp.charAt(pp.length() - 1) != ',') && (pp.charAt(pp.length() - 1) != '('))

2
src/ProjectData/Project/UI/VersionsTree.java
View File

@@ -3,7 +3,7 @@ import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Menus.GraphMenu; import Common_old.UI.Menus.GraphMenu;
import Common_old.UI.Menus.VersionsMenu; import Common_old.UI.Menus.VersionsMenu;
import Common_old.UI.Selectable; import Common.Visual.Selectable;
import Common_old.UI.Trees.DataTree; import Common_old.UI.Trees.DataTree;
import Common_old.UI.Trees.TreeRenderers; import Common_old.UI.Trees.TreeRenderers;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;

2
src/ProjectData/Project/UI/VersionsTreeCellRenderer.java
View File

@@ -1,7 +1,7 @@
package ProjectData.Project.UI; package ProjectData.Project.UI;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Selectable; import Common.Visual.Selectable;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.Trees.StyledTreeCellRenderer; import Common_old.UI.Trees.StyledTreeCellRenderer;
import ProjectData.Project.db_project_info; import ProjectData.Project.db_project_info;

3
src/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
View File

@@ -1,4 +1,5 @@
package ProjectData.SapforData.Arrays.UI; package ProjectData.SapforData.Arrays.UI;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.ControlForm; import Common_old.UI.ControlForm;
import Common_old.UI.Tables.Grid.GridAnchestor; import Common_old.UI.Tables.Grid.GridAnchestor;
@@ -25,7 +26,7 @@ public class DimensionsTableForm extends ControlForm<StyledTable> {
@Override @Override
public void Clear() { public void Clear() {
super.Clear(); super.Clear();
UI.Clear(content); CommonUI.Clear(content);
} }
@Override @Override
public void CreateControl() { public void CreateControl() {

4
src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
View File

@@ -1,7 +1,7 @@
package ProjectData.SapforData.Functions.UI.Graph; package ProjectData.SapforData.Functions.UI.Graph;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.ControlForm; import Common_old.UI.ControlForm;
import Common_old.UI.UI;
import com.mxgraph.swing.mxGraphComponent; import com.mxgraph.swing.mxGraphComponent;
import java.awt.*; import java.awt.*;
@@ -22,6 +22,6 @@ public class FunctionsGraphForm extends ControlForm<mxGraphComponent> {
@Override @Override
public void Clear() { public void Clear() {
super.Clear(); super.Clear();
UI.Clear(content); CommonUI.Clear(content);
} }
} }

2
src/Repository/BugReport/BugReportState.java
View File

@@ -1,5 +1,5 @@
package Repository.BugReport; package Repository.BugReport;
import Common_old.UI.StatusEnum; import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import java.io.Serializable; import java.io.Serializable;

2
src/Repository/BugReport/BugReportsMenuBar.java
View File

@@ -1,5 +1,5 @@
package Repository.BugReport; package Repository.BugReport;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class BugReportsMenuBar extends DataMenuBar { public class BugReportsMenuBar extends DataMenuBar {
public BugReportsMenuBar() { public BugReportsMenuBar() {

2
src/Repository/Component/Component.java
View File

@@ -8,7 +8,7 @@ import Common_old.Utils.Files.VFileChooser;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassException; import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.UI.Interface.Loggable; import Common.Utils.Loggable;
import java.io.File; import java.io.File;
import java.nio.file.Files; import java.nio.file.Files;

2
src/Repository/Component/ComponentState.java
View File

@@ -1,5 +1,5 @@
package Repository.Component; package Repository.Component;
import Common_old.UI.StatusEnum; import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
public enum ComponentState implements StatusEnum { public enum ComponentState implements StatusEnum {
Undefined, Undefined,

2
src/Repository/Component/ComponentsMenuBar.java
View File

@@ -1,6 +1,6 @@
package Repository.Component; package Repository.Component;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Common_old.UI.Menus_2023.VisualiserMenu; import Common_old.UI.Menus_2023.VisualiserMenu;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;

4
src/Repository/Server/ComponentsServer.java
View File

@@ -247,7 +247,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
for (String sType : types) { for (String sType : types) {
ComponentType componentType = ComponentType.valueOf(sType); ComponentType componentType = ComponentType.valueOf(sType);
File vFile = Paths.get(Global.Home, "Components", sType, "version.txt").toFile(); File vFile = Paths.get(Global.Home, "Components", sType, "version.txt").toFile();
String v_string = Utils.remove( String v_string = CommonUtils.removeCharacters(
Utils.ReadAllText(vFile), Utils.ReadAllText(vFile),
"\n", "\r" "\n", "\r"
); );
@@ -263,7 +263,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
for (String sType : types_) { for (String sType : types_) {
ComponentType componentType = ComponentType.valueOf(sType); ComponentType componentType = ComponentType.valueOf(sType);
File vFile = Paths.get(Global.Home, "Components", sType, "minimal_version.txt").toFile(); File vFile = Paths.get(Global.Home, "Components", sType, "minimal_version.txt").toFile();
String mv_string = Utils.remove( String mv_string = CommonUtils.removeCharacters(
Utils.ReadAllText(vFile), Utils.ReadAllText(vFile),
"\n", "\r" "\n", "\r"
); );

2
src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java
View File

@@ -1,5 +1,5 @@
package Repository.SubscriberWorkspace; package Repository.SubscriberWorkspace;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class SubscriberWorkspacesMenuBar extends DataMenuBar { public class SubscriberWorkspacesMenuBar extends DataMenuBar {
public SubscriberWorkspacesMenuBar() { public SubscriberWorkspacesMenuBar() {

2
src/Repository/Subscribes/SubscribersMenuBar.java
View File

@@ -1,5 +1,5 @@
package Repository.Subscribes; package Repository.Subscribes;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class SubscribersMenuBar extends DataMenuBar { public class SubscribersMenuBar extends DataMenuBar {
public SubscribersMenuBar() { public SubscribersMenuBar() {

4
src/Repository/Subscribes/UI/SubscriberForm.java
View File

@@ -1,7 +1,7 @@
package Repository.Subscribes.UI; package Repository.Subscribes.UI;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import GlobalData.Account.AccountRole; import GlobalData.Account.AccountRole;
@@ -34,7 +34,7 @@ public class SubscriberForm extends DBObjectDialog<Subscriber, SubscriberFields>
fields.tfName.setText(Result.name); fields.tfName.setText(Result.name);
fields.tfAddress.setText(Result.address); fields.tfAddress.setText(Result.address);
fields.cbMail.setSelected(Result.mailOn!=0); fields.cbMail.setSelected(Result.mailOn!=0);
UI.TrySelect(fields.cbRole, Result.role); CommonUI.TrySelect(fields.cbRole, Result.role);
} }
@Override @Override
public void SetEditLimits() { public void SetEditLimits() {

6
src/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -1,7 +1,7 @@
package TestingSystem.Common.Group; package TestingSystem.Common.Group;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common_old.UI.DataSetControlForm; import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour; import Common.Database.Tables.FKBehaviour;
@@ -120,8 +120,8 @@ public class GroupsDBTable extends iDBTable<Group> {
@Override @Override
public void fillFields() { public void fillFields() {
fields.tfName.setText(Result.description); fields.tfName.setText(Result.description);
UI.TrySelect(fields.cbType, Result.type); CommonUI.TrySelect(fields.cbType, Result.type);
UI.TrySelect(fields.cbLanguage, Result.language); CommonUI.TrySelect(fields.cbLanguage, Result.language);
} }
@Override @Override
public void ProcessResult() { public void ProcessResult() {

2
src/TestingSystem/Common/Group/GroupsMenuBar.java
View File

@@ -1,6 +1,6 @@
package TestingSystem.Common.Group; package TestingSystem.Common.Group;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Common_old.UI.Menus_2023.MenuBarButton; import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import TestingSystem.Common.Group.UI.AddGroupMenu; import TestingSystem.Common.Group.UI.AddGroupMenu;

2
src/TestingSystem/Common/TasksPackageState.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.Common; package TestingSystem.Common;
import Common_old.UI.StatusEnum; import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
import java.util.Arrays; import java.util.Arrays;

2
src/TestingSystem/Common/Test/TestsMenuBar.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.Common.Test; package TestingSystem.Common.Test;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import TestingSystem.Common.Test.UI.AddTestMenu; import TestingSystem.Common.Test.UI.AddTestMenu;
import TestingSystem.Common.Test.UI.EditTestMenu; import TestingSystem.Common.Test.UI.EditTestMenu;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;

2
src/TestingSystem/Common/TestingPlanner.java
View File

@@ -13,7 +13,7 @@ import Repository.Server.ServerCode;
import TestingSystem.Common.TestingPackage.TestingPackage; import TestingSystem.Common.TestingPackage.TestingPackage;
import TestingSystem.Common.TestingPackageToKill.TestingPackageToKill; import TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
import Repository.RepositoryClient; import Repository.RepositoryClient;
import Visual_DVM_2021.UI.Interface.Loggable; import Common.Utils.Loggable;
import javafx.util.Pair; import javafx.util.Pair;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;

2
src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.DVM.DVMConfiguration; package TestingSystem.DVM.DVMConfiguration;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class DVMConfigurationsMenuBar extends DataMenuBar { public class DVMConfigurationsMenuBar extends DataMenuBar {
public DVMConfigurationsMenuBar() { public DVMConfigurationsMenuBar() {

2
src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
View File

@@ -1,6 +1,6 @@
package TestingSystem.DVM.DVMPackage; package TestingSystem.DVM.DVMPackage;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Common_old.UI.Menus_2023.MenuBarButton; import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;

2
src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.DVM.DVMSettings.UI; package TestingSystem.DVM.DVMSettings.UI;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class DVMSettingsBar extends DataMenuBar { public class DVMSettingsBar extends DataMenuBar {
public DVMSettingsBar() { public DVMSettingsBar() {

2
src/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.DVM.DVMTasks; package TestingSystem.DVM.DVMTasks;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class DVMRunTasksBar extends DataMenuBar { public class DVMRunTasksBar extends DataMenuBar {
public DVMRunTasksBar() { public DVMRunTasksBar() {

2
src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.SAPFOR.SapforConfiguration; package TestingSystem.SAPFOR.SapforConfiguration;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforConfigurationsMenuBar extends DataMenuBar { public class SapforConfigurationsMenuBar extends DataMenuBar {
public SapforConfigurationsMenuBar() { public SapforConfigurationsMenuBar() {

2
src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.SAPFOR.SapforSettings; package TestingSystem.SAPFOR.SapforSettings;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforSettingsBar extends DataMenuBar { public class SapforSettingsBar extends DataMenuBar {
public SapforSettingsBar() { public SapforSettingsBar() {

2
src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.SAPFOR.SapforSettingsCommand; package TestingSystem.SAPFOR.SapforSettingsCommand;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class SapforSettingsCommandsBar extends DataMenuBar { public class SapforSettingsCommandsBar extends DataMenuBar {
public SapforSettingsCommandsBar() { public SapforSettingsCommandsBar() {

4
src/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
View File

@@ -1,8 +1,8 @@
package TestingSystem.SAPFOR.SapforSettingsCommand; package TestingSystem.SAPFOR.SapforSettingsCommand;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common.Database.Tables.iDBTable; import Common.Database.Tables.iDBTable;
import Common_old.UI.DataSetControlForm; import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog; import Common_old.UI.Windows.Dialog.DBObjectDialog;
import TestingSystem.SAPFOR.SapforSettings.SapforSettings; import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields; import TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields;
@@ -62,7 +62,7 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
} }
@Override @Override
public void fillFields() { public void fillFields() {
UI.TrySelect(fields.cbPassCode, Result.passCode); CommonUI.TrySelect(fields.cbPassCode, Result.passCode);
} }
@Override @Override
public void ProcessResult() { public void ProcessResult() {

2
src/TestingSystem/SAPFOR/SapforTask/ComparisonState.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.SAPFOR.SapforTask; package TestingSystem.SAPFOR.SapforTask;
import Common_old.UI.StatusEnum; import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
public enum ComparisonState implements StatusEnum { public enum ComparisonState implements StatusEnum {
Unknown, Unknown,

2
src/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java
View File

@@ -1,6 +1,6 @@
package TestingSystem.SAPFOR.SapforTasksPackage.UI; package TestingSystem.SAPFOR.SapforTasksPackage.UI;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Common_old.UI.Menus_2023.MenuBarButton; import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.Utils.Utils; import Common_old.Utils.Utils;
import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable; import TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;

2
src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforState.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.SAPFOR.ServerSapfor; package TestingSystem.SAPFOR.ServerSapfor;
import Common_old.UI.StatusEnum; import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts; import _VisualDVM.Syntax.VisualiserFonts;
public enum ServerSapforState implements StatusEnum { public enum ServerSapforState implements StatusEnum {
Queued, Queued,

2
src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.SAPFOR.ServerSapfor; package TestingSystem.SAPFOR.ServerSapfor;
import Common_old.UI.Menus_2023.DataMenuBar; import Common.Visual.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class ServerSapforsBar extends DataMenuBar { public class ServerSapforsBar extends DataMenuBar {
public ServerSapforsBar() { public ServerSapforsBar() {

2
src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java
View File

@@ -1,6 +1,6 @@
package Visual_DVM_2021.Passes.All; package Visual_DVM_2021.Passes.All;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common_old.UI.Selectable; import Common.Visual.Selectable;
import Common_old.UI.UI; import Common_old.UI.UI;
import ProjectData.SapforData.Includes.DependencyInfo; import ProjectData.SapforData.Includes.DependencyInfo;
import ProjectData.SapforData.Includes.FileInfo; import ProjectData.SapforData.Includes.FileInfo;

3
src/Visual_DVM_2021/Passes/All/UpdateSetting.java
View File

@@ -127,9 +127,6 @@ public class UpdateSetting extends Pass_2021<DBSetting> {
if (Current.HasProject()) if (Current.HasProject())
UI.fastAccessMenuBar.Refresh(); UI.fastAccessMenuBar.Refresh();
break; break;
case DarkThemeOn:
UI.refreshTheme();
break;
case ShowFullArraysDeclarations: case ShowFullArraysDeclarations:
if (Current.HasProject()) if (Current.HasProject())
Current.getProject().declaratedArrays.ShowUI(); Current.getProject().declaratedArrays.ShowUI();

7
src/Visual_DVM_2021/UI/Main/CallbackForm.java
View File

@@ -1,5 +1,6 @@
package Visual_DVM_2021.UI.Main; package Visual_DVM_2021.UI.Main;
import Common.Utils.CommonUtils; import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Editor.BaseEditor; import Common_old.UI.Editor.BaseEditor;
@@ -285,7 +286,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
CommentFields commentFields = new CommentFields(); CommentFields commentFields = new CommentFields();
@Override @Override
public void SwitchScreen(boolean small) { public void SwitchScreen(boolean small) {
UI.Clear(descriptionPanel); CommonUI.Clear(descriptionPanel);
//------------------------------------------------------------------ //------------------------------------------------------------------
descriptionInterface = small ? descriptionTabs : descriptionFields; descriptionInterface = small ? descriptionTabs : descriptionFields;
descriptionInterface.setEditorScroll(bugDescriptionScroll); descriptionInterface.setEditorScroll(bugDescriptionScroll);
@@ -295,7 +296,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
descriptionPanel.revalidate(); descriptionPanel.revalidate();
descriptionPanel.repaint(); descriptionPanel.repaint();
//--------- //---------
UI.Clear(commentPanel); CommonUI.Clear(commentPanel);
//------------------------------------------------------------------ //------------------------------------------------------------------
commentInterface = small ? commentTabs : commentFields; commentInterface = small ? commentTabs : commentFields;
commentInterface.setEditorScroll(bugCommentScroll); commentInterface.setEditorScroll(bugCommentScroll);
@@ -365,7 +366,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
settingsTools = new VisualiserMenuBar(); settingsTools = new VisualiserMenuBar();
} }
public void EnableBugreports() { public void EnableBugreports() {
UI.Clear(accountPanel); CommonUI.Clear(accountPanel);
accountPanel.add(SC10); accountPanel.add(SC10);
UI.getMainWindow().SwitchTestingTabs(true); UI.getMainWindow().SwitchTestingTabs(true);
} }

11
src/Visual_DVM_2021/UI/Main/FileForm.java
View File

@@ -1,5 +1,6 @@
package Visual_DVM_2021.UI.Main; package Visual_DVM_2021.UI.Main;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Visual.CommonUI;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Editor.Viewer; import Common_old.UI.Editor.Viewer;
import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar; import Common_old.UI.Menus_2023.FileMenuBar.FileMenuBar;
@@ -213,7 +214,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
} }
@Override @Override
public void ShowText() { public void ShowText() {
UI.Clear(editorPanel); CommonUI.Clear(editorPanel);
editorPanel.add(new RTextScrollPane(Body = new SPFEditor(file))); editorPanel.add(new RTextScrollPane(Body = new SPFEditor(file)));
UI.getSearchReplaceForm().setEditor(Body); UI.getSearchReplaceForm().setEditor(Body);
if (UI.getSearchReplaceForm().isVisible()) if (UI.getSearchReplaceForm().isVisible())
@@ -367,12 +368,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
@Override @Override
public void CollapseGraphs() { public void CollapseGraphs() {
Global.db.splitters.get("SC12").position = SC12.getDividerLocation(); Global.db.splitters.get("SC12").position = SC12.getDividerLocation();
UI.Clear(editorBackground); CommonUI.Clear(editorBackground);
editorBackground.add(editorPanel); editorBackground.add(editorPanel);
} }
@Override @Override
public void ExpandGraphs() { public void ExpandGraphs() {
UI.Clear(editorBackground); CommonUI.Clear(editorBackground);
SC12.setRightComponent(editorPanel); SC12.setRightComponent(editorPanel);
editorBackground.add(SC12); editorBackground.add(SC12);
//-- //--
@@ -382,12 +383,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
@Override @Override
public void CollapseMessages() { public void CollapseMessages() {
Global.db.splitters.get("SC1").position = SC1.getDividerLocation(); Global.db.splitters.get("SC1").position = SC1.getDividerLocation();
UI.Clear(content); CommonUI.Clear(content);
content.add(editorBackground); content.add(editorBackground);
} }
@Override @Override
public void ExpandMessages() { public void ExpandMessages() {
UI.Clear(content); CommonUI.Clear(content);
SC1.setLeftComponent(editorBackground); SC1.setLeftComponent(editorBackground);
content.add(SC1); content.add(SC1);
SC1.setDividerLocation(Global.db.splitters.get("SC1").position); SC1.setDividerLocation(Global.db.splitters.get("SC1").position);

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

@@ -1,4 +1,5 @@
package Visual_DVM_2021.UI.Main; package Visual_DVM_2021.UI.Main;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Menus_2023.MainMenuBar.MainWindow; import Common_old.UI.Menus_2023.MainMenuBar.MainWindow;
@@ -234,7 +235,7 @@ public class MainForm extends Form implements MainWindow {
getTestsWindow().ShowAll(); getTestsWindow().ShowAll();
if (getTestingWindow() != null) if (getTestingWindow() != null)
getTestingWindow().ShowAll(); getTestingWindow().ShowAll();
UI.windowsStack.push(this); CommonUI.windowsStack.push(this);
super.Show(); super.Show();
} }
@Override @Override

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

@@ -1,4 +1,5 @@
package Visual_DVM_2021.UI.Main; package Visual_DVM_2021.UI.Main;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.Editor.Viewer; import Common_old.UI.Editor.Viewer;
@@ -170,7 +171,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
projectTabs.setSelectedIndex(0); projectTabs.setSelectedIndex(0);
} }
}); });
UI.Clear(fileBackground); CommonUI.Clear(fileBackground);
//filesTabs.removeAll(); //filesTabs.removeAll();
} }
@Override @Override
@@ -252,7 +253,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
} }
@Override @Override
public void ShowProjectView() { public void ShowProjectView() {
UI.Clear(projectViewPanel); CommonUI.Clear(projectViewPanel);
ProjectView view = Current.getProjectView(); ProjectView view = Current.getProjectView();
menuBar.getProjectViewMenu().setToolTipText(view.getDescription()); menuBar.getProjectViewMenu().setToolTipText(view.getDescription());
menuBar.getProjectViewMenu().setIcon(Utils.getIcon(view.getIcon())); menuBar.getProjectViewMenu().setIcon(Utils.getIcon(view.getIcon()));
@@ -294,7 +295,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
public void CollapseProjectTrees() { public void CollapseProjectTrees() {
Global.db.splitters.get("SC3").position = SC3.getDividerLocation(); Global.db.splitters.get("SC3").position = SC3.getDividerLocation();
//--- //---
UI.Clear(projectBackground); CommonUI.Clear(projectBackground);
projectBackground.add(fileBackground); projectBackground.add(fileBackground);
} }
@Override @Override

3
src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
View File

@@ -1,4 +1,5 @@
package Visual_DVM_2021.UI.Main; package Visual_DVM_2021.UI.Main;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common_old.UI.Label.ShortLabel; import Common_old.UI.Label.ShortLabel;
@@ -114,7 +115,7 @@ public class SapforPackagesComparisonForm {
} }
//--- //---
public void showNoTree() { public void showNoTree() {
UI.Clear(treePanel); CommonUI.Clear(treePanel);
} }
public void showObject() { public void showObject() {
lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : "")); lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : ""));

5
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -1,5 +1,6 @@
package Visual_DVM_2021.UI.Main; package Visual_DVM_2021.UI.Main;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Visual.CommonUI;
import Common_old.Current; import Common_old.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import Common_old.UI.TextField.StyledTextField; import Common_old.UI.TextField.StyledTextField;
@@ -311,7 +312,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
@Override @Override
public void CollapseCredentials() { public void CollapseCredentials() {
Global.db.splitters.get("SC71").position = SC71.getDividerLocation(); Global.db.splitters.get("SC71").position = SC71.getDividerLocation();
UI.Clear(credentialsPanel); CommonUI.Clear(credentialsPanel);
credentialsPanel.add(UI.credentialsBar); credentialsPanel.add(UI.credentialsBar);
SC71.setDividerLocation(30); SC71.setDividerLocation(30);
SC71.setDividerSize(0); SC71.setDividerSize(0);
@@ -320,7 +321,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
} }
@Override @Override
public void ExpandCredentials() { public void ExpandCredentials() {
UI.Clear(credentialsPanel); CommonUI.Clear(credentialsPanel);
credentialsPanel.add(SC18); credentialsPanel.add(SC18);
SC71.setDividerLocation(200); SC71.setDividerLocation(200);
SC71.setDividerSize(3); SC71.setDividerSize(3);

3
src/Visual_DVM_2021/UI/Main/VersionsForm.java
View File

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

2
src/_VisualDVM/Global.java
View File

@@ -25,7 +25,7 @@ import TestingSystem.DVM.RemoteDVMTestingPlanner;
import TestingSystem.SAPFOR.PackageModeSupervisor; import TestingSystem.SAPFOR.PackageModeSupervisor;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021; import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.UI.Interface.Loggable; import Common.Utils.Loggable;
import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory; import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory; import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;