v++
This commit is contained in:
@@ -40,10 +40,6 @@ public class TestsForm extends DataSetControlForm<Test> {
|
||||
public Class getRendererClass() {
|
||||
return RendererLongCell.class;
|
||||
}
|
||||
@Override
|
||||
public int getMaxWidth() {
|
||||
return 600;
|
||||
}
|
||||
},
|
||||
new ColumnInfo<Test>("min_dim") {
|
||||
@Override
|
||||
|
||||
@@ -320,11 +320,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
}
|
||||
void RefreshDVMTests() throws Exception {
|
||||
Account account = (Account) request.object;
|
||||
int sapfor_id = Integer.parseInt(request.arg);
|
||||
ServerSapfor sapfor = null;
|
||||
if (!db.serverSapfors.containsKey(sapfor_id))
|
||||
throw new RepositoryRefuseException("Версия SAPFOR с ключом " + sapfor_id + " не найдена.");
|
||||
sapfor = db.serverSapfors.get(sapfor_id);
|
||||
ServerSapfor serverSapfor = db.serverSapfors.getLastDoneVersion();
|
||||
DownloadRepository downloadRepository = new DownloadRepository();
|
||||
if (!downloadRepository.Do())
|
||||
throw new RepositoryRefuseException("Не удалось обновить репозиторий");
|
||||
@@ -368,7 +364,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
//-теперь создать тесты.
|
||||
//--
|
||||
for (Pair<Group, Vector<File>> p : groups)
|
||||
db.RefreshGroup(account, sapfor, p);
|
||||
db.RefreshGroup(account, serverSapfor, p);
|
||||
}
|
||||
void GetFirstActiveSapforPackages() throws Exception {
|
||||
response.object = db.getFirstActiveSapforPackagesCopies();
|
||||
|
||||
@@ -196,10 +196,12 @@ public class TestsDatabase extends SQLiteDatabase {
|
||||
FileUtils.forceMkdir(tempProject);
|
||||
FileUtils.copyDirectory(testDirectory, tempProject);
|
||||
//--
|
||||
if (Sapfor.getMinMaxDim(Sapfor.getTempCopy(new File(sapfor.call_command)), tempProject, test)) {
|
||||
Update(test);
|
||||
} else
|
||||
throw new RepositoryRefuseException("Не удалось определить размерность теста " + Utils_.Brackets(test.description));
|
||||
if (sapfor!=null) {
|
||||
if (Sapfor.getMinMaxDim(Sapfor.getTempCopy(new File(sapfor.call_command)), tempProject, test)) {
|
||||
Update(test);
|
||||
} else
|
||||
throw new RepositoryRefuseException("Не удалось определить размерность теста " + Utils_.Brackets(test.description));
|
||||
}
|
||||
break;
|
||||
case c:
|
||||
test.max_dim = Utils.getCTestMaxDim(testFile);
|
||||
|
||||
Reference in New Issue
Block a user