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-08 23:21:47 +03:00
parent 31c0cad38f
commit 42675d55d8
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,8 +50,10 @@ public class SearchReplaceForm extends Form {
public void DropMatchCount() { public void DropMatchCount() {
lCount.setText("0"); lCount.setText("0");
} }
public void setEditor(RSyntaxTextArea editor_in) { public void updateEditor(RSyntaxTextArea editor_in) {
editor = editor_in; editor = editor_in;
if (isVisible())
requestFocus();
} }
@Override @Override
protected JPanel getMainPanel() { protected JPanel getMainPanel() {
@@ -127,7 +129,7 @@ public class SearchReplaceForm extends Form {
} }
@Override @Override
protected String getFormKey() { protected String getFormKey() {
return FormType.SearchReplace.toString(); return "SearchReplace";
} }
private void createUIComponents() { private void createUIComponents() {
// TODO: place custom component creation code here // TODO: place custom component creation code here

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

@@ -31,7 +31,7 @@ public class CloseCurrentFile extends Pass_2021<DBProjectFile> {
target.form.SaveSplitters(); target.form.SaveSplitters();
target.UpdateLastLine(target.form.getEditor().getCurrentLine()); target.UpdateLastLine(target.form.getEditor().getCurrentLine());
passes.get(PassCode_2021.Save).Do(); passes.get(PassCode_2021.Save).Do();
UI.getSearchReplaceForm().ClearMarkers(); UI.getSearchReplaceWindow().ClearMarkers();
target.form = null; target.form = null;
} }
@Override @Override

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

@@ -7,7 +7,6 @@ import _VisualDVM.Global;
import Common_old.UI.Menus_2023.MainMenuBar.MainWindow; import Common_old.UI.Menus_2023.MainMenuBar.MainWindow;
import Common_old.UI.UI; import Common_old.UI.UI;
import Common.Visual.Windows.Form; import Common.Visual.Windows.Form;
import Common_old.UI.Windows.FormType;
import TestingSystem.Common.Group.Group; import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test; import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
@@ -36,7 +35,7 @@ public class MainForm extends Form implements MainWindow {
} }
@Override @Override
protected String getFormKey() { protected String getFormKey() {
return FormType.Main.toString(); return "Main"; //можно было бы через имя класса
} }
@Override @Override
public String getIconPath() { public String getIconPath() {
@@ -59,8 +58,8 @@ public class MainForm extends Form implements MainWindow {
SaveTestsPanel(); SaveTestsPanel();
SaveTestingPanel(); SaveTestingPanel();
//-- //--
if (UI.debugWindow != null) if (UI.getDebugWindow() != null)
((FormWithSplitters) UI.debugWindow).SaveSplitters(); ((FormWithSplitters) UI.getDebugWindow()).SaveSplitters();
//-- //--
((GlobalDatabase)CommonUtils.db).SaveCredentials(); ((GlobalDatabase)CommonUtils.db).SaveCredentials();
//-- //--

10
src/Visual_DVM_2021/UI/Main/ProfilesForm.java
View File

@@ -1,7 +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.Windows.Dialog.Dialog; import Common.Visual.Windows.Dialog.Dialog;
import Common_old.UI.Windows.FormType;
import Common.Database.Objects.DBForm.DBForm; import Common.Database.Objects.DBForm.DBForm;
import GlobalData.GlobalDatabase; import GlobalData.GlobalDatabase;
//todo разобраться с DBform //todo разобраться с DBform
@@ -55,9 +54,12 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
ex.printStackTrace(); ex.printStackTrace();
} }
} }
protected String getFormKey() {
return "Profiles"; //можно было бы через имя класса
}
public void LoadWindowParameters() throws Exception { public void LoadWindowParameters() throws Exception {
if (((GlobalDatabase)CommonUtils.db).forms.Data.containsKey(FormType.Profiles.toString())) { if (((GlobalDatabase)CommonUtils.db).forms.Data.containsKey(getFormKey())) {
info = ((GlobalDatabase)CommonUtils.db).forms.Data.get(FormType.Profiles.toString()); info = ((GlobalDatabase)CommonUtils.db).forms.Data.get(getFormKey());
info.Apply(this); info.Apply(this);
return; return;
} }
@@ -68,6 +70,6 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
info.Init(this); info.Init(this);
CommonUtils.db.Update(info); CommonUtils.db.Update(info);
} else } else
CommonUtils.db.Insert(new DBForm(FormType.Profiles.toString(), this)); CommonUtils.db.Insert(new DBForm(getFormKey(), this));
} }
} }