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

удаление мусорного кода с настройками

Browse Source
This commit is contained in:
02090095
2025-01-13 22:41:11 +03:00
parent 6e28bfa809
commit 3decbe5212
10 changed files with 62 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -7,11 +7,15 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" 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/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VersionsComparisonMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VersionsComparisonMenu.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/PropertiesSubmenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -40,7 +40,7 @@
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
"Kernels": 8,
"ComponentsBackUpsCount": 10,
"AutoCheckTesting": true,
"AutoCheckTesting": false,
"CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": false,
"eraseTestingWorkspaces": true,

25
src/_VisualDVM/GlobalProperties.java
View File

@@ -307,35 +307,10 @@ public class GlobalProperties {
}
return false;
}
//выкинуть(?)
public void switchAndUpdateFlag(String name) {
try {
Field field = getClass().getField(name);
boolean oldValue = (boolean) field.get(this);
boolean newValue = !oldValue;
//---
field.set(this, newValue);
this.Update();
//--
} catch (Exception exception) {
exception.printStackTrace();
}
}
public File getFile() {
return Paths.get(System.getProperty("user.dir"), "properties").toFile();
}
//-----------------
//выкинуть.
public void addFlagMenuItem(JMenu menu, String fieldName) {
JMenuItem menu_item = new StableMenuItem(getFieldDescription(fieldName),
getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png");
//-
menu_item.addActionListener(e -> {
if (Global.mainModule.getPass(PassCode.UpdateProperty).Do(fieldName, !getFlag(fieldName)))
menu_item.setIcon(Utils_.getIcon(getFlag(fieldName) ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
});
menu.add(menu_item);
}
public Object getValue(String fieldName){
Object res=null;
try {

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

@@ -14,7 +14,6 @@ import javax.swing.*;
import java.io.File;
import java.lang.reflect.Field;
public class UpdateProperty extends Pass<Object> {
//todo в дальнейшем, все настройки перевести в properties, и перенести сюда функционал UpdateSetting (?)
String name = "";
Field field = null;
Object oldValue = null;

27
src/_VisualDVM/ProjectData/SapforData/SapforProperties.java Normal file
View File

@@ -0,0 +1,27 @@
package _VisualDVM.ProjectData.SapforData;
public class SapforProperties {
//побочные настройки визулизатора
public boolean Precompilation=true;
public boolean SaveModifications=true; // сохранять исходную версию
public int GCOVLimit=10;
public String DVMConvertationOptions=" ";
//настройки для компонента SAPFOR
public int STATIC_SHADOW_ANALYSIS=0;
public int STATIC_PRIVATE_ANALYSIS=1;
public int FREE_FORM=0;
public int KEEP_DVM_DIRECTIVES=0;
public int KEEP_SPF_DIRECTIVES=0;
public int PARALLELIZE_FREE_LOOPS=0;
public int MAX_SHADOW_WIDTH=50;
public int OUTPUT_UPPER=0;
public int TRANSLATE_MESSAGES=1;
public int KEEP_LOOPS_CLOSE_NESTING=0;
public int KEEP_GCOV=0;
public int ANALYSIS_OPTIONS=0;
public int DEBUG_PRINT_ON=0;
public int MPI_PROGRAM=0;
public int IGNORE_IO_SAPFOR=0;
public int KEEP_SPF_DIRECTIVES_AMONG_TRANSFORMATIONS=0;
public int PARSE_FOR_INLINE=0;
public int EMPTY_OPTION=0;
}

7
src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java
View File

@@ -1,11 +1,13 @@
package _VisualDVM.TestingSystem.Common;
import Common.MainModule_;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.VisualiserMenuBar;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.All.UpdateProperty;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -41,7 +43,7 @@ public class TestingMenuBar extends VisualiserMenuBar {
setToolTipText("Оповещение о прогрессе выполнения пакета тестов");
Mark();
addActionListener(e -> {
Global.properties.switchAndUpdateFlag("EmailOnTestingProgress");
Global.mainModule.getPass(PassCode.UpdateProperty).Do("EmailOnTestingProgress");
Mark();
});
}
@@ -56,8 +58,7 @@ public class TestingMenuBar extends VisualiserMenuBar {
setToolTipText("автоматическое обновление состояния пакета задач");
Mark();
addActionListener(e -> {
Global.properties.switchAndUpdateFlag("AutoCheckTesting");
//-
Global.mainModule.getPass(PassCode.UpdateProperty).Do("AutoCheckTesting");
if (Global.properties.AutoCheckTesting)
TestingServer.TimerOn();
else

14
src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java
View File

@@ -1,17 +1,11 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
public class SynchronizationSettingsMenu extends SettingsSubmenu {
import _VisualDVM.Visual.Menus.PropertiesSubmenu;
public class SynchronizationSettingsMenu extends PropertiesSubmenu {
public SynchronizationSettingsMenu() {
super("Синхронизация", null);
String[] propertiesNames = new String[]{
super("Синхронизация", null,
"AutoBugReportsLoad",
"AutoTestsLoad",
"AutoUpdateSearch",
};
for (String name : propertiesNames) {
Global.properties.addFlagMenuItem(this, name);
}
"AutoUpdateSearch");
}
}

14
src/_VisualDVM/Visual/Menus/MainMenuBar/VersionsComparisonMenu.java
View File

@@ -1,19 +1,15 @@
package _VisualDVM.Visual.Menus.MainMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
public class VersionsComparisonMenu extends SettingsSubmenu {
import _VisualDVM.Visual.Menus.PropertiesSubmenu;
public class VersionsComparisonMenu extends PropertiesSubmenu {
public VersionsComparisonMenu() {
super("Сравнение версий", null);
String[] propertiesNames = new String[]{
super("Сравнение версий", null,
"RegisterOn",
"SpacesOn",
"EmptyLinesOn",
"FortranWrapsOn",
"ExtensionsOn",
"ComparsionDiffMergeOn",
};
for (String name : propertiesNames) {
Global.properties.addFlagMenuItem(this, name);
}
"ComparsionDiffMergeOn"
);
}
}

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

@@ -1,23 +1,17 @@
package _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Visual.Menus.PropertiesSubmenu;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
public class CompactnessSettingsMenu extends SettingsSubmenu {
public class CompactnessSettingsMenu extends PropertiesSubmenu {
public CompactnessSettingsMenu() {
super("Компактность отображения", null);
add(Global.properties.getMenuItem("SmallScreen"));
add(Global.properties.getMenuItem("ShowFullArraysDeclarations"));
add(Global.properties.getMenuItem("ShowFullTabsNames"));
add(Global.properties.getMenuItem("LastOpenedProjectsCount"));
add(Global.properties.getMenuItem("FastAccessPassesCount"));
super("Компактность отображения", null,
"SmallScreen",
"ShowFullArraysDeclarations",
"ShowFullTabsNames",
"LastOpenedProjectsCount",
"FastAccessPassesCount");
addSeparator();
String[] propertiesNames = new String[]{
"collapseProjectTrees",
"collapseFileGraphs",
"collapseFileMessages"
};
for (String name : propertiesNames) {
Global.properties.addFlagMenuItem(this, name);
}
addProperties("collapseProjectTrees", "collapseFileGraphs", "collapseFileMessages");
}
}

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

@@ -6,13 +6,15 @@ import _VisualDVM.Global;
import javax.swing.*;
public class PropertiesSubmenu extends JMenu {
public PropertiesSubmenu(String title, String icon, String... settings) {
public PropertiesSubmenu(String title, String icon, String... properties) {
super(title);
if (icon != null)
setIcon(Utils_.getIcon(icon));
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
for (String name : settings) {
Global.properties.addFlagMenuItem(this, name);
}
addProperties(properties);
}
public void addProperties(String... properties) {
for (String name : properties)
add(Global.properties.getMenuItem(name));
}
}