временное сохранение последнийх выбранных машины юзера и компилятора в пропертиес. концепция пропертиес будет дорабатываться потом.
This commit is contained in:
@@ -13,7 +13,6 @@ import _VisualDVM.Visual.Interface.ProjectWindow;
|
||||
import _VisualDVM.Visual.Interface.TestingWindow;
|
||||
import _VisualDVM.Visual.Interface.TestsWindow;
|
||||
import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
|
||||
import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
|
||||
23
src/_VisualDVM/Visual/Windows/MainWindow.java
Normal file
23
src/_VisualDVM/Visual/Windows/MainWindow.java
Normal file
@@ -0,0 +1,23 @@
|
||||
package _VisualDVM.Visual.Windows;
|
||||
import _VisualDVM.Visual.Interface.CallbackWindow;
|
||||
import _VisualDVM.Visual.Interface.ProjectWindow;
|
||||
import _VisualDVM.Visual.Interface.TestingWindow;
|
||||
import _VisualDVM.Visual.Interface.TestsWindow;
|
||||
public interface MainWindow {
|
||||
void Show();
|
||||
void ShowProject();
|
||||
void ShowNoProject();
|
||||
ProjectWindow getProjectWindow();
|
||||
CallbackWindow getCallbackWindow();
|
||||
TestsWindow getTestsWindow();
|
||||
TestingWindow getTestingWindow();
|
||||
//-
|
||||
void ShowUpdatesIcon();
|
||||
void FocusProject();
|
||||
void FocusCallback();
|
||||
void FocusTests();
|
||||
void FocusTesting();
|
||||
void SwitchTestingTabs(boolean flag);
|
||||
//-
|
||||
void ShowCheckedTestsCount();
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
package _VisualDVM.Visual.Windows;
|
||||
import Common.CommonConstants;
|
||||
import Common.MainModule_;
|
||||
import Common.Visual.FormWithSplitters;
|
||||
import Common.Visual.TextField.StyledTextField;
|
||||
@@ -157,7 +158,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
||||
Global.testingServer.db.dvmSettings.ShowUI();
|
||||
Global.testingServer.db.sapforSettings.ShowUI();
|
||||
//---
|
||||
RestoreLastCredentials();
|
||||
Global.mainModule.getDb().RestoreCredentials();
|
||||
//---
|
||||
if (Global.properties.AutoCheckTesting)
|
||||
TestingServer.TimerOn();
|
||||
@@ -267,50 +268,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
||||
sapforPackageTreeMaster.DoComparePass();
|
||||
testingTabs.setSelectedIndex(3);
|
||||
}
|
||||
public void RestoreLastCredentials() {
|
||||
/*
|
||||
Credentials credentials = MainModule_.instance.getDb().getTable(Credentials.class).get;
|
||||
if (credentials.machine_id != CommonConstants.Nan) {
|
||||
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;
|
||||
(Global.mainModule.getDb()).UpdateCredentials();
|
||||
}
|
||||
if ((Global.mainModule.getDb()).compilers.containsKey(credentials.compiler_id)) {
|
||||
(Global.mainModule.getDb()).compilers.ShowUI(credentials.compiler_id);
|
||||
} else {
|
||||
credentials.compiler_id = CommonConstants.Nan;
|
||||
(Global.mainModule.getDb()).UpdateCredentials();
|
||||
}
|
||||
//-
|
||||
if ((Global.mainModule.getDb()).makefiles.containsKey(credentials.makefile_id)) {
|
||||
(Global.mainModule.getDb()).makefiles.ShowUI(credentials.makefile_id);
|
||||
} else {
|
||||
credentials.makefile_id = CommonConstants.Nan;
|
||||
(Global.mainModule.getDb()).UpdateCredentials();
|
||||
}
|
||||
//-
|
||||
if ((Global.mainModule.getDb()).runConfigurations.containsKey(credentials.runconfiguration_id)) {
|
||||
(Global.mainModule.getDb()).runConfigurations.ShowUI(credentials.runconfiguration_id);
|
||||
} else {
|
||||
credentials.runconfiguration_id = CommonConstants.Nan;
|
||||
(Global.mainModule.getDb()).UpdateCredentials();
|
||||
}
|
||||
} else {
|
||||
credentials.machine_id = CommonConstants.Nan;
|
||||
credentials.user_id = CommonConstants.Nan;
|
||||
credentials.compiler_id = CommonConstants.Nan;
|
||||
credentials.remotesapfor_id = CommonConstants.Nan;
|
||||
credentials.makefile_id = CommonConstants.Nan;
|
||||
credentials.runconfiguration_id = CommonConstants.Nan;
|
||||
(Global.mainModule.getDb()).UpdateCredentials();
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
@Override
|
||||
public void CollapseCredentials() {
|
||||
Global.mainModule.getDb().splitters.get("SC71").position = SC71.getDividerLocation();
|
||||
|
||||
Reference in New Issue
Block a user