Fix API breakage.

3 files changed, 31 insertions, 11 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
index 2641987acde..f1d90195528 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
@@ -28,6 +28,7 @@ import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
 import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
 import org.eclipse.cdt.core.templateengine.process.ProcessFailureException;
+import org.eclipse.cdt.internal.ui.wizards.DefaultEntryDescriptor;
 import org.eclipse.cdt.managedbuilder.buildproperties.IBuildProperty;
 import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue;
 import org.eclipse.cdt.managedbuilder.core.BuildException;
@@ -151,7 +152,7 @@ public class MBSWizardHandler extends CWizardHandler {
 					break;
 			
 				projectTypeId = path[0];
-				if(!entryDescriptor.isDefaultForCategory() && 
+				if(!(entryDescriptor instanceof DefaultEntryDescriptor) && 
 						path.length > 1 && (!path[0].equals(ManagedBuildWizard.OTHERS_LABEL))){
 					templateId = path[path.length - 1]; 
 					Template templates[] = TemplateEngineUI.getDefault().getTemplates(projectTypeId);
@@ -337,6 +338,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		return baseName;
 	}
 	
+	@Override
 	public void handleSelection() {
 		List<String> preferred = CDTPrefUtil.getPreferredTCs();
 		
@@ -344,7 +346,8 @@ public class MBSWizardHandler extends CWizardHandler {
 			table = new Table(parent, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
 			table.getAccessible().addAccessibleListener(
 					 new AccessibleAdapter() {                       
-		                 public void getName(AccessibleEvent e) {
+		                 @Override
+						public void getName(AccessibleEvent e) {
 		                	 if (e.result == null)
 		                		 e.result = head;
 		                 }
@@ -374,6 +377,7 @@ public class MBSWizardHandler extends CWizardHandler {
 				if (counter > 0) table.select(position);
 			}			
 			table.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					handleToolChainSelection();
 				}});
@@ -475,6 +479,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		}
 	}
 	
+	@Override
 	public void handleUnSelection() {
 		if (table != null) {
 			table.setVisible(false);
@@ -496,6 +501,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		full_tcs.put(tc.getUniqueRealName(), tc);
 	}
 		
+	@Override
 	public void createProject(IProject project, boolean defaults, boolean onFinish) throws CoreException {
 		ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
 		ICProjectDescription des = mngr.createProjectDescription(project, false, !onFinish);
@@ -546,6 +552,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		doCustom(project);
 	}
 	
+	@Override
 	protected void doTemplatesPostProcess(IProject prj) {
 		if(entryInfo == null)
 			return;
@@ -573,6 +580,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		return fConfigPage;
 	}
 	
+	@Override
 	public IWizardPage getSpecificPage() {
 		return entryInfo.getNextPage(getStartingPage(), getConfigPage());
 	}
@@ -582,6 +590,7 @@ public class MBSWizardHandler extends CWizardHandler {
 	 * @
 	 */
 	
+	@Override
 	public void updatePreferred(List<String> prefs) {
 		preferredTCs.clear();
 		int x = table.getItemCount();
@@ -602,10 +611,13 @@ public class MBSWizardHandler extends CWizardHandler {
 		return preferredTCs;
 	}
 	
+	@Override
 	public String getHeader() { return head; }
 	public boolean isDummy() { return false; }
+	@Override
 	public boolean supportsPreferred() { return true; }
 
+	@Override
 	public boolean isChanged() { 
 		if (savedToolChains == null)
 			return true;
@@ -624,6 +636,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		return false;
 	}
 	
+	@Override
 	public void saveState() {
 		savedToolChains = getSelectedToolChains();
 	}
@@ -659,6 +672,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		getConfigPage(); // ensure that page is created
 		return fConfigPage.getCfgItems(defaults);
 	}
+	@Override
 	public String getErrorMessage() { 
 		TableItem[] tis = table.getSelection();
 		if (tis == null || tis.length == 0)
@@ -666,6 +680,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		return null;
 	}
 	
+	@Override
 	protected void doCustom(IProject newProject) {
 		IRunnableWithProgress[] operations = MBSCustomPageManager.getOperations();
 		if(operations != null)
@@ -679,6 +694,7 @@ public class MBSWizardHandler extends CWizardHandler {
 				}
 	}
 	
+	@Override
 	public void postProcess(IProject newProject, boolean created) {
 		deleteExtraConfigs(newProject);
 		// calls are required only if the project was
@@ -722,11 +738,13 @@ public class MBSWizardHandler extends CWizardHandler {
 		} catch (CoreException e) {}
 	}
 	
+	@Override
 	public boolean isApplicable(EntryDescriptor data) { 
 		EntryInfo info = new EntryInfo(data, full_tcs);
 		return info.isValid() && (info.getToolChainsCount() > 0);
 	}
 	
+	@Override
 	public void initialize(EntryDescriptor data) throws CoreException {
 		EntryInfo info = new EntryInfo(data, full_tcs);
 		if(!info.isValid())
@@ -738,6 +756,7 @@ public class MBSWizardHandler extends CWizardHandler {
 	/**
 	 * Clones itself.
 	 */
+	@Override
 	public Object clone() {
 		MBSWizardHandler clone = (MBSWizardHandler)super.clone();
 		if (clone != null) {
@@ -752,6 +771,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		return clone;
 	}
 
+	@Override
 	public boolean canFinish() {
 		if(entryInfo == null)
 			return false;
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
index 502ee32a039..cfaea4f05dd 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
@@ -15,6 +15,7 @@ import java.util.Arrays;
 import java.util.SortedMap;
 
 import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.wizards.DefaultEntryDescriptor;
 import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyManager;
 import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyType;
 import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue;
@@ -38,6 +39,7 @@ public class ManagedBuildWizard extends AbstractCWizard {
 	/**
 	 * Creates and returns an array of items to be displayed 
 	 */
+	@Override
 	public EntryDescriptor[] createItems(boolean supportedOnly, IWizard wizard) {
 		IBuildPropertyManager bpm = ManagedBuildManager.getBuildPropertyManager();
 		IBuildPropertyType bpt = bpm.getPropertyType(MBSWizardHandler.ARTIFACT);
@@ -58,9 +60,8 @@ public class ManagedBuildWizard extends AbstractCWizard {
 				// The project category item.
 				items.add(new EntryDescriptor(vs[i].getId(), null, vs[i].getName(), true, h, null));
 				// A default project type for that category -- not using any template.
-				EntryDescriptor entryDescriptor = new EntryDescriptor(vs[i].getId() + ".default", vs[i].getId(),
+				EntryDescriptor entryDescriptor = new DefaultEntryDescriptor(vs[i].getId() + ".default", vs[i].getId(),
 						EMPTY_PROJECT, false, h, null);
-				entryDescriptor.setDefaultForCategory(true);
 				items.add(entryDescriptor);
 			}
 		}
@@ -69,7 +70,7 @@ public class ManagedBuildWizard extends AbstractCWizard {
 		EntryDescriptor oldsRoot = null;
 		SortedMap<String, IProjectType> sm = ManagedBuildManager.getExtensionProjectTypeMap();
 		for (String s : sm.keySet()) {
-			IProjectType pt = (IProjectType)sm.get(s);
+			IProjectType pt = sm.get(s);
 			if (pt.isAbstract() || pt.isSystemObject()) continue;
 			if (supportedOnly && !pt.isSupported()) continue; // not supported
 			String nattr = pt.getNameAttribute(); 
@@ -106,11 +107,9 @@ public class ManagedBuildWizard extends AbstractCWizard {
 					items.add(oldsRoot);
 				}
 				pId = oldsRoot.getId();
-			} else { // do not group to <Others>
-				pId = null;
 			}
 			items.add(new EntryDescriptor(pt.getId(), pId, pt.getName(), false, h, IMG));
 		}
-		return (EntryDescriptor[])items.toArray(new EntryDescriptor[items.size()]);
+		return items.toArray(new EntryDescriptor[items.size()]);
 	}
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java
index 011589258ac..043d691c8ec 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Intel Corporation and others.
+ * Copyright (c) 2007, 2008 Intel Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.managedbuilder.ui.wizards;
 
+import org.eclipse.cdt.internal.ui.wizards.DefaultEntryDescriptor;
 import org.eclipse.cdt.managedbuilder.core.IToolChain;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
@@ -21,6 +22,7 @@ public class StdBuildWizard extends AbstractCWizard {
 	private static final String ID = "org.eclipse.cdt.build.makefile.projectType"; //$NON-NLS-1$
 	public static final String EMPTY_PROJECT = Messages.getString("AbstractCWizard.0");  //$NON-NLS-1$
 	
+	@Override
 	public EntryDescriptor[] createItems(boolean supportedOnly, IWizard wizard) {
 		STDWizardHandler h = new STDWizardHandler(parent, wizard);
 		h.addTc(null); // add default toolchain
@@ -30,9 +32,8 @@ public class StdBuildWizard extends AbstractCWizard {
 				h.addTc(tcs[i]);
 		EntryDescriptor wd = new EntryDescriptor(ID, null, NAME, true, h, null);
 				
-		EntryDescriptor wd2 = new EntryDescriptor(ID + ".default", ID,
+		EntryDescriptor wd2 = new DefaultEntryDescriptor(ID + ".default", ID,
 				EMPTY_PROJECT, false, h, null);
-				wd2.setDefaultForCategory(true);
 						
 		return new EntryDescriptor[] {wd, wd2};