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
2025-03-13 00:32:20 +03:00
parent 91e40c4393
commit 1d97048de1
204 changed files with 984 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
View File

@@ -146,7 +146,7 @@ public class Configuration extends riDBObject {
ConfigurationCache unpacked = new ConfigurationCache(this);
List<TestJson> actualTests = new Vector<>();
for (TestJson testJson : unpacked.testsJson.array) {
if (testJson.id==test.id)
if (testJson.id == test.id)
flag = true;
else actualTests.add(testJson);
}

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

@@ -5,7 +5,6 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -51,5 +50,5 @@ public class GroupsDBTable extends iDBTable<Group> {
}
return null;
}
// CheckCurrent(Log) && Global.mainModule.getAccount().CheckAuthorship(getCurrent().sender_address, Log);
// CheckCurrent(Log) && Global.mainModule.getAccount().CheckAuthorship(getCurrent().sender_address, Log);
}

8
src/_VisualDVM/TestingSystem/Common/Group/UI/GroupDialog.java
View File

@@ -33,8 +33,10 @@ public class GroupDialog extends DBObjectDialog<Group, GroupFields> {
}
@Override
public void SetReadonly() {
fields.tfName.setEnabled(false);
fields.cbType.setEnabled(false);;
fields.cbLanguage.setEnabled(false);;
fields.tfName.setEnabled(false);
fields.cbType.setEnabled(false);
;
fields.cbLanguage.setEnabled(false);
;
}
}

9
src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
View File

@@ -1,10 +1,11 @@
package _VisualDVM.TestingSystem.Common.Group.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Utils.TextLog;
import Common.Visual.*;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Controls.StableMenuItem;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.FilterFlag;
import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.HeaderTextFilter;
@@ -15,9 +16,10 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class GroupsForm extends DataSetControlForm<Group> {
public class GroupsForm extends RDataSetControlForm<Group> {
public static boolean filterMyOnly = false;
public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
@@ -121,7 +123,6 @@ public class GroupsForm extends DataSetControlForm<Group> {
protected DBObjectDialog getDialog() {
return new GroupDialog();
}
@Override
protected boolean isObjectEditable(Group object) {
if (Global.mainModule.getAccount().CheckRegistered(null)) {

1
src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java
View File

@@ -5,7 +5,6 @@ import Common.Utils.Utils_;
import _VisualDVM.*;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.PackageCredentials.DVMPackageCredentials;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.net.InetAddress;

3
src/_VisualDVM/TestingSystem/Common/MachinesDatabase.java
View File

@@ -1,9 +1,6 @@
package _VisualDVM.TestingSystem.Common;
import Common.Database.SQLITE.SQLiteDatabase;
import Common.Passes.PassCode_;
import _VisualDVM.GlobalData.Machine.MachinesDBTable;
import _VisualDVM.GlobalData.User.UsersDBTable;
import _VisualDVM.TestingSystem.DVM.PackageCredentials.DVMPackageCredentials;
import _VisualDVM.TestingSystem.DVM.PackageCredentials.DVMPackagesCredentialsDBTable;
import java.nio.file.Paths;

1
src/_VisualDVM/TestingSystem/Common/Settings/Settings.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.TestingSystem.Common.Settings;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.TextLog;
//предопределенный набор настроек тестируемой системы. сохраняется для упрощения.

9
src/_VisualDVM/TestingSystem/Common/Test/Test.java
View File

@@ -2,13 +2,10 @@ package _VisualDVM.TestingSystem.Common.Test;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Database.RepositoryRefuseException;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.Passes.All.ZipFolderPass;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
@@ -30,7 +27,7 @@ public class Test extends riDBObject {
@Description("DEFAULT -1")
public int group_id = CommonConstants.Nan;
@Description("DEFAULT ''")
public String extended_description="";
public String extended_description = "";
@Description("DEFAULT ''")
public String packedFilesJson = "";
//--------------------------------------------->>>
@@ -53,7 +50,7 @@ public class Test extends riDBObject {
args = t.args;
group_id = t.group_id;
extended_description = t.extended_description;
packedFilesJson=t.packedFilesJson;
packedFilesJson = t.packedFilesJson;
}
@Override
public void select(boolean flag) {
@@ -110,7 +107,7 @@ public class Test extends riDBObject {
res.put(LanguageName.c, new Vector<>());
res.put(LanguageName.cpp, new Vector<>());
//--
TestFilesJson json = Utils_.gson.fromJson(packedFilesJson,TestFilesJson.class);
TestFilesJson json = Utils_.gson.fromJson(packedFilesJson, TestFilesJson.class);
for (TestFileJson file : json.values) {
//--
if (file.type.equals(FileType.program) &&

5
src/_VisualDVM/TestingSystem/Common/Test/UI/TestDialog.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.Common.Group.Group;
@@ -25,7 +24,7 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
+
Global.testingServer.db.getTable(Group.class).getUI().getCurrent().language);
}
Utils.validateFileShortNewName(fields.tfName.getText(),Log);
Utils.validateFileShortNewName(fields.tfName.getText(), Log);
}
@Override
public void fillFields() {
@@ -37,7 +36,7 @@ public class TestDialog extends DBObjectDialog<Test, TestFields> {
@Override
public void ProcessResult() {
Result.description = fields.tfName.getText();
Result.extended_description=fields.taExtendedDescription.getText();
Result.extended_description = fields.taExtendedDescription.getText();
Result.min_dim = (int) fields.sMinDim.getValue();
Result.max_dim = (int) fields.sMaxDim.getValue();
if (!edit) {

11
src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.Common.Test.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.HeaderTextFilter;
@@ -13,9 +12,10 @@ import _VisualDVM.ServerObjectsCache.TestCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class TestsForm extends DataSetControlForm<Test> {
public class TestsForm extends RDataSetControlForm<Test> {
public TestsForm(DataSet<?, Test> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -31,7 +31,7 @@ public class TestsForm extends DataSetControlForm<Test> {
new ColumnInfo<Test>("описание") {
@Override
public Object getFieldAt(Test object) {
return object.extended_description.replace("\n",";\n");
return object.extended_description.replace("\n", ";\n");
}
@Override
public Class getRendererClass() {
@@ -47,7 +47,7 @@ public class TestsForm extends DataSetControlForm<Test> {
new ColumnInfo<Test>("файлы") {
@Override
public Object getFieldAt(Test object) {
return ((TestCache)VisualCaches.GetCache(object)).srcNames;
return ((TestCache) VisualCaches.GetCache(object)).srcNames;
}
}
);
@@ -61,7 +61,7 @@ public class TestsForm extends DataSetControlForm<Test> {
return new DataMenuBar(dataSource.getPluralDescription()) {
{
addMenus(new AddTestMenu(), new EditTestMenu());
addPasses(PassCode.DetectSelectedTestsMinMaDim,PassCode.DownloadTest, PassCode.DeleteTest);
addPasses(PassCode.DetectSelectedTestsMinMaDim, PassCode.DownloadTest, PassCode.DeleteTest);
}
};
}
@@ -74,7 +74,6 @@ public class TestsForm extends DataSetControlForm<Test> {
protected DBObjectDialog getDialog() {
return new TestDialog();
}
@Override
protected boolean isObjectEditable(Test object) {
if (Global.mainModule.getAccount().CheckRegistered(null)) {

9
src/_VisualDVM/TestingSystem/Common/TestingClient.java
View File

@@ -1,15 +1,6 @@
package _VisualDVM.TestingSystem.Common;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.RepositoryPass;
import _VisualDVM.Repository.Server.RepositoryServerClient;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import java.io.FileWriter;
import java.io.Serializable;
import java.util.Date;
public abstract class TestingClient extends RepositoryServerClient<TestingServer> {
@Override
protected TestingServer getServer() {

6
src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
View File

@@ -25,9 +25,6 @@ public abstract class TestingPackage<J> extends riDBObject {
public int progress = 0; //прогресс выполнения
public long StartDate = 0;
public long ChangeDate = 0;
public long getMilliseconds() {
return ((StartDate != 0) && (ChangeDate != 0)) ? ChangeDate - StartDate : 0;
}
@Description("DEFAULT 0")
public int connectionErrosCount = 0;
public TasksPackageState state = TasksPackageState.Draft;
@@ -41,6 +38,9 @@ public abstract class TestingPackage<J> extends riDBObject {
}
public TestingPackage() {
}
public long getMilliseconds() {
return ((StartDate != 0) && (ChangeDate != 0)) ? ChangeDate - StartDate : 0;
}
//--
@Override
public void SynchronizeFields(DBObject src) {

8
src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
View File

@@ -159,11 +159,9 @@ public abstract class TestingPlanner<P extends TestingPackage> extends TestingCl
Kill();
UpdatePackageState(TasksPackageState.Aborted);
ServerCommand(ServerCode.DeleteObjectByPK, new Pair(TestingPackageToKill.class, ptk_id));
}
else if (checkIfPaused()) {
} else if (checkIfPaused()) {
UpdatePackageState(TasksPackageState.Paused);
}
else {
} else {
//--
switch (testingPackage.state) {
case TestsSynchronize:
@@ -184,7 +182,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends TestingCl
UpdatePackageState(TasksPackageState.Analysis);
break;
case Paused:
if (!checkIfPaused()&&CheckNextState())
if (!checkIfPaused() && CheckNextState())
UpdatePackage();
break;
default:

28
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -69,19 +69,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
super(TestsDatabase.class);
name = Utils_.getDateName("testingServer");
}
@Override
public void StartAction() throws Exception {
try {
machines_db = new MachinesDatabase();
machines_db.Activate();
} catch (Exception ex) {
ex.printStackTrace();
}
}
@Override
protected void extraBackup(File todayBackUp) {
zip.Do("Tests", new File(todayBackUp, "Tests.zip").getAbsolutePath());
}
public static void TimerOn() {
checkTimer = new Timer(Global.normalProperties.CheckTestingIntervalSeconds * 1000, e -> {
Global.mainModule.getPass(PassCode.ActualizePackages).Do();
@@ -97,6 +84,19 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
TimerOn();
}
@Override
public void StartAction() throws Exception {
try {
machines_db = new MachinesDatabase();
machines_db.Activate();
} catch (Exception ex) {
ex.printStackTrace();
}
}
@Override
protected void extraBackup(File todayBackUp) {
zip.Do("Tests", new File(todayBackUp, "Tests.zip").getAbsolutePath());
}
@Override
public void afterPublishAction(DBObject object) throws Exception {
if (object instanceof Test) {
Test test = (Test) object;
@@ -306,7 +306,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
Log.toString()
);
for (String address : Constants.admins_mails)
EmailMessagesQueue.add(new Pair<>(address,message));
EmailMessagesQueue.add(new Pair<>(address, message));
}
void DownloadTest() throws Exception {
int test_id = Integer.parseInt(request.arg);

13
src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.All.ZipFolderPass;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ServerObjectsCache.VisualCaches;
@@ -204,9 +203,9 @@ public class TestsDatabase extends SQLiteDatabase {
test.sender_name = account.name;
test.sender_address = account.email;
test.group_id = group.id;
TestFilesJson testFilesJson=new TestFilesJson();
TestFilesJson testFilesJson = new TestFilesJson();
testFilesJson.values.add(new TestFileJson(new ProjectFile(file)));
test.packedFilesJson=Utils_.gson.toJson(testFilesJson);
test.packedFilesJson = Utils_.gson.toJson(testFilesJson);
Insert(test);
//->>
SaveTestFromSingleFile(sapfor, group, test, file);
@@ -282,8 +281,8 @@ public class TestsDatabase extends SQLiteDatabase {
}
return null;
}
public ServerSapfor getSapforForVersion(String version_in){
for (ServerSapfor serverSapfor: serverSapfors.Data.values()){
public ServerSapfor getSapforForVersion(String version_in) {
for (ServerSapfor serverSapfor : serverSapfors.Data.values()) {
if (serverSapfor.version.equals(version_in))
return serverSapfor;
}
@@ -319,7 +318,7 @@ public class TestsDatabase extends SQLiteDatabase {
//todo возможно рассмотреть вариант с синхроннизацией тестов для пакетов через команду серверу а не в нити
//во избежание конфликта доступа,или удалением тестов во время копирования(?)
@Override
public void DropUI(){
public void DropUI() {
super.DropUI();
dvmConfigurations.ClearUI();
groups.ClearUI();
@@ -331,7 +330,7 @@ public class TestsDatabase extends SQLiteDatabase {
dvmSettings.ClearUI();
}
@Override
public void ResetUI(){
public void ResetUI() {
VisualCaches.ClearDataForClass(DVMConfiguration.class);
VisualCaches.ClearDataForClass(SapforConfiguration.class);
VisualCaches.ClearDataForClass(DVMPackage.class);