Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Spungin2014-06-13 12:49:49 +0000
committerSteven Spungin2014-06-13 12:58:23 +0000
commit02790674ef71b2e8b877f271568d301c0b20dca5 (patch)
tree045be8eed81642e24531a982f95f4b49079702a9
parent9a5d394dea914f35cbddac42c6a8e594d3004044 (diff)
downloadorg.eclipse.e4.tools-02790674ef71b2e8b877f271568d301c0b20dca5.tar.gz
org.eclipse.e4.tools-02790674ef71b2e8b877f271568d301c0b20dca5.tar.xz
org.eclipse.e4.tools-02790674ef71b2e8b877f271568d301c0b20dca5.zip
Bug 437368 - [target platform search] Finish button does not activate
for import and require actions in the non referenced resource wizard for icons Change-Id: I91a66d988a582bc7e7d938dfd2740ca18441b04f Signed-off-by: Steven Spungin <steven@spungin.tv>
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
index 1e698bf0..1be8e4f3 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/resourcelocator/dialogs/DynamicWizard.java
@@ -40,13 +40,17 @@ public class DynamicWizard extends Wizard {
@Override
public boolean canFinish() {
+
+ IWizardPage cur = getContainer().getCurrentPage();
+ IWizardPage nextPage = getNextPage(cur);
+
+ // We need to call get next page first, as that may add or remove pages
for (IWizardPage page : pages) {
if (page.isPageComplete() == false) {
return false;
}
}
- IWizardPage cur = getContainer().getCurrentPage();
- return getNextPage(cur) == null;
+ return nextPage == null;
}
@Override

Back to the top