mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug : toolchains are not visible for old-style project types grouped in "Others" folder.

Browse source
This commit is contained in:
Oleg Krasilnikov 2007-09-12 10:02:17 +00:00
parent d6e3cf9201
commit 32a9f67aea
3 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
View file

@ -140,7 +140,7 @@ public class MBSWizardHandler extends CWizardHandler {
break; break;
projectTypeId = path[0]; projectTypeId = path[0];
if(path.length > 1){ if(path.length > 1 && (!path[0].equals(ManagedBuildWizard.OTHERS_LABEL))){
templateId = path[path.length - 1]; templateId = path[path.length - 1];
Template templates[] = TemplateEngineUI.getDefault().getTemplates(projectTypeId); Template templates[] = TemplateEngineUI.getDefault().getTemplates(projectTypeId);
if(templates.length == 0) if(templates.length == 0)

2
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
View file

@ -34,7 +34,7 @@ import org.eclipse.swt.graphics.Image;
*/ */
public class ManagedBuildWizard extends AbstractCWizard { public class ManagedBuildWizard extends AbstractCWizard {
private static final Image IMG = CPluginImages.get(CPluginImages.IMG_OBJS_CONTAINER); private static final Image IMG = CPluginImages.get(CPluginImages.IMG_OBJS_CONTAINER);
private static final String OTHERS_LABEL = Messages.getString("CNewWizard.0"); //$NON-NLS-1$ public static final String OTHERS_LABEL = Messages.getString("CNewWizard.0"); //$NON-NLS-1$
/** /**
* Creates and returns an array of items to be displayed * Creates and returns an array of items to be displayed
*/ */

27
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java
View file

@ -536,27 +536,22 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
} }
private void switchTo(CWizardHandler h, EntryDescriptor ed) { private void switchTo(CWizardHandler h, EntryDescriptor ed) {
if (h == null)
if (h == null) h = ed.getHandler(); h = ed.getHandler();
try { try {
if (h != null && ed != null)
if (h != null && ed != null) h.initialize(ed); h.initialize(ed);
} catch (CoreException e) {
} catch (CoreException e) { h = null; } h = null;
}
if (h_selected != null) h_selected.handleUnSelection(); if (h_selected != null)
h_selected.handleUnSelection();
h_selected = h; h_selected = h;
if (h == null)
if (h == null) return; return;
right_label.setText(h_selected.getHeader()); right_label.setText(h_selected.getHeader());
h_selected.handleSelection(); h_selected.handleSelection();
h_selected.setSupportedOnly(show_sup.getSelection()); h_selected.setSupportedOnly(show_sup.getSelection());
} }