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-12 00:17:51 +03:00
parent f317ab1aa1
commit c826b4a4bd
102 changed files with 372 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
BugReportCommentAddition.setWrapStyleWord(true);
//----------------------------------------------
//тут развилка на то вкладки или поля.
SwitchScreen(((GlobalDatabase) Utils_.db).settings.get(SettingName.SmallScreen).toBoolean());
SwitchScreen((Global.mainModule.getDb()).settings.get(SettingName.SmallScreen).toBoolean());
//-
Global.componentsServer.db.bugReports.mountUI(bugReportsPanel);
Global.componentsServer.db.subscribers.mountUI(subscribersPanel);

23
src/_VisualDVM/Visual/Windows/DebugForm.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.FormWithSplitters;
@@ -68,22 +69,22 @@ public class DebugForm implements DebugWindow, FormWithSplitters {
//-
@Override
public void ShowAll() {
((GlobalDatabase) Utils_.db).makefiles.ShowUI();
((GlobalDatabase) Utils_.db).runConfigurations.ShowUI();
((GlobalDatabase) Utils_.db).compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
((GlobalDatabase) Utils_.db).runTasks.ShowUI();
Global.mainModule.getDb().makefiles.ShowUI();
Global.mainModule.getDb().runConfigurations.ShowUI();
Global.mainModule.getDb().compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
Global.mainModule.getDb().runTasks.ShowUI();
}
public DebugForm(){
LoadSplitters();
//--
((GlobalDatabase) Utils_.db).makefiles.mountUI(makefilesPanel);
((GlobalDatabase) Utils_.db).modules.mountUI(modulesPanel);
((GlobalDatabase) Utils_.db).runConfigurations.mountUI(runConfigurationsPanel);
((GlobalDatabase) Utils_.db).environmentValues.mountUI(environmentsPanel);
((GlobalDatabase) Utils_.db).dvmParameters.mountUI(dvmParametersPanel);
Global.mainModule.getDb().makefiles.mountUI(makefilesPanel);
Global.mainModule.getDb().modules.mountUI(modulesPanel);
Global.mainModule.getDb().runConfigurations.mountUI(runConfigurationsPanel);
Global.mainModule.getDb().environmentValues.mountUI(environmentsPanel);
Global.mainModule.getDb().dvmParameters.mountUI(dvmParametersPanel);
//-
((GlobalDatabase) Utils_.db).compilationTasks.mountUI(compilationTasksPanel);
((GlobalDatabase) Utils_.db).runTasks.mountUI(runTasksPanel);
Global.mainModule.getDb().compilationTasks.mountUI(compilationTasksPanel);
Global.mainModule.getDb().runTasks.mountUI(runTasksPanel);
//--
singleCompilationTaskMaster = new CompilationTasksComparisonForm(singleCompilationTaskSlave = new CompilationTasksComparisonForm(null));
singleRunTaskMaster = new RunTasksComparisonForm(singleRunTaskSlave = new RunTasksComparisonForm(null));

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

@@ -173,29 +173,29 @@ public class FileForm implements FileWindow, FormWithSplitters {
//----
@Override
public void ShowWarningsCount() {
boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(1, (flag ? "Предупреждения: " : "") + file.father.db.warnings.getVisibleKeys().size());
}
@Override
public void ShowErrorsCount() {
boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(2, (flag ? "Ошибки: " : "") + file.father.db.errors.getVisibleKeys().size());
}
@Override
public void ShowNotesCount() {
boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(0, (flag ? "Примечания: " : "") + file.father.db.notes.getVisibleKeys().size());
}
@Override
public void ShowRecommendationsCount() {
boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
messagesTabs.setTitleAt(3, (flag ? "Рекомендации: " : "") + file.father.db.recommendations.getVisibleKeys().size());
}
//---
@Override
public void RefreshTabsNames() {
UI.ShowTabsNames(graphsTabs);
boolean flag = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean flag = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
//--
ShowNotesCount();
ShowWarningsCount();
@@ -235,7 +235,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
}
@Override
public void ShowNoMessages() {
boolean full_tiles = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullTabsNames).toBoolean();
boolean full_tiles = (Global.mainModule.getDb()).settings.get(SettingName.ShowFullTabsNames).toBoolean();
file.father.db.notes.ClearUI();
file.father.db.warnings.ClearUI();
file.father.db.errors.ClearUI();
@@ -367,7 +367,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
//--
@Override
public void CollapseGraphs() {
Utils_.db.splitters.get("SC12").position = SC12.getDividerLocation();
Global.mainModule.getDb().splitters.get("SC12").position = SC12.getDividerLocation();
UI_.Clear(editorBackground);
editorBackground.add(editorPanel);
}
@@ -377,12 +377,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
SC12.setRightComponent(editorPanel);
editorBackground.add(SC12);
//--
SC12.setDividerLocation(Utils_.db.splitters.get("SC12").position);
SC12.setDividerLocation(Global.mainModule.getDb().splitters.get("SC12").position);
SC12.updateUI();
}
@Override
public void CollapseMessages() {
Utils_.db.splitters.get("SC1").position = SC1.getDividerLocation();
Global.mainModule.getDb().splitters.get("SC1").position = SC1.getDividerLocation();
UI_.Clear(content);
content.add(editorBackground);
}
@@ -391,7 +391,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
UI_.Clear(content);
SC1.setLeftComponent(editorBackground);
content.add(SC1);
SC1.setDividerLocation(Utils_.db.splitters.get("SC1").position);
SC1.setDividerLocation(Global.mainModule.getDb().splitters.get("SC1").position);
SC1.updateUI();
}
}

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

@@ -61,7 +61,7 @@ public class MainForm extends Form implements MainWindow {
if (UI.getDebugWindow() != null)
((FormWithSplitters) UI.getDebugWindow()).SaveSplitters();
//--
((GlobalDatabase) Utils_.db).SaveCredentials();
Global.mainModule.getDb().SaveCredentials();
//--
Global.FinishApplication();
}

5
src/_VisualDVM/Visual/Windows/ProfilesFields.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Visual.Interface.FormWithSplitters;
@@ -16,7 +17,7 @@ public class ProfilesFields implements DialogFields, FormWithSplitters {
return content;
}
public ProfilesFields(){
((GlobalDatabase) Utils_.db).sapforProfiles.mountUI(profilesPanel);
((GlobalDatabase) Utils_.db).sapforProfilesSettings.mountUI(settingsPanel);
(Global.mainModule.getDb()).sapforProfiles.mountUI(profilesPanel);
(Global.mainModule.getDb()).sapforProfilesSettings.mountUI(settingsPanel);
}
}

17
src/_VisualDVM/Visual/Windows/ProfilesForm.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Dialog;
import Common.Database.Objects.DBForm.DBForm;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.GlobalDatabase;
//todo разобраться с DBform
public class ProfilesForm extends Dialog<Object, ProfilesFields> {
@@ -18,13 +19,13 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
}
@Override
public void Init(Object... params) {
if (((GlobalDatabase) Utils_.db).sapforProfiles.size() > 0) {
for (Object key : ((GlobalDatabase) Utils_.db).sapforProfiles.Data.keySet()) {
((GlobalDatabase) Utils_.db).sapforProfiles.ShowUI(key);
if ((Global.mainModule.getDb()).sapforProfiles.size() > 0) {
for (Object key : (Global.mainModule.getDb()).sapforProfiles.Data.keySet()) {
(Global.mainModule.getDb()).sapforProfiles.ShowUI(key);
return;
}
} else {
((GlobalDatabase) Utils_.db).sapforProfiles.ShowUI();
(Global.mainModule.getDb()).sapforProfiles.ShowUI();
}
}
@Override
@@ -58,8 +59,8 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
return "Profiles"; //можно было бы через имя класса
}
public void LoadWindowParameters() throws Exception {
if (((GlobalDatabase) Utils_.db).forms.Data.containsKey(getFormKey())) {
info = ((GlobalDatabase) Utils_.db).forms.Data.get(getFormKey());
if ((Global.mainModule.getDb()).forms.Data.containsKey(getFormKey())) {
info = (Global.mainModule.getDb()).forms.Data.get(getFormKey());
info.Apply(this);
return;
}
@@ -68,8 +69,8 @@ public class ProfilesForm extends Dialog<Object, ProfilesFields> {
public void SaveWindowParameters() throws Exception {
if (info != null) {
info.Init(this);
Utils_.db.Update(info);
Global.mainModule.getDb().Update(info);
} else
Utils_.db.Insert(new DBForm(getFormKey(), this));
Global.mainModule.getDb().Insert(new DBForm(getFormKey(), this));
}
}

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

@@ -84,7 +84,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
UI.getDebugWindow().ShowAll();
ShowAllAnalyses();
ShowProjectView();
SwitchScreen(((GlobalDatabase) Utils_.db).settings.get(SettingName.SmallScreen).toBoolean());
SwitchScreen((Global.mainModule.getDb()).settings.get(SettingName.SmallScreen).toBoolean());
RefreshTabsNames();
//--
if (Global.properties.collapseProjectTrees)
@@ -294,7 +294,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
//--
@Override
public void CollapseProjectTrees() {
Utils_.db.splitters.get("SC3").position = SC3.getDividerLocation();
Global.mainModule.getDb().splitters.get("SC3").position = SC3.getDividerLocation();
//---
UI_.Clear(projectBackground);
projectBackground.add(fileBackground);
@@ -303,7 +303,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
public void ExpandProjectTrees() {
SC3.setLeftComponent(fileBackground);
projectBackground.add(SC3);
SC3.setDividerLocation(Utils_.db.splitters.get("SC3").position);
SC3.setDividerLocation(Global.mainModule.getDb().splitters.get("SC3").position);
SC3.updateUI();
}
}

7
src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java
View File

@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
@@ -82,10 +83,10 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
} else {
if (isReady()) {
if (getMaster().isReady()) {
boolean ExtensionsOn = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean();
boolean ExtensionsOn = (Global.mainModule.getDb()).settings.get(SettingName.ExtensionsOn).toBoolean();
String name1 = ExtensionsOn ? getMaster().file.file.getName() : Utils_.getFileNameWithoutExtension(getMaster().file.file);
String name2 = ExtensionsOn ? file.file.getName() : Utils_.getFileNameWithoutExtension(file.file);
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if ((Global.mainModule.getDb()).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (name1.equalsIgnoreCase(name2))
master.DoComparePass(true);
} else
@@ -155,7 +156,7 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
cbFile.setSelectedIndex(-1);
for (int i = 0; i < cbFile.getItemCount(); ++i) {
ProjectFile projectFile = cbFile.getItemAt(i);
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
if ((Global.mainModule.getDb()).settings.get(SettingName.ExtensionsOn).toBoolean()) {
//если учитываем расширения, ищем полное совпадение
if (projectFile.file.getName().equals(file_name)) {
cbFile.setSelectedIndex(i);

5
src/_VisualDVM/Visual/Windows/TasksComparisonForm.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.Visual.Windows;
import Common.Database.Objects.DBObject;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
@@ -29,7 +30,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
//в отличие от комбо боксов, тут события нажатия на кнопку, нет.
if (isReady()) {
if (slave.isReady()) {
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if ((Global.mainModule.getDb()).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
DoComparePass(true);
} else
DoShowPass(true);
@@ -40,7 +41,7 @@ public abstract class TasksComparisonForm<T extends DBObject> extends Comparison
} else {
if (isReady()) {
if (master.isReady()) {
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if ((Global.mainModule.getDb()).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
master.DoComparePass(true);
} else
master.DoShowPass(true);

40
src/_VisualDVM/Visual/Windows/TestingForm.java
View File

@@ -130,9 +130,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
SC65.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc65Listener);
SC66.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc66Listener);
//-
((GlobalDatabase) Utils_.db).machines.mountUI(machinesPanel);
((GlobalDatabase) Utils_.db).users.mountUI(usersPanel);
((GlobalDatabase) Utils_.db).compilers.mountUI(compilersPanel);
Global.mainModule.getDb().machines.mountUI(machinesPanel);
Global.mainModule.getDb().users.mountUI(usersPanel);
Global.mainModule.getDb().compilers.mountUI(compilersPanel);
//-
Global.testingServer.db.dvm_configurations.mountUI(configurationsPanel);
Global.testingServer.db.dvmPackages.mountUI(dvmPackagesPanel);
@@ -150,7 +150,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
//-
@Override
public void ShowAll() {
((GlobalDatabase) Utils_.db).machines.ShowUI();
Global.mainModule.getDb().machines.ShowUI();
Global.testingServer.db.dvm_configurations.ShowUI();
Global.testingServer.db.dvmPackages.ShowUI();
Global.testingServer.db.sapforPackages.ShowUI();
@@ -273,33 +273,33 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public void RestoreLastCredentials() {
Credentials credentials = (Credentials) Current_.get(Current.Credentials);
if (credentials.machine_id != CommonConstants.Nan) {
if (((GlobalDatabase) Utils_.db).machines.containsKey(credentials.machine_id)) {
((GlobalDatabase) Utils_.db).machines.ShowUI(credentials.machine_id);
if (((GlobalDatabase) Utils_.db).users.containsKey(credentials.user_id)) {
((GlobalDatabase) Utils_.db).users.ShowUI(credentials.user_id);
if (Global.mainModule.getDb().machines.containsKey(credentials.machine_id)) {
(Global.mainModule.getDb()).machines.ShowUI(credentials.machine_id);
if ((Global.mainModule.getDb()).users.containsKey(credentials.user_id)) {
(Global.mainModule.getDb()).users.ShowUI(credentials.user_id);
} else {
credentials.user_id = CommonConstants.Nan;
((GlobalDatabase) Utils_.db).UpdateCredentials();
(Global.mainModule.getDb()).UpdateCredentials();
}
if (((GlobalDatabase) Utils_.db).compilers.containsKey(credentials.compiler_id)) {
((GlobalDatabase) Utils_.db).compilers.ShowUI(credentials.compiler_id);
if ((Global.mainModule.getDb()).compilers.containsKey(credentials.compiler_id)) {
(Global.mainModule.getDb()).compilers.ShowUI(credentials.compiler_id);
} else {
credentials.compiler_id = CommonConstants.Nan;
((GlobalDatabase) Utils_.db).UpdateCredentials();
(Global.mainModule.getDb()).UpdateCredentials();
}
//-
if (((GlobalDatabase) Utils_.db).makefiles.containsKey(credentials.makefile_id)) {
((GlobalDatabase) Utils_.db).makefiles.ShowUI(credentials.makefile_id);
if ((Global.mainModule.getDb()).makefiles.containsKey(credentials.makefile_id)) {
(Global.mainModule.getDb()).makefiles.ShowUI(credentials.makefile_id);
} else {
credentials.makefile_id = CommonConstants.Nan;
((GlobalDatabase) Utils_.db).UpdateCredentials();
(Global.mainModule.getDb()).UpdateCredentials();
}
//-
if (((GlobalDatabase) Utils_.db).runConfigurations.containsKey(credentials.runconfiguration_id)) {
((GlobalDatabase) Utils_.db).runConfigurations.ShowUI(credentials.runconfiguration_id);
if ((Global.mainModule.getDb()).runConfigurations.containsKey(credentials.runconfiguration_id)) {
(Global.mainModule.getDb()).runConfigurations.ShowUI(credentials.runconfiguration_id);
} else {
credentials.runconfiguration_id = CommonConstants.Nan;
((GlobalDatabase) Utils_.db).UpdateCredentials();
(Global.mainModule.getDb()).UpdateCredentials();
}
} else {
credentials.machine_id = CommonConstants.Nan;
@@ -308,13 +308,13 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
credentials.remotesapfor_id = CommonConstants.Nan;
credentials.makefile_id = CommonConstants.Nan;
credentials.runconfiguration_id = CommonConstants.Nan;
((GlobalDatabase) Utils_.db).UpdateCredentials();
(Global.mainModule.getDb()).UpdateCredentials();
}
}
}
@Override
public void CollapseCredentials() {
Utils_.db.splitters.get("SC71").position = SC71.getDividerLocation();
Global.mainModule.getDb().splitters.get("SC71").position = SC71.getDividerLocation();
UI_.Clear(credentialsPanel);
credentialsPanel.add(UI.credentialsBar);
SC71.setDividerLocation(30);

9
src/_VisualDVM/Visual/Windows/VersionsComparisonForm.java
View File

@@ -1,6 +1,7 @@
package _VisualDVM.Visual.Windows;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.Settings.SettingName;
@@ -35,10 +36,10 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
} else {
if (isReady()) {
if (getMaster().isReady()) {
boolean ExtensionsOn = ((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean();
boolean ExtensionsOn = (Global.mainModule.getDb()).settings.get(SettingName.ExtensionsOn).toBoolean();
String name1 = ExtensionsOn ? getMaster().file.file.getName() : Utils_.getFileNameWithoutExtension(getMaster().file.file);
String name2 = ExtensionsOn ? file.file.getName() : Utils_.getFileNameWithoutExtension(file.file);
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if ((Global.mainModule.getDb()).settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
if (name1.equalsIgnoreCase(name2))
master.DoComparePass(true);
} else
@@ -83,7 +84,7 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
cbFile.setSelectedIndex(-1);
for (int i = 0; i < cbFile.getItemCount(); ++i) {
ProjectFile projectFile = cbFile.getItemAt(i);
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ExtensionsOn).toBoolean()) {
if ((Global.mainModule.getDb()).settings.get(SettingName.ExtensionsOn).toBoolean()) {
//если учитываем расширения, ищем полное совпадение
if (projectFile.file.getName().equals(file_in.file.getName())) {
cbFile.setSelectedIndex(i);
@@ -106,6 +107,6 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
}
@Override
protected boolean fortranWrapsOn() {
return ((GlobalDatabase) Utils_.db).settings.get(SettingName.FortranWrapsOn).toBoolean();
return (Global.mainModule.getDb()).settings.get(SettingName.FortranWrapsOn).toBoolean();
}
}