Attachment #220346 for bug #383795

View | Details | Raw Unified | Return to bug 383795
Collapse All | Expand All

Lines 54-71 public interface ISite extends ISiteObject { Link Here

(-)a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISite.java (+6 lines)
54		54
55	void addFeatures(ISiteFeature[] features) throws CoreException;	55	void addFeatures(ISiteFeature[] features) throws CoreException;
56		56
		57	void addBundles(ISiteBundle[] added) throws CoreException;
		58
57	void addArchives(ISiteArchive[] archives) throws CoreException;	59	void addArchives(ISiteArchive[] archives) throws CoreException;
58		60
59	void addCategoryDefinitions(ISiteCategoryDefinition[] defs) throws CoreException;	61	void addCategoryDefinitions(ISiteCategoryDefinition[] defs) throws CoreException;
60		62
61	void removeFeatures(ISiteFeature[] features) throws CoreException;	63	void removeFeatures(ISiteFeature[] features) throws CoreException;
62		64
		65	void removeBundles(ISiteBundle[] bundles) throws CoreException;
		66
63	void removeArchives(ISiteArchive[] archives) throws CoreException;	67	void removeArchives(ISiteArchive[] archives) throws CoreException;
64		68
65	void removeCategoryDefinitions(ISiteCategoryDefinition[] defs) throws CoreException;	69	void removeCategoryDefinitions(ISiteCategoryDefinition[] defs) throws CoreException;
66		70
67	ISiteFeature[] getFeatures();	71	ISiteFeature[] getFeatures();
68		72
		73	ISiteBundle[] getBundles();
		74
69	ISiteArchive[] getArchives();	75	ISiteArchive[] getArchives();
70		76
71	ISiteCategoryDefinition[] getCategoryDefinitions();	77	ISiteCategoryDefinition[] getCategoryDefinitions();




/*******************************************************************************
 *  Copyright (c) 2000, 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
 *  http://www.eclipse.org/legal/epl-v10.html
 * 
 *  Contributors:
 *     IBM Corporation - initial API and implementation
 *     Red Hat Inc. - Copied from IFeatureBundle
 *******************************************************************************/
package org.eclipse.pde.internal.core.isite;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.pde.internal.core.ifeature.IVersionable;

public interface ISiteBundle extends IVersionable, ISiteObject {
	void addCategories(ISiteCategory[] categories) throws CoreException;

	void removeCategories(ISiteCategory[] categories) throws CoreException;

	ISiteCategory[] getCategories();
}

Lines 7-12 Link Here

(-)a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISiteModelFactory.java (+16 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Red Hat Inc. - Support for <bundle...> in category.xml
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.pde.internal.core.isite;	12	package org.eclipse.pde.internal.core.isite;
12		13
Lines 30-35 public interface ISiteModelFactory { Link Here
30	ISiteFeature createFeature();	31	ISiteFeature createFeature();
31		32
32	/**	33	/**
		34	* Creates a new bundle model object.
		35	*
		36	* @return new instance of the bundle data object
		37	*/
		38	ISiteBundle createBundle();
		39
		40	/**
33	* Creates a new feature child object.	41	* Creates a new feature child object.
34	*	42	*
35	* @return new instance of the feature child object	43	* @return new instance of the feature child object
Lines 37-42 public interface ISiteModelFactory { Link Here
37	ISiteCategory createCategory(ISiteFeature feature);	45	ISiteCategory createCategory(ISiteFeature feature);
38		46
39	/**	47	/**
		48	* Creates a new feature child object.
		49	*
		50	* @return new instance of the feature child object
		51	*/
		52	ISiteCategory createCategory(ISiteBundle feature);
		53
		54	/**
40	* Creates a new import model object.	55	* Creates a new import model object.
41	*	56	*
42	* @return new instance of the feature import object	57	* @return new instance of the feature import object
Lines 56-59 public interface ISiteModelFactory { Link Here
56	* @return a new feature install handler.	71	* @return a new feature install handler.
57	*/	72	*/
58	ISiteArchive createArchive();	73	ISiteArchive createArchive();
		74
59	}	75	}




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Red Hat Inc. - Support for <bundle...> tag
 *******************************************************************************/
package org.eclipse.pde.internal.core.site;


	private static final long serialVersionUID = 1L;
	final static String INDENT = "   "; //$NON-NLS-1$
	private Vector features = new Vector();
	private Vector bundles = new Vector();
	private Vector archives = new Vector();
	private Vector categoryDefs = new Vector();
	private String type;

	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISite#addBundles(org.eclipse.pde.internal.core.isite.ISiteBundle)
	 */
	public void addBundles(ISiteBundle[] newBundles) throws CoreException {
		ensureModelEditable();
		for (int i = 0; i < newBundles.length; i++) {
			ISiteBundle bundle = newBundles[i];
			((SiteBundle) bundle).setInTheModel(true);
			bundles.add(bundle);
		}
		fireStructureChanged(newBundles, IModelChangedEvent.INSERT);
	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISite#addArchives(org.eclipse.pde.internal.core.isite.ISiteArchive)
	 */
	public void addArchives(ISiteArchive[] archs) throws CoreException {

	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISite#removeBundles(org.eclipse.pde.internal.core.isite.ISiteBundle)
	 */
	public void removeBundles(ISiteBundle[] newBundles) throws CoreException {
		ensureModelEditable();
		for (int i = 0; i < newBundles.length; i++) {
			ISiteBundle bundle = newBundles[i];
			((SiteFeature) bundle).setInTheModel(false);
			bundles.remove(bundle);
		}
		fireStructureChanged(newBundles, IModelChangedEvent.REMOVE);
	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISite#removeArchives(org.eclipse.pde.internal.core.isite.ISiteArchive)
	 */
	public void removeArchives(ISiteArchive[] archs) throws CoreException {

	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISite#getBundles()
	 */
	public ISiteBundle[] getBundles() {
		return (ISiteBundle[]) bundles.toArray(new ISiteBundle[bundles.size()]);
	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISite#getArchives()
	 */
	public ISiteArchive[] getArchives() {

		archives.clear();
		categoryDefs.clear();
		features.clear();
		bundles.clear();
		description = null;
		type = null;
		url = null;

			((SiteFeature) feature).parse(child);
			((SiteFeature) feature).setInTheModel(true);
			features.add(feature);
		} else if (tag.equals("bundle")) { //$NON-NLS-1$
			ISiteBundle bundle = getModel().getFactory().createBundle();
			((SiteBundle) bundle).parse(child);
			((SiteBundle) bundle).setInTheModel(true);
			bundles.add(bundle);
		} else if (tag.equals("archive")) { //$NON-NLS-1$
			ISiteArchive archive = getModel().getFactory().createArchive();
			((SiteArchive) archive).parse(child);

			description.write(indent2, writer);
		}
		writeChildren(indent2, features, writer);
		writeChildren(indent2, bundles, writer);
		writeChildren(indent2, archives, writer);
		writeChildren(indent2, categoryDefs, writer);
		writer.println(indent + "</site>"); //$NON-NLS-1$

			if (!feature.isValid())
				return false;
		}
		for (int i = 0; i < bundles.size(); i++) {
			ISiteBundle bundle = (ISiteBundle) bundles.get(i);
			if (!bundle.isValid())
				return false;
		}
		for (int i = 0; i < archives.size(); i++) {
			ISiteArchive archive = (ISiteArchive) archives.get(i);
			if (!archive.isValid())




/*******************************************************************************
 *  Copyright (c) 2000, 20012 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
 *  http://www.eclipse.org/legal/epl-v10.html
 * 
 *  Contributors:
 *     IBM Corporation - initial API and implementation
 *     Red Hat Inc. - <bundle...> in category.xml (copied from SiteFeature)
 *******************************************************************************/
package org.eclipse.pde.internal.core.site;

import java.io.PrintWriter;
import java.util.Vector;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.pde.core.IModelChangedEvent;
import org.eclipse.pde.internal.core.isite.ISiteBundle;
import org.eclipse.pde.internal.core.isite.ISiteCategory;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

public class SiteBundle extends VersionableObject implements ISiteBundle {
	private static final long serialVersionUID = 1L;
	private Vector fCategories = new Vector();

	public boolean isValid() {
		for (int i = 0; i < fCategories.size(); i++) {
			ISiteCategory category = (ISiteCategory) fCategories.get(i);
			if (!category.isValid())
				return false;
		}
		return true;
	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISiteFeature#addCategories(org.eclipse.pde.internal.core.isite.ISiteCategory)
	 */
	public void addCategories(ISiteCategory[] newCategories) throws CoreException {
		ensureModelEditable();
		for (int i = 0; i < newCategories.length; i++) {
			ISiteCategory category = newCategories[i];
			((SiteCategory) category).setInTheModel(true);
			fCategories.add(newCategories[i]);
		}
		fireStructureChanged(newCategories, IModelChangedEvent.INSERT);
	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISiteFeature#removeCategories(org.eclipse.pde.internal.core.isite.ISiteCategory)
	 */
	public void removeCategories(ISiteCategory[] newCategories) throws CoreException {
		ensureModelEditable();
		for (int i = 0; i < newCategories.length; i++) {
			ISiteCategory category = newCategories[i];
			((SiteCategory) category).setInTheModel(false);
			fCategories.remove(newCategories[i]);
		}
		fireStructureChanged(newCategories, IModelChangedEvent.REMOVE);
	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISiteFeature#getCategories()
	 */
	public ISiteCategory[] getCategories() {
		return (ISiteCategory[]) fCategories.toArray(new ISiteCategory[fCategories.size()]);
	}

	protected void parse(Node node) {
		super.parse(node);
		NodeList children = node.getChildNodes();
		for (int i = 0; i < children.getLength(); i++) {
			Node child = children.item(i);
			if (child.getNodeType() == Node.ELEMENT_NODE && child.getNodeName().equalsIgnoreCase("category")) { //$NON-NLS-1$
				SiteCategory category = (SiteCategory) getModel().getFactory().createCategory(this);
				category.parse(child);
				category.setInTheModel(true);
				fCategories.add(category);
			}
		}
	}

	protected void reset() {
		super.reset();
		fCategories.clear();
	}

	/**
	 * @see org.eclipse.pde.core.IWritable#write(java.lang.String, java.io.PrintWriter)
	 */
	public void write(String indent, PrintWriter writer) {
		writer.print(indent);
		writer.print("<bundle"); //$NON-NLS-1$
		if (id != null)
			writer.print(" id=\"" + getId() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
		if (version != null)
			writer.print(" version=\"" + getVersion() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
		if (label != null)
			writer.print(" label=\"" + getLabel() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
		if (fCategories.size() > 0) {
			writer.println(">"); //$NON-NLS-1$
			String indent2 = indent + "   "; //$NON-NLS-1$
			for (int i = 0; i < fCategories.size(); i++) {
				ISiteCategory category = (ISiteCategory) fCategories.get(i);
				category.write(indent2, writer);
			}
			writer.println(indent + "</bundle>"); //$NON-NLS-1$
		} else
			writer.println("/>"); //$NON-NLS-1$
	}

}




 *******************************************************************************/
package org.eclipse.pde.internal.core.site;

import org.eclipse.pde.internal.core.isite.*;
import org.eclipse.pde.internal.core.isite.ISiteArchive;
import org.eclipse.pde.internal.core.isite.ISiteCategory;
import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;
import org.eclipse.pde.internal.core.isite.ISiteDescription;
import org.eclipse.pde.internal.core.isite.ISiteFeature;
import org.eclipse.pde.internal.core.isite.ISiteModel;
import org.eclipse.pde.internal.core.isite.ISiteModelFactory;
import org.eclipse.pde.internal.core.isite.ISiteObject;

public class SiteModelFactory implements ISiteModelFactory {
	private ISiteModel model;

	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createBundle()
	 */
	public ISiteBundle createBundle() {
		SiteBundle bundle = new SiteBundle();
		bundle.model = model;
		bundle.parent = model.getSite();
		return bundle;
	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createCategory()
	 */
	public ISiteCategory createCategory(ISiteFeature feature) {

	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createCategory()
	 */
	public ISiteCategory createCategory(ISiteBundle bundle) {
		SiteCategory category = new SiteCategory();
		category.model = model;
		category.parent = bundle;
		return category;
	}

	/**
	 * @see org.eclipse.pde.internal.core.isite.ISiteModelFactory#createCategoryDefinition()
	 */
	public ISiteCategoryDefinition createCategoryDefinition() {

Lines 311-316 public class PDELabelProvider extends SharedLabelProvider { Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDELabelProvider.java (+6 lines)
311	return preventNull(obj.getURL());	311	return preventNull(obj.getURL());
312	}	312	}
313		313
		314	public String getObjectText(ISiteBundle obj) {
		315	IPluginModelBase modelBase = PluginRegistry.findModel(obj.getId(), obj.getVersion(), IMatchRules.COMPATIBLE, null);
		316	return getObjectText(modelBase.getPluginBase());
		317	}
		318
314	public String getObjectText(ISiteArchive obj) {	319	public String getObjectText(ISiteArchive obj) {
315	return preventNull(obj.getPath());	320	return preventNull(obj.getPath());
316	}	321	}
Lines 829-832 public class PDELabelProvider extends SharedLabelProvider { Link Here
829	}	834	}
830	return versionRange;	835	return versionRange;
831	}	836	}
		837
832	}	838	}

Lines 1722-1727 public class PDEUIMessages extends NLS { Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java (+1 lines)
1722	public static String CategorySection_new;	1722	public static String CategorySection_new;
1723	public static String CategorySection_desc;	1723	public static String CategorySection_desc;
1724	public static String CategorySection_add;	1724	public static String CategorySection_add;
		1725	public static String CategorySection_addBundle;
1725	public static String CategorySection_remove;	1726	public static String CategorySection_remove;
1726	public static String CategorySection_environment;	1727	public static String CategorySection_environment;
1727	public static String CategorySection_buildAll;	1728	public static String CategorySection_buildAll;





	protected void addEditorPages() {
		try {
			addPage(new IUsPage(this));
		} catch (PartInitException e) {
			PDEPlugin.logException(e);
		}
	}

	protected String computeInitialPageId() {
		return IUsPage.PAGE_ID;
	}

	protected ISortableContentOutlinePage createContentOutline() {

Lines 6-18 Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryLabelProvider.java (-2 / +19 lines)
6	*	6	*
7	* Contributors:	7	* Contributors:
8	* EclipseSource - initial API and implementation	8	* EclipseSource - initial API and implementation
		9	* Mickael Istria (Red Hat Inc.) - 383795: <bundle...> support
9	******************************************************************************/	10	******************************************************************************/
10	package org.eclipse.pde.internal.ui.editor.category;	11	package org.eclipse.pde.internal.ui.editor.category;
11		12
12	import org.eclipse.jface.viewers.LabelProvider;	13	import org.eclipse.jface.viewers.LabelProvider;
		14	import org.eclipse.pde.core.plugin.IMatchRules;
		15	import org.eclipse.pde.core.plugin.PluginRegistry;
13	import org.eclipse.pde.internal.core.PDECore;	16	import org.eclipse.pde.internal.core.PDECore;
14	import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;	17	import org.eclipse.pde.internal.core.isite.*;
15	import org.eclipse.pde.internal.core.isite.ISiteFeature;
16	import org.eclipse.pde.internal.ui.*;	18	import org.eclipse.pde.internal.ui.*;
17	import org.eclipse.swt.graphics.Image;	19	import org.eclipse.swt.graphics.Image;
18	import org.eclipse.ui.forms.editor.IFormPage;	20	import org.eclipse.ui.forms.editor.IFormPage;
Lines 23-34 class CategoryLabelProvider extends LabelProvider { Link Here
23		25
24	private Image fSiteFeatureImage;	26	private Image fSiteFeatureImage;
25	private Image fMissingSiteFeatureImage;	27	private Image fMissingSiteFeatureImage;
		28	private Image fSiteBundleImage;
		29	private Image fMissingSiteBundleImage;
26	private Image fPageImage;	30	private Image fPageImage;
27	private Image fCatDefImage;	31	private Image fCatDefImage;
28		32
29	public CategoryLabelProvider() {	33	public CategoryLabelProvider() {
30	fSiteFeatureImage = PDEPluginImages.DESC_FEATURE_OBJ.createImage();	34	fSiteFeatureImage = PDEPluginImages.DESC_FEATURE_OBJ.createImage();
31	fMissingSiteFeatureImage = PDEPluginImages.DESC_NOREF_FEATURE_OBJ.createImage();	35	fMissingSiteFeatureImage = PDEPluginImages.DESC_NOREF_FEATURE_OBJ.createImage();
		36	fSiteBundleImage = PDEPluginImages.DESC_PLUGIN_OBJ.createImage();
		37	fMissingSiteBundleImage = PDEPluginImages.DESC_PLUGIN_DIS_OBJ.createImage();
32	fCatDefImage = PDEPluginImages.DESC_CATEGORY_OBJ.createImage();	38	fCatDefImage = PDEPluginImages.DESC_CATEGORY_OBJ.createImage();
33	fPageImage = PDEPluginImages.DESC_PAGE_OBJ.createImage();	39	fPageImage = PDEPluginImages.DESC_PAGE_OBJ.createImage();
34	fSharedProvider = PDEPlugin.getDefault().getLabelProvider();	40	fSharedProvider = PDEPlugin.getDefault().getLabelProvider();
Lines 43-48 class CategoryLabelProvider extends LabelProvider { Link Here
43	return fMissingSiteFeatureImage;	49	return fMissingSiteFeatureImage;
44	return fSiteFeatureImage;	50	return fSiteFeatureImage;
45	}	51	}
		52	if (element instanceof SiteBundleAdapter) {
		53	ISiteBundle bundle = ((SiteBundleAdapter) element).bundle;
		54	if (PluginRegistry.findModel(bundle.getId(), bundle.getVersion(), IMatchRules.COMPATIBLE, null) == null) {
		55	return this.fMissingSiteBundleImage;
		56	}
		57	return this.fSiteBundleImage;
		58	}
46	if (element instanceof IFormPage)	59	if (element instanceof IFormPage)
47	return fPageImage;	60	return fPageImage;
48	return fSharedProvider.getImage(element);	61	return fSharedProvider.getImage(element);
Lines 55-60 class CategoryLabelProvider extends LabelProvider { Link Here
55	ISiteFeature feature = ((SiteFeatureAdapter) element).feature;	68	ISiteFeature feature = ((SiteFeatureAdapter) element).feature;
56	return fSharedProvider.getObjectText(feature);	69	return fSharedProvider.getObjectText(feature);
57	}	70	}
		71	if (element instanceof SiteBundleAdapter) {
		72	ISiteBundle bundle = ((SiteBundleAdapter) element).bundle;
		73	return fSharedProvider.getObjectText(bundle);
		74	}
58	if (element instanceof IFormPage)	75	if (element instanceof IFormPage)
59	return ((IFormPage) element).getTitle();	76	return ((IFormPage) element).getTitle();
60	return fSharedProvider.getText(element);	77	return fSharedProvider.getText(element);

Lines 32-38 public class CategoryOutlinePage extends FormOutlinePage { Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryOutlinePage.java (-3 / +18 lines)
32	ISiteModel model = (ISiteModel) page.getModel();	32	ISiteModel model = (ISiteModel) page.getModel();
33	if (model.isValid()) {	33	if (model.isValid()) {
34	ISite site = model.getSite();	34	ISite site = model.getSite();
35	if (page.getId().equals(FeaturesPage.PAGE_ID)) {	35	if (page.getId().equals(IUsPage.PAGE_ID)) {
36	ArrayList result = new ArrayList();	36	ArrayList result = new ArrayList();
37	ISiteCategoryDefinition[] catDefs = site.getCategoryDefinitions();	37	ISiteCategoryDefinition[] catDefs = site.getCategoryDefinitions();
38	for (int i = 0; i < catDefs.length; i++) {	38	for (int i = 0; i < catDefs.length; i++) {
Lines 43-48 public class CategoryOutlinePage extends FormOutlinePage { Link Here
43	if (features[i].getCategories().length == 0)	43	if (features[i].getCategories().length == 0)
44	result.add(new SiteFeatureAdapter(null, features[i]));	44	result.add(new SiteFeatureAdapter(null, features[i]));
45	}	45	}
		46	ISiteBundle[] bundles = site.getBundles();
		47	for (int i = 0; i < bundles.length; i++) {
		48	if (bundles[i].getCategories().length == 0) {
		49	result.add(new SiteBundleAdapter(null, bundles[i]));
		50	}
		51	}
46	return result.toArray();	52	return result.toArray();
47	}	53	}
48	}	54	}
Lines 52-59 public class CategoryOutlinePage extends FormOutlinePage { Link Here
52	ISiteModel model = catDef.getModel();	58	ISiteModel model = catDef.getModel();
53	if (model.isValid()) {	59	if (model.isValid()) {
54	ISite site = model.getSite();	60	ISite site = model.getSite();
55	ISiteFeature[] features = site.getFeatures();
56	HashSet result = new HashSet();	61	HashSet result = new HashSet();
		62	ISiteFeature[] features = site.getFeatures();
57	for (int i = 0; i < features.length; i++) {	63	for (int i = 0; i < features.length; i++) {
58	ISiteCategory[] cats = features[i].getCategories();	64	ISiteCategory[] cats = features[i].getCategories();
59	for (int j = 0; j < cats.length; j++) {	65	for (int j = 0; j < cats.length; j++) {
Lines 62-67 public class CategoryOutlinePage extends FormOutlinePage { Link Here
62	}	68	}
63	}	69	}
64	}	70	}
		71	ISiteBundle[] bundles = site.getBundles();
		72	for (int i = 0; i < bundles.length; i++) {
		73	ISiteCategory[] cats = bundles[i].getCategories();
		74	for (int j = 0; j < cats.length; j++) {
		75	if (cats[j].getDefinition() != null && cats[j].getDefinition().equals(catDef)) {
		76	result.add(new SiteBundleAdapter(cats[j].getName(), bundles[i]));
		77	}
		78	}
		79	}
65	return result.toArray();	80	return result.toArray();
66	}	81	}
67	}	82	}
Lines 71-77 public class CategoryOutlinePage extends FormOutlinePage { Link Here
71	protected String getParentPageId(Object item) {	86	protected String getParentPageId(Object item) {
72	String pageId = null;	87	String pageId = null;
73	if (item instanceof ISiteCategoryDefinition \|\| item instanceof SiteFeatureAdapter)	88	if (item instanceof ISiteCategoryDefinition \|\| item instanceof SiteFeatureAdapter)
74	pageId = FeaturesPage.PAGE_ID;	89	pageId = IUsPage.PAGE_ID;
75	if (pageId != null)	90	if (pageId != null)
76	return pageId;	91	return pageId;
77	return super.getParentPageId(item);	92	return super.getParentPageId(item);




import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.core.IModelChangedEvent;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.ifeature.*;
import org.eclipse.pde.internal.core.isite.*;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.dialogs.FeatureSelectionDialog;
import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;
import org.eclipse.pde.internal.ui.editor.*;
import org.eclipse.pde.internal.ui.editor.feature.FeatureEditor;
import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;


	private static final int BUTTON_ADD_CATEGORY = 0;
	private static final int BUTTON_ADD_FEATURE = 1;
	private static final int BUTTON_ADD_BUNDLE = 2;
	private static int fCounter;
	private ISiteModel fModel;
	private TreePart fCategoryTreePart;

				if (features[i].getCategories().length == 0)
					result.add(new SiteFeatureAdapter(null, features[i]));
			}
			ISiteBundle[] bundles = fModel.getSite().getBundles();
			for (int i = 0; i < bundles.length; i++) {
				if (bundles[i].getCategories().length == 0) {
					result.add(new SiteBundleAdapter(null, bundles[i]));
				}
			}
			return result.toArray();
		}

		public Object[] getChildren(Object parent) {
			if (parent instanceof ISiteCategoryDefinition) {
				ISiteCategoryDefinition catDef = (ISiteCategoryDefinition) parent;
				ISiteFeature[] features = fModel.getSite().getFeatures();
				HashSet result = new HashSet();
				ISiteFeature[] features = fModel.getSite().getFeatures();
				for (int i = 0; i < features.length; i++) {
					ISiteCategory[] cats = features[i].getCategories();
					for (int j = 0; j < cats.length; j++) {

						}
					}
				}
				ISiteBundle[] bundles = fModel.getSite().getBundles();
				for (int i = 0; i < bundles.length; i++) {
					ISiteCategory[] cats = bundles[i].getCategories();
					for (int j = 0; j < cats.length; j++) {
						if (cats[j].getDefinition() != null && cats[j].getDefinition().equals(catDef)) {
							result.add(new SiteBundleAdapter(cats[j].getName(), bundles[i]));
						}
					}
				}
				return result.toArray();
			}
			return new Object[0];

						}
					}
				}
				ISiteBundle[] bundles = fModel.getSite().getBundles();
				for (int i = 0; i < bundles.length; i++) {
					ISiteCategory[] cats = bundles[i].getCategories();
					for (int j = 0; j < cats.length; j++) {
						if (cats[j].getDefinition() != null && cats[j].getDefinition().equals(catDef)) {
							return true;
						}
					}
				}
			}
			return false;
		}
	}

	public CategorySection(PDEFormPage formPage, Composite parent) {
		super(formPage, parent, Section.DESCRIPTION, new String[] {PDEUIMessages.CategoryDefinitionCategorySection_new, PDEUIMessages.CategorySection_add, PDEUIMessages.CategorySection_addBundle});
		getSection().setText(PDEUIMessages.CategoryDefinitionCategorySection_title);
		getSection().setDescription(PDEUIMessages.CategoryDefinitionCategorySection_desc);
	}

						}
						return true;
					}
					if (objects.length > 0 && objects[0] instanceof SiteBundleAdapter) {
						if (op == DND.DROP_COPY && target != null) {
							copyBundle((SiteBundleAdapter) objects[0], target);
						} else {
							moveBundle((SiteBundleAdapter) objects[0], target);
						}
						return true;
					}
					return false;
				}


		fCategoryViewer.addDragSupport(DND.DROP_MOVE | DND.DROP_COPY, transfers, new DragSourceListener() {
			public void dragStart(DragSourceEvent event) {
				IStructuredSelection ssel = (IStructuredSelection) fCategoryViewer.getSelection();
				if (ssel == null || ssel.isEmpty() || !(ssel.getFirstElement() instanceof SiteFeatureAdapter || ssel.getFirstElement() instanceof SiteBundleAdapter)) {
					event.doit = false;
				}
			}


		fCategoryTreePart.setButtonEnabled(BUTTON_ADD_CATEGORY, isEditable());
		fCategoryTreePart.setButtonEnabled(BUTTON_ADD_FEATURE, isEditable());
		fCategoryTreePart.setButtonEnabled(BUTTON_ADD_BUNDLE, isEditable());

		// fCategoryViewer.expandAll();
		toolkit.paintBordersFor(container);

		}
	}

	private void copyBundle(SiteBundleAdapter adapter, Object target) {
		ISiteBundle bundle = findRealBundle(adapter);
		if (bundle == null) {
			return;
		}
		if (target != null && target instanceof ISiteCategoryDefinition) {
			addCategory(bundle, ((ISiteCategoryDefinition) target).getName());
		}
	}

	private void addCategory(ISiteFeature aFeature, String catName) {
		try {
			if (aFeature == null)

		}
	}

	private void addCategory(ISiteBundle aBundle, String catName) {
		try {
			if (aBundle == null)
				return;
			ISiteCategory[] cats = aBundle.getCategories();
			for (int j = 0; j < cats.length; j++) {
				if (cats[j].getName().equals(catName))
					return;
			}
			ISiteCategory cat = fModel.getFactory().createCategory(aBundle);
			cat.setName(catName);
			expandCategory(catName);
			aBundle.addCategories(new ISiteCategory[] {cat});
		} catch (CoreException e) {
		}
	}

	private void moveFeature(SiteFeatureAdapter adapter, Object target) {
		ISiteFeature feature = findRealFeature(adapter);
		if (feature == null) {

		}
	}

	private void moveBundle(SiteBundleAdapter adapter, Object target) {
		ISiteBundle bundle = findRealBundle(adapter);
		if (bundle == null) {
			return;
		}
		if (adapter.category != null) {
			removeCategory(bundle, adapter.category);
		}
		if (target != null && target instanceof ISiteCategoryDefinition) {
			addCategory(bundle, ((ISiteCategoryDefinition) target).getName());
		}
	}

	protected void buttonSelected(int index) {
		switch (index) {
			case BUTTON_ADD_CATEGORY :

			case BUTTON_ADD_FEATURE :
				handleNewFeature();
				break;
			case BUTTON_ADD_BUNDLE :
				handleNewBundle();
				break;
		}
	}


		}
	}

	private void removeCategory(ISiteBundle aBundle, String catName) {
		try {
			if (aBundle == null)
				return;
			ISiteCategory[] cats = aBundle.getCategories();
			for (int i = 0; i < cats.length; i++) {
				if (catName.equals(cats[i].getName()))
					aBundle.removeCategories(new ISiteCategory[] {cats[i]});
			}
		} catch (CoreException e) {
		}
	}

	private ISiteFeature findRealFeature(SiteFeatureAdapter adapter) {
		ISiteFeature featureCopy = adapter.feature;
		ISiteFeature[] features = fModel.getSite().getFeatures();

		return null;
	}

	private ISiteBundle findRealBundle(SiteBundleAdapter adapter) {
		ISiteBundle featureCopy = adapter.bundle;
		ISiteBundle[] bundles = fModel.getSite().getBundles();
		for (int i = 0; i < bundles.length; i++) {
			if (bundles[i].getId().equals(featureCopy.getId()) && bundles[i].getVersion().equals(featureCopy.getVersion())) {
				return bundles[i];
			}
		}
		return null;
	}

	public void dispose() {
		super.dispose();
		FeatureModelManager mng = PDECore.getDefault().getFeatureModelManager();

		});
	}

	private void handleNewBundle() {
		final Control control = fCategoryViewer.getControl();
		BusyIndicator.showWhile(control.getDisplay(), new Runnable() {
			public void run() {
				IPluginModelBase[] allModels = PluginRegistry.getAllModels();
				ArrayList newModels = new ArrayList();
				for (int i = 0; i < allModels.length; i++) {
					if (canAdd(allModels[i]))
						newModels.add(allModels[i]);
				}
				IPluginModelBase[] candidateModels = (IPluginModelBase[]) newModels.toArray(new IPluginModelBase[newModels.size()]);
				PluginSelectionDialog dialog = new PluginSelectionDialog(fCategoryViewer.getTree().getShell(), candidateModels, true);
				if (dialog.open() == Window.OK) {
					Object[] models = dialog.getResult();
					try {
						doAddBundles(models);
					} catch (CoreException e) {
						PDEPlugin.log(e);
					}
				}
			}
		});
	}

	private boolean canAdd(IFeatureModel candidate) {
		ISiteFeature[] features = fModel.getSite().getFeatures();
		IFeature cfeature = candidate.getFeature();

		return true;
	}

	private boolean canAdd(IPluginModelBase candidate) {
		ISiteBundle[] currentBundles = fModel.getSite().getBundles();
		IPluginBase candidateBundle = candidate.getPluginBase();

		for (int i = 0; i < currentBundles.length; i++) {
			ISiteBundle currentBundle = currentBundles[i];
			if (currentBundle.getId().equals(candidateBundle.getId()) && currentBundle.getVersion().equals(candidateBundle.getVersion()))
				return false;
		}
		return true;
	}

	public static ISiteFeature createSiteFeature(ISiteModel model, IFeatureModel featureModel) throws CoreException {
		IFeature feature = featureModel.getFeature();
		ISiteFeature sfeature = model.getFactory().createFeature();

		return sfeature;
	}

	private ISiteBundle createSiteBundle(ISiteModel model, IPluginModelBase candidate) throws CoreException {
		ISiteBundle newBundle = model.getFactory().createBundle();
		newBundle.setId(candidate.getPluginBase().getId());
		newBundle.setVersion(candidate.getPluginBase().getVersion());
		return newBundle;
	}

	private static String formatVersion(String version) {
		try {
			Version v = new Version(version);

		}
	}

	/**
	 * 
	 * @param candidates
	 *            Array of IPluginModelBase
	 * @param monitor
	 * @throws CoreException
	 */
	public void doAddBundles(Object[] candidates) throws CoreException {
		// Category to add features to
		String categoryName = null;
		ISelection selection = fCategoryViewer.getSelection();
		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
			Object element = ((IStructuredSelection) selection).getFirstElement();
			if (element instanceof ISiteCategoryDefinition) {
				categoryName = ((ISiteCategoryDefinition) element).getName();
			} else if (element instanceof SiteFeatureAdapter) {
				categoryName = ((SiteFeatureAdapter) element).category;
			}
		}
		//
		ISiteBundle[] added = new ISiteBundle[candidates.length];
		for (int i = 0; i < candidates.length; i++) {
			IPluginModelBase candidate = (IPluginModelBase) candidates[i];
			ISiteBundle child = createSiteBundle(fModel, candidate);
			if (categoryName != null) {
				addCategory(child, categoryName);
			}
			added[i] = child;
		}

		// Update model
		fModel.getSite().addBundles(added);
		// Select last added feature
		if (added.length > 0) {
			if (categoryName != null) {
				expandCategory(categoryName);
			}
			fCategoryViewer.setSelection(new StructuredSelection(new SiteBundleAdapter(categoryName, added[added.length - 1])), true);
		}
	}

	void fireSelection() {
		fCategoryViewer.setSelection(fCategoryViewer.getSelection());
	}

Lines 25-31 public class CategoryUndoManager extends ModelUndoManager { Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryUndoManager.java (-1 / +1 lines)
25		25
26	protected String getPageId(Object obj) {	26	protected String getPageId(Object obj) {
27	if (obj instanceof ISiteFeature \|\| obj instanceof ISiteCategory \|\| obj instanceof ISiteCategoryDefinition) {	27	if (obj instanceof ISiteFeature \|\| obj instanceof ISiteCategory \|\| obj instanceof ISiteCategoryDefinition) {
28	return FeaturesPage.PAGE_ID;	28	return IUsPage.PAGE_ID;
29	}	29	}
30	// site elements and attributes are on different pages, stay on the	30	// site elements and attributes are on different pages, stay on the
31	// current page	31	// current page




/******************************************************************************* 
* Copyright (c) 2009 EclipseSource 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:
*   EclipseSource - initial API and implementation
******************************************************************************/
package org.eclipse.pde.internal.ui.editor.category;

import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.editor.*;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.*;
import org.eclipse.ui.forms.widgets.ScrolledForm;

public class FeaturesPage extends PDEFormPage {
	public static final String PAGE_ID = "features"; //$NON-NLS-1$
	private CategorySection fCategorySection;
	private SiteFeaturesBlock fBlock;

	public class SiteFeaturesBlock extends PDEMasterDetailsBlock {
		public SiteFeaturesBlock() {
			super(FeaturesPage.this);
		}

		protected PDESection createMasterSection(IManagedForm managedForm, Composite parent) {
			fCategorySection = new CategorySection(getPage(), parent);
			return fCategorySection;
		}

		protected void registerPages(DetailsPart detailsPart) {
			detailsPart.setPageProvider(new IDetailsPageProvider() {
				public Object getPageKey(Object object) {
					if (object instanceof SiteFeatureAdapter)
						return SiteFeatureAdapter.class;
					if (object instanceof ISiteCategoryDefinition)
						return ISiteCategoryDefinition.class;
					return object.getClass();
				}

				public IDetailsPage getPage(Object key) {
					if (key.equals(SiteFeatureAdapter.class))
						return createFeatureDetails();
					if (key.equals(ISiteCategoryDefinition.class))
						return createCategoryDetails();
					return null;
				}
			});
		}
	}

	public FeaturesPage(PDEFormEditor editor) {
		super(editor, PAGE_ID, PDEUIMessages.CategoryPage_header);
		fBlock = new SiteFeaturesBlock();
	}

	protected void createFormContent(IManagedForm managedForm) {
		super.createFormContent(managedForm);
		ScrolledForm form = managedForm.getForm();
		form.setText(PDEUIMessages.CategoryPage_header);
		form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_CATEGORY_OBJ));
		fBlock.createContent(managedForm);
		fCategorySection.fireSelection();
		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.CATEGORY_EDITOR);
	}

	private IDetailsPage createFeatureDetails() {
		return new PDEDetailsSections() {
			protected PDESection[] createSections(PDEFormPage page, Composite parent) {
				return new PDESection[] {};//new FeatureDetailsSection(getPage(), parent), new PortabilitySection(getPage(), parent)};
			}

			public String getContextId() {
				return CategoryInputContext.CONTEXT_ID;
			}
		};
	}

	private IDetailsPage createCategoryDetails() {
		return new PDEDetailsSections() {
			protected PDESection[] createSections(PDEFormPage page, Composite parent) {
				return new PDESection[] {new CategoryDetailsSection(getPage(), parent)};
			}

			public String getContextId() {
				return CategoryInputContext.CONTEXT_ID;
			}
		};
	}

	protected String getHelpResource() {
		return IHelpContextIds.CATEGORY_EDITOR;
	}
}




/******************************************************************************* 
* Copyright (c) 2009 EclipseSource 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:
*   EclipseSource - initial API and implementation
******************************************************************************/
package org.eclipse.pde.internal.ui.editor.category;

import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.editor.*;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.*;
import org.eclipse.ui.forms.widgets.ScrolledForm;

public class IUsPage extends PDEFormPage {
	public static final String PAGE_ID = "ius"; //$NON-NLS-1$
	private CategorySection fCategorySection;
	private SiteFeaturesBlock fBlock;

	public class SiteFeaturesBlock extends PDEMasterDetailsBlock {
		public SiteFeaturesBlock() {
			super(IUsPage.this);
		}

		protected PDESection createMasterSection(IManagedForm managedForm, Composite parent) {
			fCategorySection = new CategorySection(getPage(), parent);
			return fCategorySection;
		}

		protected void registerPages(DetailsPart detailsPart) {
			detailsPart.setPageProvider(new IDetailsPageProvider() {
				public Object getPageKey(Object object) {
					if (object instanceof SiteFeatureAdapter)
						return SiteFeatureAdapter.class;
					if (object instanceof SiteBundleAdapter) {
						return SiteBundleAdapter.class;
					}
					if (object instanceof ISiteCategoryDefinition)
						return ISiteCategoryDefinition.class;
					return object.getClass();
				}

				public IDetailsPage getPage(Object key) {
					if (key.equals(SiteFeatureAdapter.class))
						return createFeatureDetails();
					if (key.equals(SiteBundleAdapter.class)) {
						return createBundleDetails();
					}
					if (key.equals(ISiteCategoryDefinition.class))
						return createCategoryDetails();
					return null;
				}
			});
		}
	}

	public IUsPage(PDEFormEditor editor) {
		super(editor, PAGE_ID, PDEUIMessages.CategoryPage_header);
		fBlock = new SiteFeaturesBlock();
	}

	protected void createFormContent(IManagedForm managedForm) {
		super.createFormContent(managedForm);
		ScrolledForm form = managedForm.getForm();
		form.setText(PDEUIMessages.CategoryPage_header);
		form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_CATEGORY_OBJ));
		fBlock.createContent(managedForm);
		fCategorySection.fireSelection();
		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.CATEGORY_EDITOR);
	}

	private IDetailsPage createFeatureDetails() {
		return new PDEDetailsSections() {
			protected PDESection[] createSections(PDEFormPage page, Composite parent) {
				return new PDESection[] {};//new FeatureDetailsSection(getPage(), parent), new PortabilitySection(getPage(), parent)};
			}

			public String getContextId() {
				return CategoryInputContext.CONTEXT_ID;
			}
		};
	}

	private IDetailsPage createBundleDetails() {
		return new PDEDetailsSections() {
			protected PDESection[] createSections(PDEFormPage page, Composite parent) {
				return new PDESection[] {};//new BundleDetailsSection(getPage(), parent), new PortabilitySection(getPage(), parent)};
			}

			public String getContextId() {
				return CategoryInputContext.CONTEXT_ID;
			}
		};
	}

	private IDetailsPage createCategoryDetails() {
		return new PDEDetailsSections() {
			protected PDESection[] createSections(PDEFormPage page, Composite parent) {
				return new PDESection[] {new CategoryDetailsSection(getPage(), parent)};
			}

			public String getContextId() {
				return CategoryInputContext.CONTEXT_ID;
			}
		};
	}

	protected String getHelpResource() {
		return IHelpContextIds.CATEGORY_EDITOR;
	}
}




/******************************************************************************* 
* Copyright (c) 2009 EclipseSource 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:
*   EclipseSource - initial API and implementation
*   Mickael Istria (Red Hat Inc.) - 383795: <bundle...> support
******************************************************************************/
package org.eclipse.pde.internal.ui.editor.category;

import java.io.PrintWriter;
import java.io.Serializable;
import org.eclipse.pde.core.IWritable;
import org.eclipse.pde.internal.core.isite.ISiteBundle;

public class SiteBundleAdapter implements Serializable, IWritable {

	private static final long serialVersionUID = 1L;

	String category;
	ISiteBundle bundle;

	public SiteBundleAdapter(String category, ISiteBundle bundle) {
		this.category = category;
		this.bundle = bundle;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.core.IWritable#write(java.lang.String, java.io.PrintWriter)
	 */
	public void write(String indent, PrintWriter writer) {
		bundle.write(indent, writer);
	}

	/*
	 * For retaining selectiong in the tree, when modyfing or moving features,
	 * SiteFeatureAdapter are equal if features are equal (same ID and version)
	 * 
	 * @see java.lang.Object#equals(java.lang.Object)
	 */
	public boolean equals(Object obj) {
		if (obj instanceof SiteBundleAdapter) {
			SiteBundleAdapter adapter = (SiteBundleAdapter) obj;
			String id = bundle.getId();
			String id2 = adapter.bundle.getId();
			boolean sameBundle = id != null && id2 != null && id.equals(id2);
			if (sameBundle) {
				String version = bundle.getVersion();
				String version2 = adapter.bundle.getVersion();
				sameBundle = version != null && version2 != null && version.equals(version2);
			}
			boolean sameCategory = adapter.category != null && category != null ? adapter.category.equals(category) : true;
			return sameBundle && sameCategory;
		}
		return super.equals(obj);
	}

	/* (non-Javadoc)
	 * @see java.lang.Object#hashCode()
	 */
	public int hashCode() {
		if (bundle.getId() == null) {
			return super.hashCode();
		}
		int code = bundle.getId().hashCode();
		if (bundle.getVersion() != null) {
			code += bundle.getVersion().hashCode();
		}
		if (category != null) {
			code += category.hashCode();
		}
		return code;
	}
}

Lines 1575-1580 CategorySection_desc=1. Add the features to be published on the site.\n\ Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties (-1 / +1 lines)
1575	2. For easier browsing of the site, categorize the features by dragging.\n\	1575	2. For easier browsing of the site, categorize the features by dragging.\n\
1576	3. Build the features.	1576	3. Build the features.
1577	CategorySection_add = Add Feature...	1577	CategorySection_add = Add Feature...
		1578	CategorySection_addBundle = Add Bundle...
1578	CategorySection_remove = Remove	1579	CategorySection_remove = Remove
1579	CategorySection_environment = Synchronize...	1580	CategorySection_environment = Synchronize...
1580	CategorySection_buildAll = Build All	1581	CategorySection_buildAll = Build All
1581	-

Return to bug 383795

Added Link Here

(-)a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/isite/ISiteBundle.java (+23 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	* Red Hat Inc. - Copied from IFeatureBundle
11	*******************************************************************************/
12	package org.eclipse.pde.internal.core.isite;
13
14	import org.eclipse.core.runtime.CoreException;
15	import org.eclipse.pde.internal.core.ifeature.IVersionable;
16
17	public interface ISiteBundle extends IVersionable, ISiteObject {
18	void addCategories(ISiteCategory[] categories) throws CoreException;
19
20	void removeCategories(ISiteCategory[] categories) throws CoreException;
21
22	ISiteCategory[] getCategories();
23	}

Added Link Here

(-)a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/site/SiteBundle.java (+112 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 20012 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	* Red Hat Inc. - <bundle...> in category.xml (copied from SiteFeature)
11	*******************************************************************************/
12	package org.eclipse.pde.internal.core.site;
13
14	import java.io.PrintWriter;
15	import java.util.Vector;
16	import org.eclipse.core.runtime.CoreException;
17	import org.eclipse.pde.core.IModelChangedEvent;
18	import org.eclipse.pde.internal.core.isite.ISiteBundle;
19	import org.eclipse.pde.internal.core.isite.ISiteCategory;
20	import org.w3c.dom.Node;
21	import org.w3c.dom.NodeList;
22
23	public class SiteBundle extends VersionableObject implements ISiteBundle {
24	private static final long serialVersionUID = 1L;
25	private Vector fCategories = new Vector();
26
27	public boolean isValid() {
28	for (int i = 0; i < fCategories.size(); i++) {
29	ISiteCategory category = (ISiteCategory) fCategories.get(i);
30	if (!category.isValid())
31	return false;
32	}
33	return true;
34	}
35
36	/**
37	* @see org.eclipse.pde.internal.core.isite.ISiteFeature#addCategories(org.eclipse.pde.internal.core.isite.ISiteCategory)
38	*/
39	public void addCategories(ISiteCategory[] newCategories) throws CoreException {
40	ensureModelEditable();
41	for (int i = 0; i < newCategories.length; i++) {
42	ISiteCategory category = newCategories[i];
43	((SiteCategory) category).setInTheModel(true);
44	fCategories.add(newCategories[i]);
45	}
46	fireStructureChanged(newCategories, IModelChangedEvent.INSERT);
47	}
48
49	/**
50	* @see org.eclipse.pde.internal.core.isite.ISiteFeature#removeCategories(org.eclipse.pde.internal.core.isite.ISiteCategory)
51	*/
52	public void removeCategories(ISiteCategory[] newCategories) throws CoreException {
53	ensureModelEditable();
54	for (int i = 0; i < newCategories.length; i++) {
55	ISiteCategory category = newCategories[i];
56	((SiteCategory) category).setInTheModel(false);
57	fCategories.remove(newCategories[i]);
58	}
59	fireStructureChanged(newCategories, IModelChangedEvent.REMOVE);
60	}
61
62	/**
63	* @see org.eclipse.pde.internal.core.isite.ISiteFeature#getCategories()
64	*/
65	public ISiteCategory[] getCategories() {
66	return (ISiteCategory[]) fCategories.toArray(new ISiteCategory[fCategories.size()]);
67	}
68
69	protected void parse(Node node) {
70	super.parse(node);
71	NodeList children = node.getChildNodes();
72	for (int i = 0; i < children.getLength(); i++) {
73	Node child = children.item(i);
74	if (child.getNodeType() == Node.ELEMENT_NODE && child.getNodeName().equalsIgnoreCase("category")) { //$NON-NLS-1$
75	SiteCategory category = (SiteCategory) getModel().getFactory().createCategory(this);
76	category.parse(child);
77	category.setInTheModel(true);
78	fCategories.add(category);
79	}
80	}
81	}
82
83	protected void reset() {
84	super.reset();
85	fCategories.clear();
86	}
87
88	/**
89	* @see org.eclipse.pde.core.IWritable#write(java.lang.String, java.io.PrintWriter)
90	*/
91	public void write(String indent, PrintWriter writer) {
92	writer.print(indent);
93	writer.print("<bundle"); //$NON-NLS-1$
94	if (id != null)
95	writer.print(" id=\"" + getId() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
96	if (version != null)
97	writer.print(" version=\"" + getVersion() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
98	if (label != null)
99	writer.print(" label=\"" + getLabel() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
100	if (fCategories.size() > 0) {
101	writer.println(">"); //$NON-NLS-1$
102	String indent2 = indent + " "; //$NON-NLS-1$
103	for (int i = 0; i < fCategories.size(); i++) {
104	ISiteCategory category = (ISiteCategory) fCategories.get(i);
105	category.write(indent2, writer);
106	}
107	writer.println(indent + "</bundle>"); //$NON-NLS-1$
108	} else
109	writer.println("/>"); //$NON-NLS-1$
110	}
111
112	}

Lines 80-93 public class CategoryEditor extends PDEFormEditor { Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategoryEditor.java (-2 / +2 lines)
80		80
81	protected void addEditorPages() {	81	protected void addEditorPages() {
82	try {	82	try {
83	addPage(new FeaturesPage(this));	83	addPage(new IUsPage(this));
84	} catch (PartInitException e) {	84	} catch (PartInitException e) {
85	PDEPlugin.logException(e);	85	PDEPlugin.logException(e);
86	}	86	}
87	}	87	}
88		88
89	protected String computeInitialPageId() {	89	protected String computeInitialPageId() {
90	return FeaturesPage.PAGE_ID;	90	return IUsPage.PAGE_ID;
91	}	91	}
92		92
93	protected ISortableContentOutlinePage createContentOutline() {	93	protected ISortableContentOutlinePage createContentOutline() {

Lines 17-28 import org.eclipse.jface.viewers.*; Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/CategorySection.java (-3 / +190 lines)
17	import org.eclipse.jface.window.Window;	17	import org.eclipse.jface.window.Window;
18	import org.eclipse.osgi.util.NLS;	18	import org.eclipse.osgi.util.NLS;
19	import org.eclipse.pde.core.IModelChangedEvent;	19	import org.eclipse.pde.core.IModelChangedEvent;
		20	import org.eclipse.pde.core.plugin.*;
20	import org.eclipse.pde.internal.core.*;	21	import org.eclipse.pde.internal.core.*;
21	import org.eclipse.pde.internal.core.ifeature.*;	22	import org.eclipse.pde.internal.core.ifeature.*;
22	import org.eclipse.pde.internal.core.isite.*;	23	import org.eclipse.pde.internal.core.isite.*;
23	import org.eclipse.pde.internal.ui.PDEPlugin;	24	import org.eclipse.pde.internal.ui.PDEPlugin;
24	import org.eclipse.pde.internal.ui.PDEUIMessages;	25	import org.eclipse.pde.internal.ui.PDEUIMessages;
25	import org.eclipse.pde.internal.ui.dialogs.FeatureSelectionDialog;	26	import org.eclipse.pde.internal.ui.dialogs.FeatureSelectionDialog;
		27	import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;
26	import org.eclipse.pde.internal.ui.editor.*;	28	import org.eclipse.pde.internal.ui.editor.*;
27	import org.eclipse.pde.internal.ui.editor.feature.FeatureEditor;	29	import org.eclipse.pde.internal.ui.editor.feature.FeatureEditor;
28	import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;	30	import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
Lines 42-47 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
42		44
43	private static final int BUTTON_ADD_CATEGORY = 0;	45	private static final int BUTTON_ADD_CATEGORY = 0;
44	private static final int BUTTON_ADD_FEATURE = 1;	46	private static final int BUTTON_ADD_FEATURE = 1;
		47	private static final int BUTTON_ADD_BUNDLE = 2;
45	private static int fCounter;	48	private static int fCounter;
46	private ISiteModel fModel;	49	private ISiteModel fModel;
47	private TreePart fCategoryTreePart;	50	private TreePart fCategoryTreePart;
Lines 61-74 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
61	if (features[i].getCategories().length == 0)	64	if (features[i].getCategories().length == 0)
62	result.add(new SiteFeatureAdapter(null, features[i]));	65	result.add(new SiteFeatureAdapter(null, features[i]));
63	}	66	}
		67	ISiteBundle[] bundles = fModel.getSite().getBundles();
		68	for (int i = 0; i < bundles.length; i++) {
		69	if (bundles[i].getCategories().length == 0) {
		70	result.add(new SiteBundleAdapter(null, bundles[i]));
		71	}
		72	}
64	return result.toArray();	73	return result.toArray();
65	}	74	}
66		75
67	public Object[] getChildren(Object parent) {	76	public Object[] getChildren(Object parent) {
68	if (parent instanceof ISiteCategoryDefinition) {	77	if (parent instanceof ISiteCategoryDefinition) {
69	ISiteCategoryDefinition catDef = (ISiteCategoryDefinition) parent;	78	ISiteCategoryDefinition catDef = (ISiteCategoryDefinition) parent;
70	ISiteFeature[] features = fModel.getSite().getFeatures();
71	HashSet result = new HashSet();	79	HashSet result = new HashSet();
		80	ISiteFeature[] features = fModel.getSite().getFeatures();
72	for (int i = 0; i < features.length; i++) {	81	for (int i = 0; i < features.length; i++) {
73	ISiteCategory[] cats = features[i].getCategories();	82	ISiteCategory[] cats = features[i].getCategories();
74	for (int j = 0; j < cats.length; j++) {	83	for (int j = 0; j < cats.length; j++) {
Lines 77-82 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
77	}	86	}
78	}	87	}
79	}	88	}
		89	ISiteBundle[] bundles = fModel.getSite().getBundles();
		90	for (int i = 0; i < bundles.length; i++) {
		91	ISiteCategory[] cats = bundles[i].getCategories();
		92	for (int j = 0; j < cats.length; j++) {
		93	if (cats[j].getDefinition() != null && cats[j].getDefinition().equals(catDef)) {
		94	result.add(new SiteBundleAdapter(cats[j].getName(), bundles[i]));
		95	}
		96	}
		97	}
80	return result.toArray();	98	return result.toArray();
81	}	99	}
82	return new Object[0];	100	return new Object[0];
Lines 98-110 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
98	}	116	}
99	}	117	}
100	}	118	}
		119	ISiteBundle[] bundles = fModel.getSite().getBundles();
		120	for (int i = 0; i < bundles.length; i++) {
		121	ISiteCategory[] cats = bundles[i].getCategories();
		122	for (int j = 0; j < cats.length; j++) {
		123	if (cats[j].getDefinition() != null && cats[j].getDefinition().equals(catDef)) {
		124	return true;
		125	}
		126	}
		127	}
101	}	128	}
102	return false;	129	return false;
103	}	130	}
104	}	131	}
105		132
106	public CategorySection(PDEFormPage formPage, Composite parent) {	133	public CategorySection(PDEFormPage formPage, Composite parent) {
107	super(formPage, parent, Section.DESCRIPTION, new String[] {PDEUIMessages.CategoryDefinitionCategorySection_new, PDEUIMessages.CategorySection_add});	134	super(formPage, parent, Section.DESCRIPTION, new String[] {PDEUIMessages.CategoryDefinitionCategorySection_new, PDEUIMessages.CategorySection_add, PDEUIMessages.CategorySection_addBundle});
108	getSection().setText(PDEUIMessages.CategoryDefinitionCategorySection_title);	135	getSection().setText(PDEUIMessages.CategoryDefinitionCategorySection_title);
109	getSection().setDescription(PDEUIMessages.CategoryDefinitionCategorySection_desc);	136	getSection().setDescription(PDEUIMessages.CategoryDefinitionCategorySection_desc);
110	}	137	}
Lines 208-213 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
208	}	235	}
209	return true;	236	return true;
210	}	237	}
		238	if (objects.length > 0 && objects[0] instanceof SiteBundleAdapter) {
		239	if (op == DND.DROP_COPY && target != null) {
		240	copyBundle((SiteBundleAdapter) objects[0], target);
		241	} else {
		242	moveBundle((SiteBundleAdapter) objects[0], target);
		243	}
		244	return true;
		245	}
211	return false;	246	return false;
212	}	247	}
213		248
Lines 221-227 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
221	fCategoryViewer.addDragSupport(DND.DROP_MOVE \| DND.DROP_COPY, transfers, new DragSourceListener() {	256	fCategoryViewer.addDragSupport(DND.DROP_MOVE \| DND.DROP_COPY, transfers, new DragSourceListener() {
222	public void dragStart(DragSourceEvent event) {	257	public void dragStart(DragSourceEvent event) {
223	IStructuredSelection ssel = (IStructuredSelection) fCategoryViewer.getSelection();	258	IStructuredSelection ssel = (IStructuredSelection) fCategoryViewer.getSelection();
224	if (ssel == null \|\| ssel.isEmpty() \|\| !(ssel.getFirstElement() instanceof SiteFeatureAdapter)) {	259	if (ssel == null \|\| ssel.isEmpty() \|\| !(ssel.getFirstElement() instanceof SiteFeatureAdapter \|\| ssel.getFirstElement() instanceof SiteBundleAdapter)) {
225	event.doit = false;	260	event.doit = false;
226	}	261	}
227	}	262	}
Lines 237-242 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
237		272
238	fCategoryTreePart.setButtonEnabled(BUTTON_ADD_CATEGORY, isEditable());	273	fCategoryTreePart.setButtonEnabled(BUTTON_ADD_CATEGORY, isEditable());
239	fCategoryTreePart.setButtonEnabled(BUTTON_ADD_FEATURE, isEditable());	274	fCategoryTreePart.setButtonEnabled(BUTTON_ADD_FEATURE, isEditable());
		275	fCategoryTreePart.setButtonEnabled(BUTTON_ADD_BUNDLE, isEditable());
240		276
241	// fCategoryViewer.expandAll();	277	// fCategoryViewer.expandAll();
242	toolkit.paintBordersFor(container);	278	toolkit.paintBordersFor(container);
Lines 267-272 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
267	}	303	}
268	}	304	}
269		305
		306	private void copyBundle(SiteBundleAdapter adapter, Object target) {
		307	ISiteBundle bundle = findRealBundle(adapter);
		308	if (bundle == null) {
		309	return;
		310	}
		311	if (target != null && target instanceof ISiteCategoryDefinition) {
		312	addCategory(bundle, ((ISiteCategoryDefinition) target).getName());
		313	}
		314	}
		315
270	private void addCategory(ISiteFeature aFeature, String catName) {	316	private void addCategory(ISiteFeature aFeature, String catName) {
271	try {	317	try {
272	if (aFeature == null)	318	if (aFeature == null)
Lines 284-289 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
284	}	330	}
285	}	331	}
286		332
		333	private void addCategory(ISiteBundle aBundle, String catName) {
		334	try {
		335	if (aBundle == null)
		336	return;
		337	ISiteCategory[] cats = aBundle.getCategories();
		338	for (int j = 0; j < cats.length; j++) {
		339	if (cats[j].getName().equals(catName))
		340	return;
		341	}
		342	ISiteCategory cat = fModel.getFactory().createCategory(aBundle);
		343	cat.setName(catName);
		344	expandCategory(catName);
		345	aBundle.addCategories(new ISiteCategory[] {cat});
		346	} catch (CoreException e) {
		347	}
		348	}
		349
287	private void moveFeature(SiteFeatureAdapter adapter, Object target) {	350	private void moveFeature(SiteFeatureAdapter adapter, Object target) {
288	ISiteFeature feature = findRealFeature(adapter);	351	ISiteFeature feature = findRealFeature(adapter);
289	if (feature == null) {	352	if (feature == null) {
Lines 297-302 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
297	}	360	}
298	}	361	}
299		362
		363	private void moveBundle(SiteBundleAdapter adapter, Object target) {
		364	ISiteBundle bundle = findRealBundle(adapter);
		365	if (bundle == null) {
		366	return;
		367	}
		368	if (adapter.category != null) {
		369	removeCategory(bundle, adapter.category);
		370	}
		371	if (target != null && target instanceof ISiteCategoryDefinition) {
		372	addCategory(bundle, ((ISiteCategoryDefinition) target).getName());
		373	}
		374	}
		375
300	protected void buttonSelected(int index) {	376	protected void buttonSelected(int index) {
301	switch (index) {	377	switch (index) {
302	case BUTTON_ADD_CATEGORY :	378	case BUTTON_ADD_CATEGORY :
Lines 305-310 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
305	case BUTTON_ADD_FEATURE :	381	case BUTTON_ADD_FEATURE :
306	handleNewFeature();	382	handleNewFeature();
307	break;	383	break;
		384	case BUTTON_ADD_BUNDLE :
		385	handleNewBundle();
		386	break;
308	}	387	}
309	}	388	}
310		389
Lines 415-420 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
415	}	494	}
416	}	495	}
417		496
		497	private void removeCategory(ISiteBundle aBundle, String catName) {
		498	try {
		499	if (aBundle == null)
		500	return;
		501	ISiteCategory[] cats = aBundle.getCategories();
		502	for (int i = 0; i < cats.length; i++) {
		503	if (catName.equals(cats[i].getName()))
		504	aBundle.removeCategories(new ISiteCategory[] {cats[i]});
		505	}
		506	} catch (CoreException e) {
		507	}
		508	}
		509
418	private ISiteFeature findRealFeature(SiteFeatureAdapter adapter) {	510	private ISiteFeature findRealFeature(SiteFeatureAdapter adapter) {
419	ISiteFeature featureCopy = adapter.feature;	511	ISiteFeature featureCopy = adapter.feature;
420	ISiteFeature[] features = fModel.getSite().getFeatures();	512	ISiteFeature[] features = fModel.getSite().getFeatures();
Lines 426-431 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
426	return null;	518	return null;
427	}	519	}
428		520
		521	private ISiteBundle findRealBundle(SiteBundleAdapter adapter) {
		522	ISiteBundle featureCopy = adapter.bundle;
		523	ISiteBundle[] bundles = fModel.getSite().getBundles();
		524	for (int i = 0; i < bundles.length; i++) {
		525	if (bundles[i].getId().equals(featureCopy.getId()) && bundles[i].getVersion().equals(featureCopy.getVersion())) {
		526	return bundles[i];
		527	}
		528	}
		529	return null;
		530	}
		531
429	public void dispose() {	532	public void dispose() {
430	super.dispose();	533	super.dispose();
431	FeatureModelManager mng = PDECore.getDefault().getFeatureModelManager();	534	FeatureModelManager mng = PDECore.getDefault().getFeatureModelManager();
Lines 565-570 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
565	});	668	});
566	}	669	}
567		670
		671	private void handleNewBundle() {
		672	final Control control = fCategoryViewer.getControl();
		673	BusyIndicator.showWhile(control.getDisplay(), new Runnable() {
		674	public void run() {
		675	IPluginModelBase[] allModels = PluginRegistry.getAllModels();
		676	ArrayList newModels = new ArrayList();
		677	for (int i = 0; i < allModels.length; i++) {
		678	if (canAdd(allModels[i]))
		679	newModels.add(allModels[i]);
		680	}
		681	IPluginModelBase[] candidateModels = (IPluginModelBase[]) newModels.toArray(new IPluginModelBase[newModels.size()]);
		682	PluginSelectionDialog dialog = new PluginSelectionDialog(fCategoryViewer.getTree().getShell(), candidateModels, true);
		683	if (dialog.open() == Window.OK) {
		684	Object[] models = dialog.getResult();
		685	try {
		686	doAddBundles(models);
		687	} catch (CoreException e) {
		688	PDEPlugin.log(e);
		689	}
		690	}
		691	}
		692	});
		693	}
		694
568	private boolean canAdd(IFeatureModel candidate) {	695	private boolean canAdd(IFeatureModel candidate) {
569	ISiteFeature[] features = fModel.getSite().getFeatures();	696	ISiteFeature[] features = fModel.getSite().getFeatures();
570	IFeature cfeature = candidate.getFeature();	697	IFeature cfeature = candidate.getFeature();
Lines 577-582 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
577	return true;	704	return true;
578	}	705	}
579		706
		707	private boolean canAdd(IPluginModelBase candidate) {
		708	ISiteBundle[] currentBundles = fModel.getSite().getBundles();
		709	IPluginBase candidateBundle = candidate.getPluginBase();
		710
		711	for (int i = 0; i < currentBundles.length; i++) {
		712	ISiteBundle currentBundle = currentBundles[i];
		713	if (currentBundle.getId().equals(candidateBundle.getId()) && currentBundle.getVersion().equals(candidateBundle.getVersion()))
		714	return false;
		715	}
		716	return true;
		717	}
		718
580	public static ISiteFeature createSiteFeature(ISiteModel model, IFeatureModel featureModel) throws CoreException {	719	public static ISiteFeature createSiteFeature(ISiteModel model, IFeatureModel featureModel) throws CoreException {
581	IFeature feature = featureModel.getFeature();	720	IFeature feature = featureModel.getFeature();
582	ISiteFeature sfeature = model.getFactory().createFeature();	721	ISiteFeature sfeature = model.getFactory().createFeature();
Lines 594-599 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
594	return sfeature;	733	return sfeature;
595	}	734	}
596		735
		736	private ISiteBundle createSiteBundle(ISiteModel model, IPluginModelBase candidate) throws CoreException {
		737	ISiteBundle newBundle = model.getFactory().createBundle();
		738	newBundle.setId(candidate.getPluginBase().getId());
		739	newBundle.setVersion(candidate.getPluginBase().getVersion());
		740	return newBundle;
		741	}
		742
597	private static String formatVersion(String version) {	743	private static String formatVersion(String version) {
598	try {	744	try {
599	Version v = new Version(version);	745	Version v = new Version(version);
Lines 657-662 public class CategorySection extends TreeSection implements IFeatureModelListene Link Here
657	}	803	}
658	}	804	}
659		805
		806	/**
		807	*
		808	* @param candidates
		809	* Array of IPluginModelBase
		810	* @param monitor
		811	* @throws CoreException
		812	*/
		813	public void doAddBundles(Object[] candidates) throws CoreException {
		814	// Category to add features to
		815	String categoryName = null;
		816	ISelection selection = fCategoryViewer.getSelection();
		817	if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
		818	Object element = ((IStructuredSelection) selection).getFirstElement();
		819	if (element instanceof ISiteCategoryDefinition) {
		820	categoryName = ((ISiteCategoryDefinition) element).getName();
		821	} else if (element instanceof SiteFeatureAdapter) {
		822	categoryName = ((SiteFeatureAdapter) element).category;
		823	}
		824	}
		825	//
		826	ISiteBundle[] added = new ISiteBundle[candidates.length];
		827	for (int i = 0; i < candidates.length; i++) {
		828	IPluginModelBase candidate = (IPluginModelBase) candidates[i];
		829	ISiteBundle child = createSiteBundle(fModel, candidate);
		830	if (categoryName != null) {
		831	addCategory(child, categoryName);
		832	}
		833	added[i] = child;
		834	}
		835
		836	// Update model
		837	fModel.getSite().addBundles(added);
		838	// Select last added feature
		839	if (added.length > 0) {
		840	if (categoryName != null) {
		841	expandCategory(categoryName);
		842	}
		843	fCategoryViewer.setSelection(new StructuredSelection(new SiteBundleAdapter(categoryName, added[added.length - 1])), true);
		844	}
		845	}
		846
660	void fireSelection() {	847	void fireSelection() {
661	fCategoryViewer.setSelection(fCategoryViewer.getSelection());	848	fCategoryViewer.setSelection(fCategoryViewer.getSelection());
662	}	849	}

Lines 1-98 Link Here

(-)a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/category/FeaturesPage.java (-98 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 EclipseSource and others. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors:
8	* EclipseSource - initial API and implementation
9	******************************************************************************/
10	package org.eclipse.pde.internal.ui.editor.category;
11
12	import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;
13	import org.eclipse.pde.internal.ui.*;
14	import org.eclipse.pde.internal.ui.editor.*;
15	import org.eclipse.swt.widgets.Composite;
16	import org.eclipse.ui.PlatformUI;
17	import org.eclipse.ui.forms.*;
18	import org.eclipse.ui.forms.widgets.ScrolledForm;
19
20	public class FeaturesPage extends PDEFormPage {
21	public static final String PAGE_ID = "features"; //$NON-NLS-1$
22	private CategorySection fCategorySection;
23	private SiteFeaturesBlock fBlock;
24
25	public class SiteFeaturesBlock extends PDEMasterDetailsBlock {
26	public SiteFeaturesBlock() {
27	super(FeaturesPage.this);
28	}
29
30	protected PDESection createMasterSection(IManagedForm managedForm, Composite parent) {
31	fCategorySection = new CategorySection(getPage(), parent);
32	return fCategorySection;
33	}
34
35	protected void registerPages(DetailsPart detailsPart) {
36	detailsPart.setPageProvider(new IDetailsPageProvider() {
37	public Object getPageKey(Object object) {
38	if (object instanceof SiteFeatureAdapter)
39	return SiteFeatureAdapter.class;
40	if (object instanceof ISiteCategoryDefinition)
41	return ISiteCategoryDefinition.class;
42	return object.getClass();
43	}
44
45	public IDetailsPage getPage(Object key) {
46	if (key.equals(SiteFeatureAdapter.class))
47	return createFeatureDetails();
48	if (key.equals(ISiteCategoryDefinition.class))
49	return createCategoryDetails();
50	return null;
51	}
52	});
53	}
54	}
55
56	public FeaturesPage(PDEFormEditor editor) {
57	super(editor, PAGE_ID, PDEUIMessages.CategoryPage_header);
58	fBlock = new SiteFeaturesBlock();
59	}
60
61	protected void createFormContent(IManagedForm managedForm) {
62	super.createFormContent(managedForm);
63	ScrolledForm form = managedForm.getForm();
64	form.setText(PDEUIMessages.CategoryPage_header);
65	form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_CATEGORY_OBJ));
66	fBlock.createContent(managedForm);
67	fCategorySection.fireSelection();
68	PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.CATEGORY_EDITOR);
69	}
70
71	private IDetailsPage createFeatureDetails() {
72	return new PDEDetailsSections() {
73	protected PDESection[] createSections(PDEFormPage page, Composite parent) {
74	return new PDESection[] {};//new FeatureDetailsSection(getPage(), parent), new PortabilitySection(getPage(), parent)};
75	}
76
77	public String getContextId() {
78	return CategoryInputContext.CONTEXT_ID;
79	}
80	};
81	}
82
83	private IDetailsPage createCategoryDetails() {
84	return new PDEDetailsSections() {
85	protected PDESection[] createSections(PDEFormPage page, Composite parent) {
86	return new PDESection[] {new CategoryDetailsSection(getPage(), parent)};
87	}
88
89	public String getContextId() {
90	return CategoryInputContext.CONTEXT_ID;
91	}
92	};
93	}
94
95	protected String getHelpResource() {
96	return IHelpContextIds.CATEGORY_EDITOR;
97	}
98	}