From 5961aaeb029b60396fc15061cb93ca41a3480d1d Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Thu, 26 Apr 2007 21:50:47 +0000 Subject: [PATCH] additional fix for [Bug 184185] New CDTWizard extension mechanism should use abstract classes instead of interfaces --- .../ui/preferences/PreferredToolchainsTab.java | 8 ++++---- .../cdt/ui/wizards/CDTCommonProjectWizard.java | 2 +- .../eclipse/cdt/ui/wizards/CDTMainWizardPage.java | 12 ++++++------ .../org/eclipse/cdt/ui/wizards/CWizardHandler.java | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java index 630c8f7bd3a..92ef72931d5 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java @@ -18,7 +18,7 @@ import org.eclipse.cdt.managedbuilder.ui.wizards.ICBuildWizardHandler; import org.eclipse.cdt.ui.newui.CDTPrefUtil; import org.eclipse.cdt.ui.newui.PageLayout; import org.eclipse.cdt.ui.wizards.CDTMainWizardPage; -import org.eclipse.cdt.ui.wizards.ICWizardHandler; +import org.eclipse.cdt.ui.wizards.CWizardHandler; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.TreeItem; public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { - protected ICWizardHandler h_selected = null; + protected CWizardHandler h_selected = null; // widgets private Tree tree; private Composite right; @@ -65,7 +65,7 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { public void widgetSelected(SelectionEvent e) { TreeItem[] tis = tree.getSelection(); if (tis == null || tis.length == 0) return; - switchTo((ICWizardHandler)tis[0].getData()); + switchTo((CWizardHandler)tis[0].getData()); }}); right = new Composite(c, SWT.NONE); @@ -122,7 +122,7 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { h_selected.updatePreferred(CDTPrefUtil.getPreferredTCs()); } - private void switchTo(ICWizardHandler h) { + private void switchTo(CWizardHandler h) { if (h == null) return; if (h_selected != null) h_selected.handleUnSelection(); h_selected = h; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java index df180299378..bf37970a5d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java @@ -56,7 +56,7 @@ implements IExecutableExtension, IWizardWithMemory private String lastProjectName = null; private IPath lastProjectLocation = null; - private ICWizardHandler savedHandler = null; + private CWizardHandler savedHandler = null; protected List localPages = new ArrayList(); // replacing Wizard.pages since we have to delete them 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 0a03aadfa4e..25318ee3f30 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 @@ -77,7 +77,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; private Label right_label; private ProjectContentsArea locationArea; - public ICWizardHandler h_selected = null; + public CWizardHandler h_selected = null; /** * Creates a new project creation wizard page. @@ -143,7 +143,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; public void widgetSelected(SelectionEvent e) { TreeItem[] tis = tree.getSelection(); if (tis == null || tis.length == 0) return; - switchTo((ICWizardHandler)tis[0].getData(), (EntryDescriptor)tis[0].getData(DESC)); + switchTo((CWizardHandler)tis[0].getData(), (EntryDescriptor)tis[0].getData(DESC)); setPageComplete(validatePage()); }}); @@ -401,7 +401,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; return locationArea.isDefault(); } - public static ICWizardHandler updateData(Tree tree, Composite right, Button show_sup, IWizardItemsListListener ls, IWizard wizard) { + public static CWizardHandler updateData(Tree tree, Composite right, Button show_sup, IWizardItemsListListener ls, IWizard wizard) { // remember selected item TreeItem[] sel = tree.getSelection(); String savedStr = (sel.length > 0) ? sel[0].getText() : null; @@ -449,7 +449,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; } } tree.setSelection(target); - return (ICWizardHandler)target.getData(); + return (CWizardHandler)target.getData(); } return null; } @@ -485,7 +485,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; if (wd2.getId().equals(wd1.getParentId())) { found = true; wd1.setParentId(null); - ICWizardHandler h = wd2.getHandler(); + CWizardHandler h = wd2.getHandler(); if (h == null && !wd1.isCategory()) break; @@ -514,7 +514,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; // orphan elements (with not-existing parentId) are ignored } - private void switchTo(ICWizardHandler h, EntryDescriptor ed) { + private void switchTo(CWizardHandler h, EntryDescriptor ed) { if (h == null) h = ed.getHandler(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java index 30ddf1b0014..c93c3303a27 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java @@ -44,7 +44,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; * - processing data received from config page * */ -public class CWizardHandler implements ICWizardHandler { +public class CWizardHandler implements Cloneable { protected static final Image IMG0 = CPluginImages.get(CPluginImages.IMG_EMPTY); protected static final Image IMG1 = CPluginImages.get(CPluginImages.IMG_PREFERRED);