mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

Bug 410136 - Exception when editing CDTMainWizardPage in Windows Builder

Browse source
This commit is contained in:
Sergey Prigogin 2013-06-08 13:55:15 -07:00
parent eb081d7f1f
commit f7de7ad848
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,9 +55,6 @@ import org.eclipse.cdt.ui.newui.PageLayout;
import org.eclipse.cdt.internal.ui.newui.Messages; import org.eclipse.cdt.internal.ui.newui.Messages;
public class CDTMainWizardPage extends WizardNewProjectCreationPage implements IWizardItemsListListener { public class CDTMainWizardPage extends WizardNewProjectCreationPage implements IWizardItemsListListener {
private static final Image IMG_CATEGORY = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_SEARCHFOLDER);
private static final Image IMG_ITEM = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_VARIABLE);
public static final String PAGE_ID = "org.eclipse.cdt.managedbuilder.ui.wizard.NewModelProjectWizardPage"; //$NON-NLS-1$ public static final String PAGE_ID = "org.eclipse.cdt.managedbuilder.ui.wizard.NewModelProjectWizardPage"; //$NON-NLS-1$
private static final String EXTENSION_POINT_ID = "org.eclipse.cdt.ui.CDTWizard"; //$NON-NLS-1$ private static final String EXTENSION_POINT_ID = "org.eclipse.cdt.ui.CDTWizard"; //$NON-NLS-1$
@ -462,7 +459,6 @@ public class CDTMainWizardPage extends WizardNewProjectCreationPage implements I
h_selected.setSupportedOnly(showSup.getSelection()); h_selected.setSupportedOnly(showSup.getSelection());
} }
public static EntryDescriptor getDescriptor(Tree tree) { public static EntryDescriptor getDescriptor(Tree tree) {
TreeItem[] sel = tree.getSelection(); TreeItem[] sel = tree.getSelection();
if (sel == null || sel.length == 0) if (sel == null || sel.length == 0)
@ -482,9 +478,12 @@ public class CDTMainWizardPage extends WizardNewProjectCreationPage implements I
} }
private static Image calcImage(EntryDescriptor ed) { private static Image calcImage(EntryDescriptor ed) {
if (ed.getImage() != null) return ed.getImage(); Image image = ed.getImage();
if (ed.isCategory()) return IMG_CATEGORY; if (image != null)
return IMG_ITEM; return image;
if (ed.isCategory())
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_SEARCHFOLDER);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_VARIABLE);
} }
@Override @Override