Branch merges
authorEugene Ostroukhov <eostroukhov@symbian.org>
Mon, 11 Jan 2010 14:53:40 -0800
changeset 23 c61ca05763e5
parent 22 6297dfe3bd9d (diff)
parent 21 8b1393d47610 (current diff)
child 24 ca6e8f2b6f85
Branch merges
Binary file org.symbian.tools.wrttools/bin/org/symbian/tools/wrttools/util/ProjectUtils.class has changed
Binary file org.symbian.tools.wrttools/bin/org/symbian/tools/wrttools/wizards/WrtWidgetWizard.class has changed
--- a/org.symbian.tools.wrttools/plugin.xml	Mon Jan 11 14:46:11 2010 -0800
+++ b/org.symbian.tools.wrttools/plugin.xml	Mon Jan 11 14:53:40 2010 -0800
@@ -122,4 +122,14 @@
             value="true">
       </persistent>
    </extension>
+   <extension
+         point="org.eclipse.core.contenttype.contentTypes">
+      <content-type
+            base-type="org.eclipse.core.runtime.xml"
+            file-extensions="plist"
+            id="org.symbian.tools.wrttools.contenttype.plist"
+            name="WebRuntime Descriptor File"
+            priority="normal">
+      </content-type>
+   </extension>
 </plugin>
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java	Mon Jan 11 14:46:11 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java	Mon Jan 11 14:53:40 2010 -0800
@@ -63,6 +63,7 @@
 		monitor.beginTask("Create project resources", 20);
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		IProject project = workspace.getRoot().getProject(name);
+		ValidationFramework.getDefault().addValidationBuilder(project);
 		BuildPathsBlock.createProject(project, uri, new SubProgressMonitor(
 				monitor, 10));
 
@@ -73,7 +74,6 @@
 		// BuildPathsBlock.flush(classPathEntries, javaScriptProject, superType,
 		// monitor)
 
-		ValidationFramework.getDefault().addValidationBuilder(project);
 
 		monitor.done();
 		return project;
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WrtWidgetWizard.java	Mon Jan 11 14:46:11 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WrtWidgetWizard.java	Mon Jan 11 14:53:40 2010 -0800
@@ -105,8 +105,7 @@
 	protected void createAndInitProject(IProgressMonitor monitor)
 			throws CoreException {
 		monitor.beginTask("Creating project", 100);
-		IProject project = ProjectUtils.createWrtProject(context.getProjectName(), context
-		.getProjectUri(), new SubProgressMonitor(monitor, 30));
+		IProject project = ProjectUtils.createWrtProject(context.getProjectName(), context.getProjectUri(), new SubProgressMonitor(monitor, 30));
 		populateProject(project, new SubProgressMonitor(monitor, 70));
 		monitor.done();
 	}