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

16
.idea/workspace.xml generated
View File

@@ -7,25 +7,13 @@
</component> </component>
<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 afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/Kernels.png" afterDir="false" />
<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/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MenuBarButton.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MenuBarButton.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VisualiserMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TasksPackage/TasksPackageState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />

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

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

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

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

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

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

6
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.Form;
import Common.UI.Windows.FormType; import Common.UI.Windows.FormType;
import Common.Utils.Utils; import Common.Utils.Utils;
import GlobalData.Compiler.CompilerType;
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;
@@ -144,9 +145,8 @@ public class MainForm extends Form implements MainWindow {
testingForm.getContent(), testingForm.getContent(),
"Система тестирования", 4); "Система тестирования", 4);
} }
@Override
public void ShowCredentials() {
/* /*
public void ShowCurrentCompiler() {
String res = ""; String res = "";
if (Current.HasMachine()) { if (Current.HasMachine()) {
res += "@" + Current.getMachine().getURL(); res += "@" + Current.getMachine().getURL();
@@ -163,8 +163,8 @@ public class MainForm extends Form implements MainWindow {
res += "?@?"; res += "?@?";
} }
globalTabs.setTitleAt(2, res); globalTabs.setTitleAt(2, res);
*/
} }
*/
@Override @Override
public void ShowCheckedTestsCount() { public void ShowCheckedTestsCount() {
int res = 0; 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.Global;
import Common.UI.TextField.StyledTextField; import Common.UI.TextField.StyledTextField;
import Common.UI.UI; import Common.UI.UI;
import GlobalData.Compiler.CompilerType;
import TestingSystem.Common.TestingServer; import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.UI.Interface.FormWithSplitters; import Visual_DVM_2021.UI.Interface.FormWithSplitters;
import Visual_DVM_2021.UI.Interface.TestingWindow; import Visual_DVM_2021.UI.Interface.TestingWindow;
@@ -181,4 +182,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public void FocusSapforTesting() { public void FocusSapforTesting() {
testingTabs.setSelectedIndex(1); 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);
}
} }