# HG changeset patch
# User tasneems@symbian.org
# Date 1265929237 28800
# Node ID 22c6da0edf5d089b9357330a600b4f3e0a5b6183
# Parent  058151c7f9e62fd6bed10b7ecf92d3876326a270# Parent  33876f868ea36cea2efab2e9440555a827dd2115
Merged

diff -r 058151c7f9e6 -r 22c6da0edf5d org.symbian.tools.wrttools.debug.core/plugin.xml
--- a/org.symbian.tools.wrttools.debug.core/plugin.xml	Thu Feb 11 14:43:05 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/plugin.xml	Thu Feb 11 15:00:37 2010 -0800
@@ -22,7 +22,7 @@
             delegate="org.symbian.tools.wrttools.debug.internal.launch.WidgetLaunchDelegate"
             id="org.symbian.tools.wrttools.debug.widget"
             modes="debug,run"
-            name="WRT Widget"
+            name="WRT Application"
             public="true">
       </launchConfigurationType>
    </extension>
@@ -30,7 +30,7 @@
          point="org.eclipse.debug.ui.launchConfigurationTabGroups">
       <launchConfigurationTabGroup
             class="org.symbian.tools.wrttools.debug.ui.launch.WidgetLaunchConfigurationTabGroup"
-            description="WRT Widget"
+            description="WRT Application"
             id="org.symbian.tools.wrttools.debug.wrtTabGroup"
             type="org.symbian.tools.wrttools.debug.widget">
       </launchConfigurationTabGroup>
@@ -49,7 +49,7 @@
             class="org.symbian.tools.wrttools.debug.ui.launch.WidgetLaunchShortcut"
             icon="icons/main16.gif"
             id="org.symbian.tools.wrttools.debug.wrtshortcut"
-            label="WRT Widget"
+            label="WRT Application"
             modes="run, debug">
          <configurationType
                id="org.symbian.tools.wrttools.debug.widget">
@@ -73,11 +73,11 @@
             </with>
          </enablement>
             <contextLabel
-                  label="WRT Widget"
+                  label="WRT Application"
                   mode="run">
             </contextLabel>
             <contextLabel
-                  label="WRT Widget"
+                  label="WRT Application"
                   mode="debug">
             </contextLabel></contextualLaunch>
       </shortcut>
diff -r 058151c7f9e6 -r 22c6da0edf5d org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java
--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java	Thu Feb 11 14:43:05 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/MozillaPreviewPage.java	Thu Feb 11 15:00:37 2010 -0800
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.net.URL;
 
 import org.eclipse.core.net.proxy.IProxyData;
@@ -40,13 +39,11 @@
 				if (resourceUrl != null) {
 					try {
 						URL fileUrl = FileLocator.toFileURL(resourceUrl);
-						File file = new File(fileUrl.toURI());
+						File file = new File(fileUrl.getPath());
 						System.setProperty(XUL_RUNNER_PATH_PARAMETER, file
 								.getAbsolutePath()); //$NON-NLS-1$
 					} catch (IOException e) {
-						// log the exception
-					} catch (URISyntaxException e) {
-						// log the exception
+						PreviewerPlugin.log(e);
 					}
 				}
 			}
diff -r 058151c7f9e6 -r 22c6da0edf5d org.symbian.tools.wrttools.product/plugin.xml
diff -r 058151c7f9e6 -r 22c6da0edf5d org.symbian.tools.wrttools/plugin.xml
--- a/org.symbian.tools.wrttools/plugin.xml	Thu Feb 11 14:43:05 2010 -0800
+++ b/org.symbian.tools.wrttools/plugin.xml	Thu Feb 11 15:00:37 2010 -0800
@@ -160,8 +160,7 @@
 			id="org.symbian.tools.wrttools.core.wrtwidgetwizard" name="Web Runtime Application"
 			project="true">
 			<description>
-				Creates a new Symbian WRT application project using one of the provided
-				templates
+				Creates a new Symbian WRT application project using one of the provided templates
          </description>
 		</wizard>
 		<wizard category="org.symbian.tools.wrttools.core.category"
diff -r 058151c7f9e6 -r 22c6da0edf5d org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java	Thu Feb 11 14:43:05 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java	Thu Feb 11 15:00:37 2010 -0800
@@ -46,6 +46,7 @@
 import org.eclipse.wst.jsdt.core.JavaScriptCore;
 import org.eclipse.wst.jsdt.internal.ui.wizards.buildpaths.BuildPathsBlock;
 import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.Validator;
 import org.symbian.tools.wrttools.Activator;
 import org.symbian.tools.wrttools.WidgetProjectNature;
 
@@ -80,6 +81,7 @@
 				10));
 
 		ValidationFramework.getDefault().addValidationBuilder(project);
+		ValidationFramework.getDefault().applyChanges(ValidationFramework.getDefault().getProjectSettings(project), true);
 
 		// TODO: Build path, super type, etc.
 		// BuildPathsBlock.flush(classPathEntries, javaScriptProject, superType,
diff -r 058151c7f9e6 -r 22c6da0edf5d org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectTemplateWizardPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectTemplateWizardPage.java	Thu Feb 11 14:43:05 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectTemplateWizardPage.java	Thu Feb 11 15:00:37 2010 -0800
@@ -140,8 +140,10 @@
 		Display display = getShell().getDisplay();
 		display.asyncExec(new Runnable() {
 			public void run() {
-				IWizardPage nextPage = getWizard().getNextPage(WRTProjectTemplateWizardPage.this);
-				getContainer().showPage(nextPage);
+				if (isPageComplete()) {
+					IWizardPage nextPage = getWizard().getNextPage(WRTProjectTemplateWizardPage.this);
+					getContainer().showPage(nextPage);
+				}
 			}
 		});
 	}
diff -r 058151c7f9e6 -r 22c6da0edf5d org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WgzImportWizardPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WgzImportWizardPage.java	Thu Feb 11 14:43:05 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WgzImportWizardPage.java	Thu Feb 11 15:00:37 2010 -0800
@@ -414,16 +414,6 @@
 		return true;
 	}
 
-	/*
-	 * see @DialogPage.setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			projectNameField.setFocus();
-		}
-	}
-
 	/**
 	 * Returns the useDefaults.
 	 *