no message
This commit is contained in:
@@ -3,7 +3,6 @@ import Common.Database.SQLITE.SQLiteDatabase;
|
||||
import GlobalData.Settings.SettingName;
|
||||
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
|
||||
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
|
||||
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
|
||||
import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
|
||||
import TestingSystem.Configuration.UI.ConfigurationDBTable;
|
||||
import TestingSystem.Group.GroupsDBTable;
|
||||
@@ -24,10 +23,6 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
public SapforConfigurationCommandsDBTable sapforConfigurationCommands;
|
||||
//----
|
||||
public ServerSapforsDBTable serverSapfors;
|
||||
//--
|
||||
// public SapforTasksPackagesDBTable sapforTasksPackages;
|
||||
// public SapforTasksPackagesDBTable sapforTasksPackages;
|
||||
//--
|
||||
public TestsDatabase() {
|
||||
super(Paths.get(System.getProperty("user.dir"), "Data", TasksDatabase.tests_db_name + ".sqlite").toFile());
|
||||
}
|
||||
@@ -42,8 +37,6 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
addTable(sapforConfigurations = new SapforConfigurationDBTable());
|
||||
addTable(sapforConfigurationCommands = new SapforConfigurationCommandsDBTable());
|
||||
addTable(serverSapfors = new ServerSapforsDBTable());
|
||||
// addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
|
||||
// addTable(sapforTasksPackages = new SapforTasksPackagesDBTable());
|
||||
}
|
||||
@Override
|
||||
public void Init() throws Exception {
|
||||
@@ -66,36 +59,4 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
Update(setting);
|
||||
return res;
|
||||
}
|
||||
public SapforTasksPackage getFirstActiveSapforScenario() {
|
||||
/*
|
||||
SapforTasksPackage first_active = null;
|
||||
SapforTasksPackage first_queued = null;
|
||||
if (!sapforTasksPackages.Data.isEmpty()) {
|
||||
for (SapforTasksPackage s : sapforTasksPackages.Data.values()) {
|
||||
switch (s.state) {
|
||||
case Done:
|
||||
case Aborted:
|
||||
break;
|
||||
case Queued:
|
||||
if (first_queued == null) first_queued = s;
|
||||
break;
|
||||
default:
|
||||
if (first_active == null) first_active = s; //это и будет первый активный.
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (first_active != null) return first_active;
|
||||
if (first_queued != null) {
|
||||
first_queued.state = TasksPackageState.PackageStart;
|
||||
try {
|
||||
Update(first_queued);
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
return first_queued;
|
||||
}
|
||||
*/
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user