From 7df92cb1c3b1ce025ae39c8082086c76d9f918d4 Mon Sep 17 00:00:00 2001 From: "p.plitzner" Date: Tue, 23 Feb 2016 09:20:13 +0100 Subject: [PATCH 1/1] Handle "Finish" button correctly for import wizards - "Finish" is only enabled when a file is selected #5589 --- .../etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java | 2 +- .../io/wizard/ImportFromFileDataSourceWizardPage.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java index 4c946a9a5..e4623afb1 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java @@ -101,7 +101,7 @@ public abstract class AbstractImportWizard exten */ @Override public boolean canFinish() { - return !existUnsavedEditors(); + return !existUnsavedEditors() && super.canFinish(); } /** diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java index 2d2415d96..3c7f5516d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java @@ -25,6 +25,8 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import eu.etaxonomy.cdm.common.CdmUtils; + /** *

ImportFromFileDataSourceWizardPage class.

* @@ -139,5 +141,9 @@ public class ImportFromFileDataSourceWizardPage extends WizardPage { return getFile().toURI(); } + @Override + public boolean isPageComplete() { + return CdmUtils.isNotBlank(text_file.getText()); + } } -- 2.34.1