# HG changeset patch # User Eugene Ostroukhov # Date 1288719444 25200 # Node ID 6786e27ef30aeb55268865e82b435be9143fb461 # Parent e4a4cac2cdeb8e061a26a266d5f678686644d6df Minor bugfixes diff -r e4a4cac2cdeb -r 6786e27ef30a plugins/org.symbian.tools.tmw.ui/plugin.xml --- a/plugins/org.symbian.tools.tmw.ui/plugin.xml Thu Oct 14 14:46:23 2010 -0700 +++ b/plugins/org.symbian.tools.tmw.ui/plugin.xml Tue Nov 02 10:37:24 2010 -0700 @@ -264,6 +264,7 @@ canFinishEarly="false" category="org.symbian.tools.tmw" class="org.symbian.tools.tmw.ui.project.NewApplicationWizard" + finalPerspective="org.symbian.tools.wrttools.mainPerspective" hasPages="true" icon="icons/full/etool16/newproject.png" id="org.symbian.tools.tmw.newproject" diff -r e4a4cac2cdeb -r 6786e27ef30a plugins/org.symbian.tools.tmw.ui/src/org/symbian/tools/tmw/internal/ui/project/ProjectTemplateManagerImpl.java --- a/plugins/org.symbian.tools.tmw.ui/src/org/symbian/tools/tmw/internal/ui/project/ProjectTemplateManagerImpl.java Thu Oct 14 14:46:23 2010 -0700 +++ b/plugins/org.symbian.tools.tmw.ui/src/org/symbian/tools/tmw/internal/ui/project/ProjectTemplateManagerImpl.java Tue Nov 02 10:37:24 2010 -0700 @@ -59,7 +59,8 @@ } } } - + private static final IProjectTemplate[] EMPTY = new IProjectTemplate[0]; + private Map emptyProjects; private Map> runtimeTemplateParameters; private Map templates; @@ -82,14 +83,14 @@ public IProjectTemplate[] getProjectTemplates(IMobileWebRuntime runtime) { if (runtime == null) { - return new IProjectTemplate[0]; + return EMPTY; } if (templates == null) { templates = readExtensions(); } final IProjectTemplate[] runtimeTemplates = templates.get(runtime); if (runtimeTemplates == null) { - return new IProjectTemplate[0]; + return EMPTY; } else { return runtimeTemplates; } diff -r e4a4cac2cdeb -r 6786e27ef30a plugins/org.symbian.tools.tmw.ui/src/org/symbian/tools/tmw/ui/project/NewApplicationWizard.java --- a/plugins/org.symbian.tools.tmw.ui/src/org/symbian/tools/tmw/ui/project/NewApplicationWizard.java Thu Oct 14 14:46:23 2010 -0700 +++ b/plugins/org.symbian.tools.tmw.ui/src/org/symbian/tools/tmw/ui/project/NewApplicationWizard.java Tue Nov 02 10:37:24 2010 -0700 @@ -27,13 +27,17 @@ import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExecutableExtension; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.swt.widgets.Display; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action; import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy; @@ -55,7 +59,7 @@ * * @author Eugene Ostroukhov (eugeneo@symbian.org) */ -public final class NewApplicationWizard extends ModifyFacetedProjectWizard implements INewWizard { +public final class NewApplicationWizard extends ModifyFacetedProjectWizard implements INewWizard, IExecutableExtension { public static final String ID = "org.symbian.tools.tmw.newproject"; private final PageContributions contributions = new PageContributions(); @@ -142,6 +146,7 @@ private boolean reentry = false; private final Collection currentFacets = new HashSet(); + private IConfigurationElement configElement; private Set getCurrentFixedFacets() { final Set fixedFacets = getCurrentFixedFacetVersions(); @@ -214,5 +219,15 @@ getFacetedProject().getProject().build(IncrementalProjectBuilder.FULL_BUILD, new SubProgressMonitor(monitor, 100)); monitor.done(); + Display.getDefault().asyncExec(new Runnable() { + public void run() { + BasicNewProjectResourceWizard.updatePerspective(configElement); + } + }); } + + public void setInitializationData(IConfigurationElement config, + String propertyName, Object data) throws CoreException { + configElement = config; + } } diff -r e4a4cac2cdeb -r 6786e27ef30a plugins/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch --- a/plugins/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch Thu Oct 14 14:46:23 2010 -0700 +++ b/plugins/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch Tue Nov 02 10:37:24 2010 -0700 @@ -21,8 +21,8 @@ - - + +