2518 corrected a couple comments to reflect when ingest is actually started now

This commit is contained in:
William Schaefer 2017-04-04 14:30:42 -04:00
parent b56bb8094a
commit 28a706efde
2 changed files with 4 additions and 6 deletions

View File

@ -236,6 +236,7 @@ class AddImageWizardAddingProgressPanel extends ShortcutWizardDescriptorPanel {
*/
@Override
public void readSettings(WizardDescriptor settings) {
// Start ingest if it hasn't already been started
startIngest();
settings.setOptions(new Object[]{WizardDescriptor.PREVIOUS_OPTION, WizardDescriptor.NEXT_OPTION, WizardDescriptor.FINISH_OPTION, WizardDescriptor.CANCEL_OPTION});
if (imgAdded) {

View File

@ -160,9 +160,7 @@ class AddImageWizardIngestConfigPanel extends ShortcutWizardDescriptorPanel {
public void storeSettings(WizardDescriptor settings) {
IngestJobSettings ingestJobSettings = ingestJobSettingsPanel.getSettings();
ingestJobSettings.save();
// Start ingest if it hasn't already been started
progressPanel.setIngestJobSettings(ingestJobSettings); //calls start Ingest
progressPanel.setIngestJobSettings(ingestJobSettings); //prepare ingest for being started
}
private static void showWarnings(IngestJobSettings ingestJobSettings) {
@ -189,8 +187,7 @@ class AddImageWizardIngestConfigPanel extends ShortcutWizardDescriptorPanel {
}
//Because this panel kicks off ingest during the wizard we need to
//swap out the ingestJobSettings for the ones of the chosen profile before
//we start processing
IngestJobSettings ingestJobSettings = new IngestJobSettings(lastProfileUsed);
progressPanel.setIngestJobSettings(ingestJobSettings); //calls start ingest
progressPanel.setIngestJobSettings(ingestJobSettings); //prepare ingest for being started
}
}