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-08 22:33:49 +03:00
parent 90546fc62e
commit e0974fe4a8
246 changed files with 1170 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/TestingSystem/Common/Group/Group.java
View File

@@ -1,5 +1,6 @@
package TestingSystem.Common.Group;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
@@ -45,7 +46,7 @@ public class Group extends riDBObject {
@Override
public void select(boolean flag) {
super.select(flag);
if (CommonUtils.hasUI())
if (CommonUI.isActive())
UI.getMainWindow().ShowCheckedTestsCount();
}
//--

2
src/TestingSystem/Common/Group/GroupsDBTable.java
View File

@@ -2,7 +2,7 @@ package TestingSystem.Common.Group;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;

2
src/TestingSystem/Common/Group/UI/GroupFields.java
View File

@@ -1,6 +1,6 @@
package TestingSystem.Common.Group.UI;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import ProjectData.LanguageName;
import TestingSystem.Common.Test.TestType;

4
src/TestingSystem/Common/MachineProcess/MachineProcess.java
View File

@@ -33,7 +33,7 @@ public class MachineProcess extends DBObject {
userName = p.user_name;
userPassword = p.user_password;
userWorkspace = p.user_workspace;
testingSystemRoot = CommonUtils.Home;
testingSystemRoot =CommonUtils.getHomePath();
serverName = Global.testingServer.name;
id = CommonUtils.getDateName(machineAddress + "_" + machinePort + "_" + userName);
}
@@ -96,7 +96,7 @@ public class MachineProcess extends DBObject {
File workspace = getWorkspace();
Utils.CheckAndCleanDirectory(workspace);
//копирование визуализатора
File src = new File(CommonUtils.Home, "TestingSystem.jar");
File src = new File(CommonUtils.getHomeDirectory(), "TestingSystem.jar");
File supervisor = new File(workspace, "VisualSapfor.jar");
FileUtils.copyFile(src, supervisor);
//создание настроек

2
src/TestingSystem/Common/TasksPackageState.java
View File

@@ -1,6 +1,6 @@
package TestingSystem.Common;
import Common.Visual.StatusEnum;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.Fonts.VisualiserFonts;
import java.util.Arrays;
import java.util.Vector;

3
src/TestingSystem/Common/Test/Test.java
View File

@@ -1,6 +1,7 @@
package TestingSystem.Common.Test;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
@@ -53,7 +54,7 @@ public class Test extends riDBObject {
@Override
public void select(boolean flag) {
super.select(flag);
if (CommonUtils.hasUI())
if (CommonUI.isActive())
UI.getMainWindow().ShowCheckedTestsCount();
}
//---

2
src/TestingSystem/Common/Test/TestDBTable.java
View File

@@ -2,7 +2,7 @@ package TestingSystem.Common.Test;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.UI.TestFields;

2
src/TestingSystem/Common/Test/UI/TestFields.java
View File

@@ -1,6 +1,6 @@
package TestingSystem.Common.Test.UI;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

9
src/TestingSystem/Common/TestingBar.java
View File

@@ -1,11 +1,10 @@
package TestingSystem.Common;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Visual.CommonUI;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.UI.Menus_2023.VisualiserMenuBar;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.UI;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import javax.swing.*;
@@ -76,13 +75,13 @@ public class TestingBar extends VisualiserMenuBar {
sCheckTime.setMaximumSize(new Dimension(60, 26));
sCheckTime.setModel(new SpinnerNumberModel(Global.properties.CheckTestingIntervalSeconds, 10, 3600, 1));
sCheckTime.setValue(Global.properties.CheckTestingIntervalSeconds);
UI.MakeSpinnerRapid(sCheckTime, e -> {
CommonUI.MakeSpinnerRapid(sCheckTime, e -> {
Global.properties.updateField("CheckTestingIntervalSeconds", sCheckTime.getValue());
if (Global.properties.AutoCheckTesting) TestingServer.ResetTimer();
});
add(new JLabel(" сек ") {
{
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
}
});
addSeparator();

9
src/TestingSystem/Common/TestingPlanner.java
View File

@@ -187,7 +187,6 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
//---
public TestingPlanner(){}
public TestingPlanner(String... args) {
CommonUtils.isWindows = System.getProperty("os.name").startsWith("Windows");
//---
String machineAddress = args[0];
int machinePort = Integer.parseInt(args[1]);
@@ -196,7 +195,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
String userWorkspace = args[4];
String testingSystemRoot = args[5];
serverName = args[6];
supervisorHome = new File(CommonUtils.Home); //при инициализации это текущая папка.
supervisorHome = CommonUtils.getHomeDirectory(); //при инициализации это текущая папка.
//---
CommonUtils.MainLog = new Loggable() {
@Override
@@ -205,12 +204,12 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
}
@Override
public String getLogName() {
return CommonUtils.mode.toString();
return Global.mode.toString();
}
};
CommonUtils.MainLog.ClearLog();
//--
CommonUtils.Home = testingSystemRoot;
CommonUtils.setHomePath(testingSystemRoot);
Global.CheckTestingSystemDirectories();
//---
machine = new Machine(machineAddress, machineAddress, machinePort, MachineType.Server);
@@ -221,7 +220,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
Print("userName=" + CommonUtils.Brackets(userName));
Print("userPassword=" + CommonUtils.Brackets(userPassword));
Print("userWorkspace=" + CommonUtils.Brackets(userWorkspace));
Print("root=" + CommonUtils.Brackets(CommonUtils.Home));
Print("root=" + CommonUtils.Brackets(CommonUtils.getHomePath()));
Print("serverName=" + serverName);
Print("=====");
//----