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
2025-01-11 21:08:48 +03:00
parent bbe99efefe
commit fe752d2073
10 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/workspace.xml generated
View File

@@ -8,14 +8,14 @@
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

1
properties
View File

@@ -52,6 +52,7 @@
"ExtensionsOn": false, "ExtensionsOn": false,
"ComparsionDiffMergeOn": true, "ComparsionDiffMergeOn": true,
"ShowFullArraysDeclarations": false, "ShowFullArraysDeclarations": false,
"ShowFullTabsNames": true,
"BugReportsAgeLimit": 4, "BugReportsAgeLimit": 4,
"FastAccessPassesCount": 5, "FastAccessPassesCount": 5,
"LastOpenedProjectsCount": 25 "LastOpenedProjectsCount": 25

3
src/_VisualDVM/GlobalData/Settings/SettingName.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Settings;
public enum SettingName { public enum SettingName {
Undefined, Undefined,
//-------------- //--------------
ShowFullTabsNames,
LocalMakePathWindows, LocalMakePathWindows,
SmallScreen, SmallScreen,
Precompilation, Precompilation,
@@ -52,8 +51,6 @@ public enum SettingName {
return "Маленький экран"; return "Маленький экран";
case LocalMakePathWindows: case LocalMakePathWindows:
return "Путь к make.exe"; return "Путь к make.exe";
case ShowFullTabsNames:
return "Показывать полные имена вкладок";
case STATIC_SHADOW_ANALYSIS: case STATIC_SHADOW_ANALYSIS:
return "Оптимизация теневых обменов"; return "Оптимизация теневых обменов";
case STATIC_PRIVATE_ANALYSIS: case STATIC_PRIVATE_ANALYSIS:

1
src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
View File

@@ -30,7 +30,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
public void AddAll() throws Exception { public void AddAll() throws Exception {
//проверка списка всех настроек. //проверка списка всех настроек.
//<editor-fold desc="Global"> //<editor-fold desc="Global">
AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser)); AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
if (Utils_.isWindows()) if (Utils_.isWindows())
AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser)); AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));

4
src/_VisualDVM/GlobalProperties.java
View File

@@ -125,6 +125,8 @@ public class GlobalProperties {
@Expose @Expose
public boolean ShowFullArraysDeclarations =false; public boolean ShowFullArraysDeclarations =false;
@Expose @Expose
public boolean ShowFullTabsNames=true;
@Expose
public int BugReportsAgeLimit = 2; public int BugReportsAgeLimit = 2;
@Expose @Expose
public int FastAccessPassesCount=10; public int FastAccessPassesCount=10;
@@ -181,6 +183,8 @@ public class GlobalProperties {
//----------------- //-----------------
public String getFieldDescription(String fieldName) { public String getFieldDescription(String fieldName) {
switch (fieldName) { switch (fieldName) {
case "ShowFullTabsNames":
return "Показывать полные имена вкладок";
case "ShowFullArraysDeclarations": case "ShowFullArraysDeclarations":
return "Показывать развернутый список объявлений массивов"; return "Показывать развернутый список объявлений массивов";
case "LastOpenedProjectsCount": case "LastOpenedProjectsCount":

7
src/_VisualDVM/Passes/All/UpdateProperty.java
View File

@@ -109,6 +109,13 @@ public class UpdateProperty extends Pass<Object> {
if (Global.mainModule.HasProject()) if (Global.mainModule.HasProject())
Global.mainModule.getProject().declaratedArrays.ShowUI(); Global.mainModule.getProject().declaratedArrays.ShowUI();
break; break;
case "ShowFullTabsNames":
Global.mainModule.getUI().getMainWindow().getTestingWindow().RefreshTabsNames();
if (Global.mainModule.HasProject())
Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshTabsNames();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.RefreshTabsNames();
break;
} }
} }
} }

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

@@ -81,13 +81,7 @@ public class UpdateSetting extends Pass<DBSetting> {
if (Global.mainModule.HasFile()) if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.ShowGCOV(); Global.mainModule.getFile().form.ShowGCOV();
break; break;
case ShowFullTabsNames:
Global.mainModule.getUI().getMainWindow().getTestingWindow().RefreshTabsNames();
if (Global.mainModule.HasProject())
Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshTabsNames();
if (Global.mainModule.HasFile())
Global.mainModule.getFile().form.RefreshTabsNames();
break;
case MPI_PROGRAM: case MPI_PROGRAM:
Global.mainModule.getPass(PassCode.CleanAnalyses).Do(); Global.mainModule.getPass(PassCode.CleanAnalyses).Do();
((SPF_GetArrayDistributionOnlyAnalysis) ((SPF_GetArrayDistributionOnlyAnalysis)

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

@@ -5,10 +5,10 @@ import _VisualDVM.Visual.Menus.SettingsSubmenu;
public class CompactnessSettingsMenu extends SettingsSubmenu { public class CompactnessSettingsMenu extends SettingsSubmenu {
public CompactnessSettingsMenu() { public CompactnessSettingsMenu() {
super("Компактность отображения", null, super("Компактность отображения", null,
SettingName.SmallScreen, SettingName.SmallScreen
SettingName.ShowFullTabsNames
); );
add(Global.properties.getMenuItem("ShowFullArraysDeclarations")); add(Global.properties.getMenuItem("ShowFullArraysDeclarations"));
add(Global.properties.getMenuItem("ShowFullTabsNames"));
add(Global.properties.getMenuItem("LastOpenedProjectsCount")); add(Global.properties.getMenuItem("LastOpenedProjectsCount"));
add(Global.properties.getMenuItem("FastAccessPassesCount")); add(Global.properties.getMenuItem("FastAccessPassesCount"));
addSeparator(); addSeparator();

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

@@ -169,38 +169,33 @@ public class FileForm implements FileWindow, FormWithSplitters {
//---- //----
@Override @Override
public void ShowWarningsCount() { public void ShowWarningsCount() {
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean(); messagesTabs.setTitleAt(1, (Global.properties.ShowFullTabsNames ? "Предупреждения: " : "") + file.father.db.warnings.getUI().getRowCount());
messagesTabs.setTitleAt(1, (flag ? "Предупреждения: " : "") + file.father.db.warnings.getUI().getRowCount());
} }
@Override @Override
public void ShowErrorsCount() { public void ShowErrorsCount() {
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean(); messagesTabs.setTitleAt(2, (Global.properties.ShowFullTabsNames ? "Ошибки: " : "") + file.father.db.errors.getUI().getRowCount());
messagesTabs.setTitleAt(2, (flag ? "Ошибки: " : "") + file.father.db.errors.getUI().getRowCount());
} }
@Override @Override
public void ShowNotesCount() { public void ShowNotesCount() {
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean(); messagesTabs.setTitleAt(0, (Global.properties.ShowFullTabsNames ? "Примечания: " : "") + file.father.db.notes.getUI().getRowCount());
messagesTabs.setTitleAt(0, (flag ? "Примечания: " : "") + file.father.db.notes.getUI().getRowCount());
} }
@Override @Override
public void ShowRecommendationsCount() { public void ShowRecommendationsCount() {
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean(); messagesTabs.setTitleAt(3, (Global.properties.ShowFullTabsNames ? "Рекомендации: " : "") + file.father.db.recommendations.getUI().getRowCount());
messagesTabs.setTitleAt(3, (flag ? "Рекомендации: " : "") + file.father.db.recommendations.getUI().getRowCount());
} }
//--- //---
@Override @Override
public void RefreshTabsNames() { public void RefreshTabsNames() {
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean(); UI.ShowTabsNames(graphsTabs, Global.properties.ShowFullTabsNames );
UI.ShowTabsNames(graphsTabs, flag);
//-- //--
ShowNotesCount(); ShowNotesCount();
ShowWarningsCount(); ShowWarningsCount();
ShowErrorsCount(); ShowErrorsCount();
ShowRecommendationsCount(); ShowRecommendationsCount();
//-- //--
messagesTabs.setTitleAt(4, (flag ? "Компиляция" : "")); messagesTabs.setTitleAt(4, (Global.properties.ShowFullTabsNames ? "Компиляция" : ""));
messagesTabs.setTitleAt(5, (flag ? "Запуск" : "")); messagesTabs.setTitleAt(5, (Global.properties.ShowFullTabsNames ? "Запуск" : ""));
messagesTabs.setTitleAt(6, (flag ? "Журнал GCOV" : "")); messagesTabs.setTitleAt(6, (Global.properties.ShowFullTabsNames ? "Журнал GCOV" : ""));
} }
@Override @Override
public void FocusCompilationOut() { public void FocusCompilationOut() {
@@ -231,15 +226,14 @@ public class FileForm implements FileWindow, FormWithSplitters {
} }
@Override @Override
public void ShowNoMessages() { public void ShowNoMessages() {
boolean full_tiles = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
file.father.db.notes.ClearUI(); file.father.db.notes.ClearUI();
file.father.db.warnings.ClearUI(); file.father.db.warnings.ClearUI();
file.father.db.errors.ClearUI(); file.father.db.errors.ClearUI();
file.father.db.recommendations.ClearUI(); file.father.db.recommendations.ClearUI();
messagesTabs.setTitleAt(0, (full_tiles ? "Примечания: " : "") + "-"); messagesTabs.setTitleAt(0, (Global.properties.ShowFullTabsNames ? "Примечания: " : "") + "-");
messagesTabs.setTitleAt(1, (full_tiles ? "Предупреждения: " : "") + "-"); messagesTabs.setTitleAt(1, (Global.properties.ShowFullTabsNames ? "Предупреждения: " : "") + "-");
messagesTabs.setTitleAt(2, (full_tiles ? "Ошибки: " : "") + "-"); messagesTabs.setTitleAt(2, (Global.properties.ShowFullTabsNames ? "Ошибки: " : "") + "-");
messagesTabs.setTitleAt(3, (full_tiles ? "Рекомендации: " : "") + "-"); messagesTabs.setTitleAt(3, (Global.properties.ShowFullTabsNames ? "Рекомендации: " : "") + "-");
} }
@Override @Override
public void ShowLoops() { public void ShowLoops() {

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

@@ -226,7 +226,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
} }
@Override @Override
public void RefreshTabsNames() { public void RefreshTabsNames() {
UI.ShowTabsNames(projectTabs, 1, Global.mainModule.getDb().settings.get(SettingName.ShowFullTabsNames).toBoolean()); UI.ShowTabsNames(projectTabs, 1, Global.properties.ShowFullTabsNames);
} }
@Override @Override
public void RefreshProjectTreeAndMessages() { public void RefreshProjectTreeAndMessages() {