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-11 17:43:27 +03:00
parent 3de25ff12d
commit 9c6198656f
13 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/workspace.xml generated
View File

@@ -8,7 +8,18 @@
<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/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/OpenCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.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

@@ -16,6 +16,7 @@
"collapseProjectTrees": false, "collapseProjectTrees": false,
"BackupWorkspace": "_sapfor_x64_backups", "BackupWorkspace": "_sapfor_x64_backups",
"Workspace": "E:\\Workspace", "Workspace": "E:\\Workspace",
"ProjectsSearchDirectory": "E:\\Workspace",
"BackupHour": 5, "BackupHour": 5,
"BackupMinute": 0, "BackupMinute": 0,
"EmailAdminsOnStart": false, "EmailAdminsOnStart": false,

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

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Settings;
public enum SettingName { public enum SettingName {
Undefined, Undefined,
//-------------- //--------------
ProjectsSearchDirectory,
EditorFontSize, EditorFontSize,
//-------------- //--------------
FastAccessPassesCount, FastAccessPassesCount,

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.ProjectsSearchDirectory, "", SettingType.StringField, ComponentType.Visualiser, false));
AddSetting(new DBSetting(SettingName.EditorFontSize, "14", SettingType.StringField, ComponentType.Visualiser, false)); AddSetting(new DBSetting(SettingName.EditorFontSize, "14", SettingType.StringField, ComponentType.Visualiser, false));
AddSetting(new DBSetting(SettingName.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser)); AddSetting(new DBSetting(SettingName.ShowFullArraysDeclarations, 0, SettingType.SapforFlag, ComponentType.Visualiser));
AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser)); AddSetting(new DBSetting(SettingName.ShowFullTabsNames, 0, SettingType.SapforFlag, ComponentType.Visualiser));

2
src/_VisualDVM/GlobalProperties.java
View File

@@ -50,6 +50,8 @@ public class GlobalProperties {
@Expose @Expose
public String Workspace =""; public String Workspace ="";
@Expose @Expose
public String ProjectsSearchDirectory="";
@Expose
public int BackupHour = 5; public int BackupHour = 5;
@Expose @Expose
public int BackupMinute = 0; public int BackupMinute = 0;

2
src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java
View File

@@ -62,7 +62,7 @@ public class CreateGroupFromDirectory extends PublishTests {
} else return false; } else return false;
//--------------- //---------------
Vector<File> files = new Vector<>(Arrays.asList(files_)); Vector<File> files = new Vector<>(Arrays.asList(files_));
Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, directoryChooser.getCurrentDirectory()); Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", directoryChooser.getCurrentDirectory());
return super.canStart(files, group); return super.canStart(files, group);
} }
} }

2
src/_VisualDVM/Passes/All/CreateGroupFromFiles.java
View File

@@ -30,7 +30,7 @@ public class CreateGroupFromFiles extends PublishTests {
return false; return false;
} }
File dir = fileChooser.getCurrentDirectory(); File dir = fileChooser.getCurrentDirectory();
Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir); Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir);
//--------------- //---------------
if (dir.getName().equals(Constants.data)) { if (dir.getName().equals(Constants.data)) {
Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!"); Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");

2
src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
View File

@@ -39,7 +39,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
} }
//-- //--
void saveDirectory() { void saveDirectory() {
Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory",
(dir.getParentFile() == null) ? dir.getAbsolutePath() : dir.getParent() (dir.getParentFile() == null) ? dir.getAbsolutePath() : dir.getParent()
); );
} }

2
src/_VisualDVM/Passes/All/CreateTestsFromFiles.java
View File

@@ -26,7 +26,7 @@ public class CreateTestsFromFiles extends PublishTests {
Log.Writeln_("Не выбрано ни одного файла."); Log.Writeln_("Не выбрано ни одного файла.");
return false; return false;
} }
Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, fileChooser.getCurrentDirectory()); Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", fileChooser.getCurrentDirectory());
return super.canStart(files, Global.testingServer.db.groups.getUI().getCurrent()); return super.canStart(files, Global.testingServer.db.groups.getUI().getCurrent());
} }
return false; return false;

2
src/_VisualDVM/Passes/All/OpenCurrentProject.java
View File

@@ -107,7 +107,7 @@ public class OpenCurrentProject extends Pass<db_project_info> {
Global.mainModule.set(Current.ProjectView, ProjectView.Files); Global.mainModule.set(Current.ProjectView, ProjectView.Files);
if (root_changes) if (root_changes)
Global.mainModule.set(Current.Root, new_root); Global.mainModule.set(Current.Root, new_root);
Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir.getParent()); Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir.getParent());
Global.mainModule.getPass(PassCode.UpdateSetting).Do( Global.mainModule.getPass(PassCode.UpdateSetting).Do(
SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0") SettingName.FREE_FORM, target.style.equals(LanguageStyle.free) ? "1" : "0")
; ;

2
src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java
View File

@@ -41,7 +41,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass<Vector<Test>> {
//--------------------------------------------------------------- //---------------------------------------------------------------
//-- //--
File dir = fileChooser.getCurrentDirectory(); File dir = fileChooser.getCurrentDirectory();
Global.mainModule.getPass(PassCode.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, dir); Global.mainModule.getPass(PassCode.UpdateProperty).Do("ProjectsSearchDirectory", dir);
//--------------- //---------------
if (dir.getName().equals(Constants.data)) { if (dir.getName().equals(Constants.data)) {
Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!"); Log.Writeln_(Utils_.Brackets(dir) + "\nявляется служебной папкой визуализатора!");

3
src/_VisualDVM/Utils.java
View File

@@ -599,8 +599,7 @@ public class Utils {
return res; return res;
} }
public static void RestoreSelectedDirectory(VFileChooser_ directoryChooser) { public static void RestoreSelectedDirectory(VFileChooser_ directoryChooser) {
String last_dir_home = String last_dir_home = Global.properties.ProjectsSearchDirectory;
(Global.mainModule.getDb()).settings.get(SettingName.ProjectsSearchDirectory).Value;
if (!last_dir_home.isEmpty()) if (!last_dir_home.isEmpty())
directoryChooser.SetCurrentDirectory(last_dir_home); directoryChooser.SetCurrentDirectory(last_dir_home);
} }

4
src/_VisualDVM/Visual/MainUI.java
View File

@@ -64,8 +64,8 @@ public class MainUI extends UIModule_ {
return debugWindow; return debugWindow;
} }
public void HideSearchForm() { public void HideSearchForm() {
if (searchReplaceWindow.isVisible()) if (getSearchReplaceWindow().isVisible())
searchReplaceWindow.setVisible(false); getSearchReplaceWindow().setVisible(false);
} }
public VersionsWindow getVersionsWindow() { public VersionsWindow getVersionsWindow() {
return versionsWindow; return versionsWindow;