From f7de7ad8487d30e0ccd299e568c1a6932b399c24 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Sat, 8 Jun 2013 13:55:15 -0700 Subject: [PATCH] Bug 410136 - Exception when editing CDTMainWizardPage in Windows Builder --- .../eclipse/cdt/ui/wizards/CDTMainWizardPage.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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 f8d253160ff..c8ff6bcab43 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 @@ -55,9 +55,6 @@ import org.eclipse.cdt.ui.newui.PageLayout; import org.eclipse.cdt.internal.ui.newui.Messages; 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$ private static final String EXTENSION_POINT_ID = "org.eclipse.cdt.ui.CDTWizard"; //$NON-NLS-1$ @@ -462,12 +459,11 @@ public class CDTMainWizardPage extends WizardNewProjectCreationPage implements I h_selected.setSupportedOnly(showSup.getSelection()); } - public static EntryDescriptor getDescriptor(Tree tree) { TreeItem[] sel = tree.getSelection(); if (sel == null || sel.length == 0) return null; - return (EntryDescriptor)sel[0].getData(DESC); + return (EntryDescriptor) sel[0].getData(DESC); } @Override @@ -482,9 +478,12 @@ public class CDTMainWizardPage extends WizardNewProjectCreationPage implements I } private static Image calcImage(EntryDescriptor ed) { - if (ed.getImage() != null) return ed.getImage(); - if (ed.isCategory()) return IMG_CATEGORY; - return IMG_ITEM; + Image image = ed.getImage(); + if (image != null) + return image; + if (ed.isCategory()) + return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_SEARCHFOLDER); + return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_VARIABLE); } @Override