[Esbox-commits] r447 - in trunk: org.indt.esbox.python.ui/src/org/indt/esbox/python/ui/wizards org.indt.esbox.ui/src/org/indt/esbox/ui/wizards org.indt.esbox.ui/templates/EmptyProject

[carolina at garage.maemo.org]

Author: carolina
Date: 2008-02-28 22:00:41 +0200 (Thu, 28 Feb 2008)
New Revision: 447

Added:
   trunk/org.indt.esbox.ui/templates/EmptyProject/src/
Modified:
   trunk/org.indt.esbox.python.ui/src/org/indt/esbox/python/ui/wizards/ESboxPythonCommonProjectWizard.java
   trunk/org.indt.esbox.python.ui/src/org/indt/esbox/python/ui/wizards/ESboxPythonConfigWizardPage.java
   trunk/org.indt.esbox.ui/src/org/indt/esbox/ui/wizards/ESboxConfigWizardPage.java
   trunk/org.indt.esbox.ui/templates/EmptyProject/template.xml
Log:
Project wizard does create 'src' folder for empty projects

and

The "Next" button in "Empty Project" on the last window has disabled.

Modified: trunk/org.indt.esbox.python.ui/src/org/indt/esbox/python/ui/wizards/ESboxPythonCommonProjectWizard.java
===================================================================
--- trunk/org.indt.esbox.python.ui/src/org/indt/esbox/python/ui/wizards/ESboxPythonCommonProjectWizard.java	2008-02-28 12:53:29 UTC (rev 446)
+++ trunk/org.indt.esbox.python.ui/src/org/indt/esbox/python/ui/wizards/ESboxPythonCommonProjectWizard.java	2008-02-28 20:00:41 UTC (rev 447)
@@ -360,11 +360,13 @@
         initializeDefaultPageImageDescriptor();
     }
 		
+    
 	/*
 	 * (non-Javadoc)
 	 * @see org.eclipse.jface.wizard.Wizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
 	 */
 	public IWizardPage getNextPage(IWizardPage page) {
+		
 		if (page == fMainPage) {
 			configPage = new ESboxPythonConfigWizardPage(esboxHandler);
 			configPage.setWizard(this);
@@ -379,6 +381,11 @@
 			}
 			this.addPage(configPage);
 		}
+		
+		if (page == configPage) {		
+				return null;
+		}
+		
 		return super.getNextPage(page);
 	}
 	

Modified: trunk/org.indt.esbox.python.ui/src/org/indt/esbox/python/ui/wizards/ESboxPythonConfigWizardPage.java
===================================================================
--- trunk/org.indt.esbox.python.ui/src/org/indt/esbox/python/ui/wizards/ESboxPythonConfigWizardPage.java	2008-02-28 12:53:29 UTC (rev 446)
+++ trunk/org.indt.esbox.python.ui/src/org/indt/esbox/python/ui/wizards/ESboxPythonConfigWizardPage.java	2008-02-28 20:00:41 UTC (rev 447)
@@ -20,6 +20,7 @@
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.cdt.managedbuilder.ui.wizards.CfgHolder;
 import org.eclipse.cdt.ui.newui.UIMessages;
+import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -237,6 +238,11 @@
 		return super.isPageComplete() && (getErrorMessage() == null);
 	}
 
+	public boolean canFlipToNextPage() {		
+		if (esboxHandler.getTemplate().getTemplateId().equalsIgnoreCase("emptyProject"))
+			return false;		
+		return super.canFlipToNextPage();
+	}
 
 	protected void update() {
 		getWizard().getContainer().updateButtons();

Modified: trunk/org.indt.esbox.ui/src/org/indt/esbox/ui/wizards/ESboxConfigWizardPage.java
===================================================================
--- trunk/org.indt.esbox.ui/src/org/indt/esbox/ui/wizards/ESboxConfigWizardPage.java	2008-02-28 12:53:29 UTC (rev 446)
+++ trunk/org.indt.esbox.ui/src/org/indt/esbox/ui/wizards/ESboxConfigWizardPage.java	2008-02-28 20:00:41 UTC (rev 447)
@@ -347,6 +347,11 @@
 		return super.isPageComplete() && (getErrorMessage() == null);
 	}
 
+	public boolean canFlipToNextPage() {		
+		if (esboxHandler.getTemplate().getTemplateId().equalsIgnoreCase("emptyProject"))
+			return false;		
+		return super.canFlipToNextPage();
+	}
 
 	protected void update() {
 		getWizard().getContainer().updateButtons();

Modified: trunk/org.indt.esbox.ui/templates/EmptyProject/template.xml
===================================================================
--- trunk/org.indt.esbox.ui/templates/EmptyProject/template.xml	2008-02-28 12:53:29 UTC (rev 446)
+++ trunk/org.indt.esbox.ui/templates/EmptyProject/template.xml	2008-02-28 20:00:41 UTC (rev 447)
@@ -4,8 +4,13 @@
 		id="EmptyProject" label="Empty Project" description="An empty project template"
 		 help="help.html">
 		 
+	<process type="org.eclipse.cdt.core.CreateSourceFolder">
+		<simple name="projectName" value="$(projectName)"/>
+		<simple name="path" value="src"/>
+	</process>
+	
 	<process type="org.eclipse.cdt.core.AddFiles">
-		<simple name="projectName" value="$(projectName)"/>
+		<simple name="projectName" value="$(projectName)"/>		
 		<complex-array name="files">			
 			<element>
 				<simple name="source" value="autogen.sh"/>