### Eclipse Workspace Patch 1.0 #P org.eclipse.pde.ui Index: src/org/eclipse/pde/internal/ui/editor/product/ProductEditor.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductEditor.java,v retrieving revision 1.26 diff -u -r1.26 ProductEditor.java --- src/org/eclipse/pde/internal/ui/editor/product/ProductEditor.java 16 Jan 2008 17:08:19 -0000 1.26 +++ src/org/eclipse/pde/internal/ui/editor/product/ProductEditor.java 6 Nov 2008 20:48:14 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM 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 @@ -112,7 +112,8 @@ protected void addEditorPages() { try { addPage(new OverviewPage(this)); - addPage(new ConfigurationPage(this, useFeatures())); + addPage(new DependenciesPage(this, useFeatures())); + addPage(new ConfigurationPage(this, false)); addPage(new LaunchingPage(this)); addPage(new SplashPage(this)); addPage(new BrandingPage(this)); @@ -124,7 +125,7 @@ public void updateConfigurationPage() { try { removePage(1); - addPage(1, new ConfigurationPage(this, useFeatures())); + addPage(1, new DependenciesPage(this, useFeatures())); } catch (PartInitException e) { } } Index: src/org/eclipse/pde/internal/ui/editor/product/IntroSection.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/IntroSection.java,v retrieving revision 1.29 diff -u -r1.29 IntroSection.java --- src/org/eclipse/pde/internal/ui/editor/product/IntroSection.java 16 Jan 2008 17:08:19 -0000 1.29 +++ src/org/eclipse/pde/internal/ui/editor/product/IntroSection.java 6 Nov 2008 20:48:13 -0000 @@ -212,9 +212,9 @@ plugin.setId(INTRO_PLUGIN_ID); product.addPlugins(new IProductPlugin[] {plugin}); boolean includeOptional = false; - IFormPage page = getPage().getEditor().findPage(ConfigurationPage.PLUGIN_ID); + IFormPage page = getPage().getEditor().findPage(DependenciesPage.PLUGIN_ID); if (page != null) - includeOptional = ((ConfigurationPage) page).includeOptionalDependencies(); + includeOptional = ((DependenciesPage) page).includeOptionalDependencies(); PluginSection.handleAddRequired(new IProductPlugin[] {plugin}, includeOptional); } if (fManifest == null) Index: src/org/eclipse/pde/internal/ui/editor/product/OverviewPage.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/OverviewPage.java,v retrieving revision 1.35 diff -u -r1.35 OverviewPage.java --- src/org/eclipse/pde/internal/ui/editor/product/OverviewPage.java 16 Jan 2008 17:08:19 -0000 1.35 +++ src/org/eclipse/pde/internal/ui/editor/product/OverviewPage.java 6 Nov 2008 20:48:13 -0000 @@ -84,7 +84,7 @@ getPDEEditor().doSave(null); new ProductExportAction(getPDEEditor()).run(); } else if (href.equals("configuration")) { //$NON-NLS-1$ - String pageId = ((ProductLauncherFormPageHelper) getLauncherHelper()).getProduct().useFeatures() ? ConfigurationPage.FEATURE_ID : ConfigurationPage.PLUGIN_ID; + String pageId = ((ProductLauncherFormPageHelper) getLauncherHelper()).getProduct().useFeatures() ? DependenciesPage.FEATURE_ID : DependenciesPage.PLUGIN_ID; getEditor().setActivePage(pageId); } else super.linkActivated(e); Index: src/org/eclipse/pde/internal/ui/editor/product/ProductOutlinePage.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductOutlinePage.java,v retrieving revision 1.5 diff -u -r1.5 ProductOutlinePage.java --- src/org/eclipse/pde/internal/ui/editor/product/ProductOutlinePage.java 16 Jan 2008 17:08:19 -0000 1.5 +++ src/org/eclipse/pde/internal/ui/editor/product/ProductOutlinePage.java 6 Nov 2008 20:48:14 -0000 @@ -24,8 +24,8 @@ } protected Object[] getChildren(Object parent) { - if (parent instanceof ConfigurationPage) { - ConfigurationPage page = (ConfigurationPage) parent; + if (parent instanceof DependenciesPage) { + DependenciesPage page = (DependenciesPage) parent; IProduct product = ((IProductModel) page.getModel()).getProduct(); if (product.useFeatures()) return product.getFeatures(); @@ -36,9 +36,9 @@ protected String getParentPageId(Object item) { if (item instanceof IProductPlugin) - return ConfigurationPage.PLUGIN_ID; + return DependenciesPage.PLUGIN_ID; if (item instanceof IProductFeature) - return ConfigurationPage.FEATURE_ID; + return DependenciesPage.FEATURE_ID; return super.getParentPageId(item); } Index: src/org/eclipse/pde/internal/ui/editor/product/ConfigurationPage.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationPage.java,v retrieving revision 1.22 diff -u -r1.22 ConfigurationPage.java --- src/org/eclipse/pde/internal/ui/editor/product/ConfigurationPage.java 16 Jan 2008 17:08:19 -0000 1.22 +++ src/org/eclipse/pde/internal/ui/editor/product/ConfigurationPage.java 6 Nov 2008 20:48:13 -0000 @@ -1,12 +1,13 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2008 Code 9 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 * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation + * Code 9 Corporation - initial API and implementation + * Bartosz Michalik (bartosz.michalik@gmail.com) *******************************************************************************/ package org.eclipse.pde.internal.ui.editor.product; @@ -16,28 +17,21 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.forms.IManagedForm; -import org.eclipse.ui.forms.editor.FormEditor; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.ScrolledForm; +/** + * @author Bartosz Michalik + */ public class ConfigurationPage extends PDEFormPage { - public static final String PLUGIN_ID = "plugin-configuration"; //$NON-NLS-1$ - public static final String FEATURE_ID = "feature-configuration"; //$NON-NLS-1$ - - private boolean fUseFeatures; - private PluginSection fPluginSection = null; - - public ConfigurationPage(FormEditor editor, boolean useFeatures) { - super(editor, useFeatures ? FEATURE_ID : PLUGIN_ID, PDEUIMessages.Product_ConfigurationPage_title); - fUseFeatures = useFeatures; - } - /* (non-Javadoc) - * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#getHelpResource() + /** + * @param productEditor + * @param useFeatures */ - protected String getHelpResource() { - return IPDEUIConstants.PLUGIN_DOC_ROOT + "guide/tools/editors/product_editor/configuration.htm"; //$NON-NLS-1$ + public ConfigurationPage(ProductEditor editor, boolean useFeatures) { + super(editor, PLUGIN_ID, PDEUIMessages.ConfigurationPageMock_pageTitle); } /* (non-Javadoc) @@ -48,24 +42,15 @@ ScrolledForm form = managedForm.getForm(); FormToolkit toolkit = managedForm.getToolkit(); form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_FEATURE_OBJ)); - form.setText(PDEUIMessages.Product_ConfigurationPage_title); + form.setText(PDEUIMessages.ConfigurationPageMock_pageTitle); fillBody(managedForm, toolkit); PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.CONFIGURATION_PAGE); } private void fillBody(IManagedForm managedForm, FormToolkit toolkit) { Composite body = managedForm.getForm().getBody(); - body.setLayout(FormLayoutFactory.createFormGridLayout(false, 1)); - - // sections - if (fUseFeatures) - managedForm.addPart(new FeatureSection(this, body)); - else - managedForm.addPart(fPluginSection = new PluginSection(this, body)); + body.setLayout(FormLayoutFactory.createFormGridLayout(false, 2)); + managedForm.addPart(new PluginConfigurationSection(this, body)); managedForm.addPart(new ConfigurationSection(this, body)); } - - public boolean includeOptionalDependencies() { - return (fPluginSection != null) ? fPluginSection.includeOptionalDependencies() : false; - } } Index: src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java,v retrieving revision 1.44 diff -u -r1.44 ProductInfoSection.java --- src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java 26 Apr 2008 23:28:08 -0000 1.44 +++ src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java 6 Nov 2008 20:48:14 -0000 @@ -307,7 +307,7 @@ } public void linkActivated(HyperlinkEvent e) { - String pageId = fPluginButton.getSelection() ? ConfigurationPage.PLUGIN_ID : ConfigurationPage.FEATURE_ID; + String pageId = fPluginButton.getSelection() ? DependenciesPage.PLUGIN_ID : DependenciesPage.FEATURE_ID; getPage().getEditor().setActivePage(pageId); } }); @@ -447,7 +447,7 @@ // If the current page is the configuration page, switch to the // overview page before doing the update; otherwise, widget disposed // errors may result - if (currentPage instanceof ConfigurationPage) { + if (currentPage instanceof DependenciesPage) { getPage().getEditor().setActivePage(OverviewPage.PAGE_ID); } ((ProductEditor) getPage().getEditor()).updateConfigurationPage(); Index: src/org/eclipse/pde/internal/ui/pderesources.properties =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties,v retrieving revision 1.1010 diff -u -r1.1010 pderesources.properties --- src/org/eclipse/pde/internal/ui/pderesources.properties 26 Oct 2008 18:24:02 -0000 1.1010 +++ src/org/eclipse/pde/internal/ui/pderesources.properties 6 Nov 2008 20:48:13 -0000 @@ -535,6 +535,9 @@ ConfigurationSection_default=Generate a default config.ini file ConfigurationSection_browse=Browse... ConfigurationAreaBlock_name=configuration area location +ConfigurationPageMock_pageTitle=Configuration +ConfigurationPageMock_sectionTitle=Plug-ins +ConfigurationPageMock_sectionDesc=Specify plug-ins and their associated start levels. ConfigurationSection_message=Select a config.ini file: ConfigurationTemplateBlock_name=template file location ConfigurationTab_fileSelection=File Selection @@ -1866,7 +1869,7 @@ ProductExportWizardPage_browse=Bro&wse... Product_PluginSection_removeAll=Remove All Product_PluginSection_newPlugin=New Plug-in... -Product_ConfigurationPage_title=Configuration +Product_DependenciesPage_title=Dependencies ProductFileWizadPage_groupTitle=Initialize the file content Product_PluginSection_newFragment=New Fragment... Product_overview_testing=