STS-2686: fixed bug where couldn't download template projects

tobias-hammerschmidt · Jun 11, 2012 · a153dfa · a153dfa
1 parent d3eb52a
commit a153dfa
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...zard/src/org/springframework/ide/eclipse/wizard/template/TemplateSelectionWizardPage.java b/...zard/src/org/springframework/ide/eclipse/wizard/template/TemplateSelectionWizardPage.java
@@ -149,7 +149,7 @@ protected TemplateSelectionWizardPage(TemplateWizard wizard) {
 
 	@Override
 	public boolean canFlipToNextPage() {
-		return selectedTemplate != null;
+		return treeViewer.getSelection() != null && !treeViewer.getSelection().isEmpty();
 	}
 
 	public void createControl(Composite parent) {
@@ -351,12 +351,13 @@ public void selectionChanged(SelectionChangedEvent event) {
 				if (selection instanceof TreeSelection) {
 					Object element = ((TreeSelection) selection).getFirstElement();
 					if (element instanceof Template) {
-						selectedTemplate = ((Template) element);
+						if (element != null) {
+							selectedTemplate = ((Template) element);
+						}
 					}
 				}
 				firstPage = null;
 
-				// selectedTemplate can be null if there is no network
 				if (selectedTemplate != null) {
 					setDescription(selectedTemplate);
 					if (TemplateSelectionWizardPage.this.equals(wizard.getContainer().getCurrentPage())) {
@@ -395,7 +396,7 @@ public IWizardPage getNextPage() {
 			return firstPage;
 		}
 
-		if (selectedTemplate == null) {
+		if (!canFlipToNextPage()) {
 			return null;
 		}
 
@@ -621,7 +622,7 @@ public boolean isPageComplete() {
 	}
 
 	private void refreshPage() {
-		selectedTemplate = null;
+		// selectedTemplate = null;
 
 		treeViewer.refresh(true);
 		treeViewer.setSelection(new StructuredSelection());