промежуточный. частичный рефакторинг с прицелом на библиотечную часть
This commit is contained in:
@@ -1,10 +1,6 @@
|
||||
package TestingSystem.DVM.DVMConfiguration;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Utils.Utils;
|
||||
import GlobalData.RunConfiguration.RunConfiguration;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import TestingSystem.Common.Configuration.Configuration;
|
||||
|
||||
import java.util.Vector;
|
||||
//конфгурация тестирования ДВМ
|
||||
public class DVMConfiguration extends Configuration {
|
||||
public int c_maxtime = 40;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package TestingSystem.DVM.DVMConfiguration;
|
||||
import Common.Current;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Database.iDBTable;
|
||||
import Common.UI.DataSetControlForm;
|
||||
import Common.UI.Tables.TableRenderers;
|
||||
import Common.UI.VisualCache.ConfigurationCache;
|
||||
import Common.UI.VisualCache.VisualCaches;
|
||||
import Common.UI.Windows.Dialog.DBObjectDialog;
|
||||
import Common_old.Current;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import Common_old.UI.DataSetControlForm;
|
||||
import Common_old.UI.Tables.TableRenderers;
|
||||
import Common_old.UI.VisualCache.ConfigurationCache;
|
||||
import Common_old.UI.VisualCache.VisualCaches;
|
||||
import Common_old.UI.Windows.Dialog.DBObjectDialog;
|
||||
import TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
|
||||
public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
|
||||
public DVMConfigurationDBTable() {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package TestingSystem.DVM.DVMConfiguration;
|
||||
import Common.UI.Menus_2023.DataMenuBar;
|
||||
import Common_old.UI.Menus_2023.DataMenuBar;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
public class DVMConfigurationsMenuBar extends DataMenuBar {
|
||||
public DVMConfigurationsMenuBar() {
|
||||
|
||||
@@ -1,17 +1,10 @@
|
||||
package TestingSystem.DVM.DVMConfiguration.UI;
|
||||
import Common.Current;
|
||||
import Common.Global;
|
||||
import Common.UI.VisualiserStringList;
|
||||
import Common.UI.TextField.StyledTextField;
|
||||
import Common.UI.Windows.Dialog.DialogFields;
|
||||
import Common.Utils.Utils;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.Pass_2021;
|
||||
import Common_old.UI.TextField.StyledTextField;
|
||||
import Common_old.UI.Windows.Dialog.DialogFields;
|
||||
import Common_old.Utils.Utils;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
public class ConfigurationFields implements DialogFields {
|
||||
public JTextField tfName;
|
||||
public JSpinner sCompilationMaxtime;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package TestingSystem.DVM.DVMPackage;
|
||||
import Common.Constants;
|
||||
import Common.Current;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Global;
|
||||
import Common.UI.VisualCache.DVMConfigurationCache;
|
||||
import Common.UI.VisualCache.VisualCaches;
|
||||
import Common_old.Constants;
|
||||
import Common_old.Current;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.VisualCache.DVMConfigurationCache;
|
||||
import Common_old.UI.VisualCache.VisualCaches;
|
||||
import GlobalData.Account.Account;
|
||||
import GlobalData.Compiler.Compiler;
|
||||
import GlobalData.Machine.Machine;
|
||||
@@ -17,7 +17,6 @@ import TestingSystem.Common.TestingPackage.TestingPackage;
|
||||
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||
import TestingSystem.DVM.DVMSettings.DVMSettings;
|
||||
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
|
||||
import TestingSystem.DVM.DVMTasks.DVMRunTask;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Vector;
|
||||
|
||||
@@ -1,19 +1,18 @@
|
||||
package TestingSystem.DVM.DVMPackage;
|
||||
import Common.Current;
|
||||
import Common.Database.iDBTable;
|
||||
import Common.Global;
|
||||
import Common.UI.DataSetControlForm;
|
||||
import Common.UI.UI;
|
||||
import Common.UI.VisualCache.PackageCache;
|
||||
import Common.UI.VisualCache.VisualCache;
|
||||
import Common.UI.VisualCache.VisualCaches;
|
||||
import Common_old.Current;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.DataSetControlForm;
|
||||
import Common_old.UI.UI;
|
||||
import Common_old.UI.VisualCache.PackageCache;
|
||||
import Common_old.UI.VisualCache.VisualCaches;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.Pass_2021;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
|
||||
import static Common.UI.Tables.TableRenderers.*;
|
||||
import static Common_old.UI.Tables.TableRenderers.*;
|
||||
public class DVMPackageDBTable extends iDBTable<DVMPackage> {
|
||||
public static boolean filterMyOnly = false;
|
||||
public static boolean filterActive = false;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package TestingSystem.DVM.DVMPackage;
|
||||
import Common.Global;
|
||||
import Common.UI.Menus_2023.DataMenuBar;
|
||||
import Common.UI.Menus_2023.MenuBarButton;
|
||||
import Common.Utils.Utils;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.UI.Menus_2023.DataMenuBar;
|
||||
import Common_old.UI.Menus_2023.MenuBarButton;
|
||||
import Common_old.Utils.Utils;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
|
||||
import javax.swing.*;
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
package TestingSystem.DVM.DVMSettings;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import GlobalData.RunConfiguration.RunConfiguration;
|
||||
import TestingSystem.Common.Settings.Settings;
|
||||
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||
import com.sun.org.glassfish.gmbal.Description;
|
||||
|
||||
import java.util.Vector;
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
package TestingSystem.DVM.DVMSettings;
|
||||
import Common.Current;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Database.iDBTable;
|
||||
import Common.UI.DataSetControlForm;
|
||||
import Common.UI.VisualiserStringList;
|
||||
import Common.UI.Windows.Dialog.DBObjectDialog;
|
||||
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||
import TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
|
||||
import Common_old.Current;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import Common_old.UI.DataSetControlForm;
|
||||
import Common_old.UI.Windows.Dialog.DBObjectDialog;
|
||||
import TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
|
||||
public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
|
||||
public DVMSettingsDBTable() {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package TestingSystem.DVM.DVMSettings.UI;
|
||||
import Common.UI.Menus_2023.DataMenuBar;
|
||||
import Common_old.UI.Menus_2023.DataMenuBar;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
public class DVMSettingsBar extends DataMenuBar {
|
||||
public DVMSettingsBar() {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package TestingSystem.DVM.DVMSettings.UI;
|
||||
import Common.Current;
|
||||
import Common.UI.TextField.StyledTextField;
|
||||
import Common.UI.Windows.Dialog.DialogFields;
|
||||
import Common_old.Current;
|
||||
import Common_old.UI.TextField.StyledTextField;
|
||||
import Common_old.UI.Windows.Dialog.DialogFields;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.Pass_2021;
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package TestingSystem.DVM.DVMTasks;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Utils.Utils;
|
||||
import TestingSystem.Common.Group.Group;
|
||||
import TestingSystem.Common.Test.Test;
|
||||
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package TestingSystem.DVM.DVMTasks;
|
||||
import Common.Constants;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Global;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Constants;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.Utils.Utils;
|
||||
import GlobalData.Tasks.TaskState;
|
||||
import TestingSystem.Common.Group.Group;
|
||||
import TestingSystem.Common.Test.Test;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package TestingSystem.DVM.DVMTasks;
|
||||
import Common.UI.Menus_2023.DataMenuBar;
|
||||
import Common_old.UI.Menus_2023.DataMenuBar;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
public class DVMRunTasksBar extends DataMenuBar {
|
||||
public DVMRunTasksBar() {
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
package TestingSystem.DVM.DVMTasks;
|
||||
import Common.Current;
|
||||
import Common.Database.DBObjectFilter;
|
||||
import Common.Database.DataSet;
|
||||
import Common.Database.DataSetFilter;
|
||||
import Common.UI.DataSetControlForm;
|
||||
import Common_old.Current;
|
||||
import Common.Visual.DBObjectFilter;
|
||||
import Common.Database.Tables.DataSet;
|
||||
import Common.Visual.DataSetFilter;
|
||||
import Common_old.UI.DataSetControlForm;
|
||||
import GlobalData.Tasks.TaskState;
|
||||
import TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
import static Common.UI.Tables.TableRenderers.RendererProgress;
|
||||
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
|
||||
import static Common_old.UI.Tables.TableRenderers.RendererProgress;
|
||||
import static Common_old.UI.Tables.TableRenderers.RendererStatusEnum;
|
||||
public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
|
||||
//todo обобщить бы наличие фильтров для всех таблиц.
|
||||
DVMPackage target;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package TestingSystem.DVM.DVMTasks;
|
||||
import Common.Constants;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Database.iDBObject;
|
||||
import Common.Global;
|
||||
import Common_old.Constants;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Objects.iDBObject;
|
||||
import _VisualDVM.Global;
|
||||
import GlobalData.Tasks.TaskState;
|
||||
import ProjectData.LanguageName;
|
||||
import TestingSystem.Common.Group.Group;
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
package TestingSystem.DVM;
|
||||
import Common.Constants;
|
||||
import Common.Global;
|
||||
import Common.Utils.Utils;
|
||||
import GlobalData.RemoteFile.RemoteFile;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.Utils.Utils;
|
||||
import GlobalData.Tasks.TaskState;
|
||||
import ProjectData.Files.ProjectFile;
|
||||
import ProjectData.LanguageName;
|
||||
|
||||
@@ -1,18 +1,9 @@
|
||||
package TestingSystem.DVM;
|
||||
import Common.Constants;
|
||||
import Common.Global;
|
||||
import Common.Utils.Utils;
|
||||
import GlobalData.RemoteFile.RemoteFile;
|
||||
import Repository.Server.ServerCode;
|
||||
import TestingSystem.Common.TasksPackageState;
|
||||
import TestingSystem.Common.TestingPlanner;
|
||||
import TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Vector;
|
||||
public class LocalDVMTestingPlanner extends DVMTestingPlanner {
|
||||
public LocalDVMTestingPlanner(String[] args) {
|
||||
super(args);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package TestingSystem.DVM;
|
||||
import Common.Constants;
|
||||
import Common.Global;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Constants;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.Utils.Utils;
|
||||
import GlobalData.RemoteFile.RemoteFile;
|
||||
import GlobalData.Tasks.TaskState;
|
||||
import TestingSystem.Common.TasksPackageState;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package TestingSystem.DVM;
|
||||
import Common.Constants;
|
||||
import Common.Global;
|
||||
import Common.Utils.Utils;
|
||||
import Common_old.Constants;
|
||||
import _VisualDVM.Global;
|
||||
import Common_old.Utils.Utils;
|
||||
import GlobalData.Machine.Machine;
|
||||
import GlobalData.RemoteFile.RemoteFile;
|
||||
import GlobalData.User.User;
|
||||
|
||||
Reference in New Issue
Block a user