Commit 568c53d2 authored by Stefan Tauner's avatar Stefan Tauner
Browse files

FIJITestsViewer: remove needless indentation in Populate

parent e2feea6f
......@@ -120,36 +120,35 @@ sub Populate {
if (!defined($settings) || !blessed($settings) || !$settings->isa("FIJI::Settings")) {
$logger->error("No or invalid settings given.");
return;
} else {
$self->{'settings'} = $settings;
}
$self->{'settings'} = $settings;
if (!defined($tests) || !blessed($tests) || !$tests->isa("FIJI::Tests")) {
$logger->error("No or invalid tests given.");
return;
} else {
}
$self->{'tests'} = $tests;
$self->{'manualtest'} = {};
$self->{'tests'}->set_test_defaults($self->{'manualtest'});
$self->{'tests'} = $tests;
$self->{'manualtest'} = {};
$self->{'tests'}->set_test_defaults($self->{'manualtest'});
if (ref($self->{'tests'}->{'tests'}) ne 'ARRAY') {
$logger->debug("Adding empty tests array to tests reference.");
$self->{'tests'}->{'tests'} = [];
}
if (ref($self->{'tests'}->{'tests'}) ne 'ARRAY') {
$logger->debug("Adding empty tests array to tests reference.");
$self->{'tests'}->{'tests'} = [];
}
if ( ($self->{'tests'}->{'ext'}->{'CFGS_PER_MSG'} != $self->{'settings'}->{'design'}->{'CFGS_PER_MSG'})
|| ($self->{'tests'}->{'ext'}->{'FIU_NUM'} != $self->{'settings'}->{'design'}->{'FIU_NUM'}))
{
$logger->error("Given Tests file does not match Settings file.");
return;
}
$self->{'original_tests'} = clone($tests);
$self->{'original_tests'}->{'tests'} = clone($tests->{'tests'});
$self->traceVariable($self->{'tests'}->{'design'}, 'w' => [\&_watch_settings, $self]);
$self->traceVariable($self->{'tests'}->{'tests'}, 'w' => [\&_watch_settings, $self]);
$self->{'Downloader'} = FIJI::Downloader->new(undef, undef, $self->{'tests'}, undef, $self->{'settings'});
if ( ($self->{'tests'}->{'ext'}->{'CFGS_PER_MSG'} != $self->{'settings'}->{'design'}->{'CFGS_PER_MSG'})
|| ($self->{'tests'}->{'ext'}->{'FIU_NUM'} != $self->{'settings'}->{'design'}->{'FIU_NUM'}))
{
$logger->error("Given Tests file does not match Settings file.");
return;
}
$self->{'original_tests'} = clone($tests);
$self->{'original_tests'}->{'tests'} = clone($tests->{'tests'});
$self->traceVariable($self->{'tests'}->{'design'}, 'w' => [\&_watch_settings, $self]);
$self->traceVariable($self->{'tests'}->{'tests'}, 'w' => [\&_watch_settings, $self]);
$self->{'Downloader'} = FIJI::Downloader->new(undef, undef, $self->{'tests'}, undef, $self->{'settings'});
$self->SUPER::Populate($args);
$self->_populate_widget($self);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment