From b4f9e7052eb03bfa84742d9ac547d064bf7c259c Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Sat, 7 Jul 2012 07:52:10 -0400 Subject: [PATCH] bug 383032: C Project dialog project type tree is missing arrows to collapse expand --- .../org/eclipse/cdt/internal/ui/newui/Messages.java | 2 ++ .../eclipse/cdt/internal/ui/newui/Messages.properties | 3 +++ .../org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java | 10 +++++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.java index f250ed7ce84..a8f1063e6d3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.java @@ -85,6 +85,8 @@ public class Messages extends NLS { public static String CDTCommonProjectWizard_creatingProject; public static String CDTMainWizardPage_0; public static String CDTMainWizardPage_1; + public static String CDTMainWizardPage_DefaultProjectCategory; + public static String CDTMainWizardPage_DefaultProjectType; public static String CLocationOutputTab_0; public static String CLocationSourceTab_0; public static String CLocationTab_0; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties index 73eebb342a8..672564a0e8f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties @@ -317,3 +317,6 @@ WorkingSetConfigAction_22=Build error IncludeTab_export=Export Settings... IncludeTab_import=Import Settings... +# These defaults must match with properties defined in managed build plugins +CDTMainWizardPage_DefaultProjectCategory=Executable +CDTMainWizardPage_DefaultProjectType=Empty Project diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java index bcdd3864dbf..d8b09411ef6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java @@ -26,6 +26,7 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardPage; @@ -314,9 +315,16 @@ import org.eclipse.cdt.internal.ui.newui.Messages; if (tree.getItemCount() > 0) { TreeItem target = null; // try to search item which was selected before - if (savedLabel!=null) { + if (savedLabel != null) { target = findItem(tree, savedLabel, savedParentLabel); } + if (target == null) { + // Default selection associated with "org.eclipse.cdt.build.core.buildArtefactType.exe" project type + target = findItem(tree, Messages.CDTMainWizardPage_DefaultProjectType, Messages.CDTMainWizardPage_DefaultProjectCategory); + if (target == null) { + CUIPlugin.log(new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID, "Default project not found in New C/C++ Project Wizard")); //$NON-NLS-1$ + } + } if (target == null) { target = tree.getItem(0); if (target.getItemCount() != 0)