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

промежуточный. частичный рефакторинг с прицелом на библиотечную часть

Browse Source
This commit is contained in:
02090095
2024-10-07 00:58:29 +03:00
parent c211ffb82b
commit 6b1576461d
798 changed files with 3007 additions and 2344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/TestingSystem/Common/Configuration/Configuration.java
View File

@@ -1,8 +1,9 @@
package TestingSystem.Common.Configuration;
import Common.Database.DBObject;
import Common.Database.riDBObject;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Utils.CommonUtils;
import Common.Utils.TextLog;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Group.Json.GroupsJson;
import TestingSystem.Common.Settings.Json.SettingsArrayJson;
@@ -33,7 +34,7 @@ public class Configuration extends riDBObject {
autoTesting = (autoTesting == 0) ? 1 : 0;
}
public ImageIcon GetAutoIcon() {
return Utils.getIcon("/icons/" + (autoTesting == 1 ? "RedPick" : "NotPick") + ".png");
return Utils.getIcon("/Common/icons/" + (autoTesting == 1 ? "RedPick" : "NotPick") + ".png");
}
//--
@Description("DEFAULT ''")
@@ -44,13 +45,13 @@ public class Configuration extends riDBObject {
public String packedSettingsJson = "";
//--
public void saveGroupsAsJson(Vector<Group> groups) {
packedGroupsJson = Utils.jsonToPrettyFormat(Utils.gson.toJson(new GroupsJson(groups)));
packedGroupsJson = CommonUtils.gson.toJson(new GroupsJson(groups));
}
public void saveTestsAsJson(Vector<Test> tests) {
packedTestsJson = Utils.jsonToPrettyFormat(Utils.gson.toJson(new TestsJson(tests)));
packedTestsJson = CommonUtils.gson.toJson(new TestsJson(tests));
}
public void saveSettingsAsJson(Vector<Settings> settings) {
packedSettingsJson = Utils.jsonToPrettyFormat(Utils.gson.toJson(new SettingsArrayJson(settings)));
packedSettingsJson = CommonUtils.gson.toJson(new SettingsArrayJson(settings));
}
//--
@Override