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

Двоеточия в счетчиках таблиц. Исправление бага с неотображением версий при загрузке базы.

Browse Source
This commit is contained in:
02090095
2023-11-13 17:12:16 +03:00
parent 84f87ca957
commit 7506a41499
13 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
.idea/workspace.xml generated
View File

@@ -7,15 +7,20 @@
</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/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/Тестирование.pptx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java" 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$/src/SapforTestingSystem/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DataMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DataMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.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/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/GlobalData/Account/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Account/Account.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

2
src/Common/Global.java
View File

@@ -192,7 +192,7 @@ public class Global {
public static void RefreshUpdatesStatus() { public static void RefreshUpdatesStatus() {
Components.RefreshUI(); Components.RefreshUI();
ValidateComponentsStates(); ValidateComponentsStates();
if (UI.HasNewMainWindow()) if (UI.HasMainWindow())
UI.getMainWindow().ShowUpdatesIcon(); UI.getMainWindow().ShowUpdatesIcon();
} }
public static boolean ValidateComponentsStates() { public static boolean ValidateComponentsStates() {

2
src/Common/UI/Menus_2023/DataMenuBar.java
View File

@@ -15,7 +15,7 @@ public class DataMenuBar extends VisualiserMenuBar {
//- //-
public DataMenuBar(String dataName, PassCode_2021... passes) { public DataMenuBar(String dataName, PassCode_2021... passes) {
// Font font = Current.getTheme().Fonts.get(VisualiserFonts.TreeBoldItalic).deriveFont(12.0F); // Font font = Current.getTheme().Fonts.get(VisualiserFonts.TreeBoldItalic).deriveFont(12.0F);
add(new JLabel(dataName + " ")); add(new JLabel(dataName + " : "));
add(countLabel = new JLabel("?")); add(countLabel = new JLabel("?"));
addPasses(passes); addPasses(passes);
} }

2
src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java
View File

@@ -3,6 +3,6 @@ import Common.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021; import Visual_DVM_2021.Passes.PassCode_2021;
public class ServerSapforsBar extends DataMenuBar { public class ServerSapforsBar extends DataMenuBar {
public ServerSapforsBar() { public ServerSapforsBar() {
super("SAPFOR", PassCode_2021.InstallServerSapfor, PassCode_2021.DeleteServerSapfor); super("версии SAPFOR", PassCode_2021.InstallServerSapfor, PassCode_2021.DeleteServerSapfor);
} }
} }

2
src/Common/UI/UI.java
View File

@@ -157,7 +157,7 @@ public class UI {
public static ComponentsForm getComponentsWindow() { public static ComponentsForm getComponentsWindow() {
return (ComponentsForm) windows.get(FormType.Components); return (ComponentsForm) windows.get(FormType.Components);
} }
public static boolean HasNewMainWindow() { public static boolean HasMainWindow() {
return getMainWindow() != null; return getMainWindow() != null;
} }
public static SearchReplaceForm getSearchReplaceForm() { public static SearchReplaceForm getSearchReplaceForm() {

2
src/GlobalData/Account/Account.java
View File

@@ -17,7 +17,7 @@ public class Account extends DBObject {
if (role.equals(AccountRole.Undefined)) { if (role.equals(AccountRole.Undefined)) {
if (Log != null) { if (Log != null) {
Log.Writeln("Пользователь не зарегистрирован"); Log.Writeln("Пользователь не зарегистрирован");
if (UI.HasNewMainWindow()) if (UI.HasMainWindow())
UI.getMainWindow().FocusCallback(); UI.getMainWindow().FocusCallback();
} }
return false; return false;

2
src/Repository/Component/Visualiser.java
View File

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override @Override
public void GetVersionInfo() { public void GetVersionInfo() {
version = 1025; version = 1026;
String pattern = "MMM dd yyyy HH:mm:ss"; String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH); DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime()); date_text = df.format(getClassBuildTime());

2
src/Repository/RepositoryServer.java
View File

@@ -284,6 +284,8 @@ public abstract class RepositoryServer<D extends Database> {
case GetObjectsCopiesByPK: case GetObjectsCopiesByPK:
Print("Получить список копий объектов по ключам"); Print("Получить список копий объектов по ключам");
p = (Pair<Class, Object>) request.object; p = (Pair<Class, Object>) request.object;
System.out.println(p.getKey());
System.out.println(p.getValue());
response = new ServerExchangeUnit_2021(ServerCode.OK); response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object = db.getObjectsCopies(p.getKey(), (Vector<Object>) p.getValue()); response.object = db.getObjectsCopies(p.getKey(), (Vector<Object>) p.getValue());
break; break;

10
src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
View File

@@ -43,18 +43,24 @@ public class SapforTasksPackageSupervisor {
Vector<String> groupsIds = new Vector<>(); Vector<String> groupsIds = new Vector<>();
LinkedHashMap<String, Group> groups = new LinkedHashMap<>(); LinkedHashMap<String, Group> groups = new LinkedHashMap<>();
//-- //--
System.out.println(sapforTasksPackage.id + " — TestsSynchronize");
System.out.println("configurations size =" + configurations_.size());
System.out.println("tests size =" + tests_.size());
for (String test_id : testsIds) {
System.out.println(Utils.Brackets(test_id));
}
System.out.println("=======");
for (Object o : tests_) { for (Object o : tests_) {
Test test = (Test) o; Test test = (Test) o;
System.out.println(test.description);
tests.put(test.id, test); tests.put(test.id, test);
if (!groupsIds.contains(test.group_id)) if (!groupsIds.contains(test.group_id))
groupsIds.add(test.group_id); groupsIds.add(test.group_id);
} }
//-- //--
Vector<Object> groups_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(Group.class, groupsIds)); Vector<Object> groups_ = (Vector<Object>) planner.ServerCommand(ServerCode.GetObjectsCopiesByPK, "", new Pair<>(Group.class, groupsIds));
System.out.println("groups size =" + groups_.size());
for (Object o : groups_) { for (Object o : groups_) {
Group group = (Group) o; Group group = (Group) o;
System.out.println(group.description);
groups.put(group.id, group); groups.put(group.id, group);
} }
//-- //--

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

@@ -57,7 +57,7 @@ public class CloseCurrentProject extends Pass_2021<db_project_info> {
} }
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
if (UI.HasNewMainWindow()) { if (UI.HasMainWindow()) {
UI.getMainWindow().ShowNoProject(); UI.getMainWindow().ShowNoProject();
UI.getVersionsWindow().ShowNoProjectVariants(); UI.getVersionsWindow().ShowNoProjectVariants();
UI.getVersionsWindow().BlockVariants(); UI.getVersionsWindow().BlockVariants();

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

@@ -45,7 +45,7 @@ public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
} }
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
if (UI.HasNewMainWindow()) { if (UI.HasMainWindow()) {
UI.getMainWindow().getCallbackWindow().ShowBugReports(); UI.getMainWindow().getCallbackWindow().ShowBugReports();
Global.componentsServer.db.bugReports.RestoreLastSelections(); Global.componentsServer.db.bugReports.RestoreLastSelections();
} }

5
src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
View File

@@ -28,7 +28,7 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
server.db.configurations.ClearUI(); server.db.configurations.ClearUI();
server.db.groups.ClearUI(); server.db.groups.ClearUI();
server.db.sapforConfigurations.ClearUI(); server.db.sapforConfigurations.ClearUI();
// server.db.sapforTasksPackages.ClearUI(); server.db.serverSapfors.ClearUI();
} }
@Override @Override
protected void ServerAction() throws Exception { protected void ServerAction() throws Exception {
@@ -48,10 +48,11 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
} }
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
if (UI.HasNewMainWindow()) { if (UI.HasMainWindow()) {
server.db.configurations.ShowUI(); server.db.configurations.ShowUI();
server.db.groups.ShowUI(); server.db.groups.ShowUI();
server.db.sapforConfigurations.ShowUI(); server.db.sapforConfigurations.ShowUI();
server.db.serverSapfors.ShowUI();
server.db.RestoreLastSelections(); server.db.RestoreLastSelections();
UI.getMainWindow().ShowCheckedTestsCount(); UI.getMainWindow().ShowCheckedTestsCount();
} }

BIN
Тестирование.pptx Normal file
View File

Binary file not shown.