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-10 21:03:06 +03:00
parent 368fcf4a8e
commit 9bc35c0ca6
7 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.idea/workspace.xml generated
View File

@@ -8,17 +8,11 @@
<component name="ChangeListManager">
<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$/PerformanceAnalyzer/1049392283/stat.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/PerformanceAnalyzer/139606632/stat.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/PerformanceAnalyzer/1664247100/stat.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/PerformanceAnalyzer/535943622/stat.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/PerformanceAnalyzer/622828792/stat.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.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/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.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/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -19,6 +19,8 @@
"BackupMinute": 0,
"EmailAdminsOnStart": false,
"AutoUpdateSearch": true,
"AutoBugReportsLoad": true,
"AutoTestsLoad": true,
"ConfirmPassesStart": true,
"ShowPassesDone": true,
"FocusPassesResult": true,

7
src/_VisualDVM/Global.java
View File

@@ -235,13 +235,12 @@ public class Global {
//---------------
componentsServer.ActivateDB();
testingServer.ActivateDB();
//в проперти их!
//-- чисто чтобы создать таблицы. соединения на стороне клиента не предвидится.
if (mainModule.getDb().settings.get(SettingName.AutoBugReportsLoad).toBoolean())
if (Global.properties.AutoBugReportsLoad)
Global.mainModule.getPass(PassCode.SynchronizeBugReports).Do();
//--
if (mainModule.getDb().settings.get(SettingName.AutoTestsLoad).toBoolean())
if (Global.properties.AutoTestsLoad)
Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
//--
Global.mainModule.getSapfor().refreshPid(); //без сапфора сюда это все равно не дойдет.
Global.mainModule.getUI().getMainWindow().Show();
}

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

@@ -3,6 +3,7 @@ public enum SettingName {
Undefined,
//
//совместимость
/*
ConfirmPassesStart,
ShowPassesDone,
FocusPassesResult,
@@ -10,13 +11,15 @@ public enum SettingName {
AutoSubscribeTest,
VersionsMultiSelection,
FilesMultiSelection,
AutoBugReportsLoad,
AutoTestsLoad,
*/
//----------------------------------
ProjectsSearchDirectory,
LastVersionPath,
EditorFontSize,
//---------------------------------
AutoBugReportsLoad,
AutoTestsLoad,
//-
AutoSynchronizeRecipients,
FastAccessPassesCount,
@@ -113,10 +116,6 @@ public enum SettingName {
return "Учитывать регистр";
case Workspace:
return "Рабочее пространство визуализатора";
case AutoBugReportsLoad:
return "Автоматическая синхронизация отчётов об ошибках";
case AutoTestsLoad:
return "Автоматическая синхронизация системы тестирования";
case STATIC_SHADOW_ANALYSIS:
return "Оптимизация теневых обменов";
case STATIC_PRIVATE_ANALYSIS:
@@ -151,8 +150,6 @@ public enum SettingName {
return "Сохранять SPF директивы при преобразованиях";
case PARSE_FOR_INLINE:
return "Синтаксический анализ для подстановки";
case AutoSubscribeTest:
return "Автоматическая проверка подписки";
case AutoSynchronizeRecipients:
return "Автоматическое извлечение адресатов";
case FastAccessPassesCount:

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

@@ -39,13 +39,9 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
AddSetting(new DBSetting(SettingName.LastOpenedProjectsCount, 5, SettingType.IntField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.Workspace, "", SettingType.StringField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.AutoBugReportsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
AddSetting(new DBSetting(SettingName.AutoTestsLoad, 0, SettingType.SapforFlag, ComponentType.Visualiser, true));
if (Utils_.isWindows())
AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.SmallScreen, 0, SettingType.SapforFlag, ComponentType.Visualiser));
//совместимость. указываем явно чтобы не были видны в меню.
AddSetting(new DBSetting(SettingName.AutoSubscribeTest, 0, SettingType.SapforFlag, ComponentType.Visualiser, false));
//</editor-fold>
//--
//<editor-fold desc="Sapfor">

10
src/_VisualDVM/GlobalProperties.java
View File

@@ -51,6 +51,10 @@ public class GlobalProperties {
@Expose
public boolean AutoUpdateSearch = true;
@Expose
public boolean AutoBugReportsLoad = true;
@Expose
public boolean AutoTestsLoad = true;
@Expose
public boolean ConfirmPassesStart = true;
@Expose
public boolean ShowPassesDone = true;
@@ -86,14 +90,12 @@ public class GlobalProperties {
public boolean EmailOnTestingProgress = false; //включено ли оповещение по email о результатах тестирования.
@Expose
public boolean eraseTestingWorkspaces = true; //удалять ли рабочее пространство пакетов тестирования после его завершения
@Expose
public int lastMachineId = CommonConstants.Nan;
@Expose
public int lastUserId = CommonConstants.Nan;
@Expose
public int lastCompilerId = CommonConstants.Nan;
public GlobalProperties(GlobalProperties p) {
super();
Mode = p.Mode;
@@ -145,6 +147,10 @@ public class GlobalProperties {
//-----------------
public String getFieldDescription(String fieldName) {
switch (fieldName) {
case "AutoBugReportsLoad":
return "Автоматическая синхронизация отчётов об ошибках";
case "AutoTestsLoad":
return "Автоматическая синхронизация системы тестирования";
case "ShowPassesDone":
return "Сообщать об успешном выполнении проходов";
case "ConfirmPassesStart":

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

@@ -4,10 +4,10 @@ import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
public class SynchronizationSettingsMenu extends SettingsSubmenu {
public SynchronizationSettingsMenu() {
super("Синхронизация", null,
SettingName.AutoBugReportsLoad,
SettingName.AutoTestsLoad);
super("Синхронизация", null);
String[] propertiesNames = new String[]{
"AutoBugReportsLoad",
"AutoTestsLoad",
"AutoUpdateSearch",
};
for (String name : propertiesNames) {