M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

восстановил отображение текущей двм системы на вкладке

Browse Source
This commit is contained in:
02090095
2023-12-11 18:52:23 +03:00
parent 12e963ca1b
commit 953ff522d5
8 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
View File

@@ -17,7 +17,6 @@ public interface MainWindow {
void FocusTesting();
void SwitchTestingTabs(boolean flag);
//-
void ShowCredentials();
void ShowCheckedTestsCount();
void FocusCredentials();
}

4
src/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -119,12 +119,12 @@ public class CompilersDBTable extends iDBTable<Compiler> {
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
UI.getMainWindow().ShowCredentials();
UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
UI.getMainWindow().ShowCredentials();
UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
}
};
}

4
src/GlobalData/Machine/MachinesDBTable.java
View File

@@ -83,13 +83,13 @@ public class MachinesDBTable extends iDBTable<Machine> {
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
UI.getMainWindow().ShowCredentials();
UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
UI.testingBar.ShowMachine();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
UI.getMainWindow().ShowCredentials();
UI.getMainWindow().getTestingWindow().ShowCurrentCompiler();
UI.testingBar.ShowNoMachine();
}
@Override

4
src/GlobalData/User/UsersDBTable.java
View File

@@ -76,13 +76,13 @@ public class UsersDBTable extends iDBTable<User> {
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
UI.getMainWindow().ShowCredentials();
// UI.getMainWindow().ShowCurrentCompiler();
UI.testingBar.ShowUser();
}
@Override
public void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
UI.getMainWindow().ShowCredentials();
// UI.getMainWindow().ShowCurrentCompiler();
UI.testingBar.ShowNoUser();
}

1
src/Visual_DVM_2021/UI/Interface/TestingWindow.java
View File

@@ -17,4 +17,5 @@ public interface TestingWindow extends VisualizerForm {
void ShowNoSapforPackageVersionEtalon();
void ShowNoSapforPackageVersion();
void FocusSapforTesting();
void ShowCurrentCompiler();
}

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

@@ -6,6 +6,7 @@ import Common.UI.UI;
import Common.UI.Windows.Form;
import Common.UI.Windows.FormType;
import Common.Utils.Utils;
import GlobalData.Compiler.CompilerType;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -144,9 +145,8 @@ public class MainForm extends Form implements MainWindow {
testingForm.getContent(),
"Система тестирования", 4);
}
@Override
public void ShowCredentials() {
/*
/*
public void ShowCurrentCompiler() {
String res = "";
if (Current.HasMachine()) {
res += "@" + Current.getMachine().getURL();
@@ -163,8 +163,8 @@ public class MainForm extends Form implements MainWindow {
res += "?@?";
}
globalTabs.setTitleAt(2, res);
*/
}
*/
@Override
public void ShowCheckedTestsCount() {
int res = 0;

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

@@ -3,6 +3,7 @@ import Common.Current;
import Common.Global;
import Common.UI.TextField.StyledTextField;
import Common.UI.UI;
import GlobalData.Compiler.CompilerType;
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.UI.Interface.FormWithSplitters;
import Visual_DVM_2021.UI.Interface.TestingWindow;
@@ -181,4 +182,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public void FocusSapforTesting() {
testingTabs.setSelectedIndex(1);
}
@Override
public void ShowCurrentCompiler() {
String title = (Current.HasCompiler() && Current.getCompiler().type.equals(CompilerType.dvm))?
"DVM система: " + Current.getCompiler().description: "DVM система: ?";
testingTabs.setTitleAt(0, title);
}
}