Attachment #131469 for bug #270626

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




		} catch (CoreException e) {
			return MessageFormat.format(Messages.BundleContainerTable_4, new String[] {e.getMessage()});
		}
		if (element instanceof IStatus) {
			return ((IStatus) element).getMessage();
		}
		return super.getText(element);
	}


			IBundleContainer container = (IBundleContainer) element;
			if (container.isResolved()) {
				IStatus status = container.getBundleStatus();
				if (status.getSeverity() == IStatus.WARNING || status.getSeverity() == IStatus.INFO) {
					flag = SharedLabelProvider.F_WARNING;
				} else if (status.getSeverity() == IStatus.ERROR) {
					flag = SharedLabelProvider.F_ERROR;

			} else if (element instanceof ProfileBundleContainer) {
				return PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_PRODUCT_DEFINITION, flag);
			}
		} else if (element instanceof IStatus) {
			int severity = ((IStatus) element).getSeverity();
			if (severity == IStatus.WARNING) {
				return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
			} else if (severity == IStatus.ERROR) {
				return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
			}
		}

		return super.getImage(element);
	}





import org.eclipse.jface.wizard.Wizard;
import org.eclipse.pde.internal.core.target.impl.*;
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.PDEPlugin;

public class EditBundleContainerWizard extends Wizard {

	private ITargetDefinition fTarget;
	private IBundleContainer fContainer;
	private EditDirectoryContainerPage fPage;

	public EditBundleContainerWizard(IBundleContainer container) {
		fTarget = target;
		fContainer = container;
		IDialogSettings settings = PDEPlugin.getDefault().getDialogSettings().getSection(AddBundleContainerSelectionPage.SETTINGS_SECTION);
		if (settings == null) {


	public void addPages() {
		if (fContainer instanceof DirectoryBundleContainer) {
			fPage = new EditDirectoryContainerPage(fContainer);
			addPage(fPage);
		} else if (fContainer instanceof ProfileBundleContainer) {
			fPage = new EditProfileContainerPage(fContainer);
			addPage(fPage);
		} else if (fContainer instanceof FeatureBundleContainer) {
			fPage = new EditFeatureContainerPage(fContainer);
			addPage(fPage);
		}
	}

	public boolean performFinish() {
		if (fPage != null) {
			fPage.storeSettings();
			fContainer = fPage.getBundleContainer();
			return true;
		}




/*******************************************************************************
 * Copyright (c) 2009 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
 *******************************************************************************/
package org.eclipse.pde.internal.ui.shared.target;

import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.*;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.pde.internal.core.target.provisional.*;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.SWTFactory;
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
import org.eclipse.pde.internal.ui.editor.targetdefinition.TargetEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.progress.UIJob;

/**
 * UI part that can be added to a dialog or to a form editor.  Contains a table displaying
 * the bundle containers of a target definition.  Also has buttons to add, edit and remove
 * bundle containers of varying types.
 * 
 * @see TargetEditor
 * @see ITargetDefinition
 * @see IBundleContainer
 */
public class BundleContainerTable {

	private TreeViewer fTreeViewer;
	private Button fAddButton;
	private Button fEditButton;
	private Button fRemoveButton;
	private Button fRemoveAllButton;
	private Label fShowLabel;
	private Button fShowPluginsButton;
	private Button fShowSourceButton;
	private ViewerFilter fPluginFilter;
	private ViewerFilter fSourceFilter;

	private ITargetDefinition fTarget;
	private IBundleContainerTableReporter fReporter;

	/**
	 * Creates this part using the form toolkit and adds it to the given composite.
	 * 
	 * @param parent parent composite
	 * @param toolkit toolkit to create the widgets with
	 * @param reporter reporter implementation that will handle resolving and changes to the containers
	 * @return generated instance of the table part
	 */
	public static BundleContainerTable createTableInForm(Composite parent, FormToolkit toolkit, IBundleContainerTableReporter reporter) {
		BundleContainerTable contentTable = new BundleContainerTable(reporter);
		contentTable.createFormContents(parent, toolkit);
		return contentTable;
	}

	/**
	 * Creates this part using standard dialog widgets and adds it to the given composite.
	 * 
	 * @param parent parent composite
	 * @param reporter reporter implementation that will handle resolving and changes to the containers
	 * @return generated instance of the table part
	 */
	public static BundleContainerTable createTableInDialog(Composite parent, IBundleContainerTableReporter reporter) {
		BundleContainerTable contentTable = new BundleContainerTable(reporter);
		contentTable.createDialogContents(parent);
		return contentTable;
	}

	/**
	 * Private constructor, use one of {@link #createTableInDialog(Composite, IBundleContainerTableReporter)}
	 * or {@link #createTableInForm(Composite, FormToolkit, IBundleContainerTableReporter)}.
	 * 
	 * @param reporter reporter implementation that will handle resolving and changes to the containers
	 */
	private BundleContainerTable(IBundleContainerTableReporter reporter) {
		fReporter = reporter;
	}

	/**
	 * Creates the part contents from a toolkit
	 * @param parent parent composite
	 * @param toolkit form toolkit to create widgets
	 */
	private void createFormContents(Composite parent, FormToolkit toolkit) {
		Composite comp = toolkit.createComposite(parent);
		comp.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 2));
		comp.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL));

		Tree atree = toolkit.createTree(comp, SWT.V_SCROLL | SWT.H_SCROLL);
		atree.setLayout(new GridLayout());
		GridData gd = new GridData(GridData.FILL_BOTH);
		atree.setLayoutData(gd);

		Composite buttonComp = toolkit.createComposite(comp);
		GridLayout layout = new GridLayout();
		layout.marginWidth = layout.marginHeight = 0;
		buttonComp.setLayout(layout);
		buttonComp.setLayoutData(new GridData(GridData.FILL_VERTICAL));

		fAddButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_0, SWT.PUSH);
		fEditButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_1, SWT.PUSH);
		fRemoveButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_2, SWT.PUSH);
		fRemoveAllButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_3, SWT.PUSH);

		Composite filterComp = toolkit.createComposite(buttonComp);
		layout = new GridLayout();
		layout.marginWidth = layout.marginHeight = 0;
		filterComp.setLayout(layout);
		filterComp.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, true, true));

		fShowLabel = toolkit.createLabel(filterComp, Messages.BundleContainerTable_9);
		fShowPluginsButton = toolkit.createButton(filterComp, Messages.BundleContainerTable_14, SWT.CHECK);
		fShowSourceButton = toolkit.createButton(filterComp, Messages.BundleContainerTable_15, SWT.CHECK);

		initializeTreeViewer(atree);
		initializeButtons();
		initializeFilters();

		toolkit.paintBordersFor(comp);
	}

	/**
	 * Creates the part contents using SWTFactory
	 * @param parent parent composite
	 */
	private void createDialogContents(Composite parent) {
		Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH, 0, 0);

		Tree atree = new Tree(comp, SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
		atree.setLayout(new GridLayout());
		GridData gd = new GridData(GridData.FILL_BOTH);
		gd.widthHint = 200;
		atree.setLayoutData(gd);

		Composite buttonComp = SWTFactory.createComposite(comp, 2, 1, GridData.FILL_BOTH);
		GridLayout layout = new GridLayout();
		layout.marginHeight = 0;
		layout.marginWidth = 0;
		buttonComp.setLayout(layout);
		buttonComp.setLayoutData(new GridData(GridData.FILL_VERTICAL));

		fAddButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_0, null);
		fEditButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_1, null);
		fRemoveButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_2, null);
		fRemoveAllButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_3, null);

		Composite filterComp = SWTFactory.createComposite(buttonComp, 1, 1, GridData.BEGINNING, 0, 0);
		filterComp.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, true, true));

		fShowLabel = SWTFactory.createLabel(filterComp, Messages.BundleContainerTable_9, 1);
		fShowPluginsButton = SWTFactory.createCheckButton(filterComp, Messages.BundleContainerTable_14, null, true, 1);
		fShowSourceButton = SWTFactory.createCheckButton(filterComp, Messages.BundleContainerTable_15, null, true, 1);

		initializeTreeViewer(atree);
		initializeButtons();
		initializeFilters();
	}

	/**
	 * Sets up the tree viewer using the given tree
	 * @param tree
	 */
	private void initializeTreeViewer(Tree tree) {
		fTreeViewer = new TreeViewer(tree);
		fTreeViewer.setContentProvider(new BundleContainerContentProvider());
		fTreeViewer.setLabelProvider(new BundleContainerLabelProvider());
		fTreeViewer.setComparator(new ViewerComparator());
		fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
			public void selectionChanged(SelectionChangedEvent event) {
				updateButtons();
			}
		});
		fTreeViewer.addDoubleClickListener(new IDoubleClickListener() {
			public void doubleClick(DoubleClickEvent event) {
				if (!event.getSelection().isEmpty()) {
					handleEdit();
				}
			}
		});
		fTreeViewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
	}

	/**
	 * Sets up the buttons, the button fields must already be created before calling this method
	 */
	private void initializeButtons() {
		fAddButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleAdd();
			}
		});
		fAddButton.setLayoutData(new GridData());
		SWTFactory.setButtonDimensionHint(fAddButton);

		fEditButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleEdit();
			}
		});
		fEditButton.setLayoutData(new GridData());
		fEditButton.setEnabled(false);
		SWTFactory.setButtonDimensionHint(fEditButton);

		fRemoveButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleRemove();
			}
		});
		fRemoveButton.setLayoutData(new GridData());
		fRemoveButton.setEnabled(false);
		SWTFactory.setButtonDimensionHint(fRemoveButton);

		fRemoveAllButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleRemoveAll();
			}
		});
		fRemoveAllButton.setLayoutData(new GridData());
		SWTFactory.setButtonDimensionHint(fRemoveAllButton);

		fShowPluginsButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				if (!fShowPluginsButton.getSelection()) {
					fTreeViewer.addFilter(fPluginFilter);
				} else {
					fTreeViewer.removeFilter(fPluginFilter);
				}
			}
		});
		fShowPluginsButton.setSelection(true);
		GridData gd = new GridData();
		gd.horizontalIndent = 10;
		fShowPluginsButton.setLayoutData(gd);

		fShowSourceButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				if (!fShowSourceButton.getSelection()) {
					fTreeViewer.addFilter(fSourceFilter);
				} else {
					fTreeViewer.removeFilter(fSourceFilter);
				}
			}
		});
		fShowSourceButton.setSelection(true);
		gd = new GridData();
		gd.horizontalIndent = 10;
		fShowSourceButton.setLayoutData(gd);
	}

	private void initializeFilters() {
		fSourceFilter = new ViewerFilter() {
			public boolean select(Viewer viewer, Object parentElement, Object element) {
				if (element instanceof IResolvedBundle) {
					if (((IResolvedBundle) element).isSourceBundle()) {
						return false;
					}
				}
				return true;
			}
		};
		fPluginFilter = new ViewerFilter() {
			public boolean select(Viewer viewer, Object parentElement, Object element) {
				if (element instanceof IResolvedBundle) {
					if (!((IResolvedBundle) element).isSourceBundle()) {
						return false;
					}
				}
				return true;
			}
		};
	}

	/**
	 * Sets the target definition model to use as input for the tree, can be called with different
	 * models to change the tree's input.
	 * @param target target model
	 */
	public void setInput(ITargetDefinition target) {
		fTarget = target;
		refresh();
	}

	/**
	 * Refreshes the contents of the table
	 */
	public void refresh() {
		if (!fTarget.isResolved()) {
			fReporter.runResolveOperation(new ResolveContainersOperation());
		} else {
			fTreeViewer.setInput(fTarget);
			fTreeViewer.refresh();
			updateButtons();
		}
	}

	private void setEnabled(boolean enablement) {
		fTreeViewer.getControl().setEnabled(enablement);
		fAddButton.setEnabled(enablement);

		fShowLabel.setEnabled(enablement);
		fShowPluginsButton.setEnabled(enablement);
		fShowSourceButton.setEnabled(enablement);

		if (enablement) {
			updateButtons();
		} else {
			fRemoveButton.setEnabled(enablement);
			fRemoveAllButton.setEnabled(enablement);
			fEditButton.setEnabled(enablement);
		}
	}

	private void handleAdd() {
		AddBundleContainerWizard wizard = new AddBundleContainerWizard(fTarget);
		Shell parent = fTreeViewer.getTree().getShell();
		WizardDialog dialog = new WizardDialog(parent, wizard);
		if (dialog.open() != Window.CANCEL) {
			refresh();
			contentsChanged();
		}
	}

	private void handleEdit() {
		IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
		if (!selection.isEmpty()) {
			Object selected = selection.getFirstElement();
			IBundleContainer oldContainer = null;
			if (selected instanceof IBundleContainer) {
				oldContainer = (IBundleContainer) selected;
			} else if (selected instanceof IResolvedBundle) {
				TreeItem[] treeSelection = fTreeViewer.getTree().getSelection();
				if (treeSelection.length > 0) {
					Object parent = treeSelection[0].getParentItem().getData();
					if (parent instanceof IBundleContainer) {
						oldContainer = (IBundleContainer) parent;
					}
				}
			}
			if (oldContainer != null) {
				Shell parent = fTreeViewer.getTree().getShell();
				EditBundleContainerWizard wizard = new EditBundleContainerWizard(fTarget, oldContainer);
				WizardDialog dialog = new WizardDialog(parent, wizard);
				if (dialog.open() == Window.OK) {
					// Replace the old container with the new one
					IBundleContainer newContainer = wizard.getBundleContainer();
					if (newContainer != null) {
						IBundleContainer[] containers = fTarget.getBundleContainers();
						java.util.List newContainers = new ArrayList(containers.length);
						for (int i = 0; i < containers.length; i++) {
							if (!containers[i].equals(oldContainer)) {
								newContainers.add(containers[i]);
							}
						}
						newContainers.add(newContainer);
						fTarget.setBundleContainers((IBundleContainer[]) newContainers.toArray(new IBundleContainer[newContainers.size()]));

						// Update the table
						refresh();
						contentsChanged();
						fTreeViewer.setSelection(new StructuredSelection(newContainer), true);
					}
				}
			}
		}
	}

	private void handleRemove() {
		IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
		if (!selection.isEmpty()) {
			Object selected = selection.getFirstElement();
			IBundleContainer container = null;
			if (selected instanceof IBundleContainer) {
				container = (IBundleContainer) selected;
				IBundleContainer[] currentContainers = fTarget.getBundleContainers();
				ArrayList newBundleContainers = new ArrayList(currentContainers.length);
				for (int i = 0; i < currentContainers.length; i++) {
					if (!currentContainers[i].equals(container)) {
						newBundleContainers.add(currentContainers[i]);
					}
				}
				fTarget.setBundleContainers((IBundleContainer[]) newBundleContainers.toArray(new IBundleContainer[newBundleContainers.size()]));
				contentsChanged();
				refresh();
			}
		}
	}

	private void handleRemoveAll() {
		fTarget.setBundleContainers(null);
		contentsChanged();
		refresh();
	}

	private void updateButtons() {
		IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
		fEditButton.setEnabled(!selection.isEmpty() && (selection.getFirstElement() instanceof IBundleContainer || selection.getFirstElement() instanceof IResolvedBundle));
		fRemoveButton.setEnabled(!selection.isEmpty() && selection.getFirstElement() instanceof IBundleContainer);
		fRemoveAllButton.setEnabled(fTarget.getBundleContainers() != null && fTarget.getBundleContainers().length > 0);
	}

	/**
	 * Informs the reporter for this table that something has changed
	 * and is dirty.
	 */
	private void contentsChanged() {
		fReporter.contentsChanged();
	}

	/**
	 * Runnable that resolves the target.  Disables the table while running
	 */
	class ResolveContainersOperation implements IRunnableWithProgress {

		/* (non-Javadoc)
		 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
		 */
		public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
			Job job = new UIJob(Messages.BundleContainerTable_16) {
				public IStatus runInUIThread(IProgressMonitor monitor) {
					if (!fTreeViewer.getControl().isDisposed()) {
						setEnabled(false);
						fTreeViewer.setInput(Messages.BundleContainerTable_17);
						fTreeViewer.refresh();
					}
					return Status.OK_STATUS;
				}
			};
			job.setSystem(true);
			job.schedule();
			fTarget.resolve(monitor);
			if (!monitor.isCanceled()) {
				job = new UIJob(Messages.BundleContainerTable_18) {
					public IStatus runInUIThread(IProgressMonitor monitor) {
						if (!fTreeViewer.getControl().isDisposed()) {
							setEnabled(true);
							fTreeViewer.setInput(fTarget);
							fTreeViewer.refresh();
							updateButtons();
						}
						return Status.OK_STATUS;
					}
				};
				job.setSystem(true);
				job.schedule();
			}
		}
	}

	/**
	 * Content provider for the tree, primary input is a ITargetDefinition, children are IBundleContainers
	 */
	class BundleContainerContentProvider implements ITreeContentProvider {

		public Object[] getChildren(Object parentElement) {
			if (parentElement instanceof ITargetDefinition) {
				IBundleContainer[] containers = ((ITargetDefinition) parentElement).getBundleContainers();
				return containers != null ? containers : new Object[0];
			} else if (parentElement instanceof IBundleContainer) {
				IBundleContainer container = (IBundleContainer) parentElement;
				if (container.isResolved()) {
					IStatus status = container.getBundleStatus();
					if (!status.isOK() && !status.isMultiStatus()) {
						return new Object[] {status};
					}
					return container.getBundles();
				}
				// We should only be populating the table if the containers are resolved, but just in case
				return new Object[] {new Status(IStatus.ERROR, PDEPlugin.getPluginId(), Messages.BundleContainerTable_19)};
			} else if (parentElement instanceof IResolvedBundle) {
				IStatus status = ((IResolvedBundle) parentElement).getStatus();
				if (!status.isOK()) {
					return new Object[] {status};
				}
			}
			return new Object[0];
		}

		public Object getParent(Object element) {
			return null;
		}

		public boolean hasChildren(Object element) {
			// Since we are already resolved we can't be more efficient
			return getChildren(element).length > 0;
		}

		public Object[] getElements(Object inputElement) {
			if (inputElement instanceof ITargetDefinition) {
				IBundleContainer[] containers = ((ITargetDefinition) inputElement).getBundleContainers();
				if (containers != null) {
					return containers;
				}
			} else if (inputElement instanceof String) {
				return new Object[] {inputElement};
			}
			return new Object[0];
		}

		public void dispose() {
		}

		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
		}

	}

}




AddDirectoryContainerPage_4=Directory
AddDirectoryContainerPage_5=Select a directory containing one or more plug-ins.
AddDirectoryContainerPage_6=Location directory does not exist
AddDirectoryContainerPage_7=< no plug-ins found in the current location >
AddDirectoryContainerPage_9=Could not acquire the target platform service to create the new container.
AddFeatureContainerPage_0=Add Features
AddFeatureContainerPage_1=Select features from a directory.

BundleContainerTable_16=Disable Target Contents
BundleContainerTable_17=Resolving the contents of the target...
BundleContainerTable_18=Enable Target Contents
BundleContainerTable_19=Container has not been resolved
# label provider error messages
# {0} is the error message
BundleContainerTable_4=Error creating label: {0}
BundleContainerTable_9=Show:
EditBundleContainerWizard_0=Edit Content
EditDirectoryContainerPage_0=Edit Directory
EditDirectoryContainerPage_1=&Variables...
EditDirectoryContainerPage_2=Included Plug-ins
EditDirectoryContainerPage_3=Resolve Container Job
EditFeatureContainerPage_0=Edit Feature
EditFeatureContainerPage_1=Edit the plug-ins included in this feature

EditFeatureContainerPage_3=Feature Version:
EditFeatureContainerPage_4=Unspecified
EditFeatureContainerPage_5=Location:
EditProfileContainerPage_0=Configuration Location
EditProfileContainerPage_1=Var&iables...
EditProfileContainerPage_2=Select a configuration directory
EditProfileContainerPage_3=Edit Installation

IncludedBundlesTree_3=Dese&lect All
IncludedBundlesTree_4=Select Re&quired
# {0}: count of checked plug-ins {1}: total number of plug-ins  example: 12 of 15 included
IncludedBundlesTree_5={0} of {1} selected
IncludedBundlesTree_6=Group Plug-ins by location
RestrictionsListSelectionDialog_0=Select the plug-ins to include in the target:
RestrictionsListSelectionDialog_1=Plug-in Selection
RestrictionsListSelectionDialog_2=Use specific plug-in version (versus highest available version)




import org.eclipse.pde.internal.core.feature.ExternalFeatureModel;
import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;

	private Button fIncludeVersionButton;
	private CheckboxTableViewer fFeatureTable;

	protected AddFeatureContainersPage(ITargetDefinition target) {
		super(target);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#getDefaultTitle()
	 */

	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#createLocationArea(org.eclipse.swt.widgets.Composite)
	 */
	protected void createLocationArea(Composite parent) {
		super.createLocationArea(parent);
		createTableArea(parent);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.ui.shared.target.AddDirectoryContainerPage#createTableArea(org.eclipse.swt.widgets.Composite)
	 */
	protected void createTableArea(Composite parent) {
		Composite tableComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH, 0, 0);

		SWTFactory.createLabel(tableComp, "Features:", 2);

		fFeatureTable = CheckboxTableViewer.newCheckList(tableComp, SWT.BORDER);
		// Connect the label provider
		PDEPlugin.getDefault().getLabelProvider().connect(this);




import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.pde.internal.core.target.impl.ProfileBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.SWTFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;

	 */
	private static final String SETTINGS_CONFIG_3 = "config3"; //$NON-NLS-1$

	public EditProfileContainerPage() {
		super();
	}

	public EditProfileContainerPage(IBundleContainer container) {
		super(container);
	}

	/* (non-Javadoc)

	protected void createLocationArea(Composite parent) {
		super.createLocationArea(parent);

		Composite configComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL, 0, 0);

		fUseDefaultConfig = new Button(configComp, SWT.CHECK | SWT.RIGHT);
		GridData gd = new GridData();

		});

		fConfigLabel = SWTFactory.createLabel(configComp, Messages.AddProfileContainerPage_3, 1);
		((GridData) fConfigLabel.getLayoutData()).horizontalIndent = 15;

		fConfigLocation = SWTFactory.createCombo(configComp, SWT.BORDER, 1, getConfigComboItems());
		fConfigLocation.addModifyListener(new ModifyListener() {

			if (fConfigLocation.isEnabled()) {
				// Check if the text field is blank
				if (fConfigLocation.getText().trim().length() == 0) {
					fBundleTree.setInput(null);
					setMessage(Messages.EditProfileContainerPage_2);
					setPageComplete(false);
					return false;
				}



				// Check that the directory exists
				if (!configLocation.isDirectory()) {
					fBundleTree.setInput(null);
					setMessage(Messages.AddProfileContainerPage_8, IMessageProvider.WARNING);
					setPageComplete(true);
				} else {
					setMessage(getDefaultMessage());
					setPageComplete(true);
				}
			}
		}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#refreshContainer(org.eclipse.pde.internal.core.target.provisional.IBundleContainer)
	 */
	protected IBundleContainer createContainer(IBundleContainer previous) throws CoreException {
		IBundleContainer container = getTargetPlatformService().newProfileContainer(fInstallLocation.getText(), fConfigLocation.isEnabled() ? fConfigLocation.getText() : null);
		if (previous instanceof ProfileBundleContainer) {
			container.setIncludedBundles(previous.getIncludedBundles());




import org.eclipse.core.runtime.CoreException;
import org.eclipse.pde.internal.core.target.impl.FeatureBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.SWTFactory;
import org.eclipse.swt.SWT;


public class EditFeatureContainerPage extends EditDirectoryContainerPage {

	public EditFeatureContainerPage(IBundleContainer container) {
		super(container);
	}

	/* (non-Javadoc)

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#refreshContainer(org.eclipse.pde.internal.core.target.provisional.IBundleContainer)
	 */
	protected IBundleContainer createContainer(IBundleContainer previous) throws CoreException {
		return getBundleContainer();
	}


Lines 18-24 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerWizard.java (-1 / +1 lines)
18	* Wizard for adding a bundle container to a target. Provides a selection page	18	* Wizard for adding a bundle container to a target. Provides a selection page
19	* where the user can choose the type of container to create.	19	* where the user can choose the type of container to create.
20	*	20	*
21	* @see BundleContainerTable	21	* @see TargetLocationsGroup
22	* @see IBundleContainer	22	* @see IBundleContainer
23	*/	23	*/
24	public class AddBundleContainerWizard extends Wizard {	24	public class AddBundleContainerWizard extends Wizard {

Lines 10-15 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/BundleInfoLabelProvider.java (-2 / +23 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.shared.target;	11	package org.eclipse.pde.internal.ui.shared.target;
12		12
		13	import org.eclipse.core.runtime.IPath;
13	import org.eclipse.core.runtime.IStatus;	14	import org.eclipse.core.runtime.IStatus;
14	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	15	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
15	import org.eclipse.jface.viewers.LabelProvider;	16	import org.eclipse.jface.viewers.LabelProvider;
Lines 18-23 Link Here
18	import org.eclipse.pde.internal.ui.PDEPluginImages;	19	import org.eclipse.pde.internal.ui.PDEPluginImages;
19	import org.eclipse.pde.internal.ui.util.SharedLabelProvider;	20	import org.eclipse.pde.internal.ui.util.SharedLabelProvider;
20	import org.eclipse.swt.graphics.Image;	21	import org.eclipse.swt.graphics.Image;
		22	import org.eclipse.ui.ISharedImages;
		23	import org.eclipse.ui.PlatformUI;
21		24
22	/**	25	/**
23	* Provides text and image labels for BundleInfo and IResolveBundle objects.	26	* Provides text and image labels for BundleInfo and IResolveBundle objects.
Lines 57-63 Link Here
57	}	60	}
58	return buf.toString();	61	return buf.toString();
59	} else if (element instanceof IResolvedBundle) {	62	} else if (element instanceof IResolvedBundle) {
60	return getText(((IResolvedBundle) element).getBundleInfo());	63	IResolvedBundle bundle = ((IResolvedBundle) element);
		64	if (!bundle.getStatus().isOK()) {
		65	// TODO Better error message for missing bundles
		66	return bundle.getStatus().getMessage();
		67	}
		68	return getText(bundle.getBundleInfo());
		69	} else if (element instanceof IStatus) {
		70	return ((IStatus) element).getMessage();
		71	} else if (element instanceof IPath) {
		72	return ((IPath) element).removeFirstSegments(1).toString();
61	}	73	}
62	return super.getText(element);	74	return super.getText(element);
63	}	75	}
Lines 69-75 Link Here
69	if (element instanceof IResolvedBundle) {	81	if (element instanceof IResolvedBundle) {
70	IResolvedBundle bundle = (IResolvedBundle) element;	82	IResolvedBundle bundle = (IResolvedBundle) element;
71	int flag = 0;	83	int flag = 0;
72	if (bundle.getStatus().getSeverity() == IStatus.WARNING) {	84	if (bundle.getStatus().getSeverity() == IStatus.WARNING \|\| bundle.getStatus().getSeverity() == IStatus.INFO) {
73	flag = SharedLabelProvider.F_WARNING;	85	flag = SharedLabelProvider.F_WARNING;
74	} else if (bundle.getStatus().getSeverity() == IStatus.ERROR) {	86	} else if (bundle.getStatus().getSeverity() == IStatus.ERROR) {
75	flag = SharedLabelProvider.F_ERROR;	87	flag = SharedLabelProvider.F_ERROR;
Lines 84-89 Link Here
84	}	96	}
85	} else if (element instanceof BundleInfo) {	97	} else if (element instanceof BundleInfo) {
86	return PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_PLUGIN_OBJ);	98	return PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_PLUGIN_OBJ);
		99	} else if (element instanceof IStatus) {
		100	int severity = ((IStatus) element).getSeverity();
		101	if (severity == IStatus.WARNING \|\| severity == IStatus.INFO) {
		102	return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
		103	} else if (severity == IStatus.ERROR) {
		104	return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
		105	}
		106	} else if (element instanceof IPath) {
		107	return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
87	}	108	}
88	return super.getImage(element);	109	return super.getImage(element);
89	}	110	}




	public static String AddDirectoryContainerPage_4;
	public static String AddDirectoryContainerPage_5;
	public static String AddDirectoryContainerPage_6;
	public static String AddDirectoryContainerPage_7;
	public static String AddDirectoryContainerPage_9;
	public static String AddFeatureContainerPage_0;
	public static String AddFeatureContainerPage_1;

	public static String BundleContainerTable_16;
	public static String BundleContainerTable_17;
	public static String BundleContainerTable_18;
	public static String BundleContainerTable_19;
	public static String BundleContainerTable_2;
	public static String BundleContainerTable_3;
	public static String BundleContainerTable_4;

	public static String EditBundleContainerWizard_0;
	public static String EditDirectoryContainerPage_0;
	public static String EditDirectoryContainerPage_1;
	public static String EditDirectoryContainerPage_2;
	public static String EditDirectoryContainerPage_3;
	public static String EditFeatureContainerPage_0;
	public static String EditFeatureContainerPage_1;

	public static String EditFeatureContainerPage_3;
	public static String EditFeatureContainerPage_4;
	public static String EditFeatureContainerPage_5;
	public static String EditProfileContainerPage_0;
	public static String EditProfileContainerPage_1;
	public static String EditProfileContainerPage_2;
	public static String EditProfileContainerPage_3;

	public static String IncludedBundlesTree_2;
	public static String IncludedBundlesTree_3;
	public static String IncludedBundlesTree_4;
	public static String IncludedBundlesTree_5;
	public static String IncludedBundlesTree_6;
	public static String RestrictionsListSelectionDialog_0;
	public static String RestrictionsListSelectionDialog_1;
	public static String RestrictionsListSelectionDialog_2;




package org.eclipse.pde.internal.ui.shared.target;

import com.ibm.icu.text.MessageFormat;
import java.io.File;
import java.util.*;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.jface.viewers.*;
import org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.SWTFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.dialogs.FilteredTree;
import org.eclipse.ui.dialogs.PatternFilter;

public class IncludedBundlesTree extends FilteredTree {

	private CheckboxTreeViewer fTree;
	private Button fSelectButton;
	private Button fDeselectButton;
	private Button fSelectAllButton;
	private Button fDeselectAllButton;
//	private Button fSelectRequiredButton;
	private Label fShowLabel;
	private Button fShowSourceButton;
	private Button fShowPluginsButton;
	private Label fCountLabel;
	private ViewerFilter fSourceFilter;
	private ViewerFilter fPluginFilter;
	private IResolvedBundle[] fAllBundles;
	private Button fGroupPlugins;
	private HashMap fTreeViewerContents;
	private boolean fIsGroupedByLocation;

	public IncludedBundlesTree(Composite parent) {
		super(parent, SWT.BORDER | SWT.MULTI, new PatternFilter(), true);
	}

	protected Control createTreeControl(Composite parent, int style) {
		fIsGroupedByLocation = false;
		Composite treeComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH, 0, 0);
		super.createTreeControl(treeComp, style);
		((GridData) fTree.getControl().getLayoutData()).heightHint = 300;
		createButtons(treeComp);
		fCountLabel = SWTFactory.createLabel(treeComp, "", 2); //$NON-NLS-1$
		updateButtons();
		initializeFilters();
		initializeTreeContents(fAllBundles);
		return treeComp;
	}

	protected void createButtons(Composite parent) {
		Composite buttonComp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_VERTICAL, 0, 0);

		// TODO Add Mnemonics
		fSelectButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_0, null);
		fSelectButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				if (!fTree.getSelection().isEmpty()) {
					Object[] selected = ((IStructuredSelection) fTree.getSelection()).toArray();
					for (int i = 0; i < selected.length; i++) {
						if (fIsGroupedByLocation) {
							handleCheck(selected[i], true);
						} else {
							fTree.setChecked(selected[i], true);
						}
					}
					updateButtons();
				}
			}
		});
		fDeselectButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_1, null);
		fDeselectButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				if (!fTree.getSelection().isEmpty()) {
					Object[] selected = ((IStructuredSelection) fTree.getSelection()).toArray();
					for (int i = 0; i < selected.length; i++) {
						if (fIsGroupedByLocation) {
							handleCheck(selected[i], false);
						} else {
							fTree.setChecked(selected[i], false);
						}
					}
					updateButtons();
				}
			}
		});

		createEmptySpace(buttonComp);

		fSelectAllButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_2, null);
		fSelectAllButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				if (fIsGroupedByLocation) {
					Iterator iter = fTreeViewerContents.keySet().iterator();
					while (iter.hasNext()) {
						handleCheck(iter.next(), true);
					}

				} else {
					// We only want to check visible
					fTree.setAllChecked(true);
				}

				updateButtons();
			}
		});
		fDeselectAllButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_3, null);
		fDeselectAllButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {

				if (fIsGroupedByLocation) {
					Iterator iter = fTreeViewerContents.keySet().iterator();
					while (iter.hasNext()) {
						handleCheck(iter.next(), false);
					}

				} else {
					// We only want to uncheck visible
					fTree.setAllChecked(false);
				}
				updateButtons();
			}
		});

		createEmptySpace(buttonComp);

		// TODO Support selecting required.
//		fSelectRequiredButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_4, null);
//		fSelectRequiredButton.addSelectionListener(new SelectionAdapter() {
//			public void widgetSelected(SelectionEvent e) {
//				updateButtons();
//			}
//		});

		Composite filterComp = SWTFactory.createComposite(buttonComp, 1, 1, SWT.NONE, 0, 0);
		filterComp.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, true, true));

		fGroupPlugins = SWTFactory.createCheckButton(filterComp, Messages.IncludedBundlesTree_6, null, false, 1);
		fGroupPlugins.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				setEnabled(false);
				fIsGroupedByLocation = fGroupPlugins.getSelection();
				Object[] checkedElements = fTree.getCheckedElements();
				fTree.setContentProvider(getContentProviderForTree());

				if (fIsGroupedByLocation) {
					fTree.expandAll();
					fTree.setCheckedElements(checkedElements);
					Iterator iter = fTreeViewerContents.keySet().iterator();
					HashMap bundles = null;
					Object key = null;

					while (iter.hasNext()) {
						key = iter.next();
						bundles = (HashMap) fTreeViewerContents.get(key);

						Iterator childIter = bundles.keySet().iterator();
						boolean allChilrenSelected = true;
						boolean noneChildrenSelected = true;
						while (childIter.hasNext()) {
							Object bundle = childIter.next();
							boolean checkedState = ((Boolean) bundles.get(bundle)).booleanValue();
							allChilrenSelected = allChilrenSelected && checkedState;
							noneChildrenSelected = noneChildrenSelected && !checkedState;

						}
						fTree.setChecked(key, !noneChildrenSelected);
						fTree.setGrayed(key, !allChilrenSelected && !noneChildrenSelected);
					}
				}
				updateButtons();
				setEnabled(true);
			}
		});
		fShowLabel = SWTFactory.createLabel(filterComp, Messages.BundleContainerTable_9, 1);

		fShowPluginsButton = SWTFactory.createCheckButton(filterComp, Messages.BundleContainerTable_14, null, true, 1);
		fShowPluginsButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				if (!fShowPluginsButton.getSelection()) {
					fTree.addFilter(fPluginFilter);
				} else {
					fTree.removeFilter(fPluginFilter);
				}
				updateButtons();
			}
		});
		fShowPluginsButton.setSelection(true);
		GridData gd = new GridData();
		gd.horizontalIndent = 10;
		fShowPluginsButton.setLayoutData(gd);

		fShowSourceButton = SWTFactory.createCheckButton(filterComp, Messages.BundleContainerTable_15, null, true, 1);
		fShowSourceButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				if (!fShowSourceButton.getSelection()) {
					fTree.addFilter(fSourceFilter);
				} else {
					fTree.removeFilter(fSourceFilter);
				}
				updateButtons();
			}
		});
		fShowSourceButton.setSelection(true);
		gd = new GridData();
		gd.horizontalIndent = 10;
		fShowSourceButton.setLayoutData(gd);

	}

	/**
	 * returns a HashMap which contains all the new File objects representing a new location
	 */
	protected HashMap initializeTreeContents(IResolvedBundle[] allBundles) {
		HashMap parents = new HashMap();
		if (allBundles == null)
			return null;

		if (fTreeViewerContents == null)
			fTreeViewerContents = new HashMap();
		else
			fTreeViewerContents.clear();

		for (int i = 0; i < allBundles.length; i++) {
			IResolvedBundle bundle = allBundles[i];

			String path = bundle.getBundleInfo().getLocation().getRawPath();
			if (path != null) {
				File installFile = new File(path);
				File parentFile = installFile.getParentFile();
				HashMap bundles = (HashMap) fTreeViewerContents.get(parentFile);
				if (bundles == null) {
					bundles = new HashMap();
					bundles.put(bundle, new Boolean(fTree.getChecked(bundle)));
					fTreeViewerContents.put(parentFile, bundles);
					parents.put(parentFile, Boolean.FALSE);
				} else {
					bundles.put(bundle, new Boolean(fTree.getChecked(bundle)));
				}
			}
		}

		return parents;
	}

	private void initializeFilters() {
		fSourceFilter = new ViewerFilter() {
			public boolean select(Viewer viewer, Object parentElement, Object element) {
				if (element instanceof IResolvedBundle) {
					if (((IResolvedBundle) element).isSourceBundle()) {
						return false;
					}
				}
				return true;
			}
		};
		fPluginFilter = new ViewerFilter() {
			public boolean select(Viewer viewer, Object parentElement, Object element) {
				if (element instanceof IResolvedBundle) {
					if (!((IResolvedBundle) element).isSourceBundle()) {
						return false;
					}
				}
				return true;
			}
		};
	}

	private Label createEmptySpace(Composite parent) {
		Label label = new Label(parent, SWT.NONE);
		GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
		gd.widthHint = gd.heightHint = 5;
		label.setLayoutData(gd);
		return label;
	}

	private void updateButtons() {
		if (fAllBundles != null && !fTree.getSelection().isEmpty()) {
			Object[] selection = ((IStructuredSelection) fTree.getSelection()).toArray();
			boolean allSelected = true;
			boolean noneSelected = true;
			for (int i = 0; i < selection.length; i++) {
				boolean checked = fTree.getChecked(selection[i]);
				if (checked) {
					noneSelected = false;
				} else {
					allSelected = false;
				}
			}
			fSelectButton.setEnabled(!allSelected);
			fDeselectButton.setEnabled(!noneSelected);
//			fSelectRequiredButton.setEnabled(true);
		} else {
			fSelectButton.setEnabled(false);
			fDeselectButton.setEnabled(false);
//			fSelectRequiredButton.setEnabled(false);
		}

		int checked;
		if (fIsGroupedByLocation) {
			checked = fTree.getCheckedElements().length;
			Iterator iter = fTreeViewerContents.keySet().iterator();
			while (iter.hasNext()) {
				if (fTree.getChecked(iter.next())) {
					--checked;
				}
			}
		} else {
			checked = fTree.getCheckedElements().length;
		}
		fSelectAllButton.setEnabled(fAllBundles != null && checked != fTree.getTree().getItemCount());
		fDeselectAllButton.setEnabled(fAllBundles != null && checked != 0);

		if (fAllBundles != null) {
			fCountLabel.setText(MessageFormat.format(Messages.IncludedBundlesTree_5, new String[] {Integer.toString(checked), Integer.toString(fAllBundles.length)}));
		} else {
			fCountLabel.setText(""); //$NON-NLS-1$
		}
	}

	/**
	 * Set the container to display in the tree or <code>null</code> to disable the tree 
	 * @param input bundle container or <code>null</code>
	 */
	public void setInput(IBundleContainer input) {
		fAllBundles = null;

		// Check that the input is a container with valid, resolved bundles
		if (!(input instanceof AbstractBundleContainer)) {
			fTree.setInput(Messages.AddDirectoryContainerPage_7);
			setEnabled(false);
			return;
		}
		if (!input.isResolved()) {
			fTree.setInput(new Status(IStatus.ERROR, PDEPlugin.getPluginId(), Messages.BundleContainerTable_19));
			setEnabled(false);
			return;
		}
		IStatus status = input.getBundleStatus();
		if (!status.isOK() && !status.isMultiStatus()) {
			fTree.setInput(status);
			setEnabled(false);
			return;
		}
		IResolvedBundle[] allResolvedBundles = ((AbstractBundleContainer) input).getAllBundles();
		if (allResolvedBundles == null || allResolvedBundles.length == 0) {
			fTree.setInput(Messages.AddDirectoryContainerPage_7);
			setEnabled(false);
			return;
		}

		// Input is valid, setup the tree
		fAllBundles = allResolvedBundles;
		fTree.setInput(allResolvedBundles);

		// Check the included bundles
		BundleInfo[] included = input.getIncludedBundles();
		if (included == null) {
			fTree.setCheckedElements(fAllBundles);
		} else {
			Set includedBundles = new HashSet();
			for (int i = 0; i < included.length; i++) {
				includedBundles.add(included[i].getSymbolicName());
			}
			java.util.List toCheck = new ArrayList(includedBundles.size());
			for (int i = 0; i < allResolvedBundles.length; i++) {
				if (includedBundles.contains(allResolvedBundles[i].getBundleInfo().getSymbolicName())) {
					toCheck.add(allResolvedBundles[i]);
				}
			}
			fTree.setCheckedElements(toCheck.toArray());
		}

		// Enable the tree and update the buttons
		setEnabled(true);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.swt.widgets.Control#setEnabled(boolean)
	 */
	public void setEnabled(boolean enabled) {
		super.setEnabled(enabled);
		if (enabled) {
			updateButtons();
		} else {
			fSelectButton.setEnabled(false);
			fSelectAllButton.setEnabled(false);
			fDeselectButton.setEnabled(false);
			fDeselectAllButton.setEnabled(false);
//			fSelectRequiredButton.setEnabled(false);
			fCountLabel.setText(""); //$NON-NLS-1$
		}
		fShowLabel.setEnabled(enabled);
		fShowPluginsButton.setEnabled(enabled);
		fShowSourceButton.setEnabled(enabled);
		super.setEnabled(enabled);
	}

	protected TreeViewer doCreateTreeViewer(Composite parent, int style) {
		fTree = new CheckboxTreeViewer(parent, style) {
			public void refresh(boolean updateLabels) {
				super.refresh(updateLabels);
				if (updateLabels) {
					// We want to update the labels and buttons as users change the filtering
					updateButtons();
				}
			}
		};
		fTree.setContentProvider(getContentProviderForTree());
		fTree.setLabelProvider(new BundleInfoLabelProvider(false));
		fTree.addDoubleClickListener(new IDoubleClickListener() {
			public void doubleClick(DoubleClickEvent event) {
				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
				fTree.setChecked(selection.getFirstElement(), !fTree.getChecked(selection.getFirstElement()));
				updateButtons();
			}
		});
		fTree.addCheckStateListener(new ICheckStateListener() {

			public void checkStateChanged(CheckStateChangedEvent event) {
				if (fIsGroupedByLocation) {
					handleCheck(event.getElement(), event.getChecked());
					updateButtons();
				}
			}
		});
		fTree.addSelectionChangedListener(new ISelectionChangedListener() {
			public void selectionChanged(SelectionChangedEvent event) {
				updateButtons();
			}
		});
		fTree.setSorter(new ViewerSorter());
		return fTree;
	}

	/**
	 * Marks the check state of <code>element</code> to <code>state</code> when plug-ins are grouped by location 
	 */
	private void handleCheck(Object element, boolean state) {
		if (fTreeViewerContents.containsKey(element)) {

			HashMap bundles = (HashMap) fTreeViewerContents.get(element);
			Iterator iter = bundles.keySet().iterator();
			while (iter.hasNext()) {
				Object key = iter.next();
				bundles.put(key, new Boolean(state));
				fTree.setChecked(key, state);
			}
			fTree.setChecked(element, state);
			fTree.setGrayed(element, false);
			return;
		}
		Iterator iter = fTreeViewerContents.keySet().iterator();
		HashMap bundles = null;
		Object key = null;
		while (iter.hasNext()) {
			key = iter.next();
			bundles = (HashMap) fTreeViewerContents.get(key);
			if (bundles.containsKey(element)) {
				bundles.put(element, new Boolean(state));
				break;
			}
		}
		iter = bundles.keySet().iterator();
		boolean allChilrenSelected = true;
		boolean noneChildrenSelected = true;
		while (iter.hasNext()) {
			Object bundle = iter.next();
			boolean checkedState = ((Boolean) bundles.get(bundle)).booleanValue();
			allChilrenSelected = allChilrenSelected && checkedState;
			noneChildrenSelected = noneChildrenSelected && !checkedState;
		}
		fTree.setChecked(element, state);
		fTree.setChecked(key, !noneChildrenSelected);
		fTree.setGrayed(key, !allChilrenSelected && !noneChildrenSelected);
	}

	private ITreeContentProvider getContentProviderForTree() {
		if (fIsGroupedByLocation) {

			//Content provider for grouped by location
			return (new ITreeContentProvider() {

				public Object[] getChildren(Object parentElement) {
					if (parentElement instanceof File) {
						HashMap files = (HashMap) fTreeViewerContents.get(parentElement);
						if (files != null) {
							Object[] result = files.keySet().toArray();
							return result;
						}
					}
					return new Object[0];
				}

				public Object getParent(Object element) {
					if (element instanceof IResolvedBundle) {
						IResolvedBundle bundle = (IResolvedBundle) element;
						String installPath = bundle.getBundleInfo().getLocation().getPath();
						if (installPath != null)
							return new File(installPath).getParentFile();
					}
					return null;
				}

				public boolean hasChildren(Object element) {
					if (element instanceof File)
						return fTreeViewerContents.containsKey(element);
					return false;
				}

				public Object[] getElements(Object inputElement) {
					if (fTreeViewerContents == null)
						return initializeTreeContents(fAllBundles).keySet().toArray();
					return fTreeViewerContents.keySet().toArray();
				}

				public void dispose() {
				}

				public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
				}
			});
		}

		//ungrouped content provider
		return (new ITreeContentProvider() {
			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
			}

			public void dispose() {
			}

			public Object[] getElements(Object inputElement) {
				if (inputElement instanceof IResolvedBundle[]) {
					return (IResolvedBundle[]) inputElement;
				}
				return new Object[] {inputElement};
			}

			public boolean hasChildren(Object element) {
				return false;
			}

			public Object getParent(Object element) {
				return null;
			}

			public Object[] getChildren(Object parentElement) {
				return new Object[0];
			}
		});
	}

	/**
	 * Return the set of bundles to include in this bundle container based on what is
	 * checked in the tree.  If all bundles in the container are checked or there was
	 * a problem getting the bundles from the container, this method will return 
	 * <code>null</code>
	 * 
	 * @return set of bundles to include or <code>null</code>
	 */
	public BundleInfo[] getIncludedBundles() {
		if (fTree.getControl().isEnabled() && fAllBundles != null) {
			Object[] checked = fTree.getCheckedElements();
			if (fIsGroupedByLocation) {
				int count = fTree.getCheckedElements().length;
				Iterator iter = fTreeViewerContents.keySet().iterator();
				while (iter.hasNext()) {
					if (fTree.getChecked(iter.next())) {
						--count;
					}
				}
				if (count == fAllBundles.length)
					return null;

			} else if (checked.length == fAllBundles.length) {
				return null;
			}

			java.util.List included = new ArrayList(checked.length);
			for (int i = 0; i < checked.length; i++) {
				if (checked[i] instanceof IResolvedBundle) {
					included.add(new BundleInfo(((IResolvedBundle) checked[i]).getBundleInfo().getSymbolicName(), null, null, BundleInfo.NO_LEVEL, false));
				}
			}
			return (BundleInfo[]) included.toArray(new BundleInfo[included.size()]);
		}
		return null;
	}
}




/*******************************************************************************
 * Copyright (c) 2009 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
 *******************************************************************************/
package org.eclipse.pde.internal.ui.shared.target;

import org.eclipse.jface.operation.IRunnableWithProgress;

/**
 * Does container specific actions for the BundleContainerTable.  Allows the resolve
 * operation to run differently (job or dialog) if the table is being used in an editor
 * or a wizard page.  Allows changes to the bundle containers to be reported properly.
 *
 * @see BundleContainerTable
 */
public interface IBundleContainerTableReporter {

	/**
	 * Runs the given operation in a container appropriate fashion.
	 * <p>
	 * This method may be called from the UI thread so implementors should
	 * not block.
	 * </p>
	 * @param operation the operation to run
	 */
	public void runResolveOperation(IRunnableWithProgress operation);

	/**
	 * Informs the container that the contents of the target's bundle 
	 * containers have changed.  Used to mark the editor dirty.
	 */
	public void contentsChanged();

}

Lines 163-180 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java (-4 / +50 lines)
163	standardChoices.add(new AbstractBundleContainerNode(Messages.AddBundleContainerSelectionPage_3, Messages.AddBundleContainerSelectionPage_4, PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER)) {	163	standardChoices.add(new AbstractBundleContainerNode(Messages.AddBundleContainerSelectionPage_3, Messages.AddBundleContainerSelectionPage_4, PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER)) {
164	public IWizard createWizard() {	164	public IWizard createWizard() {
165	Wizard wizard = new Wizard() {	165	Wizard wizard = new Wizard() {
		166	private EditDirectoryContainerPage fPage1;
		167
166	public void addPages() {	168	public void addPages() {
167	IDialogSettings settings = PDEPlugin.getDefault().getDialogSettings().getSection(SETTINGS_SECTION);	169	IDialogSettings settings = PDEPlugin.getDefault().getDialogSettings().getSection(SETTINGS_SECTION);
168	if (settings == null) {	170	if (settings == null) {
169	settings = PDEPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_SECTION);	171	settings = PDEPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_SECTION);
170	}	172	}
171	setDialogSettings(settings);	173	setDialogSettings(settings);
172	addPage(new EditDirectoryContainerPage(fTarget));	174	fPage1 = new EditDirectoryContainerPage();
		175	addPage(fPage1);
		176	addPage(new PreviewContainerPage(fTarget, fPage1));
		177	setNeedsProgressMonitor(true);
173	}	178	}
174		179
175	public boolean performFinish() {	180	public boolean performFinish() {
176	IBundleContainer container = ((EditDirectoryContainerPage) getPages()[0]).getBundleContainer();	181	IBundleContainer container = fPage1.getBundleContainer();
177	if (container != null) {	182	if (container != null) {
		183	fPage1.storeSettings();
178	IBundleContainer[] oldContainers = fTarget.getBundleContainers();	184	IBundleContainer[] oldContainers = fTarget.getBundleContainers();
179	if (oldContainers == null) {	185	if (oldContainers == null) {
180	fTarget.setBundleContainers(new IBundleContainer[] {container});	186	fTarget.setBundleContainers(new IBundleContainer[] {container});
Lines 195-212 Link Here
195	standardChoices.add(new AbstractBundleContainerNode(Messages.AddBundleContainerSelectionPage_6, Messages.AddBundleContainerSelectionPage_7, PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_PRODUCT_DEFINITION)) {	201	standardChoices.add(new AbstractBundleContainerNode(Messages.AddBundleContainerSelectionPage_6, Messages.AddBundleContainerSelectionPage_7, PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_PRODUCT_DEFINITION)) {
196	public IWizard createWizard() {	202	public IWizard createWizard() {
197	Wizard wizard = new Wizard() {	203	Wizard wizard = new Wizard() {
		204	private EditDirectoryContainerPage fPage1;
		205
198	public void addPages() {	206	public void addPages() {
199	IDialogSettings settings = PDEPlugin.getDefault().getDialogSettings().getSection(SETTINGS_SECTION);	207	IDialogSettings settings = PDEPlugin.getDefault().getDialogSettings().getSection(SETTINGS_SECTION);
200	if (settings == null) {	208	if (settings == null) {
201	settings = PDEPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_SECTION);	209	settings = PDEPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_SECTION);
202	}	210	}
203	setDialogSettings(settings);	211	setDialogSettings(settings);
204	addPage(new EditProfileContainerPage(fTarget));	212	setDialogSettings(settings);
		213	fPage1 = new EditProfileContainerPage();
		214	addPage(fPage1);
		215	addPage(new PreviewContainerPage(fTarget, fPage1));
		216	setNeedsProgressMonitor(true);
205	}	217	}
206		218
207	public boolean performFinish() {	219	public boolean performFinish() {
208	IBundleContainer container = ((EditProfileContainerPage) getPages()[0]).getBundleContainer();	220	IBundleContainer container = ((EditProfileContainerPage) getPages()[0]).getBundleContainer();
209	if (container != null) {	221	if (container != null) {
		222	((EditProfileContainerPage) getPages()[0]).storeSettings();
210	IBundleContainer[] oldContainers = fTarget.getBundleContainers();	223	IBundleContainer[] oldContainers = fTarget.getBundleContainers();
211	if (oldContainers == null) {	224	if (oldContainers == null) {
212	fTarget.setBundleContainers(new IBundleContainer[] {container});	225	fTarget.setBundleContainers(new IBundleContainer[] {container});
Lines 233-245 Link Here
233	settings = PDEPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_SECTION);	246	settings = PDEPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_SECTION);
234	}	247	}
235	setDialogSettings(settings);	248	setDialogSettings(settings);
236	addPage(new AddFeatureContainersPage(fTarget));	249	addPage(new AddFeatureContainersPage());
237	}	250	}
238		251
239	public boolean performFinish() {	252	public boolean performFinish() {
240	try {	253	try {
241	IBundleContainer[] containers = ((AddFeatureContainersPage) getPages()[0]).getBundleContainers();	254	IBundleContainer[] containers = ((AddFeatureContainersPage) getPages()[0]).getBundleContainers();
242	if (containers != null) {	255	if (containers != null) {
		256	((AddFeatureContainersPage) getPages()[0]).storeSettings();
243	IBundleContainer[] oldContainers = fTarget.getBundleContainers();	257	IBundleContainer[] oldContainers = fTarget.getBundleContainers();
244	// TODO: show progress as resolving	258	// TODO: show progress as resolving
245	for (int i = 0; i < containers.length; i++) {	259	for (int i = 0; i < containers.length; i++) {
Lines 266-271 Link Here
266	return wizard;	280	return wizard;
267	}	281	}
268	});	282	});
		283	standardChoices.add(new AbstractBundleContainerNode("Repository or Update Site", "Download plug-ins from a p2 repository or update site.", PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_REPOSITORY_OBJ)) {
		284	public IWizard createWizard() {
		285	Wizard wizard = new Wizard() {
		286	public void addPages() {
		287	IDialogSettings settings = PDEPlugin.getDefault().getDialogSettings().getSection(SETTINGS_SECTION);
		288	if (settings == null) {
		289	settings = PDEPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_SECTION);
		290	}
		291	setDialogSettings(settings);
		292	addPage(new AddP2ContainerPage());
		293	}
		294
		295	public boolean performFinish() {
		296	IBundleContainer container = ((AddP2ContainerPage) getPages()[0]).getBundleContainer();
		297	if (container != null) {
		298	IBundleContainer[] oldContainers = fTarget.getBundleContainers();
		299	if (oldContainers == null) {
		300	fTarget.setBundleContainers(new IBundleContainer[] {container});
		301	} else {
		302	IBundleContainer[] newContainers = new IBundleContainer[oldContainers.length + 1];
		303	System.arraycopy(oldContainers, 0, newContainers, 0, oldContainers.length);
		304	newContainers[newContainers.length - 1] = container;
		305	fTarget.setBundleContainers(newContainers);
		306	}
		307	}
		308	return true;
		309	}
		310	};
		311	wizard.setWindowTitle(Messages.AddBundleContainerSelectionPage_1);
		312	return wizard;
		313	}
		314	});
269	return standardChoices;	315	return standardChoices;
270	}	316	}
271		317




import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer;
import org.eclipse.pde.internal.core.target.impl.DirectoryBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.SWTFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*;

 */
public class EditDirectoryContainerPage extends WizardPage {

	/**
	 * How long to wait before validating the directory
	 */
	protected static final int TYPING_DELAY = 200;

	private static ITargetPlatformService fTargetService;
	protected Combo fInstallLocation;
	protected IncludedBundlesTree fBundleTree;
	protected IBundleContainer fContainer;
	private ITargetDefinition fTarget;
	private Job fTextChangedJob;

	/**

	 */
	private static final String SETTINGS_LOCATION_3 = "location3"; //$NON-NLS-1$

	protected EditDirectoryContainerPage(IBundleContainer container) {
		this();
		fContainer = container;
	}

	protected EditDirectoryContainerPage() {
		super("EditDirectoryContainer"); //$NON-NLS-1$
		fTarget = target;
	}

	/* (non-Javadoc)

	public void createControl(Composite parent) {
		setMessage(getDefaultMessage());
		setTitle(getDefaultTitle());
		setPageComplete(false);
		Composite comp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH, 0, 0);
		createLocationArea(comp);
		createTableArea(comp);
		setControl(comp);
		initializeInputFields(fContainer);
	}

	}

	/**
	 * Creates the area at the bottom of the page.  Contains a table intended to display
	 * the current resolved bundles.  This class may be overridden by subclasses to 
	 * provide custom widgets.
	 * @param parent parent composite
	 */
	protected void createTableArea(Composite parent) {
		Group tableGroup = SWTFactory.createGroup(parent, Messages.EditDirectoryContainerPage_2, 2, 1, GridData.FILL_BOTH);
		fBundleTree = new IncludedBundlesTree(tableGroup);
		fBundleTree.setInput(null);
	}

	/**
	 * Initializes the fields use to describe the container.  They should be filled in using
	 * the given container or set to default values if the container is <code>null</code>.
	 * @param container bundle container being edited, possibly <code>null</code>


	/**
	 * Store all of the dialog settings for this page
	 * Should be explicitly called during the perform finish call of the wizard
	 */
	protected void storeSettings() {
		String newLocation = fInstallLocation.getText().trim();

	}

	/**
	 * @return bundle container created/edited in this wizard or <code>null</code>
	 */
	public IBundleContainer getBundleContainer() {
		return fContainer;
	}

	/**
	 * Called whenever the location or another aspect of the container has changed
	 * in the UI.  Will schedule a UIJob to verify and resolve the container 
	 * reporting any problems to the user.  If a previous job is running or sleeping

	 */
	protected void containerChanged(long delay) {
		if (fTextChangedJob == null) {
			fTextChangedJob = new CreateContainerJob(getShell().getDisplay(), Messages.EditDirectoryContainerPage_3);
		} else {
			fTextChangedJob.cancel();
		}

	protected boolean validateInput() throws CoreException {
		// Check if the text field is blank
		if (fInstallLocation.getText().trim().length() == 0) {
			fBundleTree.setInput(null);
			setMessage(getDefaultMessage());
			setPageComplete(false);
			return false;
		}



		// Check if directory exists
		if (!location.isDirectory()) {
			fBundleTree.setInput(null);
			setMessage(Messages.AddDirectoryContainerPage_6, IMessageProvider.WARNING);
			setPageComplete(true);
		} else {
			setMessage(getDefaultMessage());
			setPageComplete(true);
		}
		return true;
	}

	 * @return a new or modified bundle container
	 * @throws CoreException
	 */
	protected IBundleContainer createContainer(IBundleContainer previous) throws CoreException {
		IBundleContainer container = getTargetPlatformService().newDirectoryContainer(fInstallLocation.getText());
		if (previous instanceof DirectoryBundleContainer) {
			container.setIncludedBundles(previous.getIncludedBundles());

		return fTargetService;
	}

	private class CreateContainerJob extends UIJob {
		public CreateContainerJob(Display jobDisplay, String name) {
	 * included bundles set on it based on what is checked in the tree.
	 * Will return <code>null</code> if there was a problem creating the
	 * bundle container.
	 * 
	 * @return bundle container or <code>null</code>
	 * 
	 */
	public IBundleContainer getBundleContainer() {
		if (fBundleTree != null) {
			fContainer.setIncludedBundles(fBundleTree.getIncludedBundles());
		}
		return fContainer;
	}

	private class ResolveJob extends UIJob {
		public ResolveJob(Display jobDisplay, String name) {
			super(jobDisplay, name);
		}


				// Validate the location and any other text fields
				if (validateInput()) {
					// Create a container from the input
					fContainer = createContainer(fContainer);
					setPageComplete(true);
						// Resolve the container
						BusyIndicator.showWhile(getDisplay(), new Runnable() {
							public void run() {
								IStatus result = fContainer.isResolved() ? Status.OK_STATUS : fContainer.resolve(fTarget, null);

								if (!result.isOK() && !result.isMultiStatus()) {
									// There was a specific problem preventing the resolution, warn the user
									fBundleTree.setInput(null);
									setMessage(result.getMessage(), IMessageProvider.WARNING);
								} else {
									// Resolution was successful
									fBundleTree.setInput(fContainer);
									setPageComplete(true);
								}
							}
						});
						// Store the input into dialog settings as it is valid
						storeSettings();
					}
				} else {
					fContainer = null;
					setPageComplete(false);
				}
				return Status.OK_STATUS;
			} catch (CoreException e) {
				fContainer = null;
				fBundleTree.setInput(null);
				setErrorMessage(e.getMessage());
				setPageComplete(false);
				return e.getStatus();




ContentPage_fGroup = Fragment Properties
ContentPage_parentPluginGroup = Host Plug-in
ContentSection_0=Content
ContentSection_1=List of plug-ins to include in this target.  Only the plug-ins checked below will be included in the target platform.
ContentSection_selectedOnly=Include only plug-ins designated below
ContentSection_targetContent=Target Content
ContentPage_pClassGroup = Plug-in Options

OverviewPage_extensionPageMessageTitle=Extension pages hidden
OverviewPage_extensionPageMessageBody=The Extension and Extension Point pages are currently hidden, would you like to display them now?
OverviewPage_environmentDescription=<form>\
<p>The <a href="environment">Environment</a> section contains additional settings including: locale, operating system, java runtime, arguments and implicit dependencies.</p>\
<li>Environment settings including locale, processor architecture, operating system and windowing system.</li>\
<li>Java runtime environment.</li>\
<li>Program and VM arguments.</li>\
<li>Implicit plug-ins, which should always be taken into account when calculating dependencies.</li>\
</form>
OverviewPage_fExtensionContent=<form>\
<p>This fragment may define extensions and extension points:</p>\

<li style="image" value="page" bindent="5"><a href="ex-points">Extension Points</a>: declares new function points this fragment adds to the platform.</li>\
</form>
OverviewPage_contentDescription=<form>\
<p>The <a href="content">Content</a> section specifies the set of plug-ins that will be included in the target platform.</p>\
<p>An option is also available to simply include all plug-ins from the specified locations into the target platform.</p>\
</form>
OverviewPage_buildTitle=Build Configuration
ClassAttributeRow_dialogTitle=Select Type

Lines 128-133 Link Here

(-)src/org/eclipse/pde/internal/ui/PDEPluginImages.java (+2 lines)
128	public static final ImageDescriptor DESC_COMGROUP_OBJ = create(PATH_OBJ, "keygroups_obj.gif"); //$NON-NLS-1$	128	public static final ImageDescriptor DESC_COMGROUP_OBJ = create(PATH_OBJ, "keygroups_obj.gif"); //$NON-NLS-1$
129	public static final ImageDescriptor DESC_GENCOM_OBJ = create(PATH_OBJ, "command_obj.gif"); //$NON-NLS-1$	129	public static final ImageDescriptor DESC_GENCOM_OBJ = create(PATH_OBJ, "command_obj.gif"); //$NON-NLS-1$
130		130
		131	public static final ImageDescriptor DESC_REPOSITORY_OBJ = create(PATH_OBJ, "metadata_repo_obj.gif"); //$NON-NLS-1$
		132
131	public static final ImageDescriptor DESC_PLUGIN_OBJ = create(PATH_OBJ, "plugin_obj.gif"); //$NON-NLS-1$	133	public static final ImageDescriptor DESC_PLUGIN_OBJ = create(PATH_OBJ, "plugin_obj.gif"); //$NON-NLS-1$
132	public static final ImageDescriptor DESC_PLUGIN_DIS_OBJ = create(PATH_OBJ, "plugin_dis_obj.gif"); //$NON-NLS-1$	134	public static final ImageDescriptor DESC_PLUGIN_DIS_OBJ = create(PATH_OBJ, "plugin_dis_obj.gif"); //$NON-NLS-1$
133	public static final ImageDescriptor DESC_OPERATING_SYSTEM_OBJ = create(PATH_OBJ, "operating_system_obj.gif"); //$NON-NLS-1$	135	public static final ImageDescriptor DESC_OPERATING_SYSTEM_OBJ = create(PATH_OBJ, "operating_system_obj.gif"); //$NON-NLS-1$

Lines 14-19 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditor.java (+79 lines)
14	import java.util.List;	14	import java.util.List;
15	import org.eclipse.core.resources.*;	15	import org.eclipse.core.resources.*;
16	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
		17	import org.eclipse.core.runtime.jobs.Job;
		18	import org.eclipse.core.runtime.jobs.JobChangeAdapter;
17	import org.eclipse.jface.action.Action;	19	import org.eclipse.jface.action.Action;
18	import org.eclipse.jface.action.ControlContribution;	20	import org.eclipse.jface.action.ControlContribution;
19	import org.eclipse.jface.dialogs.IMessageProvider;	21	import org.eclipse.jface.dialogs.IMessageProvider;
Lines 21-26 Link Here
21	import org.eclipse.pde.internal.core.target.impl.WorkspaceFileTargetHandle;	23	import org.eclipse.pde.internal.core.target.impl.WorkspaceFileTargetHandle;
22	import org.eclipse.pde.internal.core.target.provisional.*;	24	import org.eclipse.pde.internal.core.target.provisional.*;
23	import org.eclipse.pde.internal.ui.*;	25	import org.eclipse.pde.internal.ui.*;
		26	import org.eclipse.pde.internal.ui.shared.target.*;
24	import org.eclipse.swt.SWT;	27	import org.eclipse.swt.SWT;
25	import org.eclipse.swt.custom.BusyIndicator;	28	import org.eclipse.swt.custom.BusyIndicator;
26	import org.eclipse.swt.widgets.*;	29	import org.eclipse.swt.widgets.*;
Lines 32-37 Link Here
32	import org.eclipse.ui.forms.events.IHyperlinkListener;	35	import org.eclipse.ui.forms.events.IHyperlinkListener;
33	import org.eclipse.ui.forms.widgets.*;	36	import org.eclipse.ui.forms.widgets.*;
34	import org.eclipse.ui.part.FileEditorInput;	37	import org.eclipse.ui.part.FileEditorInput;
		38	import org.eclipse.ui.progress.UIJob;
35		39
36	/**	40	/**
37	* Editor for target definition (*.target) files. Interacts with the ITargetDefinition model	41	* Editor for target definition (*.target) files. Interacts with the ITargetDefinition model
Lines 46-51 Link Here
46	private ITargetDefinition fTarget;	50	private ITargetDefinition fTarget;
47	private List fManagedFormPages = new ArrayList(2);	51	private List fManagedFormPages = new ArrayList(2);
48	private FileInputListener fInputListener;	52	private FileInputListener fInputListener;
		53	private TargetChangedListener fTargetChangedListener;
49		54
50	/* (non-Javadoc)	55	/* (non-Javadoc)
51	* @see org.eclipse.ui.forms.editor.FormEditor#createToolkit(org.eclipse.swt.widgets.Display)	56	* @see org.eclipse.ui.forms.editor.FormEditor#createToolkit(org.eclipse.swt.widgets.Display)
Lines 62-67 Link Here
62	setActiveEditor(this);	67	setActiveEditor(this);
63	setPartName(getEditorInput().getName());	68	setPartName(getEditorInput().getName());
64	addPage(new DefinitionPage(this));	69	addPage(new DefinitionPage(this));
		70	addPage(new ContentPage(this));
65	addPage(new EnvironmentPage(this));	71	addPage(new EnvironmentPage(this));
66	} catch (PartInitException e) {	72	} catch (PartInitException e) {
67	PDEPlugin.log(e);	73	PDEPlugin.log(e);
Lines 147-152 Link Here
147	if (input instanceof IFileEditorInput) {	153	if (input instanceof IFileEditorInput) {
148	fInputListener = new FileInputListener(((IFileEditorInput) input).getFile());	154	fInputListener = new FileInputListener(((IFileEditorInput) input).getFile());
149	PDEPlugin.getWorkspace().addResourceChangeListener(fInputListener);	155	PDEPlugin.getWorkspace().addResourceChangeListener(fInputListener);
		156	getTargetChangedListener().contentsChanged(getTarget(), true);
150	}	157	}
151	}	158	}
152		159
Lines 198-203 Link Here
198	}	205	}
199		206
200	/**	207	/**
		208	* @return a shared listener that will refresh UI components when the target is modified
		209	*/
		210	public TargetChangedListener getTargetChangedListener() {
		211	if (fTargetChangedListener == null) {
		212	fTargetChangedListener = new TargetChangedListener();
		213	}
		214	return fTargetChangedListener;
		215	}
		216
		217	/**
201	* Handles the revert action	218	* Handles the revert action
202	*/	219	*/
203	public void doRevert() {	220	public void doRevert() {
Lines 303-306 Link Here
303	}	320	}
304	}	321	}
305		322
		323	class TargetChangedListener implements ITargetChangedListener {
		324	private TargetLocationsGroup fLocationTree;
		325	private TargetContentsGroup fContentTree;
		326
		327	public void setLocationTree(TargetLocationsGroup locationTree) {
		328	fLocationTree = locationTree;
		329	}
		330
		331	public void setContentTree(TargetContentsGroup contentTree) {
		332	fContentTree = contentTree;
		333	}
		334
		335	public void contentsChanged(ITargetDefinition definition, boolean resolve) {
		336	if (resolve) {
		337	if (definition.isResolved()) {
		338	if (fContentTree != null) {
		339	fContentTree.setInput(getTarget());
		340	}
		341	if (fLocationTree != null) {
		342	fLocationTree.setInput(getTarget());
		343	}
		344	} else {
		345	if (fContentTree != null) {
		346	fContentTree.setEnabled(false);
		347	}
		348	if (fLocationTree != null) {
		349	fLocationTree.setInput(null);
		350	}
		351	// TODO Cancel any other started jobs? Bad if we do this every time a checkbox changes
		352	Job resolveJob = new Job("Resolving Target") {
		353	protected IStatus run(IProgressMonitor monitor) {
		354	getTarget().resolve(monitor);
		355	if (monitor.isCanceled()) {
		356	return Status.CANCEL_STATUS;
		357	}
		358	// Don't return any problems because we don't want an error dialog
		359	return Status.OK_STATUS;
		360	}
		361	};
		362	resolveJob.addJobChangeListener(new JobChangeAdapter() {
		363	public void done(org.eclipse.core.runtime.jobs.IJobChangeEvent event) {
		364	UIJob job = new UIJob("Refresh UI") {
		365	public IStatus runInUIThread(IProgressMonitor monitor) {
		366	if (fContentTree != null) {
		367	fContentTree.setInput(getTarget());
		368	}
		369	if (fLocationTree != null) {
		370	fLocationTree.setInput(getTarget());
		371	}
		372	return Status.OK_STATUS;
		373	}
		374	};
		375	job.setSystem(true);
		376	job.schedule();
		377	}
		378	});
		379	resolveJob.schedule();
		380	}
		381	}
		382	}
		383	}
		384
306	}	385	}




 *******************************************************************************/
package org.eclipse.pde.internal.ui.editor.targetdefinition;

import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
import org.eclipse.pde.internal.ui.shared.target.ITargetChangedListener;
import org.eclipse.pde.internal.ui.shared.target.TargetContentsGroup;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.SectionPart;

 */
public class ContentSection extends SectionPart {

	private TargetContentsGroup fContentGroup;
	private TargetEditor fEditor;

	public ContentSection(FormPage page, Composite parent) {

		client.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 1));
		client.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL));

		fContentGroup = TargetContentsGroup.createInForm(client, toolkit);
		fEditor.getTargetChangedListener().setContentTree(fContentGroup);
		fContentGroup.addTargetChangedListener(fEditor.getTargetChangedListener());
		fContentGroup.addTargetChangedListener(new ITargetChangedListener() {
			public void contentsChanged(ITargetDefinition definition, boolean resolve) {

							operation.run(monitor);
							return Status.OK_STATUS;
						} catch (InvocationTargetException e) {
							return new Status(IStatus.ERROR, PDEPlugin.getPluginId(), PDEUIMessages.TargetDefinitionContentPage_5, e);
						} catch (InterruptedException e) {
							return Status.CANCEL_STATUS;
						}
					}
				};
				job.setUser(true);
				job.schedule();
			}

			public void contentsChanged() {
				markDirty();
			}
		});

	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
	 */
	public void refresh() {
		fContentGroup.setInput(getTarget());
		super.refresh();
	}





 *******************************************************************************/
package org.eclipse.pde.internal.ui.editor.targetdefinition;

import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
import org.eclipse.pde.internal.ui.editor.target.ContentPage;
import org.eclipse.pde.internal.ui.editor.target.EnvironmentPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.events.HyperlinkEvent;
import org.eclipse.ui.forms.events.IHyperlinkListener;
import org.eclipse.ui.forms.widgets.*;

/**
 * First page in the target definition editor.  Allows for editing of the name,
 * description and content of the target.
 * @see TargetEditor
 * @see InformationSection
 * @see LocationSection
 */
public class DefinitionPage extends FormPage implements IHyperlinkListener {

	public static final String PAGE_ID = "definition"; //$NON-NLS-1$

	public DefinitionPage(TargetEditor editor) {
		super(editor, PAGE_ID, PDEUIMessages.DefinitionPage_0);

		Composite body = managedForm.getForm().getBody();
		body.setLayout(FormLayoutFactory.createFormGridLayout(true, 1));
		managedForm.addPart(new InformationSection(this, body));
		managedForm.addPart(new LocationSection(this, body));
		Composite linkComposite = toolkit.createComposite(body);
		linkComposite.setLayout(FormLayoutFactory.createFormGridLayout(true, 2));
		linkComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
		createContentsSection(linkComposite, toolkit);
		createEnvironmentSection(linkComposite, toolkit);
	}

	private void createContentsSection(Composite parent, FormToolkit toolkit) {
		Section section = createSection(parent, toolkit, PDEUIMessages.OverviewPage_contentTitle);
		createText(section, PDEUIMessages.OverviewPage_contentDescription, toolkit);
	}

	private void createEnvironmentSection(Composite parent, FormToolkit toolkit) {
		Section section = createSection(parent, toolkit, PDEUIMessages.OverviewPage_environmentTitle);
		createText(section, PDEUIMessages.OverviewPage_environmentDescription, toolkit);
	}

	private Section createSection(Composite parent, FormToolkit toolkit, String title) {
		Section section = toolkit.createSection(parent, ExpandableComposite.TITLE_BAR);
		section.clientVerticalSpacing = FormLayoutFactory.SECTION_HEADER_VERTICAL_SPACING;
		section.setText(title);
		section.setLayout(FormLayoutFactory.createClearTableWrapLayout(false, 1));
		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING));
		return section;
	}

	private FormText createText(Section section, String content, FormToolkit toolkit) {
		Composite container = toolkit.createComposite(section, SWT.NONE);
		container.setLayout(FormLayoutFactory.createSectionClientTableWrapLayout(false, 1));
		section.setClient(container);
		FormText text = toolkit.createFormText(container, true);
		try {
			text.setText(content, true, false);
		} catch (SWTException e) {
			text.setText(e.getMessage(), false, false);
		}
		TableWrapData data = new TableWrapData(TableWrapData.FILL_GRAB);
		data.maxWidth = 250;
		text.setLayoutData(data);
		text.addHyperlinkListener(this);
		return text;
	}

	public void linkActivated(HyperlinkEvent e) {
		String href = (String) e.getHref();
		if (href.equals("content")) //$NON-NLS-1$
			getEditor().setActivePage(ContentPage.PAGE_ID);
		else if (href.equals("environment")) //$NON-NLS-1$
			getEditor().setActivePage(EnvironmentPage.PAGE_ID);
	}

	public void linkEntered(HyperlinkEvent e) {
		IStatusLineManager mng = getEditor().getEditorSite().getActionBars().getStatusLineManager();
		mng.setMessage(e.getLabel());
	}

	public void linkExited(HyperlinkEvent e) {
		IStatusLineManager mng = getEditor().getEditorSite().getActionBars().getStatusLineManager();
		mng.setMessage(null);
	}

	// TODO Hook up help toolbar action

Lines 10-17 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java (-41 / +83 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.wizards.target;	11	package org.eclipse.pde.internal.ui.wizards.target;
12		12
13	import org.eclipse.pde.internal.ui.PDEUIMessages;
14
15	import java.lang.reflect.InvocationTargetException;	13	import java.lang.reflect.InvocationTargetException;
16	import java.util.*;	14	import java.util.*;
17	import java.util.List;	15	import java.util.List;
Lines 41-46 Link Here
41	import org.eclipse.swt.layout.GridData;	39	import org.eclipse.swt.layout.GridData;
42	import org.eclipse.swt.layout.GridLayout;	40	import org.eclipse.swt.layout.GridLayout;
43	import org.eclipse.swt.widgets.*;	41	import org.eclipse.swt.widgets.*;
		42	import org.eclipse.ui.ISharedImages;
		43	import org.eclipse.ui.PlatformUI;
44	import org.eclipse.ui.dialogs.ElementListSelectionDialog;	44	import org.eclipse.ui.dialogs.ElementListSelectionDialog;
45	import org.eclipse.ui.progress.UIJob;	45	import org.eclipse.ui.progress.UIJob;
46		46
Lines 55-61 Link Here
55	private static final String EMPTY_STRING = ""; //$NON-NLS-1$	55	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
56		56
57	private Text fNameText;	57	private Text fNameText;
58	private BundleContainerTable fTable;	58	private TabItem fLocationTab;
		59	private TargetLocationsGroup fLocationTree;
		60	private TargetContentsGroup fContentTree;
59		61
60	// Environment pull-downs	62	// Environment pull-downs
61	private Combo fOSCombo;	63	private Combo fOSCombo;
Lines 125-169 Link Here
125	TabFolder tabs = new TabFolder(comp, SWT.NONE);	127	TabFolder tabs = new TabFolder(comp, SWT.NONE);
126	tabs.setLayoutData(new GridData(GridData.FILL_BOTH));	128	tabs.setLayoutData(new GridData(GridData.FILL_BOTH));
127		129
128	TabItem pluginsTab = new TabItem(tabs, SWT.NONE);	130	fLocationTab = new TabItem(tabs, SWT.NONE);
129	pluginsTab.setText(PDEUIMessages.TargetDefinitionContentPage_6);	131	fLocationTab.setText("Locations");
130		132
131	Composite pluginTabContainer = SWTFactory.createComposite(tabs, 1, 1, GridData.FILL_BOTH);	133	Composite pluginTabContainer = SWTFactory.createComposite(tabs, 1, 1, GridData.FILL_BOTH);
132		134	SWTFactory.createWrapLabel(pluginTabContainer, "List of locations to look for plug-ins to add to this target.", 2, 400);
133	SWTFactory.createWrapLabel(pluginTabContainer, PDEUIMessages.ContentSection_1, 2, 400);	135	fLocationTree = TargetLocationsGroup.createInDialog(pluginTabContainer);
134		136	fLocationTab.setControl(pluginTabContainer);
135	fTable = BundleContainerTable.createTableInDialog(pluginTabContainer, new IBundleContainerTableReporter() {	137
136	public void runResolveOperation(final IRunnableWithProgress operation) {	138	TabItem contentTab = new TabItem(tabs, SWT.NONE);
137	if (isControlCreated()) {	139	contentTab.setText(PDEUIMessages.TargetDefinitionContentPage_6);
138	try {	140	Composite contentTabContainer = SWTFactory.createComposite(tabs, 1, 1, GridData.FILL_BOTH);
139	getContainer().run(true, false, operation);	141	SWTFactory.createWrapLabel(contentTabContainer, PDEUIMessages.ContentSection_1, 2, 400);
140	} catch (InvocationTargetException e) {	142	fContentTree = TargetContentsGroup.createInDialog(contentTabContainer);
141	PDEPlugin.log(e);	143	contentTab.setControl(contentTabContainer);
142	} catch (InterruptedException e) {
143	// TODO Cancel the wizard?
144	}
145	} else {
146	// If the page isn't open yet, try running a UI job so the dialog has time to finish opening
147	new UIJob(PDEUIMessages.TargetDefinitionContentPage_0) {
148	public IStatus runInUIThread(IProgressMonitor monitor) {
149	try {
150	getContainer().run(true, false, operation);
151	return Status.OK_STATUS;
152	} catch (InvocationTargetException e) {
153	return new Status(IStatus.ERROR, PDEPlugin.getPluginId(), PDEUIMessages.TargetDefinitionContentPage_5, e);
154	} catch (InterruptedException e) {
155	return Status.CANCEL_STATUS;
156	}
157	}
158	}.schedule();
159	}
160	}
161
162	public void contentsChanged() {
163	// Do nothing, as wizard will always save when finish is pressed
164	}
165	});
166	pluginsTab.setControl(pluginTabContainer);
167		144
168	TabItem envTab = new TabItem(tabs, SWT.NONE);	145	TabItem envTab = new TabItem(tabs, SWT.NONE);
169	envTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_3);	146	envTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_3);
Lines 180-189 Link Here
180	depTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_5);	157	depTab.setText(PDEUIMessages.TargetDefinitionEnvironmentPage_5);
181	depTab.setControl(createImplicitTabContents(tabs));	158	depTab.setControl(createImplicitTabContents(tabs));
182		159
		160	initializeListeners();
183	targetChanged(getTargetDefinition());	161	targetChanged(getTargetDefinition());
184	setControl(comp);	162	setControl(comp);
185	}	163	}
186		164
		165	private void initializeListeners() {
		166	ITargetChangedListener listener = new ITargetChangedListener() {
		167	public void contentsChanged(ITargetDefinition definition, boolean resolve) {
		168	if (resolve) {
		169	if (!definition.isResolved()) {
		170	try {
		171	getContainer().run(true, true, new IRunnableWithProgress() {
		172	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
		173	getTargetDefinition().resolve(monitor);
		174	if (monitor.isCanceled()) {
		175	throw new InterruptedException();
		176	}
		177	}
		178	});
		179	} catch (InvocationTargetException e) {
		180	PDECore.log(e);
		181	} catch (InterruptedException e) {
		182	// Do nothing, op cancelled
		183	}
		184	}
		185	fContentTree.setInput(definition);
		186	fLocationTree.setInput(definition);
		187	if (definition.isResolved() && definition.getBundleStatus().getSeverity() == IStatus.ERROR) {
		188	fLocationTab.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK));
		189	} else {
		190	fLocationTab.setImage(null);
		191	}
		192	}
		193	}
		194	};
		195	fContentTree.addTargetChangedListener(listener);
		196	fLocationTree.addTargetChangedListener(listener);
		197	// When If the page isn't open yet, try running a UI job so the dialog has time to finish opening
		198	new UIJob(PDEUIMessages.TargetDefinitionContentPage_0) {
		199	public IStatus runInUIThread(IProgressMonitor monitor) {
		200	try {
		201	getContainer().run(true, true, new IRunnableWithProgress() {
		202	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
		203	getTargetDefinition().resolve(monitor);
		204	if (monitor.isCanceled()) {
		205	throw new InterruptedException();
		206	}
		207	}
		208	});
		209	} catch (InvocationTargetException e) {
		210	PDECore.log(e);
		211	} catch (InterruptedException e) {
		212	return Status.CANCEL_STATUS;
		213	}
		214	ITargetDefinition definition = getTargetDefinition();
		215	fContentTree.setInput(definition);
		216	fLocationTree.setInput(definition);
		217	if (definition.isResolved() && definition.getBundleStatus().getSeverity() == IStatus.ERROR) {
		218	fLocationTab.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK));
		219	} else {
		220	fLocationTab.setImage(null);
		221	}
		222	return Status.OK_STATUS;
		223	}
		224	}.schedule();
		225
		226	}
		227
187	/* (non-Javadoc)	228	/* (non-Javadoc)
188	* @see org.eclipse.pde.internal.ui.wizards.target.TargetDefinitionPage#targetChanged()	229	* @see org.eclipse.pde.internal.ui.wizards.target.TargetDefinitionPage#targetChanged()
189	*/	230	*/
Lines 200-206 Link Here
200	else	241	else
201	setMessage(PDEUIMessages.TargetDefinitionContentPage_8);	242	setMessage(PDEUIMessages.TargetDefinitionContentPage_8);
202		243
203	fTable.setInput(definition);	244	fLocationTree.setInput(definition);
		245	fContentTree.setInput(definition);
204		246
205	String presetValue = (definition.getOS() == null) ? EMPTY_STRING : definition.getOS();	247	String presetValue = (definition.getOS() == null) ? EMPTY_STRING : definition.getOS();
206	fOSCombo.setText(presetValue);	248	fOSCombo.setText(presetValue);

Lines 237-243 Link Here

(-)src/org/eclipse/pde/internal/ui/util/PDEJavaHelperUI.java (-1 / +1 lines)
237	// Set auto activation character to be a '.'	237	// Set auto activation character to be a '.'
238	char[] autoActivationChars = new char[] {TypeContentProposalProvider.F_DOT};	238	char[] autoActivationChars = new char[] {TypeContentProposalProvider.F_DOT};
239	// Create the adapter	239	// Create the adapter
240	ContentAssistCommandAdapter adapter = new ContentAssistCommandAdapter(text, textContentAdapter, proposalProvider, IWorkbenchCommandConstants.EDIT_CONTENT_ASSIST, autoActivationChars);	240	ContentAssistCommandAdapter adapter = new ContentAssistCommandAdapter(text, textContentAdapter, proposalProvider, IWorkbenchCommandConstants.EDIT_CONTENTASSIST, autoActivationChars);
241	// Configure the adapter	241	// Configure the adapter
242	// Add label provider	242	// Add label provider
243	ILabelProvider labelProvider = new TypeProposalLabelProvider();	243	ILabelProvider labelProvider = new TypeProposalLabelProvider();




               id="org.eclipse.pde.ui.TargetPlatformPreferencePage">
         </keywordReference>
      </page>
      <page
            category="org.eclipse.pde.ui.MainPreferencePage"
            class="org.eclipse.pde.internal.ui.preferences.TargetPlatformPreferencePage"
            id="org.eclipse.pde.ui.TargetPlatformPreferencePage"
            name="Target 2">
         <keywordReference
               id="org.eclipse.pde.ui.pde">
         </keywordReference>
         <keywordReference
               id="org.eclipse.pde.ui.TargetPlatformPreferencePage">
         </keywordReference>
      </page>
   </extension>
   <extension
   		point="org.eclipse.ui.keywords">




/*******************************************************************************
 * Copyright (c) 2009 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
 *******************************************************************************/
package org.eclipse.pde.internal.ui.shared.target;

import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.wizards.target.TargetDefinitionContentPage;

/**
 * Listener for UI components that modify the contents of target definitions.
 * Whenever the contents of the target changes the listener will be called so
 * the target can be resolved and the UI updated.
 * 
 * @see TargetLocationsGroup
 * @see TargetContentsGroup
 * @see TargetDefinitionContentPage
 */
public interface ITargetChangedListener {

	/**
	 * Informs the listener that the contents of the target have changed
	 * and UI elements may need to be refreshed.
	 * @param definition target definition whose contents have changed or <code>null</code> if the definition is not available
	 * @param resolve whether the definition must be resolved to catch up to all changes
	 */
	public void contentsChanged(ITargetDefinition definition, boolean resolve);

}




/*******************************************************************************
 * Copyright (c) 2009 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
 *******************************************************************************/
package org.eclipse.pde.internal.ui.shared.target;

import java.net.URI;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.internal.provisional.p2.ui.actions.PropertyDialogAction;
import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.*;
import org.eclipse.equinox.internal.provisional.p2.ui.policy.IUViewQueryContext;
import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.window.SameShellProvider;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.pde.internal.core.target.impl.P2BundleContainer;
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.wizards.provisioner.p2.ProvisionerMessages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.PlatformUI;

/**
 * Wizard page allowing users to select which IUs they would like to download
 * 
 * @since 3.5
 */
public class AddP2ContainerPage extends WizardPage {

	static final IStatus BAD_IU_SELECTION = new Status(IStatus.ERROR, PDEPlugin.getPluginId(), ProvisionerMessages.P2TargetProvisionerWizardPage_1);
	IStatus fSelectedIUStatus = BAD_IU_SELECTION;

	P2BundleContainer fContainer;
	IUViewQueryContext fQueryContext;

	RepositorySelectionGroup fRepoSelector;
	AvailableIUGroup fAvailableIUGroup;

	Button fPropertiesButton;
	private IAction fPropertyAction;

	protected AddP2ContainerPage() {
		super("AddP2Container"); //$NON-NLS-1$
		// TODO Use the target service to create?
		fContainer = new P2BundleContainer();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
	 */
	public void createControl(Composite parent) {
		setMessage("Select content from a repository to be downloaded and added to your target");
		setTitle("Add Repository or Update Site");
		Composite composite = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH, 0, 0);

		createQueryContext();
		createRepositoryComboArea(composite);
		createAvailableIUArea(composite);
		createDetailsArea(composite);
		createCheckboxArea(composite);

		setPageComplete(false);
		restoreWidgetState();
		setControl(composite);
		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.P2_PROVISIONING_PAGE);
	}

	private void createCheckboxArea(Composite parent) {
		// Categories, provisioning context/store sites/
		Composite checkComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL, 0, 0);
		// TODO Update labels with mnemonics
		SWTFactory.createCheckButton(checkComp, "Group by Category", null, true, 1);
		SWTFactory.createCheckButton(checkComp, "Show only the latest version", null, true, 1);
		SWTFactory.createCheckButton(checkComp, "Download all dependencies", null, true, 1);
		SWTFactory.createCheckButton(checkComp, "Include the repo location in the target", null, true, 1);

	}

	private void createQueryContext() {
		fQueryContext = Policy.getDefault().getQueryContext();
	}

	private void createRepositoryComboArea(Composite parent) {
		RepositorySelectionGroup repoSelector = new RepositorySelectionGroup(getContainer(), parent, Policy.getDefault(), fQueryContext);
		repoSelector.addRepositorySelectionListener(new IRepositorySelectionListener() {
			public void repositorySelectionChanged(int repoChoice, URI repoLocation) {
				fAvailableIUGroup.setRepositoryFilter(repoChoice, repoLocation);
			}
		});
	}

	/**
	 * Create the UI area where the user will be able to select which IUs they
	 * would like to download.  There will also be buttons to see properties for
	 * the selection and open the manage sites dialog.
	 * 
	 * @param parent parent composite
	 */
	private void createAvailableIUArea(Composite parent) {
		fAvailableIUGroup = new AvailableIUGroup(parent);
		fAvailableIUGroup.getCheckboxTreeViewer().addCheckStateListener(new ICheckStateListener() {
			public void checkStateChanged(CheckStateChangedEvent event) {
				IInstallableUnit[] units = fAvailableIUGroup.getCheckedLeafIUs();
				fPropertiesButton.setEnabled(units.length > 0);
				if (units.length > 0) {
					fSelectedIUStatus = Status.OK_STATUS;
					fContainer.setRequiredUnits(units);
				} else {
					fSelectedIUStatus = BAD_IU_SELECTION;
					fContainer.setRequiredUnits(null);
				}
				pageChanged();
			}
		});
		fAvailableIUGroup.setUseBoldFontForFilteredItems(true);
		GridData data = (GridData) fAvailableIUGroup.getStructuredViewer().getControl().getLayoutData();
		data.heightHint = 200;
	}

	private void createDetailsArea(Composite parent) {
		Group detailsGroup = SWTFactory.createGroup(parent, "Details", 1, 1, GridData.FILL_HORIZONTAL);

		fPropertiesButton = new Button(detailsGroup, SWT.PUSH);
		fPropertiesButton.setText(ProvisionerMessages.P2TargetProvisionerWizardPage_10);
		fPropertiesButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		fPropertiesButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent event) {
				fPropertyAction.run();
			}
		});
		fPropertyAction = new PropertyDialogAction(new SameShellProvider(getShell()), fAvailableIUGroup.getStructuredViewer());
	}

	/**
	 * Checks if the page is complete, updating messages and finish button.
	 */
	void pageChanged() {
		if (fSelectedIUStatus.getSeverity() == IStatus.ERROR) {
			setErrorMessage(fSelectedIUStatus.getMessage());
			setPageComplete(false);
		} else {
			setErrorMessage(null);
			setPageComplete(true);
		}
	}

	/**
	 * Restores the state of the wizard from previous invocations
	 */
	private void restoreWidgetState() {
		// TODO Init check boxes
	}

	/**
	 * @return bundle container created by this wizard or <code>null</code>
	 */
	public IBundleContainer getBundleContainer() {
		return fContainer;
	}

}




/*******************************************************************************
 * Copyright (c) 2009 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
 *******************************************************************************/
package org.eclipse.pde.internal.ui.editor.targetdefinition;

import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.PDEPluginImages;
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;

/**
 * First page in the target definition editor.  Allows for editing of the name,
 * description and content of the target.
 * @see TargetEditor
 * @see InformationSection
 * @see LocationSection
 */
public class ContentPage extends FormPage {

	public static final String PAGE_ID = "content"; //$NON-NLS-1$

	public ContentPage(TargetEditor editor) {
		super(editor, PAGE_ID, "Content");
	}

	/**
	 * @return The target model backing this editor
	 */
	public ITargetDefinition getTarget() {
		return ((TargetEditor) getEditor()).getTarget();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
	 */
	protected void createFormContent(IManagedForm managedForm) {
		super.createFormContent(managedForm);
		ScrolledForm form = managedForm.getForm();
		FormToolkit toolkit = managedForm.getToolkit();
		form.setText("Target Content");
		PDEPlugin.getDefault().getLabelProvider().connect(this);
		form.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_TARGET_DEFINITION));
		toolkit.decorateFormHeading(form.getForm());
		fillBody(managedForm, toolkit);
		// TODO Finish help
		((TargetEditor) getEditor()).contributeToToolbar(managedForm.getForm(), ""); //$NON-NLS-1$
		((TargetEditor) getEditor()).addForm(managedForm);
		form.updateToolBar();
//		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.TARGET_OVERVIEW_PAGE);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.forms.editor.FormPage#dispose()
	 */
	public void dispose() {
		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
		super.dispose();
	}

	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
		Composite body = managedForm.getForm().getBody();
		body.setLayout(FormLayoutFactory.createFormGridLayout(true, 1));
		managedForm.addPart(new ContentSection(this, body));
	}

	// TODO Hook up help toolbar action
//	protected String getHelpResource() {
//		return "/org.eclipse.pde.doc.user/guide/tools/editors/target_definition_editor/overview.htm"; //$NON-NLS-1$
//	}

}




/*******************************************************************************
 * Copyright (c) 2005, 2009 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
 *******************************************************************************/
package org.eclipse.pde.internal.ui.editor.targetdefinition;

import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
import org.eclipse.pde.internal.ui.shared.target.ITargetChangedListener;
import org.eclipse.pde.internal.ui.shared.target.TargetLocationsGroup;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.SectionPart;
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.*;

/**
 * Section for editing the content of the target (bundle containers) in the target definition editor
 * @see DefinitionPage
 * @see TargetEditor
 */
public class LocationSection extends SectionPart {

	private TargetLocationsGroup fContainerGroup;
	private TargetEditor fEditor;

	public LocationSection(FormPage page, Composite parent) {
		super(parent, page.getManagedForm().getToolkit(), Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
		fEditor = (TargetEditor) page.getEditor();
		createClient(getSection(), page.getEditor().getToolkit());
	}

	/**
	 * @return The target model backing this editor
	 */
	private ITargetDefinition getTarget() {
		return fEditor.getTarget();
	}

	/**
	 * Creates the UI for this section.
	 * 
	 * @param section section the UI is being added to
	 * @param toolkit form toolkit used to create the widgets
	 */
	protected void createClient(Section section, FormToolkit toolkit) {
		section.setLayout(FormLayoutFactory.createClearTableWrapLayout(false, 1));
		GridData sectionData = new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL);
		sectionData.horizontalSpan = 2;
		section.setLayoutData(sectionData);
		section.setText("Locations");

		section.setDescription(PDEUIMessages.ContentSection_1);
		Composite client = toolkit.createComposite(section);
		client.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 1));
		client.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL));

		fContainerGroup = TargetLocationsGroup.createInForm(client, toolkit);
		fEditor.getTargetChangedListener().setLocationTree(fContainerGroup);
		fContainerGroup.addTargetChangedListener(fEditor.getTargetChangedListener());
		fContainerGroup.addTargetChangedListener(new ITargetChangedListener() {
			public void contentsChanged(ITargetDefinition definition, boolean resolve) {
				markDirty();
			}
		});

		toolkit.paintBordersFor(client);
		section.setClient(client);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
	 */
	public void refresh() {
		fContainerGroup.setInput(getTarget());
		super.refresh();
	}

}




package org.eclipse.pde.internal.ui.shared.target;

import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.SWTFactory;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;

public class PreviewContainerPage extends WizardPage {

	private ITargetDefinition fTarget;
	private EditDirectoryContainerPage fPage1;
	protected TableViewer fPreviewTable;
	protected Object fInput;

	protected PreviewContainerPage(ITargetDefinition definition, EditDirectoryContainerPage page1) {
		super("ContainerPreviewPage");
		setTitle("Preview Contents");
		setMessage("The plug-ins found in the container are visible below");
		fTarget = definition;
		fPage1 = page1;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
	 */
	public void createControl(Composite parent) {
		Composite composite = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH);
		SWTFactory.createLabel(composite, "Plug-ins:", 1);
		fPreviewTable = new TableViewer(composite);
		fPreviewTable.setLabelProvider(new BundleInfoLabelProvider(true));
		fPreviewTable.setContentProvider(ArrayContentProvider.getInstance());
		fPreviewTable.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
		setControl(composite);
	}

	/**
	 * Refreshes the contents of the preview table, possible resolving the container
	 * @param resolve whether the current container should be resolved if it hasn't been already
	 */
	protected void setInput(final IBundleContainer container) {
		if (container == null) {
			fInput = null;
			fPreviewTable.setInput(null);
			return;
		}

		if (container.isResolved()) {
			fInput = container.getAllBundles();
			fPreviewTable.setInput(fInput);
			return;
		}

		try {
			getContainer().run(true, true, new IRunnableWithProgress() {
				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
					IStatus result = container.resolve(fTarget, monitor);
					if (monitor.isCanceled()) {
						fInput = null;
					} else if (!result.isOK() && !result.isMultiStatus()) {
						fInput = new Object[] {result};
					} else {
						fInput = container.getAllBundles();
					}

				}
			});
			fPreviewTable.setInput(fInput);
		} catch (InvocationTargetException e) {
			PDEPlugin.log(e);
			setErrorMessage(e.getMessage());
		} catch (InterruptedException e) {
		}

	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
	 */
	public void setVisible(boolean visible) {
		super.setVisible(visible);
		if (visible) {
			setInput(fPage1.getBundleContainer());
		}
	}

}




package org.eclipse.pde.internal.ui.shared.target;

import com.ibm.icu.text.MessageFormat;
import java.net.URI;
import java.util.*;
import java.util.List;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.*;
import org.eclipse.jface.viewers.*;
import org.eclipse.pde.internal.core.target.provisional.*;
import org.eclipse.pde.internal.ui.SWTFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.dialogs.FilteredTree;
import org.eclipse.ui.dialogs.PatternFilter;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.progress.UIJob;

public class TargetContentsGroup extends FilteredTree {

	private CheckboxTreeViewer fTree;
	private Button fSelectButton;
	private Button fDeselectButton;
	private Button fSelectAllButton;
	private Button fDeselectAllButton;
//	private Button fSelectRequiredButton;
	private Label fShowLabel;
	private Button fShowSourceButton;
	private Button fShowPluginsButton;
	private Label fCountLabel;
	private Label fGroupLabel;
	private Combo fGroupCombo;

	private ViewerFilter fSourceFilter;
	private ViewerFilter fPluginFilter;

	private List fAllBundles;
	private Set fAllChecked;
	private Map fContainerBundles;
	private Map fContainerChecked;
	private Map fFileBundles;
	private Map fFileChecked;

	private ITargetDefinition fTargetDefinition;

	private int fGrouping;
	private static final int GROUP_BY_NONE = 0;
	private static final int GROUP_BY_FILE_LOC = 1;
	private static final int GROUP_BY_CONTAINER = 2;
	private ListenerList fChangeListeners = new ListenerList();

	public static TargetContentsGroup createInForm(Composite parent, FormToolkit toolkit) {
		// TODO Should we be using the tooklit to create the controls?
		TargetContentsGroup control = new TargetContentsGroup(parent);
		return control;
	}

	public static TargetContentsGroup createInDialog(Composite parent) {
		TargetContentsGroup control = new TargetContentsGroup(parent);
		return control;
	}

	private TargetContentsGroup(Composite parent) {
		super(parent, SWT.BORDER | SWT.MULTI, new PatternFilter(), true);
	}

	/**
	 * Adds a listener to the set of listeners that will be notified when the bundle containers
	 * are modified.  This method has no effect if the listener has already been added. 
	 * 
	 * @param listener target changed listener to add
	 */
	public void addTargetChangedListener(ITargetChangedListener listener) {
		fChangeListeners.add(listener);
	}

	/**
	 * Informs the target content listeners that check state has changed
	 */
	public void contentChanged() {
		// TODO Save the included bundles
		Object[] listeners = fChangeListeners.getListeners();
		for (int i = 0; i < listeners.length; i++) {
			((ITargetChangedListener) listeners[i]).contentsChanged(fTargetDefinition, false);
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.dialogs.FilteredTree#createTreeControl(org.eclipse.swt.widgets.Composite, int)
	 */
	protected Control createTreeControl(Composite parent, int style) {
		fGrouping = GROUP_BY_NONE;
		Composite treeComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH, 0, 0);
		super.createTreeControl(treeComp, style);
		((GridData) fTree.getControl().getLayoutData()).heightHint = 300;
		createButtons(treeComp);
		createOptions(treeComp);

		updateButtons();
		initializeFilters();
		return treeComp;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.dialogs.FilteredTree#doCreateTreeViewer(org.eclipse.swt.widgets.Composite, int)
	 */
	protected TreeViewer doCreateTreeViewer(Composite parent, int style) {
		fTree = new CheckboxTreeViewer(parent, style) {
			public void refresh(boolean updateLabels) {
				super.refresh(updateLabels);
				if (updateLabels) {
					// We want to update the labels and buttons as users change the filtering
					updateButtons();
				}
			}
		};
		fTree.setContentProvider(new TreeContentProvider());
		fTree.setLabelProvider(new BundleContainerLabelProvider());
		fTree.addDoubleClickListener(new IDoubleClickListener() {
			public void doubleClick(DoubleClickEvent event) {
				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
				Object first = selection.getFirstElement();
				handleCheck(new Object[] {selection.getFirstElement()}, !fTree.getChecked(first));
			}
		});
		fTree.addCheckStateListener(new ICheckStateListener() {
			public void checkStateChanged(CheckStateChangedEvent event) {
				handleCheck(new Object[] {event.getElement()}, fTree.getChecked(event.getElement()));
			}
		});
		fTree.addSelectionChangedListener(new ISelectionChangedListener() {
			public void selectionChanged(SelectionChangedEvent event) {
				updateButtons();
			}
		});
		fTree.setSorter(new ViewerSorter() {
			public int compare(Viewer viewer, Object e1, Object e2) {
				if (e1 instanceof IResolvedBundle && e2 instanceof IResolvedBundle) {
					IStatus status1 = ((IResolvedBundle) e1).getStatus();
					IStatus status2 = ((IResolvedBundle) e2).getStatus();
					if (!status1.isOK() && status2.isOK()) {
						return -1;
					}
					if (status1.isOK() && !status2.isOK()) {
						return 1;
					}
				}
				return super.compare(viewer, e1, e2);
			}

		});
		return fTree;
	}

	private void createButtons(Composite parent) {
		Composite buttonComp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_VERTICAL, 0, 0);

		fSelectButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_0, null);
		fSelectButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				if (!fTree.getSelection().isEmpty()) {
					Object[] selected = ((IStructuredSelection) fTree.getSelection()).toArray();
					handleCheck(selected, true);
				}
			}
		});
		fDeselectButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_1, null);
		fDeselectButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				if (!fTree.getSelection().isEmpty()) {
					Object[] selected = ((IStructuredSelection) fTree.getSelection()).toArray();
					handleCheck(selected, false);
				}
			}
		});

		createEmptySpace(buttonComp);

		fSelectAllButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_2, null);
		fSelectAllButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				// TODO
//				Object[] elements = ((ITreeContentProvider) fTree.getContentProvider()).getElements(fTree.getInput());
//				fTree.setGrayedElements(new Object[0]);
//				for (int i = 0; i < elements.length; i++) {
//					fTree.setSubtreeChecked(elements[i], true);
//				}
//				updateParentCheckState(elements);
//				contentChanged();
//				updateButtons();
			}
		});
		fDeselectAllButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_3, null);
		fDeselectAllButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				// TODO
//				Object[] elements = ((ITreeContentProvider) fTree.getContentProvider()).getElements(fTree.getInput());
//				fTree.setGrayedElements(new Object[0]);
//				for (int i = 0; i < elements.length; i++) {
//					fTree.setSubtreeChecked(elements[i], false);
//				}
//				updateParentCheckState(elements);
//				contentChanged();
//				updateButtons();
			}
		});

		createEmptySpace(buttonComp);

		// TODO Support selecting required.
//		fSelectRequiredButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_4, null);
//		fSelectRequiredButton.addSelectionListener(new SelectionAdapter() {
//			public void widgetSelected(SelectionEvent e) {
//				updateButtons();
//			}
//		});

		Composite filterComp = SWTFactory.createComposite(buttonComp, 1, 1, SWT.NONE, 0, 0);
		filterComp.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, true, true));

		fShowLabel = SWTFactory.createLabel(filterComp, Messages.BundleContainerTable_9, 1);

		fShowPluginsButton = SWTFactory.createCheckButton(filterComp, Messages.BundleContainerTable_14, null, true, 1);
		fShowPluginsButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				if (!fShowPluginsButton.getSelection()) {
					fTree.addFilter(fPluginFilter);
				} else {
					fTree.removeFilter(fPluginFilter);
				}
				updateButtons();
			}
		});
		fShowPluginsButton.setSelection(true);
		GridData gd = new GridData();
		gd.horizontalIndent = 10;
		fShowPluginsButton.setLayoutData(gd);

		fShowSourceButton = SWTFactory.createCheckButton(filterComp, Messages.BundleContainerTable_15, null, true, 1);
		fShowSourceButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				if (!fShowSourceButton.getSelection()) {
					fTree.addFilter(fSourceFilter);
				} else {
					fTree.removeFilter(fSourceFilter);
				}
				updateButtons();
			}
		});
		fShowSourceButton.setSelection(true);
		gd = new GridData();
		gd.horizontalIndent = 10;
		fShowSourceButton.setLayoutData(gd);
	}

	private void createOptions(Composite parent) {
		Composite comp = SWTFactory.createComposite(parent, 2, 2, GridData.FILL_HORIZONTAL, 0, 0);

		fGroupLabel = SWTFactory.createLabel(comp, "Group by:", 1);
		fGroupCombo = SWTFactory.createCombo(comp, SWT.READ_ONLY, 1, new String[] {"None", "File Path", "Plug-in Container"});
		fGroupCombo.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleGroupChange();
			}
		});

		fCountLabel = SWTFactory.createLabel(comp, "", 2); //$NON-NLS-1$
	}

	private void initializeFilters() {
		fSourceFilter = new ViewerFilter() {
			public boolean select(Viewer viewer, Object parentElement, Object element) {
				if (element instanceof IResolvedBundle) {
					if (((IResolvedBundle) element).isSourceBundle()) {
						return false;
					}
				}
				return true;
			}
		};
		fPluginFilter = new ViewerFilter() {
			public boolean select(Viewer viewer, Object parentElement, Object element) {
				if (element instanceof IResolvedBundle) {
					if (!((IResolvedBundle) element).isSourceBundle()) {
						return false;
					}
				}
				return true;
			}
		};
	}

	private Label createEmptySpace(Composite parent) {
		Label label = new Label(parent, SWT.NONE);
		GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
		gd.widthHint = gd.heightHint = 5;
		label.setLayoutData(gd);
		return label;
	}

	private IPath getParentPath(IResolvedBundle bundle) {
		URI location = bundle.getBundleInfo().getLocation();
		if (location == null) {
			return new Path("Unknown");
		}
		IPath path = new Path(URIUtil.toUnencodedString(location));
		path = path.removeLastSegments(1);
		return path;
	}

	private void handleCheck(Object[] changedElements, boolean checkState) {
		if (changedElements.length > 0) {
			if (changedElements[0] instanceof IResolvedBundle) {
				Set parentsToUpdate = new HashSet();
				for (int i = 0; i < changedElements.length; i++) {
					Object parent = ((IResolvedBundle) changedElements[i]).getParentContainer();
					if (fGrouping == GROUP_BY_CONTAINER) {
						parentsToUpdate.add(parent);
					}
					Set containerChecked = ((Set) fContainerChecked.get(parent));

					parent = getParentPath((IResolvedBundle) changedElements[i]);
					if (fGrouping == GROUP_BY_FILE_LOC) {
						parentsToUpdate.add(parent);
					}
					Set fileChecked = ((Set) fContainerChecked.get(parent));

					if (checkState) {
						fAllChecked.add(changedElements[i]);
						containerChecked.add(changedElements[i]);
						fileChecked.add(changedElements[i]);
					} else {
						fAllChecked.remove(changedElements[i]);
						containerChecked.remove(changedElements[i]);
						fileChecked.remove(changedElements[i]);
					}
					fTree.setChecked(changedElements, checkState);
				}
				for (Iterator iterator = parentsToUpdate.iterator(); iterator.hasNext();) {
					Object parent = iterator.next();
					if (getChecked(parent).size() == 0) {
						fTree.setGrayChecked(parent, false);
					} else if (getChecked(parent).size() == getBundleChildren(parent).size()) {
						fTree.setGrayed(parent, false);
						fTree.setChecked(parent, true);
					} else {
						fTree.setGrayChecked(parent, true);
					}
				}
			} else {
				for (int i = 0; i < changedElements.length; i++) {
					fTree.setGrayed(changedElements[i], false);
					fTree.setChecked(changedElements[i], checkState);
					fTree.setSubtreeChecked(changedElements[i], checkState);
					
					fgetChecked(changedElements[i]).
				}
			}
		}
	}

	/**
	 * Update the check state of parent elements when there is grouping.  The list of changed elements must be
	 * all IResolvedBundles.
	 * 
	 * @param changedElements array of IResolvedBundles that have changed
	 */
	private void updateParentCheckState(Object[] changedElements) {
		if (fGrouping != GROUP_BY_NONE && changedElements.length > 0) {
			Set changedParents = new HashSet();
			if (changedElements[0] instanceof IResolvedBundle) {
				if (fGrouping == GROUP_BY_FILE_LOC) {
					for (int i = 0; i < changedElements.length; i++) {
						changedParents.add(getParentPath((IResolvedBundle) changedElements[i]));
					}
				} else if (fGrouping == GROUP_BY_CONTAINER) {
					for (int i = 0; i < changedElements.length; i++) {
						changedParents.add(((IResolvedBundle) changedElements[i]).getParentContainer());
					}
				}
			} else {
				changedParents.addAll(Arrays.asList(changedElements));
			}
			if (fGrouping == GROUP_BY_FILE_LOC) {
				for (Iterator iterator = changedParents.iterator(); iterator.hasNext();) {
					IPath currentParent = (IPath) iterator.next();
					List children = (List) getFileLocationMap().get(currentParent);
					updateGrayChecked(currentParent, children);
				}
			} else if (fGrouping == GROUP_BY_CONTAINER) {
				for (Iterator iterator = changedParents.iterator(); iterator.hasNext();) {
					IBundleContainer currentParent = (IBundleContainer) iterator.next();
					List children = Arrays.asList(currentParent.getAllBundles());
					// TODO Get plug-in errors (missing bundles)
					updateGrayChecked(currentParent, children);
				}
			}
		}
	}

	/**
	 * Updates the children of the changed parent elements.  Also removed the gray state
	 * of the parent.
	 * 
	 * @param changedElements list of changed parents
	 * @param state whether the parents are being checked or unchecked
	 */
	private void updateChildrenCheckState(Object[] changedElements, boolean state) {
		for (int i = 0; i < changedElements.length; i++) {
			fTree.setSubtreeChecked(changedElements[i], state);
			fTree.setGrayed(changedElements[i], false);
			fTree.setChecked(changedElements[i], state);
		}
	}

	private void updateGrayChecked(Object parent, List children) {
		boolean allChecked = true;
		boolean noneChecked = true;
		for (Iterator iterator2 = children.iterator(); iterator2.hasNext();) {
			boolean checked = fTree.getChecked(iterator2.next());
			if (checked) {
				noneChecked = false;
			} else {
				allChecked = false;
			}
			if (!noneChecked && !allChecked) {
				break;
			}
		}
		if (!noneChecked && !allChecked) {
			fTree.setGrayChecked(parent, true);
		} else if (allChecked) {
			fTree.setChecked(parent, true);
			fTree.setGrayed(parent, false);
		} else {
			fTree.setChecked(parent, false);
			fTree.setGrayed(parent, false);
		}
	}

	private void handleGroupChange() {
		// TODO
		fGrouping = fGroupCombo.getSelectionIndex();
		Object[] checked = fTree.getCheckedElements();
		fTree.getControl().setRedraw(false);
		fTree.refresh(false);
		fTree.setCheckedElements(checked);
		if (fGrouping == GROUP_BY_CONTAINER) {
			updateParentCheckState(fTargetDefinition.getBundleContainers());
		} else if (fGrouping == GROUP_BY_FILE_LOC) {
			updateParentCheckState(getFileLocationMap().keySet().toArray());
		}
		fTree.getControl().setRedraw(true);
		updateButtons();
	}

	private void updateButtons() {
		if (fTargetDefinition != null && !fTree.getSelection().isEmpty()) {
			Object[] selection = ((IStructuredSelection) fTree.getSelection()).toArray();
			boolean hasResolveBundle = false;
			boolean hasParent = false;
			boolean allSelected = true;
			boolean noneSelected = true;
			for (int i = 0; i < selection.length; i++) {
				if (!hasResolveBundle || !hasParent) {
					if (selection[i] instanceof IResolvedBundle) {
						hasResolveBundle = true;
					} else {
						hasParent = true;
					}
				}
				boolean checked = fTree.getChecked(selection[i]);
				if (checked) {
					noneSelected = false;
				} else {
					allSelected = false;
				}
			}
			// Selection is available is not everything is already selected and not both a parent and child item are selected
			fSelectButton.setEnabled(!allSelected && !(hasResolveBundle && hasParent));
			fDeselectButton.setEnabled(!noneSelected && !(hasResolveBundle && hasParent));
//			fSelectRequiredButton.setEnabled(true);
		} else {
			fSelectButton.setEnabled(false);
			fDeselectButton.setEnabled(false);
//			fSelectRequiredButton.setEnabled(false);
		}

		// TODO how to handle filtered case
		if (fGrouping == GROUP_BY_FILE_LOC) {
			boolean allChecked = true;
			boolean noneChecked = true;
			if (fTree.getGrayedElements().length > 0) {
				allChecked = false;
				noneChecked = false;
			} else {
				for (Iterator iterator = getFileLocationMap().keySet().iterator(); iterator.hasNext();) {
					boolean checked = fTree.getChecked(iterator.next());
					if (checked) {
						noneChecked = false;
					} else {
						allChecked = false;
					}
					if (!noneChecked && !allChecked) {
						break;
					}
				}
			}
			fSelectAllButton.setEnabled(fTargetDefinition != null && !allChecked);
			fDeselectAllButton.setEnabled(fTargetDefinition != null && !noneChecked);
		} else {
			int checked = fTree.getCheckedElements().length;
			fSelectAllButton.setEnabled(fTargetDefinition != null && checked != fTree.getTree().getItemCount());
			fDeselectAllButton.setEnabled(fTargetDefinition != null && checked != 0);
		}

		if (fTargetDefinition != null) {
			fCountLabel.setText(MessageFormat.format("{0} of {1} selected", new String[] {Integer.toString(fAllChecked.size()), Integer.toString(fAllBundles.size())}));
		} else {
			fCountLabel.setText(""); //$NON-NLS-1$
		}
	}

	/**
	 * Set the container to display in the tree or <code>null</code> to disable the tree 
	 * @param input bundle container or <code>null</code>
	 */
	public void setInput(ITargetDefinition input) {
		fTargetDefinition = input;

		if (input == null || !input.isResolved()) {
			fTree.setInput("Resolving...");
			setEnabled(false);
			return;
		}

		IResolvedBundle[] allResolvedBundles = input.getAllBundles();
		if (allResolvedBundles == null || allResolvedBundles.length == 0) {
			fTree.setInput("< no plug-ins found in the target >");
			setEnabled(false);
			return;
		}

		fTree.setInput("Initializing...");
		setEnabled(false);
		Job initJob = new InitalizeJob();
		initJob.addJobChangeListener(new JobChangeAdapter() {
			public void done(IJobChangeEvent event) {
				Job refreshJob = new UIJob("Refreshing Tree") {
					public IStatus runInUIThread(IProgressMonitor monitor) {
						fTree.setInput(fTargetDefinition);
						// For now we always start with no grouping
						fTree.setCheckedElements(getChecked(null).toArray());
						setEnabled(true);
						return Status.OK_STATUS;
					}
				};
				refreshJob.setSystem(true);
				refreshJob.schedule();
			}
		});
		initJob.schedule();
	}

	private class InitalizeJob extends Job {

		public InitalizeJob() {
			super("Initializing Tree");
			setSystem(true);
		}

		protected IStatus run(IProgressMonitor monitor) {
			fAllBundles = new ArrayList();
			fAllChecked = new HashSet();
			fContainerBundles = new HashMap();
			fContainerChecked = new HashMap();
			IBundleContainer[] containers = fTargetDefinition.getBundleContainers();
			// Iterate through each container, adding bundles to the map and list
			for (int i = 0; i < containers.length; i++) {
				List containerBundles = Arrays.asList(containers[i].getAllBundles());
				fAllBundles.addAll(containerBundles);
				fContainerBundles.put(containers[i], containerBundles);

				// Determine which of the bundles are checked (included)
				if (containers[i].getIncludedBundles() == null) {
					// Everything is included
					Set checked = new HashSet();
					checked.addAll(containerBundles);
					fContainerChecked.put(containers[i], checked);
					fAllChecked.addAll(checked);
				} else {
					// Mark the included bundles as checked
					List includedBundles = Arrays.asList(containers[i].getBundles());
					// If an included bundle has errors it must be explicitly added to the bundle list as getAllBundles does not return it.
					for (Iterator iterator = includedBundles.iterator(); iterator.hasNext();) {
						IResolvedBundle currentIncluded = (IResolvedBundle) iterator.next();
						if (!currentIncluded.getStatus().isOK()) {
							((List) fContainerBundles.get(containers[i])).add(currentIncluded);
							fAllBundles.add(currentIncluded);
						}
					}
					Set checked = new HashSet();
					checked.addAll(includedBundles);
					fContainerChecked.put(containers[i], checked);
					fAllChecked.addAll(checked);
				}
			}

			// Map the bundles into their file locations
			fFileBundles = new HashMap();
			fFileChecked = new HashMap();
			Set allChecked = new HashSet();
			allChecked.addAll(fAllChecked);
			for (Iterator iterator = fAllBundles.iterator(); iterator.hasNext();) {
				IResolvedBundle currentBundle = (IResolvedBundle) iterator.next();
				IPath parentPath = getParentPath(currentBundle);
				List bundles = (List) fFileBundles.get(parentPath);
				if (bundles == null) {
					bundles = new ArrayList();
					bundles.add(currentBundle);
					fFileBundles.put(parentPath, bundles);
				} else {
					bundles.add(currentBundle);
				}
				// Determine whether the current bundle is checked
				if (allChecked.contains(currentBundle)) {
					Set checked = (Set) fFileChecked.get(parentPath);
					if (checked == null) {
						checked = new HashSet();
						checked.add(currentBundle);
						fFileChecked.put(parentPath, checked);
					} else {
						checked.add(currentBundle);
					}
				}
			}

			return Status.OK_STATUS;
		}
	}

	private Set getChecked(Object parent) {
		Set result = null;
		if (parent == null) {
			result = fAllChecked;
		} else if (fGrouping == GROUP_BY_CONTAINER) {
			result = (Set) fContainerChecked.get(parent);
		} else if (fGrouping == GROUP_BY_FILE_LOC) {
			result = (Set) fFileChecked.get(parent);
		}
		if (result == null) {
			return new HashSet(0);
		}
		return result;
	}

	private List getBundleChildren(Object parent) {
		List result = null;
		if (parent == null) {
			result = fAllBundles;
		} else if (fGrouping == GROUP_BY_CONTAINER) {
			result = (List) fContainerBundles.get(parent);
		} else if (fGrouping == GROUP_BY_FILE_LOC) {
			result = (List) fFileBundles.get(parent);
		}
		if (result == null) {
			return new ArrayList(0);
		}
		return result;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.swt.widgets.Control#setEnabled(boolean)
	 */
	public void setEnabled(boolean enabled) {
		super.setEnabled(enabled);
		if (enabled) {
			updateButtons();
		} else {
			fSelectButton.setEnabled(false);
			fSelectAllButton.setEnabled(false);
			fDeselectButton.setEnabled(false);
			fDeselectAllButton.setEnabled(false);
//			fSelectRequiredButton.setEnabled(false);
			fCountLabel.setText(""); //$NON-NLS-1$
		}
		fShowLabel.setEnabled(enabled);
		fShowPluginsButton.setEnabled(enabled);
		fShowSourceButton.setEnabled(enabled);
		fGroupLabel.setEnabled(enabled);
		fGroupCombo.setEnabled(enabled);
		super.setEnabled(enabled);
	}

	public void saveIncludedBundleState() {
		// TODO Simplify with bundle containers
//		IBundleContainer[] containers = fTargetDefinition.getBundleContainers();
//		for (int i = 0; i < containers.length; i++) {
//			IResolvedBundle[] allBundles = containers[i].getAllBundles();
//			List included = new ArrayList(allBundles.length);
//			for (int j = 0; j < allBundles.length; j++) {
//				if (fTree.getChecked(allBundles[j])) {
//					included.add(new BundleInfo(allBundles[j].getBundleInfo().getSymbolicName(), null, null, BundleInfo.NO_LEVEL, false));
//				}
//			}
//			if (included.size() == allBundles.length) {
//				containers[i].setIncludedBundles(null);
//			} else {
//				containers[i].setIncludedBundles((BundleInfo[]) included.toArray(new BundleInfo[included.size()]));
//			}
//		}
		// TODO Handle plug-in errors (missing bundles)
	}

	class TreeContentProvider implements ITreeContentProvider {
		public Object[] getChildren(Object parentElement) {
			return getBundleChildren(parentElement).toArray();
		}

		public Object getParent(Object element) {
//			if (fGrouping == GROUP_BY_CONTAINER && element instanceof IResolvedBundle) {
//				return ((IResolvedBundle) element).getParentContainer();
//			} else if (fGrouping == GROUP_BY_FILE_LOC && element instanceof IResolvedBundle) {
//				return getParentPath((IResolvedBundle) element);
//			}
			return null;
		}

		public boolean hasChildren(Object element) {
			if (fGrouping == GROUP_BY_NONE || element instanceof IResolvedBundle) {
				return false;
			}
			if (element instanceof IBundleContainer || element instanceof IPath) {
				return getBundleChildren(element).size() > 0;
			}
			return false;
		}

		public Object[] getElements(Object inputElement) {
			if (inputElement instanceof ITargetDefinition) {
				if (fGrouping == GROUP_BY_NONE) {
					return fAllBundles.toArray();
				} else if (fGrouping == GROUP_BY_CONTAINER) {
					return fContainerBundles.keySet().toArray();
				} else {
					return fFileBundles.keySet().toArray();
				}
			}
			return new Object[] {inputElement};
		}

		public void dispose() {
		}

		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
		}
	}

}




/*******************************************************************************
 * Copyright (c) 2009 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
 *******************************************************************************/
package org.eclipse.pde.internal.ui.shared.target;

import java.util.ArrayList;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.viewers.*;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.pde.internal.core.target.provisional.*;
import org.eclipse.pde.internal.ui.SWTFactory;
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
import org.eclipse.pde.internal.ui.editor.targetdefinition.TargetEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.forms.widgets.FormToolkit;

/**
 * UI part that can be added to a dialog or to a form editor.  Contains a table displaying
 * the bundle containers of a target definition.  Also has buttons to add, edit and remove
 * bundle containers of varying types.
 * 
 * @see TargetEditor
 * @see ITargetDefinition
 * @see IBundleContainer
 */
public class TargetLocationsGroup {

	private TreeViewer fTreeViewer;
	private Button fAddButton;
	private Button fEditButton;
	private Button fRemoveButton;
	private Button fRemoveAllButton;
	private Button fShowContentButton;

	private ITargetDefinition fTarget;
	private ListenerList fChangeListeners = new ListenerList();

	/**
	 * Creates this part using the form toolkit and adds it to the given composite.
	 * 
	 * @param parent parent composite
	 * @param toolkit toolkit to create the widgets with
	 * @param reporter reporter implementation that will handle resolving and changes to the containers
	 * @return generated instance of the table part
	 */
	public static TargetLocationsGroup createInForm(Composite parent, FormToolkit toolkit) {
		TargetLocationsGroup contentTable = new TargetLocationsGroup();
		contentTable.createFormContents(parent, toolkit);
		return contentTable;
	}

	/**
	 * Creates this part using standard dialog widgets and adds it to the given composite.
	 * 
	 * @param parent parent composite
	 * @param reporter reporter implementation that will handle resolving and changes to the containers
	 * @return generated instance of the table part
	 */
	public static TargetLocationsGroup createInDialog(Composite parent) {
		TargetLocationsGroup contentTable = new TargetLocationsGroup();
		contentTable.createDialogContents(parent);
		return contentTable;
	}

	/**
	 * Private constructor, use one of {@link #createTableInDialog(Composite, ITargetChangedListener)}
	 * or {@link #createTableInForm(Composite, FormToolkit, ITargetChangedListener)}.
	 * 
	 * @param reporter reporter implementation that will handle resolving and changes to the containers
	 */
	private TargetLocationsGroup() {

	}

	/**
	 * Adds a listener to the set of listeners that will be notified when the bundle containers
	 * are modified.  This method has no effect if the listener has already been added. 
	 * 
	 * @param listener target changed listener to add
	 */
	public void addTargetChangedListener(ITargetChangedListener listener) {
		fChangeListeners.add(listener);
	}

	/**
	 * Creates the part contents from a toolkit
	 * @param parent parent composite
	 * @param toolkit form toolkit to create widgets
	 */
	private void createFormContents(Composite parent, FormToolkit toolkit) {
		Composite comp = toolkit.createComposite(parent);
		comp.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 2));
		comp.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_VERTICAL));

		Tree atree = toolkit.createTree(comp, SWT.V_SCROLL | SWT.H_SCROLL);
		atree.setLayout(new GridLayout());
		GridData gd = new GridData(GridData.FILL_BOTH);
		atree.setLayoutData(gd);

		Composite buttonComp = toolkit.createComposite(comp);
		GridLayout layout = new GridLayout();
		layout.marginWidth = layout.marginHeight = 0;
		buttonComp.setLayout(layout);
		buttonComp.setLayoutData(new GridData(GridData.FILL_VERTICAL));

		fAddButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_0, SWT.PUSH);
		fEditButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_1, SWT.PUSH);
		fRemoveButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_2, SWT.PUSH);
		fRemoveAllButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_3, SWT.PUSH);

		fShowContentButton = toolkit.createButton(comp, "Show plug-in content", SWT.CHECK);

		initializeTreeViewer(atree);
		initializeButtons();

		toolkit.paintBordersFor(comp);
	}

	/**
	 * Creates the part contents using SWTFactory
	 * @param parent parent composite
	 */
	private void createDialogContents(Composite parent) {
		Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH, 0, 0);

		Tree atree = new Tree(comp, SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
		atree.setLayout(new GridLayout());
		GridData gd = new GridData(GridData.FILL_BOTH);
		gd.widthHint = 200;
		atree.setLayoutData(gd);

		Composite buttonComp = SWTFactory.createComposite(comp, 2, 1, GridData.FILL_BOTH);
		GridLayout layout = new GridLayout();
		layout.marginHeight = 0;
		layout.marginWidth = 0;
		buttonComp.setLayout(layout);
		buttonComp.setLayoutData(new GridData(GridData.FILL_VERTICAL));

		fAddButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_0, null);
		fEditButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_1, null);
		fRemoveButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_2, null);
		fRemoveAllButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_3, null);

		fShowContentButton = SWTFactory.createCheckButton(comp, "Show Plug-in Content", null, false, 2);

		initializeTreeViewer(atree);
		initializeButtons();
	}

	/**
	 * Sets up the tree viewer using the given tree
	 * @param tree
	 */
	private void initializeTreeViewer(Tree tree) {
		fTreeViewer = new TreeViewer(tree);
		fTreeViewer.setContentProvider(new BundleContainerContentProvider());
		fTreeViewer.setLabelProvider(new BundleContainerLabelProvider());
		fTreeViewer.setComparator(new ViewerComparator());
		fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
			public void selectionChanged(SelectionChangedEvent event) {
				updateButtons();
			}
		});
		fTreeViewer.addDoubleClickListener(new IDoubleClickListener() {
			public void doubleClick(DoubleClickEvent event) {
				if (!event.getSelection().isEmpty()) {
					handleEdit();
				}
			}
		});
		fTreeViewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
	}

	/**
	 * Sets up the buttons, the button fields must already be created before calling this method
	 */
	private void initializeButtons() {
		fAddButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleAdd();
			}
		});
		fAddButton.setLayoutData(new GridData());
		SWTFactory.setButtonDimensionHint(fAddButton);

		fEditButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleEdit();
			}
		});
		fEditButton.setLayoutData(new GridData());
		fEditButton.setEnabled(false);
		SWTFactory.setButtonDimensionHint(fEditButton);

		fRemoveButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleRemove();
			}
		});
		fRemoveButton.setLayoutData(new GridData());
		fRemoveButton.setEnabled(false);
		SWTFactory.setButtonDimensionHint(fRemoveButton);

		fRemoveAllButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleRemoveAll();
			}
		});
		fRemoveAllButton.setLayoutData(new GridData());
		SWTFactory.setButtonDimensionHint(fRemoveAllButton);

		fShowContentButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				fTreeViewer.refresh();
				fTreeViewer.expandAll();
			}
		});
		fShowContentButton.setLayoutData(new GridData());
		SWTFactory.setButtonDimensionHint(fShowContentButton);
	}

	/**
	 * Sets the target definition model to use as input for the tree, can be called with different
	 * models to change the tree's input.
	 * @param target target model
	 */
	public void setInput(ITargetDefinition target) {
		fTarget = target;
		refresh();
	}

	/**
	 * Refreshes the contents of the table
	 */
	public void refresh() {
		fTreeViewer.setInput(fTarget);
		updateButtons();
	}

//	private void setEnabled(boolean enablement) {
//		fTreeViewer.getControl().setEnabled(enablement);
//		fAddButton.setEnabled(enablement);
//
//		if (enablement) {
//			updateButtons();
//		} else {
//			fRemoveButton.setEnabled(enablement);
//			fRemoveAllButton.setEnabled(enablement);
//			fEditButton.setEnabled(enablement);
//		}
//	}

	private void handleAdd() {
		AddBundleContainerWizard wizard = new AddBundleContainerWizard(fTarget);
		Shell parent = fTreeViewer.getTree().getShell();
		WizardDialog dialog = new WizardDialog(parent, wizard);
		if (dialog.open() != Window.CANCEL) {
			contentsChanged();
		}
	}

	private void handleEdit() {
		IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
		if (!selection.isEmpty()) {
			Object selected = selection.getFirstElement();
			IBundleContainer oldContainer = null;
			if (selected instanceof IBundleContainer) {
				oldContainer = (IBundleContainer) selected;
			} else if (selected instanceof IResolvedBundle) {
				TreeItem[] treeSelection = fTreeViewer.getTree().getSelection();
				if (treeSelection.length > 0) {
					Object parent = treeSelection[0].getParentItem().getData();
					if (parent instanceof IBundleContainer) {
						oldContainer = (IBundleContainer) parent;
					}
				}
			}
			if (oldContainer != null) {
				Shell parent = fTreeViewer.getTree().getShell();
				EditBundleContainerWizard wizard = new EditBundleContainerWizard(oldContainer);
				WizardDialog dialog = new WizardDialog(parent, wizard);
				if (dialog.open() == Window.OK) {
					// Replace the old container with the new one
					IBundleContainer newContainer = wizard.getBundleContainer();
					if (newContainer != null) {
						IBundleContainer[] containers = fTarget.getBundleContainers();
						java.util.List newContainers = new ArrayList(containers.length);
						for (int i = 0; i < containers.length; i++) {
							if (!containers[i].equals(oldContainer)) {
								newContainers.add(containers[i]);
							}
						}
						newContainers.add(newContainer);
						fTarget.setBundleContainers((IBundleContainer[]) newContainers.toArray(new IBundleContainer[newContainers.size()]));

						// Update the table
						contentsChanged();
						fTreeViewer.setSelection(new StructuredSelection(newContainer), true);
					}
				}
			}
		}
	}

	private void handleRemove() {
		IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
		if (!selection.isEmpty()) {
			Object selected = selection.getFirstElement();
			IBundleContainer container = null;
			if (selected instanceof IBundleContainer) {
				container = (IBundleContainer) selected;
				IBundleContainer[] currentContainers = fTarget.getBundleContainers();
				ArrayList newBundleContainers = new ArrayList(currentContainers.length);
				for (int i = 0; i < currentContainers.length; i++) {
					if (!currentContainers[i].equals(container)) {
						newBundleContainers.add(currentContainers[i]);
					}
				}
				fTarget.setBundleContainers((IBundleContainer[]) newBundleContainers.toArray(new IBundleContainer[newBundleContainers.size()]));
				contentsChanged();
			}
		}
	}

	private void handleRemoveAll() {
		fTarget.setBundleContainers(null);
		contentsChanged();
	}

	private void updateButtons() {
		IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
		fEditButton.setEnabled(!selection.isEmpty() && selection.getFirstElement() instanceof IBundleContainer);
		fRemoveButton.setEnabled(!selection.isEmpty() && selection.getFirstElement() instanceof IBundleContainer);
		fRemoveAllButton.setEnabled(fTarget != null && fTarget.getBundleContainers() != null && fTarget.getBundleContainers().length > 0);
	}

	/**
	 * Informs the reporter for this table that something has changed
	 * and is dirty.
	 */
	private void contentsChanged() {
		Object[] listeners = fChangeListeners.getListeners();
		for (int i = 0; i < listeners.length; i++) {
			((ITargetChangedListener) listeners[i]).contentsChanged(fTarget, true);
		}
		refresh();
	}

	/**
	 * Content provider for the tree, primary input is a ITargetDefinition, children are IBundleContainers
	 */
	class BundleContainerContentProvider implements ITreeContentProvider {

		public Object[] getChildren(Object parentElement) {
			if (parentElement instanceof ITargetDefinition) {
				IBundleContainer[] containers = ((ITargetDefinition) parentElement).getBundleContainers();
				return containers != null ? containers : new Object[0];
			} else if (parentElement instanceof IBundleContainer) {
				IBundleContainer container = (IBundleContainer) parentElement;
				if (container.isResolved()) {
					IStatus status = container.getBundleStatus();
					if (!status.isOK() && !status.isMultiStatus()) {
						return new Object[] {status};
					}
					if (fShowContentButton.getSelection()) {
						return container.getBundles();
					} else if (!status.isOK()) {
						// Show multi-status children so user can easily see problems
						if (status.isMultiStatus()) {
							return status.getChildren();
						}
					}
				}
			}
			return new Object[0];
		}

		public Object getParent(Object element) {
			return null;
		}

		public boolean hasChildren(Object element) {
			// Since we are already resolved we can't be more efficient
			return getChildren(element).length > 0;
		}

		public Object[] getElements(Object inputElement) {
			if (inputElement instanceof ITargetDefinition) {
				IBundleContainer[] containers = ((ITargetDefinition) inputElement).getBundleContainers();
				if (containers != null) {
					return containers;
				}
			} else if (inputElement instanceof String) {
				return new Object[] {inputElement};
			}
			return new Object[0];
		}

		public void dispose() {
		}

		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
		}

	}

}

Lines 47-52 Link Here

(-)src/org/eclipse/pde/internal/core/target/provisional/IResolvedBundle.java (+7 lines)
47	public BundleInfo getBundleInfo();	47	public BundleInfo getBundleInfo();
48		48
49	/**	49	/**
		50	* Returns the parent bundle container that this bundle belongs to.
		51	*
		52	* @return parent bundle container
		53	*/
		54	public IBundleContainer getParentContainer();
		55
		56	/**
50	* Returns <code>true</code> if this bundle is a source bundle and	57	* Returns <code>true</code> if this bundle is a source bundle and
51	* <code>false</code> if this bundle is an executable bundle.	58	* <code>false</code> if this bundle is an executable bundle.
52	*	59	*

Lines 22-28 Link Here

(-)src/org/eclipse/pde/internal/core/target/impl/Messages.java (-1 lines)
22	public static String AbstractBundleContainer_2;	22	public static String AbstractBundleContainer_2;
23	public static String AbstractBundleContainer_3;	23	public static String AbstractBundleContainer_3;
24	public static String AbstractBundleContainer_4;	24	public static String AbstractBundleContainer_4;
25	public static String AbstractBundleContainer_5;
26	public static String DirectoryBundleContainer_0;	25	public static String DirectoryBundleContainer_0;
27	public static String DirectoryBundleContainer_1;	26	public static String DirectoryBundleContainer_1;
28	public static String DirectoryBundleContainer_2;	27	public static String DirectoryBundleContainer_2;




import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;

/**

public class ResolvedBundle implements IResolvedBundle {

	private BundleInfo fInfo;
	private IBundleContainer fContainer;
	private boolean fIsSource = false;
	private IStatus fStatus;
	private boolean fIsOptional = false;

	 * @param optional whether the bundle is optional
	 * @param whether the bundle is a fragment
	 */
	ResolvedBundle(BundleInfo info, IBundleContainer parentContainer, IStatus status, boolean source, boolean optional, boolean fragment) {
		fInfo = info;
		fContainer = parentContainer;
		if (status == null) {
			fStatus = Status.OK_STATUS;
		} else {

	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.target.provisional.IResolvedBundle#getParentContainer()
	 */
	public IBundleContainer getParentContainer() {
		return fContainer;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.target.provisional.IResolvedBundle#getStatus()
	 */
	public IStatus getStatus() {

	public String getSourcePath() {
		return fSourcePath;
	}

	/* (non-Javadoc)
	 * @see java.lang.Object#toString()
	 */
	public String toString() {
		StringBuffer result = new StringBuffer().append(fInfo.toString());
		if (fStatus != null && !fStatus.isOK()) {
			result = result.append(' ').append(fStatus.toString());
		}
		return result.toString();
	}
}




				sev = IStatus.INFO;
				message = NLS.bind(Messages.AbstractBundleContainer_2, new Object[] {info.getVersion(), info.getSymbolicName()});
			}
			return new ResolvedBundle(info, null, new Status(sev, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_VERSION_DOES_NOT_EXIST, message, null), false, optional, false);
		}
		// DOES NOT EXIST
		int sev = IStatus.ERROR;

			sev = IStatus.INFO;
			message = NLS.bind(Messages.AbstractBundleContainer_4, info.getSymbolicName());
		}
		return new ResolvedBundle(info, null, new Status(sev, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_DOES_NOT_EXIST, message, null), false, optional, false);
	}

	/**

			}
			return ManifestElement.parseBundleManifest(manifestStream, new Hashtable(10));
		} catch (BundleException e) {
			throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_INVALID_MANIFEST, NLS.bind(Messages.DirectoryBundleContainer_3, bundle.getSymbolicName()), e));
		} catch (IOException e) {
			throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_INVALID_MANIFEST, NLS.bind(Messages.DirectoryBundleContainer_3, bundle.getSymbolicName()), e));
		} finally {
			closeZipFileAndStream(manifestStream, jarFile);
		}

		} catch (CoreException e) {
			status = e.getStatus();
		}
		return new ResolvedBundle(info, this, status, source, false, fragment);
	}

	/**

							}
							boolean source = isSourceBundle(file, name, manifest);
							boolean fragment = manifest.containsKey(Constants.FRAGMENT_HOST);
							ResolvedBundle rb = new ResolvedBundle(info, this, null, source, false, fragment);
							rb.setSourcePath(fSourcePath);
							return rb;
						}

Lines 10-20 Link Here

(-)src/org/eclipse/pde/internal/core/target/impl/Messages.properties (-5 / +4 lines)
10	###############################################################################	10	###############################################################################
11		11
12	AbstractBundleContainer_0=Problems occurred while resolving plug-ins in the target	12	AbstractBundleContainer_0=Problems occurred while resolving plug-ins in the target
13	AbstractBundleContainer_2=Missing version {0} of optional plug-in: {1}	13	AbstractBundleContainer_2=Optional plug-in with version {0} could not be found: {1}
14	AbstractBundleContainer_3=Missing required plug-in: {0}	14	AbstractBundleContainer_3=Required plug-in could not be found: {0}
15	AbstractBundleContainer_4=Missing optional plug-in: {0}	15	AbstractBundleContainer_4=Optional plug-in could not be found: {0}
16	AbstractBundleContainer_5=Error reading bundle manifest	16	AbstractBundleContainer_1=Required plug-in with version {0} not found: {1}
17	AbstractBundleContainer_1=Missing required version {0} of plug-in: {1}
18	DirectoryBundleContainer_0=Reading bundles...	17	DirectoryBundleContainer_0=Reading bundles...
19	DirectoryBundleContainer_1=Directory does not exist: {0}	18	DirectoryBundleContainer_1=Directory does not exist: {0}
20	DirectoryBundleContainer_2=Error converting manifest for {0}	19	DirectoryBundleContainer_2=Error converting manifest for {0}




	 * @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#resolveBundles(org.eclipse.pde.internal.core.target.provisional.ITargetDefinition, org.eclipse.core.runtime.IProgressMonitor)
	 */
	protected IResolvedBundle[] resolveBundles(ITargetDefinition definition, IProgressMonitor monitor) throws CoreException {
		URL configUrl = getConfigurationArea();
		String home = resolveHomeLocation().toOSString();
		if (!new File(home).isDirectory()) {
			throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(Messages.ProfileBundleContainer_0, home)));
		}

		URL configUrl = getConfigurationArea();
		if (!new File(configUrl.getFile()).isDirectory()) {
			throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind("Configuration directory does not exist: {0}", home)));
		}

		BundleInfo[] infos = P2Utils.readBundles(home, configUrl);
		if (infos == null) {
			IResolvedBundle[] platformXML = resolvePlatformXML(definition, home, monitor);




import java.io.PrintWriter;
import java.io.Serializable;
import java.util.Vector;
import org.eclipse.core.runtime.*;
import org.eclipse.pde.core.*;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.core.runtime.PlatformObject;
import org.eclipse.core.runtime.Status;
import org.eclipse.pde.core.IModel;
import org.eclipse.pde.core.IModelChangeProvider;
import org.eclipse.pde.core.IModelChangedEvent;
import org.eclipse.pde.core.ISourceObject;
import org.eclipse.pde.core.ModelChangedEvent;
import org.eclipse.pde.core.plugin.IPluginBase;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.IPluginObject;
import org.eclipse.pde.core.plugin.ISharedPluginModel;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.PDECoreMessages;
import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelProvider;

	}

	public String toString() {
		String result = null;
		if (fName != null) {
			result = fName;
		}
		if ((result == null || result.indexOf('%') >= 0) && fModel != null) {
			result = fModel.toString();
		}
		if (result != null) {
			return result;
		}
		return super.toString();
	}


Lines 58-64 Link Here

(-)META-INF/MANIFEST.MF (-1 / +5 lines)
58	org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",	58	org.eclipse.ant.core;bundle-version="[3.1.0,4.0.0)",
59	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[1.0.100,2.0.0)",	59	org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[1.0.100,2.0.0)",
60	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",	60	org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",
61	org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)"	61	org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
		62	org.eclipse.equinox.p2.metadata;bundle-version="[1.0.0,2.0.0)",
		63	org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",
		64	org.eclipse.equinox.p2.core;bundle-version="[1.0.100,2.0.0)",
		65	org.eclipse.equinox.p2.repository.tools;bundle-version="[1.0.0,2.0.0)"
62	Eclipse-LazyStart: true	66	Eclipse-LazyStart: true
63	Bundle-RequiredExecutionEnvironment: J2SE-1.4	67	Bundle-RequiredExecutionEnvironment: J2SE-1.4
64	Import-Package: com.ibm.icu.util	68	Import-Package: com.ibm.icu.util




package org.eclipse.pde.internal.core.target.impl;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.equinox.internal.p2.director.PermissiveSlicer;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.internal.repository.tools.Repo2Runnable;
import org.eclipse.equinox.p2.internal.repository.tools.RepositoryDescriptor;
import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;

public class P2BundleContainer extends AbstractBundleContainer {

	/**
	 * Constant describing the type of bundle container 
	 */
	public static final String TYPE = "P2Repo"; //$NON-NLS-1$

	private IInstallableUnit[] fUnits;
	private String fDownloadDir;
	private String[] fSourceRepos = null;

	public P2BundleContainer() {
		fDownloadDir = "/home/cwindatt/Desktop/Export";
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#getLocation(boolean)
	 */
	public String getLocation(boolean resolve) throws CoreException {
		// TODO We are breaking getVMArguments and other places this method is used
		return fDownloadDir;
	}

	public String[] getSourceRepos() {
		return fSourceRepos;
	}

	public void setSourceRepos(String[] sourceRepos) {
		fSourceRepos = sourceRepos;
	}

	public IInstallableUnit[] getRequiredUnits() {
		return fUnits;
	}

	public void setRequiredUnits(IInstallableUnit[] units) {
		fUnits = units;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#getType()
	 */
	public String getType() {
		return TYPE;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#resolveBundles(org.eclipse.pde.internal.core.target.provisional.ITargetDefinition, org.eclipse.core.runtime.IProgressMonitor)
	 */
	protected IResolvedBundle[] resolveBundles(ITargetDefinition definition, IProgressMonitor monitor) throws CoreException {
		// Create queryable for all source repos

		// Use the slicer to get the complete list of ius to grab
		PermissiveSlicer slicer = new PermissiveSlicer(null, null, true, true, true, true);
		slicer.slice(fUnits, monitor);

		// We need to get the features as well'
//		org.eclipse.update.install.features=true

		// Download artifacts to the folder
		Repo2Runnable runnable = new Repo2Runnable();
		runnable.addDestination(new RepositoryDescriptor());
		runnable.run(monitor);

//		try {
//			Repo2Runnable tool = new Repo2Runnable();
//			tool.setDestinationArtifactRepository(fInstallDir.toString());
//			tool.setDestinationMetadataRepository(fInstallDir.toString());
//			tool.setSourceIUs(Arrays.asList(fUnits));
//			IStatus result = tool.run(SubMonitor.convert(monitor, 1));
//			if (result.matches(IStatus.ERROR))
//				throw new ProvisionException(result);
//			fLocations = new File[] {fInstallDir};
//		} catch (ProvisionException e) {
//			throw new InvocationTargetException(e);
//		}

		// Use the iu's to create resolved bundles
		return new IResolvedBundle[0];
	}
}

Return to bug 270626

Lines 686-692 Link Here

(-)src/org/eclipse/pde/internal/ui/pderesources.properties (-8 / +3 lines)
686	ContentPage_fGroup = Fragment Properties	686	ContentPage_fGroup = Fragment Properties
687	ContentPage_parentPluginGroup = Host Plug-in	687	ContentPage_parentPluginGroup = Host Plug-in
688	ContentSection_0=Content	688	ContentSection_0=Content
689	ContentSection_1=This table lists the plug-ins and source bundles that will be included in the target. Locations to look for plug-ins can be added, edited and removed. In addition, a location can be modified to only include a subset of bundles.	689	ContentSection_1=List of plug-ins to include in this target. Only the plug-ins checked below will be included in the target platform.
690	ContentSection_selectedOnly=Include only plug-ins designated below	690	ContentSection_selectedOnly=Include only plug-ins designated below
691	ContentSection_targetContent=Target Content	691	ContentSection_targetContent=Target Content
692	ContentPage_pClassGroup = Plug-in Options	692	ContentPage_pClassGroup = Plug-in Options
Lines 1687-1697 Link Here
1687	OverviewPage_extensionPageMessageTitle=Extension pages hidden	1687	OverviewPage_extensionPageMessageTitle=Extension pages hidden
1688	OverviewPage_extensionPageMessageBody=The Extension and Extension Point pages are currently hidden, would you like to display them now?	1688	OverviewPage_extensionPageMessageBody=The Extension and Extension Point pages are currently hidden, would you like to display them now?
1689	OverviewPage_environmentDescription=<form>\	1689	OverviewPage_environmentDescription=<form>\
1690	<p>The <a href="environment">Environment</a> section contains the following environment and setup information:</p>\	1690	<p>The <a href="environment">Environment</a> section contains additional settings including: locale, operating system, java runtime, arguments and implicit dependencies.</p>\
1691	<li>Environment settings including locale, processor architecture, operating system and windowing system.</li>\
1692	<li>Java runtime environment.</li>\
1693	<li>Program and VM arguments.</li>\
1694	<li>Implicit plug-ins, which should always be taken into account when calculating dependencies.</li>\
1695	</form>	1691	</form>
1696	OverviewPage_fExtensionContent=<form>\	1692	OverviewPage_fExtensionContent=<form>\
1697	<p>This fragment may define extensions and extension points:</p>\	1693	<p>This fragment may define extensions and extension points:</p>\
Lines 1699-1706 Link Here
1699	<li style="image" value="page" bindent="5"><a href="ex-points">Extension Points</a>: declares new function points this fragment adds to the platform.</li>\	1695	<li style="image" value="page" bindent="5"><a href="ex-points">Extension Points</a>: declares new function points this fragment adds to the platform.</li>\
1700	</form>	1696	</form>
1701	OverviewPage_contentDescription=<form>\	1697	OverviewPage_contentDescription=<form>\
1702	<p>The <a href="content">Content</a> section specifies the make-up of the target platform in terms of plug-ins, features or both.</p>\	1698	<p>The <a href="content">Content</a> section specifies the set of plug-ins that will be included in the target platform.</p>\
1703	<p>An option is also available to simply include all plug-ins from the specified locations into the target platform.</p>\
1704	</form>	1699	</form>
1705	OverviewPage_buildTitle=Build Configuration	1700	OverviewPage_buildTitle=Build Configuration
1706	ClassAttributeRow_dialogTitle=Select Type	1701	ClassAttributeRow_dialogTitle=Select Type

Lines 51-59 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/BundleContainerLabelProvider.java (-12 / +1 lines)
51	} catch (CoreException e) {	51	} catch (CoreException e) {
52	return MessageFormat.format(Messages.BundleContainerTable_4, new String[] {e.getMessage()});	52	return MessageFormat.format(Messages.BundleContainerTable_4, new String[] {e.getMessage()});
53	}	53	}
54	if (element instanceof IStatus) {
55	return ((IStatus) element).getMessage();
56	}
57	return super.getText(element);	54	return super.getText(element);
58	}	55	}
59		56
Lines 66-72 Link Here
66	IBundleContainer container = (IBundleContainer) element;	63	IBundleContainer container = (IBundleContainer) element;
67	if (container.isResolved()) {	64	if (container.isResolved()) {
68	IStatus status = container.getBundleStatus();	65	IStatus status = container.getBundleStatus();
69	if (status.getSeverity() == IStatus.WARNING) {	66	if (status.getSeverity() == IStatus.WARNING \|\| status.getSeverity() == IStatus.INFO) {
70	flag = SharedLabelProvider.F_WARNING;	67	flag = SharedLabelProvider.F_WARNING;
71	} else if (status.getSeverity() == IStatus.ERROR) {	68	} else if (status.getSeverity() == IStatus.ERROR) {
72	flag = SharedLabelProvider.F_ERROR;	69	flag = SharedLabelProvider.F_ERROR;
Lines 80-94 Link Here
80	} else if (element instanceof ProfileBundleContainer) {	77	} else if (element instanceof ProfileBundleContainer) {
81	return PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_PRODUCT_DEFINITION, flag);	78	return PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_PRODUCT_DEFINITION, flag);
82	}	79	}
83	} else if (element instanceof IStatus) {
84	int severity = ((IStatus) element).getSeverity();
85	if (severity == IStatus.WARNING) {
86	return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
87	} else if (severity == IStatus.ERROR) {
88	return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
89	}
90	}	80	}
91
92	return super.getImage(element);	81	return super.getImage(element);
93	}	82	}
94		83

Lines 4-20 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/EditBundleContainerWizard.java (-7 / +5 lines)
4	import org.eclipse.jface.wizard.Wizard;	4	import org.eclipse.jface.wizard.Wizard;
5	import org.eclipse.pde.internal.core.target.impl.*;	5	import org.eclipse.pde.internal.core.target.impl.*;
6	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;	6	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
7	import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
8	import org.eclipse.pde.internal.ui.PDEPlugin;	7	import org.eclipse.pde.internal.ui.PDEPlugin;
9		8
10	public class EditBundleContainerWizard extends Wizard {	9	public class EditBundleContainerWizard extends Wizard {
11		10
12	private ITargetDefinition fTarget;
13	private IBundleContainer fContainer;	11	private IBundleContainer fContainer;
14	private EditDirectoryContainerPage fPage;	12	private EditDirectoryContainerPage fPage;
15		13
16	public EditBundleContainerWizard(ITargetDefinition target, IBundleContainer container) {	14	public EditBundleContainerWizard(IBundleContainer container) {
17	fTarget = target;
18	fContainer = container;	15	fContainer = container;
19	IDialogSettings settings = PDEPlugin.getDefault().getDialogSettings().getSection(AddBundleContainerSelectionPage.SETTINGS_SECTION);	16	IDialogSettings settings = PDEPlugin.getDefault().getDialogSettings().getSection(AddBundleContainerSelectionPage.SETTINGS_SECTION);
20	if (settings == null) {	17	if (settings == null) {
Lines 26-44 Link Here
26		23
27	public void addPages() {	24	public void addPages() {
28	if (fContainer instanceof DirectoryBundleContainer) {	25	if (fContainer instanceof DirectoryBundleContainer) {
29	fPage = new EditDirectoryContainerPage(fTarget, fContainer);	26	fPage = new EditDirectoryContainerPage(fContainer);
30	addPage(fPage);	27	addPage(fPage);
31	} else if (fContainer instanceof ProfileBundleContainer) {	28	} else if (fContainer instanceof ProfileBundleContainer) {
32	fPage = new EditProfileContainerPage(fTarget, fContainer);	29	fPage = new EditProfileContainerPage(fContainer);
33	addPage(fPage);	30	addPage(fPage);
34	} else if (fContainer instanceof FeatureBundleContainer) {	31	} else if (fContainer instanceof FeatureBundleContainer) {
35	fPage = new EditFeatureContainerPage(fTarget, fContainer);	32	fPage = new EditFeatureContainerPage(fContainer);
36	addPage(fPage);	33	addPage(fPage);
37	}	34	}
38	}	35	}
39		36
40	public boolean performFinish() {	37	public boolean performFinish() {
41	if (fPage != null) {	38	if (fPage != null) {
		39	fPage.storeSettings();
42	fContainer = fPage.getBundleContainer();	40	fContainer = fPage.getBundleContainer();
43	return true;	41	return true;
44	}	42	}

Removed Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/BundleContainerTable.java (-525 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 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	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.shared.target;
12
13	import java.lang.reflect.InvocationTargetException;
14	import java.util.ArrayList;
15	import org.eclipse.core.runtime.*;
16	import org.eclipse.core.runtime.jobs.Job;
17	import org.eclipse.jface.operation.IRunnableWithProgress;
18	import org.eclipse.jface.viewers.*;
19	import org.eclipse.jface.window.Window;
20	import org.eclipse.jface.wizard.WizardDialog;
21	import org.eclipse.pde.internal.core.target.provisional.*;
22	import org.eclipse.pde.internal.ui.PDEPlugin;
23	import org.eclipse.pde.internal.ui.SWTFactory;
24	import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
25	import org.eclipse.pde.internal.ui.editor.targetdefinition.TargetEditor;
26	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.events.SelectionAdapter;
28	import org.eclipse.swt.events.SelectionEvent;
29	import org.eclipse.swt.layout.GridData;
30	import org.eclipse.swt.layout.GridLayout;
31	import org.eclipse.swt.widgets.*;
32	import org.eclipse.ui.forms.widgets.FormToolkit;
33	import org.eclipse.ui.progress.UIJob;
34
35	/**
36	* UI part that can be added to a dialog or to a form editor. Contains a table displaying
37	* the bundle containers of a target definition. Also has buttons to add, edit and remove
38	* bundle containers of varying types.
39	*
40	* @see TargetEditor
41	* @see ITargetDefinition
42	* @see IBundleContainer
43	*/
44	public class BundleContainerTable {
45
46	private TreeViewer fTreeViewer;
47	private Button fAddButton;
48	private Button fEditButton;
49	private Button fRemoveButton;
50	private Button fRemoveAllButton;
51	private Label fShowLabel;
52	private Button fShowPluginsButton;
53	private Button fShowSourceButton;
54	private ViewerFilter fPluginFilter;
55	private ViewerFilter fSourceFilter;
56
57	private ITargetDefinition fTarget;
58	private IBundleContainerTableReporter fReporter;
59
60	/**
61	* Creates this part using the form toolkit and adds it to the given composite.
62	*
63	* @param parent parent composite
64	* @param toolkit toolkit to create the widgets with
65	* @param reporter reporter implementation that will handle resolving and changes to the containers
66	* @return generated instance of the table part
67	*/
68	public static BundleContainerTable createTableInForm(Composite parent, FormToolkit toolkit, IBundleContainerTableReporter reporter) {
69	BundleContainerTable contentTable = new BundleContainerTable(reporter);
70	contentTable.createFormContents(parent, toolkit);
71	return contentTable;
72	}
73
74	/**
75	* Creates this part using standard dialog widgets and adds it to the given composite.
76	*
77	* @param parent parent composite
78	* @param reporter reporter implementation that will handle resolving and changes to the containers
79	* @return generated instance of the table part
80	*/
81	public static BundleContainerTable createTableInDialog(Composite parent, IBundleContainerTableReporter reporter) {
82	BundleContainerTable contentTable = new BundleContainerTable(reporter);
83	contentTable.createDialogContents(parent);
84	return contentTable;
85	}
86
87	/**
88	* Private constructor, use one of {@link #createTableInDialog(Composite, IBundleContainerTableReporter)}
89	* or {@link #createTableInForm(Composite, FormToolkit, IBundleContainerTableReporter)}.
90	*
91	* @param reporter reporter implementation that will handle resolving and changes to the containers
92	*/
93	private BundleContainerTable(IBundleContainerTableReporter reporter) {
94	fReporter = reporter;
95	}
96
97	/**
98	* Creates the part contents from a toolkit
99	* @param parent parent composite
100	* @param toolkit form toolkit to create widgets
101	*/
102	private void createFormContents(Composite parent, FormToolkit toolkit) {
103	Composite comp = toolkit.createComposite(parent);
104	comp.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 2));
105	comp.setLayoutData(new GridData(GridData.FILL_BOTH \| GridData.GRAB_VERTICAL));
106
107	Tree atree = toolkit.createTree(comp, SWT.V_SCROLL \| SWT.H_SCROLL);
108	atree.setLayout(new GridLayout());
109	GridData gd = new GridData(GridData.FILL_BOTH);
110	atree.setLayoutData(gd);
111
112	Composite buttonComp = toolkit.createComposite(comp);
113	GridLayout layout = new GridLayout();
114	layout.marginWidth = layout.marginHeight = 0;
115	buttonComp.setLayout(layout);
116	buttonComp.setLayoutData(new GridData(GridData.FILL_VERTICAL));
117
118	fAddButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_0, SWT.PUSH);
119	fEditButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_1, SWT.PUSH);
120	fRemoveButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_2, SWT.PUSH);
121	fRemoveAllButton = toolkit.createButton(buttonComp, Messages.BundleContainerTable_3, SWT.PUSH);
122
123	Composite filterComp = toolkit.createComposite(buttonComp);
124	layout = new GridLayout();
125	layout.marginWidth = layout.marginHeight = 0;
126	filterComp.setLayout(layout);
127	filterComp.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, true, true));
128
129	fShowLabel = toolkit.createLabel(filterComp, Messages.BundleContainerTable_9);
130	fShowPluginsButton = toolkit.createButton(filterComp, Messages.BundleContainerTable_14, SWT.CHECK);
131	fShowSourceButton = toolkit.createButton(filterComp, Messages.BundleContainerTable_15, SWT.CHECK);
132
133	initializeTreeViewer(atree);
134	initializeButtons();
135	initializeFilters();
136
137	toolkit.paintBordersFor(comp);
138	}
139
140	/**
141	* Creates the part contents using SWTFactory
142	* @param parent parent composite
143	*/
144	private void createDialogContents(Composite parent) {
145	Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH, 0, 0);
146
147	Tree atree = new Tree(comp, SWT.V_SCROLL \| SWT.H_SCROLL \| SWT.BORDER);
148	atree.setLayout(new GridLayout());
149	GridData gd = new GridData(GridData.FILL_BOTH);
150	gd.widthHint = 200;
151	atree.setLayoutData(gd);
152
153	Composite buttonComp = SWTFactory.createComposite(comp, 2, 1, GridData.FILL_BOTH);
154	GridLayout layout = new GridLayout();
155	layout.marginHeight = 0;
156	layout.marginWidth = 0;
157	buttonComp.setLayout(layout);
158	buttonComp.setLayoutData(new GridData(GridData.FILL_VERTICAL));
159
160	fAddButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_0, null);
161	fEditButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_1, null);
162	fRemoveButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_2, null);
163	fRemoveAllButton = SWTFactory.createPushButton(buttonComp, Messages.BundleContainerTable_3, null);
164
165	Composite filterComp = SWTFactory.createComposite(buttonComp, 1, 1, GridData.BEGINNING, 0, 0);
166	filterComp.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, true, true));
167
168	fShowLabel = SWTFactory.createLabel(filterComp, Messages.BundleContainerTable_9, 1);
169	fShowPluginsButton = SWTFactory.createCheckButton(filterComp, Messages.BundleContainerTable_14, null, true, 1);
170	fShowSourceButton = SWTFactory.createCheckButton(filterComp, Messages.BundleContainerTable_15, null, true, 1);
171
172	initializeTreeViewer(atree);
173	initializeButtons();
174	initializeFilters();
175	}
176
177	/**
178	* Sets up the tree viewer using the given tree
179	* @param tree
180	*/
181	private void initializeTreeViewer(Tree tree) {
182	fTreeViewer = new TreeViewer(tree);
183	fTreeViewer.setContentProvider(new BundleContainerContentProvider());
184	fTreeViewer.setLabelProvider(new BundleContainerLabelProvider());
185	fTreeViewer.setComparator(new ViewerComparator());
186	fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
187	public void selectionChanged(SelectionChangedEvent event) {
188	updateButtons();
189	}
190	});
191	fTreeViewer.addDoubleClickListener(new IDoubleClickListener() {
192	public void doubleClick(DoubleClickEvent event) {
193	if (!event.getSelection().isEmpty()) {
194	handleEdit();
195	}
196	}
197	});
198	fTreeViewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
199	}
200
201	/**
202	* Sets up the buttons, the button fields must already be created before calling this method
203	*/
204	private void initializeButtons() {
205	fAddButton.addSelectionListener(new SelectionAdapter() {
206	public void widgetSelected(SelectionEvent e) {
207	handleAdd();
208	}
209	});
210	fAddButton.setLayoutData(new GridData());
211	SWTFactory.setButtonDimensionHint(fAddButton);
212
213	fEditButton.addSelectionListener(new SelectionAdapter() {
214	public void widgetSelected(SelectionEvent e) {
215	handleEdit();
216	}
217	});
218	fEditButton.setLayoutData(new GridData());
219	fEditButton.setEnabled(false);
220	SWTFactory.setButtonDimensionHint(fEditButton);
221
222	fRemoveButton.addSelectionListener(new SelectionAdapter() {
223	public void widgetSelected(SelectionEvent e) {
224	handleRemove();
225	}
226	});
227	fRemoveButton.setLayoutData(new GridData());
228	fRemoveButton.setEnabled(false);
229	SWTFactory.setButtonDimensionHint(fRemoveButton);
230
231	fRemoveAllButton.addSelectionListener(new SelectionAdapter() {
232	public void widgetSelected(SelectionEvent e) {
233	handleRemoveAll();
234	}
235	});
236	fRemoveAllButton.setLayoutData(new GridData());
237	SWTFactory.setButtonDimensionHint(fRemoveAllButton);
238
239	fShowPluginsButton.addSelectionListener(new SelectionAdapter() {
240	public void widgetSelected(SelectionEvent e) {
241	if (!fShowPluginsButton.getSelection()) {
242	fTreeViewer.addFilter(fPluginFilter);
243	} else {
244	fTreeViewer.removeFilter(fPluginFilter);
245	}
246	}
247	});
248	fShowPluginsButton.setSelection(true);
249	GridData gd = new GridData();
250	gd.horizontalIndent = 10;
251	fShowPluginsButton.setLayoutData(gd);
252
253	fShowSourceButton.addSelectionListener(new SelectionAdapter() {
254	public void widgetSelected(SelectionEvent e) {
255	if (!fShowSourceButton.getSelection()) {
256	fTreeViewer.addFilter(fSourceFilter);
257	} else {
258	fTreeViewer.removeFilter(fSourceFilter);
259	}
260	}
261	});
262	fShowSourceButton.setSelection(true);
263	gd = new GridData();
264	gd.horizontalIndent = 10;
265	fShowSourceButton.setLayoutData(gd);
266	}
267
268	private void initializeFilters() {
269	fSourceFilter = new ViewerFilter() {
270	public boolean select(Viewer viewer, Object parentElement, Object element) {
271	if (element instanceof IResolvedBundle) {
272	if (((IResolvedBundle) element).isSourceBundle()) {
273	return false;
274	}
275	}
276	return true;
277	}
278	};
279	fPluginFilter = new ViewerFilter() {
280	public boolean select(Viewer viewer, Object parentElement, Object element) {
281	if (element instanceof IResolvedBundle) {
282	if (!((IResolvedBundle) element).isSourceBundle()) {
283	return false;
284	}
285	}
286	return true;
287	}
288	};
289	}
290
291	/**
292	* Sets the target definition model to use as input for the tree, can be called with different
293	* models to change the tree's input.
294	* @param target target model
295	*/
296	public void setInput(ITargetDefinition target) {
297	fTarget = target;
298	refresh();
299	}
300
301	/**
302	* Refreshes the contents of the table
303	*/
304	public void refresh() {
305	if (!fTarget.isResolved()) {
306	fReporter.runResolveOperation(new ResolveContainersOperation());
307	} else {
308	fTreeViewer.setInput(fTarget);
309	fTreeViewer.refresh();
310	updateButtons();
311	}
312	}
313
314	private void setEnabled(boolean enablement) {
315	fTreeViewer.getControl().setEnabled(enablement);
316	fAddButton.setEnabled(enablement);
317
318	fShowLabel.setEnabled(enablement);
319	fShowPluginsButton.setEnabled(enablement);
320	fShowSourceButton.setEnabled(enablement);
321
322	if (enablement) {
323	updateButtons();
324	} else {
325	fRemoveButton.setEnabled(enablement);
326	fRemoveAllButton.setEnabled(enablement);
327	fEditButton.setEnabled(enablement);
328	}
329	}
330
331	private void handleAdd() {
332	AddBundleContainerWizard wizard = new AddBundleContainerWizard(fTarget);
333	Shell parent = fTreeViewer.getTree().getShell();
334	WizardDialog dialog = new WizardDialog(parent, wizard);
335	if (dialog.open() != Window.CANCEL) {
336	refresh();
337	contentsChanged();
338	}
339	}
340
341	private void handleEdit() {
342	IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
343	if (!selection.isEmpty()) {
344	Object selected = selection.getFirstElement();
345	IBundleContainer oldContainer = null;
346	if (selected instanceof IBundleContainer) {
347	oldContainer = (IBundleContainer) selected;
348	} else if (selected instanceof IResolvedBundle) {
349	TreeItem[] treeSelection = fTreeViewer.getTree().getSelection();
350	if (treeSelection.length > 0) {
351	Object parent = treeSelection[0].getParentItem().getData();
352	if (parent instanceof IBundleContainer) {
353	oldContainer = (IBundleContainer) parent;
354	}
355	}
356	}
357	if (oldContainer != null) {
358	Shell parent = fTreeViewer.getTree().getShell();
359	EditBundleContainerWizard wizard = new EditBundleContainerWizard(fTarget, oldContainer);
360	WizardDialog dialog = new WizardDialog(parent, wizard);
361	if (dialog.open() == Window.OK) {
362	// Replace the old container with the new one
363	IBundleContainer newContainer = wizard.getBundleContainer();
364	if (newContainer != null) {
365	IBundleContainer[] containers = fTarget.getBundleContainers();
366	java.util.List newContainers = new ArrayList(containers.length);
367	for (int i = 0; i < containers.length; i++) {
368	if (!containers[i].equals(oldContainer)) {
369	newContainers.add(containers[i]);
370	}
371	}
372	newContainers.add(newContainer);
373	fTarget.setBundleContainers((IBundleContainer[]) newContainers.toArray(new IBundleContainer[newContainers.size()]));
374
375	// Update the table
376	refresh();
377	contentsChanged();
378	fTreeViewer.setSelection(new StructuredSelection(newContainer), true);
379	}
380	}
381	}
382	}
383	}
384
385	private void handleRemove() {
386	IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
387	if (!selection.isEmpty()) {
388	Object selected = selection.getFirstElement();
389	IBundleContainer container = null;
390	if (selected instanceof IBundleContainer) {
391	container = (IBundleContainer) selected;
392	IBundleContainer[] currentContainers = fTarget.getBundleContainers();
393	ArrayList newBundleContainers = new ArrayList(currentContainers.length);
394	for (int i = 0; i < currentContainers.length; i++) {
395	if (!currentContainers[i].equals(container)) {
396	newBundleContainers.add(currentContainers[i]);
397	}
398	}
399	fTarget.setBundleContainers((IBundleContainer[]) newBundleContainers.toArray(new IBundleContainer[newBundleContainers.size()]));
400	contentsChanged();
401	refresh();
402	}
403	}
404	}
405
406	private void handleRemoveAll() {
407	fTarget.setBundleContainers(null);
408	contentsChanged();
409	refresh();
410	}
411
412	private void updateButtons() {
413	IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
414	fEditButton.setEnabled(!selection.isEmpty() && (selection.getFirstElement() instanceof IBundleContainer \|\| selection.getFirstElement() instanceof IResolvedBundle));
415	fRemoveButton.setEnabled(!selection.isEmpty() && selection.getFirstElement() instanceof IBundleContainer);
416	fRemoveAllButton.setEnabled(fTarget.getBundleContainers() != null && fTarget.getBundleContainers().length > 0);
417	}
418
419	/**
420	* Informs the reporter for this table that something has changed
421	* and is dirty.
422	*/
423	private void contentsChanged() {
424	fReporter.contentsChanged();
425	}
426
427	/**
428	* Runnable that resolves the target. Disables the table while running
429	*/
430	class ResolveContainersOperation implements IRunnableWithProgress {
431
432	/* (non-Javadoc)
433	* @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
434	*/
435	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
436	Job job = new UIJob(Messages.BundleContainerTable_16) {
437	public IStatus runInUIThread(IProgressMonitor monitor) {
438	if (!fTreeViewer.getControl().isDisposed()) {
439	setEnabled(false);
440	fTreeViewer.setInput(Messages.BundleContainerTable_17);
441	fTreeViewer.refresh();
442	}
443	return Status.OK_STATUS;
444	}
445	};
446	job.setSystem(true);
447	job.schedule();
448	fTarget.resolve(monitor);
449	if (!monitor.isCanceled()) {
450	job = new UIJob(Messages.BundleContainerTable_18) {
451	public IStatus runInUIThread(IProgressMonitor monitor) {
452	if (!fTreeViewer.getControl().isDisposed()) {
453	setEnabled(true);
454	fTreeViewer.setInput(fTarget);
455	fTreeViewer.refresh();
456	updateButtons();
457	}
458	return Status.OK_STATUS;
459	}
460	};
461	job.setSystem(true);
462	job.schedule();
463	}
464	}
465	}
466
467	/**
468	* Content provider for the tree, primary input is a ITargetDefinition, children are IBundleContainers
469	*/
470	class BundleContainerContentProvider implements ITreeContentProvider {
471
472	public Object[] getChildren(Object parentElement) {
473	if (parentElement instanceof ITargetDefinition) {
474	IBundleContainer[] containers = ((ITargetDefinition) parentElement).getBundleContainers();
475	return containers != null ? containers : new Object[0];
476	} else if (parentElement instanceof IBundleContainer) {
477	IBundleContainer container = (IBundleContainer) parentElement;
478	if (container.isResolved()) {
479	IStatus status = container.getBundleStatus();
480	if (!status.isOK() && !status.isMultiStatus()) {
481	return new Object[] {status};
482	}
483	return container.getBundles();
484	}
485	// We should only be populating the table if the containers are resolved, but just in case
486	return new Object[] {new Status(IStatus.ERROR, PDEPlugin.getPluginId(), Messages.BundleContainerTable_19)};
487	} else if (parentElement instanceof IResolvedBundle) {
488	IStatus status = ((IResolvedBundle) parentElement).getStatus();
489	if (!status.isOK()) {
490	return new Object[] {status};
491	}
492	}
493	return new Object[0];
494	}
495
496	public Object getParent(Object element) {
497	return null;
498	}
499
500	public boolean hasChildren(Object element) {
501	// Since we are already resolved we can't be more efficient
502	return getChildren(element).length > 0;
503	}
504
505	public Object[] getElements(Object inputElement) {
506	if (inputElement instanceof ITargetDefinition) {
507	IBundleContainer[] containers = ((ITargetDefinition) inputElement).getBundleContainers();
508	if (containers != null) {
509	return containers;
510	}
511	} else if (inputElement instanceof String) {
512	return new Object[] {inputElement};
513	}
514	return new Object[0];
515	}
516
517	public void dispose() {
518	}
519
520	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
521	}
522
523	}
524
525	}

Lines 15-21 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/messages.properties (-8 lines)
15	AddDirectoryContainerPage_4=Directory	15	AddDirectoryContainerPage_4=Directory
16	AddDirectoryContainerPage_5=Select a directory containing one or more plug-ins.	16	AddDirectoryContainerPage_5=Select a directory containing one or more plug-ins.
17	AddDirectoryContainerPage_6=Location directory does not exist	17	AddDirectoryContainerPage_6=Location directory does not exist
18	AddDirectoryContainerPage_7=< no plug-ins found in the current location >
19	AddDirectoryContainerPage_9=Could not acquire the target platform service to create the new container.	18	AddDirectoryContainerPage_9=Could not acquire the target platform service to create the new container.
20	AddFeatureContainerPage_0=Add Features	19	AddFeatureContainerPage_0=Add Features
21	AddFeatureContainerPage_1=Select features from a directory.	20	AddFeatureContainerPage_1=Select features from a directory.
Lines 61-75 Link Here
61	BundleContainerTable_16=Disable Target Contents	60	BundleContainerTable_16=Disable Target Contents
62	BundleContainerTable_17=Resolving the contents of the target...	61	BundleContainerTable_17=Resolving the contents of the target...
63	BundleContainerTable_18=Enable Target Contents	62	BundleContainerTable_18=Enable Target Contents
64	BundleContainerTable_19=Container has not been resolved
65	# label provider error messages
66	# {0} is the error message
67	BundleContainerTable_4=Error creating label: {0}	63	BundleContainerTable_4=Error creating label: {0}
68	BundleContainerTable_9=Show:	64	BundleContainerTable_9=Show:
69	EditBundleContainerWizard_0=Edit Content	65	EditBundleContainerWizard_0=Edit Content
70	EditDirectoryContainerPage_0=Edit Directory	66	EditDirectoryContainerPage_0=Edit Directory
71	EditDirectoryContainerPage_1=&Variables...	67	EditDirectoryContainerPage_1=&Variables...
72	EditDirectoryContainerPage_2=Included Plug-ins
73	EditDirectoryContainerPage_3=Resolve Container Job	68	EditDirectoryContainerPage_3=Resolve Container Job
74	EditFeatureContainerPage_0=Edit Feature	69	EditFeatureContainerPage_0=Edit Feature
75	EditFeatureContainerPage_1=Edit the plug-ins included in this feature	70	EditFeatureContainerPage_1=Edit the plug-ins included in this feature
Lines 77-83 Link Here
77	EditFeatureContainerPage_3=Feature Version:	72	EditFeatureContainerPage_3=Feature Version:
78	EditFeatureContainerPage_4=Unspecified	73	EditFeatureContainerPage_4=Unspecified
79	EditFeatureContainerPage_5=Location:	74	EditFeatureContainerPage_5=Location:
80	EditProfileContainerPage_0=Configuration Location
81	EditProfileContainerPage_1=Var&iables...	75	EditProfileContainerPage_1=Var&iables...
82	EditProfileContainerPage_2=Select a configuration directory	76	EditProfileContainerPage_2=Select a configuration directory
83	EditProfileContainerPage_3=Edit Installation	77	EditProfileContainerPage_3=Edit Installation
Lines 91-98 Link Here
91	IncludedBundlesTree_3=Dese&lect All	85	IncludedBundlesTree_3=Dese&lect All
92	IncludedBundlesTree_4=Select Re&quired	86	IncludedBundlesTree_4=Select Re&quired
93	# {0}: count of checked plug-ins {1}: total number of plug-ins example: 12 of 15 included	87	# {0}: count of checked plug-ins {1}: total number of plug-ins example: 12 of 15 included
94	IncludedBundlesTree_5={0} of {1} selected
95	IncludedBundlesTree_6=Group Plug-ins by location
96	RestrictionsListSelectionDialog_0=Select the plug-ins to include in the target:	88	RestrictionsListSelectionDialog_0=Select the plug-ins to include in the target:
97	RestrictionsListSelectionDialog_1=Plug-in Selection	89	RestrictionsListSelectionDialog_1=Plug-in Selection
98	RestrictionsListSelectionDialog_2=Use specific plug-in version (versus highest available version)	90	RestrictionsListSelectionDialog_2=Use specific plug-in version (versus highest available version)

Lines 21-27 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/AddFeatureContainersPage.java (-5 / +10 lines)
21	import org.eclipse.pde.internal.core.feature.ExternalFeatureModel;	21	import org.eclipse.pde.internal.core.feature.ExternalFeatureModel;
22	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;	22	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
23	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;	23	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
24	import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
25	import org.eclipse.pde.internal.ui.*;	24	import org.eclipse.pde.internal.ui.*;
26	import org.eclipse.swt.SWT;	25	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.events.SelectionAdapter;	26	import org.eclipse.swt.events.SelectionAdapter;
Lines 44-53 Link Here
44	private Button fIncludeVersionButton;	43	private Button fIncludeVersionButton;
45	private CheckboxTableViewer fFeatureTable;	44	private CheckboxTableViewer fFeatureTable;
46		45
47	protected AddFeatureContainersPage(ITargetDefinition target) {
48	super(target);
49	}
50
51	/* (non-Javadoc)	46	/* (non-Javadoc)
52	* @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#getDefaultTitle()	47	* @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#getDefaultTitle()
53	*/	48	*/
Lines 63-73 Link Here
63	}	58	}
64		59
65	/* (non-Javadoc)	60	/* (non-Javadoc)
		61	* @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#createLocationArea(org.eclipse.swt.widgets.Composite)
		62	*/
		63	protected void createLocationArea(Composite parent) {
		64	super.createLocationArea(parent);
		65	createTableArea(parent);
		66	}
		67
		68	/* (non-Javadoc)
66	* @see org.eclipse.pde.internal.ui.shared.target.AddDirectoryContainerPage#createTableArea(org.eclipse.swt.widgets.Composite)	69	* @see org.eclipse.pde.internal.ui.shared.target.AddDirectoryContainerPage#createTableArea(org.eclipse.swt.widgets.Composite)
67	*/	70	*/
68	protected void createTableArea(Composite parent) {	71	protected void createTableArea(Composite parent) {
69	Composite tableComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH, 0, 0);	72	Composite tableComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH, 0, 0);
70		73
		74	SWTFactory.createLabel(tableComp, "Features:", 2);
		75
71	fFeatureTable = CheckboxTableViewer.newCheckList(tableComp, SWT.BORDER);	76	fFeatureTable = CheckboxTableViewer.newCheckList(tableComp, SWT.BORDER);
72	// Connect the label provider	77	// Connect the label provider
73	PDEPlugin.getDefault().getLabelProvider().connect(this);	78	PDEPlugin.getDefault().getLabelProvider().connect(this);

Lines 3-9 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/EditFeatureContainerPage.java (-4 / +3 lines)
3	import org.eclipse.core.runtime.CoreException;	3	import org.eclipse.core.runtime.CoreException;
4	import org.eclipse.pde.internal.core.target.impl.FeatureBundleContainer;	4	import org.eclipse.pde.internal.core.target.impl.FeatureBundleContainer;
5	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;	5	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
6	import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
7	import org.eclipse.pde.internal.ui.PDEPlugin;	6	import org.eclipse.pde.internal.ui.PDEPlugin;
8	import org.eclipse.pde.internal.ui.SWTFactory;	7	import org.eclipse.pde.internal.ui.SWTFactory;
9	import org.eclipse.swt.SWT;	8	import org.eclipse.swt.SWT;
Lines 13-20 Link Here
13		12
14	public class EditFeatureContainerPage extends EditDirectoryContainerPage {	13	public class EditFeatureContainerPage extends EditDirectoryContainerPage {
15		14
16	public EditFeatureContainerPage(ITargetDefinition target, IBundleContainer container) {	15	public EditFeatureContainerPage(IBundleContainer container) {
17	super(target, container);	16	super(container);
18	}	17	}
19		18
20	/* (non-Javadoc)	19	/* (non-Javadoc)
Lines 80-86 Link Here
80	/* (non-Javadoc)	79	/* (non-Javadoc)
81	* @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#refreshContainer(org.eclipse.pde.internal.core.target.provisional.IBundleContainer)	80	* @see org.eclipse.pde.internal.ui.shared.target.EditDirectoryContainerPage#refreshContainer(org.eclipse.pde.internal.core.target.provisional.IBundleContainer)
82	*/	81	*/
83	protected IBundleContainer refreshContainer(IBundleContainer previous) throws CoreException {	82	protected IBundleContainer createContainer(IBundleContainer previous) throws CoreException {
84	return getBundleContainer();	83	return getBundleContainer();
85	}	84	}
86		85

Lines 21-27 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/Messages.java (-6 lines)
21	public static String AddDirectoryContainerPage_4;	21	public static String AddDirectoryContainerPage_4;
22	public static String AddDirectoryContainerPage_5;	22	public static String AddDirectoryContainerPage_5;
23	public static String AddDirectoryContainerPage_6;	23	public static String AddDirectoryContainerPage_6;
24	public static String AddDirectoryContainerPage_7;
25	public static String AddDirectoryContainerPage_9;	24	public static String AddDirectoryContainerPage_9;
26	public static String AddFeatureContainerPage_0;	25	public static String AddFeatureContainerPage_0;
27	public static String AddFeatureContainerPage_1;	26	public static String AddFeatureContainerPage_1;
Lines 52-58 Link Here
52	public static String BundleContainerTable_16;	51	public static String BundleContainerTable_16;
53	public static String BundleContainerTable_17;	52	public static String BundleContainerTable_17;
54	public static String BundleContainerTable_18;	53	public static String BundleContainerTable_18;
55	public static String BundleContainerTable_19;
56	public static String BundleContainerTable_2;	54	public static String BundleContainerTable_2;
57	public static String BundleContainerTable_3;	55	public static String BundleContainerTable_3;
58	public static String BundleContainerTable_4;	56	public static String BundleContainerTable_4;
Lines 63-69 Link Here
63	public static String EditBundleContainerWizard_0;	61	public static String EditBundleContainerWizard_0;
64	public static String EditDirectoryContainerPage_0;	62	public static String EditDirectoryContainerPage_0;
65	public static String EditDirectoryContainerPage_1;	63	public static String EditDirectoryContainerPage_1;
66	public static String EditDirectoryContainerPage_2;
67	public static String EditDirectoryContainerPage_3;	64	public static String EditDirectoryContainerPage_3;
68	public static String EditFeatureContainerPage_0;	65	public static String EditFeatureContainerPage_0;
69	public static String EditFeatureContainerPage_1;	66	public static String EditFeatureContainerPage_1;
Lines 71-77 Link Here
71	public static String EditFeatureContainerPage_3;	68	public static String EditFeatureContainerPage_3;
72	public static String EditFeatureContainerPage_4;	69	public static String EditFeatureContainerPage_4;
73	public static String EditFeatureContainerPage_5;	70	public static String EditFeatureContainerPage_5;
74	public static String EditProfileContainerPage_0;
75	public static String EditProfileContainerPage_1;	71	public static String EditProfileContainerPage_1;
76	public static String EditProfileContainerPage_2;	72	public static String EditProfileContainerPage_2;
77	public static String EditProfileContainerPage_3;	73	public static String EditProfileContainerPage_3;
Lines 84-91 Link Here
84	public static String IncludedBundlesTree_2;	80	public static String IncludedBundlesTree_2;
85	public static String IncludedBundlesTree_3;	81	public static String IncludedBundlesTree_3;
86	public static String IncludedBundlesTree_4;	82	public static String IncludedBundlesTree_4;
87	public static String IncludedBundlesTree_5;
88	public static String IncludedBundlesTree_6;
89	public static String RestrictionsListSelectionDialog_0;	83	public static String RestrictionsListSelectionDialog_0;
90	public static String RestrictionsListSelectionDialog_1;	84	public static String RestrictionsListSelectionDialog_1;
91	public static String RestrictionsListSelectionDialog_2;	85	public static String RestrictionsListSelectionDialog_2;

Removed Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/IncludedBundlesTree.java (-598 lines)
1	package org.eclipse.pde.internal.ui.shared.target;
2
3	import com.ibm.icu.text.MessageFormat;
4	import java.io.File;
5	import java.util.*;
6	import org.eclipse.core.runtime.IStatus;
7	import org.eclipse.core.runtime.Status;
8	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
9	import org.eclipse.jface.viewers.*;
10	import org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer;
11	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
12	import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;
13	import org.eclipse.pde.internal.ui.PDEPlugin;
14	import org.eclipse.pde.internal.ui.SWTFactory;
15	import org.eclipse.swt.SWT;
16	import org.eclipse.swt.events.SelectionAdapter;
17	import org.eclipse.swt.events.SelectionEvent;
18	import org.eclipse.swt.layout.GridData;
19	import org.eclipse.swt.widgets.*;
20	import org.eclipse.ui.dialogs.FilteredTree;
21	import org.eclipse.ui.dialogs.PatternFilter;
22
23	public class IncludedBundlesTree extends FilteredTree {
24
25	private CheckboxTreeViewer fTree;
26	private Button fSelectButton;
27	private Button fDeselectButton;
28	private Button fSelectAllButton;
29	private Button fDeselectAllButton;
30	// private Button fSelectRequiredButton;
31	private Label fShowLabel;
32	private Button fShowSourceButton;
33	private Button fShowPluginsButton;
34	private Label fCountLabel;
35	private ViewerFilter fSourceFilter;
36	private ViewerFilter fPluginFilter;
37	private IResolvedBundle[] fAllBundles;
38	private Button fGroupPlugins;
39	private HashMap fTreeViewerContents;
40	private boolean fIsGroupedByLocation;
41
42	public IncludedBundlesTree(Composite parent) {
43	super(parent, SWT.BORDER \| SWT.MULTI, new PatternFilter(), true);
44	}
45
46	protected Control createTreeControl(Composite parent, int style) {
47	fIsGroupedByLocation = false;
48	Composite treeComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH, 0, 0);
49	super.createTreeControl(treeComp, style);
50	((GridData) fTree.getControl().getLayoutData()).heightHint = 300;
51	createButtons(treeComp);
52	fCountLabel = SWTFactory.createLabel(treeComp, "", 2); //$NON-NLS-1$
53	updateButtons();
54	initializeFilters();
55	initializeTreeContents(fAllBundles);
56	return treeComp;
57	}
58
59	protected void createButtons(Composite parent) {
60	Composite buttonComp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_VERTICAL, 0, 0);
61
62	// TODO Add Mnemonics
63	fSelectButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_0, null);
64	fSelectButton.addSelectionListener(new SelectionAdapter() {
65	public void widgetSelected(SelectionEvent e) {
66	if (!fTree.getSelection().isEmpty()) {
67	Object[] selected = ((IStructuredSelection) fTree.getSelection()).toArray();
68	for (int i = 0; i < selected.length; i++) {
69	if (fIsGroupedByLocation) {
70	handleCheck(selected[i], true);
71	} else {
72	fTree.setChecked(selected[i], true);
73	}
74	}
75	updateButtons();
76	}
77	}
78	});
79	fDeselectButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_1, null);
80	fDeselectButton.addSelectionListener(new SelectionAdapter() {
81	public void widgetSelected(SelectionEvent e) {
82	if (!fTree.getSelection().isEmpty()) {
83	Object[] selected = ((IStructuredSelection) fTree.getSelection()).toArray();
84	for (int i = 0; i < selected.length; i++) {
85	if (fIsGroupedByLocation) {
86	handleCheck(selected[i], false);
87	} else {
88	fTree.setChecked(selected[i], false);
89	}
90	}
91	updateButtons();
92	}
93	}
94	});
95
96	createEmptySpace(buttonComp);
97
98	fSelectAllButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_2, null);
99	fSelectAllButton.addSelectionListener(new SelectionAdapter() {
100	public void widgetSelected(SelectionEvent e) {
101	if (fIsGroupedByLocation) {
102	Iterator iter = fTreeViewerContents.keySet().iterator();
103	while (iter.hasNext()) {
104	handleCheck(iter.next(), true);
105	}
106
107	} else {
108	// We only want to check visible
109	fTree.setAllChecked(true);
110	}
111
112	updateButtons();
113	}
114	});
115	fDeselectAllButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_3, null);
116	fDeselectAllButton.addSelectionListener(new SelectionAdapter() {
117	public void widgetSelected(SelectionEvent e) {
118
119	if (fIsGroupedByLocation) {
120	Iterator iter = fTreeViewerContents.keySet().iterator();
121	while (iter.hasNext()) {
122	handleCheck(iter.next(), false);
123	}
124
125	} else {
126	// We only want to uncheck visible
127	fTree.setAllChecked(false);
128	}
129	updateButtons();
130	}
131	});
132
133	createEmptySpace(buttonComp);
134
135	// TODO Support selecting required.
136	// fSelectRequiredButton = SWTFactory.createPushButton(buttonComp, Messages.IncludedBundlesTree_4, null);
137	// fSelectRequiredButton.addSelectionListener(new SelectionAdapter() {
138	// public void widgetSelected(SelectionEvent e) {
139	// updateButtons();
140	// }
141	// });
142
143	Composite filterComp = SWTFactory.createComposite(buttonComp, 1, 1, SWT.NONE, 0, 0);
144	filterComp.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, true, true));
145
146	fGroupPlugins = SWTFactory.createCheckButton(filterComp, Messages.IncludedBundlesTree_6, null, false, 1);
147	fGroupPlugins.addSelectionListener(new SelectionAdapter() {
148	public void widgetSelected(SelectionEvent e) {
149	setEnabled(false);
150	fIsGroupedByLocation = fGroupPlugins.getSelection();
151	Object[] checkedElements = fTree.getCheckedElements();
152	fTree.setContentProvider(getContentProviderForTree());
153
154	if (fIsGroupedByLocation) {
155	fTree.expandAll();
156	fTree.setCheckedElements(checkedElements);
157	Iterator iter = fTreeViewerContents.keySet().iterator();
158	HashMap bundles = null;
159	Object key = null;
160
161	while (iter.hasNext()) {
162	key = iter.next();
163	bundles = (HashMap) fTreeViewerContents.get(key);
164
165	Iterator childIter = bundles.keySet().iterator();
166	boolean allChilrenSelected = true;
167	boolean noneChildrenSelected = true;
168	while (childIter.hasNext()) {
169	Object bundle = childIter.next();
170	boolean checkedState = ((Boolean) bundles.get(bundle)).booleanValue();
171	allChilrenSelected = allChilrenSelected && checkedState;
172	noneChildrenSelected = noneChildrenSelected && !checkedState;
173
174	}
175	fTree.setChecked(key, !noneChildrenSelected);
176	fTree.setGrayed(key, !allChilrenSelected && !noneChildrenSelected);
177	}
178	}
179	updateButtons();
180	setEnabled(true);
181	}
182	});
183	fShowLabel = SWTFactory.createLabel(filterComp, Messages.BundleContainerTable_9, 1);
184
185	fShowPluginsButton = SWTFactory.createCheckButton(filterComp, Messages.BundleContainerTable_14, null, true, 1);
186	fShowPluginsButton.addSelectionListener(new SelectionAdapter() {
187	public void widgetSelected(SelectionEvent e) {
188	if (!fShowPluginsButton.getSelection()) {
189	fTree.addFilter(fPluginFilter);
190	} else {
191	fTree.removeFilter(fPluginFilter);
192	}
193	updateButtons();
194	}
195	});
196	fShowPluginsButton.setSelection(true);
197	GridData gd = new GridData();
198	gd.horizontalIndent = 10;
199	fShowPluginsButton.setLayoutData(gd);
200
201	fShowSourceButton = SWTFactory.createCheckButton(filterComp, Messages.BundleContainerTable_15, null, true, 1);
202	fShowSourceButton.addSelectionListener(new SelectionAdapter() {
203	public void widgetSelected(SelectionEvent e) {
204	if (!fShowSourceButton.getSelection()) {
205	fTree.addFilter(fSourceFilter);
206	} else {
207	fTree.removeFilter(fSourceFilter);
208	}
209	updateButtons();
210	}
211	});
212	fShowSourceButton.setSelection(true);
213	gd = new GridData();
214	gd.horizontalIndent = 10;
215	fShowSourceButton.setLayoutData(gd);
216
217	}
218
219	/**
220	* returns a HashMap which contains all the new File objects representing a new location
221	*/
222	protected HashMap initializeTreeContents(IResolvedBundle[] allBundles) {
223	HashMap parents = new HashMap();
224	if (allBundles == null)
225	return null;
226
227	if (fTreeViewerContents == null)
228	fTreeViewerContents = new HashMap();
229	else
230	fTreeViewerContents.clear();
231
232	for (int i = 0; i < allBundles.length; i++) {
233	IResolvedBundle bundle = allBundles[i];
234
235	String path = bundle.getBundleInfo().getLocation().getRawPath();
236	if (path != null) {
237	File installFile = new File(path);
238	File parentFile = installFile.getParentFile();
239	HashMap bundles = (HashMap) fTreeViewerContents.get(parentFile);
240	if (bundles == null) {
241	bundles = new HashMap();
242	bundles.put(bundle, new Boolean(fTree.getChecked(bundle)));
243	fTreeViewerContents.put(parentFile, bundles);
244	parents.put(parentFile, Boolean.FALSE);
245	} else {
246	bundles.put(bundle, new Boolean(fTree.getChecked(bundle)));
247	}
248	}
249	}
250
251	return parents;
252	}
253
254	private void initializeFilters() {
255	fSourceFilter = new ViewerFilter() {
256	public boolean select(Viewer viewer, Object parentElement, Object element) {
257	if (element instanceof IResolvedBundle) {
258	if (((IResolvedBundle) element).isSourceBundle()) {
259	return false;
260	}
261	}
262	return true;
263	}
264	};
265	fPluginFilter = new ViewerFilter() {
266	public boolean select(Viewer viewer, Object parentElement, Object element) {
267	if (element instanceof IResolvedBundle) {
268	if (!((IResolvedBundle) element).isSourceBundle()) {
269	return false;
270	}
271	}
272	return true;
273	}
274	};
275	}
276
277	private Label createEmptySpace(Composite parent) {
278	Label label = new Label(parent, SWT.NONE);
279	GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
280	gd.widthHint = gd.heightHint = 5;
281	label.setLayoutData(gd);
282	return label;
283	}
284
285	private void updateButtons() {
286	if (fAllBundles != null && !fTree.getSelection().isEmpty()) {
287	Object[] selection = ((IStructuredSelection) fTree.getSelection()).toArray();
288	boolean allSelected = true;
289	boolean noneSelected = true;
290	for (int i = 0; i < selection.length; i++) {
291	boolean checked = fTree.getChecked(selection[i]);
292	if (checked) {
293	noneSelected = false;
294	} else {
295	allSelected = false;
296	}
297	}
298	fSelectButton.setEnabled(!allSelected);
299	fDeselectButton.setEnabled(!noneSelected);
300	// fSelectRequiredButton.setEnabled(true);
301	} else {
302	fSelectButton.setEnabled(false);
303	fDeselectButton.setEnabled(false);
304	// fSelectRequiredButton.setEnabled(false);
305	}
306
307	int checked;
308	if (fIsGroupedByLocation) {
309	checked = fTree.getCheckedElements().length;
310	Iterator iter = fTreeViewerContents.keySet().iterator();
311	while (iter.hasNext()) {
312	if (fTree.getChecked(iter.next())) {
313	--checked;
314	}
315	}
316	} else {
317	checked = fTree.getCheckedElements().length;
318	}
319	fSelectAllButton.setEnabled(fAllBundles != null && checked != fTree.getTree().getItemCount());
320	fDeselectAllButton.setEnabled(fAllBundles != null && checked != 0);
321
322	if (fAllBundles != null) {
323	fCountLabel.setText(MessageFormat.format(Messages.IncludedBundlesTree_5, new String[] {Integer.toString(checked), Integer.toString(fAllBundles.length)}));
324	} else {
325	fCountLabel.setText(""); //$NON-NLS-1$
326	}
327	}
328
329	/**
330	* Set the container to display in the tree or <code>null</code> to disable the tree
331	* @param input bundle container or <code>null</code>
332	*/
333	public void setInput(IBundleContainer input) {
334	fAllBundles = null;
335
336	// Check that the input is a container with valid, resolved bundles
337	if (!(input instanceof AbstractBundleContainer)) {
338	fTree.setInput(Messages.AddDirectoryContainerPage_7);
339	setEnabled(false);
340	return;
341	}
342	if (!input.isResolved()) {
343	fTree.setInput(new Status(IStatus.ERROR, PDEPlugin.getPluginId(), Messages.BundleContainerTable_19));
344	setEnabled(false);
345	return;
346	}
347	IStatus status = input.getBundleStatus();
348	if (!status.isOK() && !status.isMultiStatus()) {
349	fTree.setInput(status);
350	setEnabled(false);
351	return;
352	}
353	IResolvedBundle[] allResolvedBundles = ((AbstractBundleContainer) input).getAllBundles();
354	if (allResolvedBundles == null \|\| allResolvedBundles.length == 0) {
355	fTree.setInput(Messages.AddDirectoryContainerPage_7);
356	setEnabled(false);
357	return;
358	}
359
360	// Input is valid, setup the tree
361	fAllBundles = allResolvedBundles;
362	fTree.setInput(allResolvedBundles);
363
364	// Check the included bundles
365	BundleInfo[] included = input.getIncludedBundles();
366	if (included == null) {
367	fTree.setCheckedElements(fAllBundles);
368	} else {
369	Set includedBundles = new HashSet();
370	for (int i = 0; i < included.length; i++) {
371	includedBundles.add(included[i].getSymbolicName());
372	}
373	java.util.List toCheck = new ArrayList(includedBundles.size());
374	for (int i = 0; i < allResolvedBundles.length; i++) {
375	if (includedBundles.contains(allResolvedBundles[i].getBundleInfo().getSymbolicName())) {
376	toCheck.add(allResolvedBundles[i]);
377	}
378	}
379	fTree.setCheckedElements(toCheck.toArray());
380	}
381
382	// Enable the tree and update the buttons
383	setEnabled(true);
384	}
385
386	/* (non-Javadoc)
387	* @see org.eclipse.swt.widgets.Control#setEnabled(boolean)
388	*/
389	public void setEnabled(boolean enabled) {
390	super.setEnabled(enabled);
391	if (enabled) {
392	updateButtons();
393	} else {
394	fSelectButton.setEnabled(false);
395	fSelectAllButton.setEnabled(false);
396	fDeselectButton.setEnabled(false);
397	fDeselectAllButton.setEnabled(false);
398	// fSelectRequiredButton.setEnabled(false);
399	fCountLabel.setText(""); //$NON-NLS-1$
400	}
401	fShowLabel.setEnabled(enabled);
402	fShowPluginsButton.setEnabled(enabled);
403	fShowSourceButton.setEnabled(enabled);
404	super.setEnabled(enabled);
405	}
406
407	protected TreeViewer doCreateTreeViewer(Composite parent, int style) {
408	fTree = new CheckboxTreeViewer(parent, style) {
409	public void refresh(boolean updateLabels) {
410	super.refresh(updateLabels);
411	if (updateLabels) {
412	// We want to update the labels and buttons as users change the filtering
413	updateButtons();
414	}
415	}
416	};
417	fTree.setContentProvider(getContentProviderForTree());
418	fTree.setLabelProvider(new BundleInfoLabelProvider(false));
419	fTree.addDoubleClickListener(new IDoubleClickListener() {
420	public void doubleClick(DoubleClickEvent event) {
421	IStructuredSelection selection = (IStructuredSelection) event.getSelection();
422	fTree.setChecked(selection.getFirstElement(), !fTree.getChecked(selection.getFirstElement()));
423	updateButtons();
424	}
425	});
426	fTree.addCheckStateListener(new ICheckStateListener() {
427
428	public void checkStateChanged(CheckStateChangedEvent event) {
429	if (fIsGroupedByLocation) {
430	handleCheck(event.getElement(), event.getChecked());
431	updateButtons();
432	}
433	}
434	});
435	fTree.addSelectionChangedListener(new ISelectionChangedListener() {
436	public void selectionChanged(SelectionChangedEvent event) {
437	updateButtons();
438	}
439	});
440	fTree.setSorter(new ViewerSorter());
441	return fTree;
442	}
443
444	/**
445	* Marks the check state of <code>element</code> to <code>state</code> when plug-ins are grouped by location
446	*/
447	private void handleCheck(Object element, boolean state) {
448	if (fTreeViewerContents.containsKey(element)) {
449
450	HashMap bundles = (HashMap) fTreeViewerContents.get(element);
451	Iterator iter = bundles.keySet().iterator();
452	while (iter.hasNext()) {
453	Object key = iter.next();
454	bundles.put(key, new Boolean(state));
455	fTree.setChecked(key, state);
456	}
457	fTree.setChecked(element, state);
458	fTree.setGrayed(element, false);
459	return;
460	}
461	Iterator iter = fTreeViewerContents.keySet().iterator();
462	HashMap bundles = null;
463	Object key = null;
464	while (iter.hasNext()) {
465	key = iter.next();
466	bundles = (HashMap) fTreeViewerContents.get(key);
467	if (bundles.containsKey(element)) {
468	bundles.put(element, new Boolean(state));
469	break;
470	}
471	}
472	iter = bundles.keySet().iterator();
473	boolean allChilrenSelected = true;
474	boolean noneChildrenSelected = true;
475	while (iter.hasNext()) {
476	Object bundle = iter.next();
477	boolean checkedState = ((Boolean) bundles.get(bundle)).booleanValue();
478	allChilrenSelected = allChilrenSelected && checkedState;
479	noneChildrenSelected = noneChildrenSelected && !checkedState;
480	}
481	fTree.setChecked(element, state);
482	fTree.setChecked(key, !noneChildrenSelected);
483	fTree.setGrayed(key, !allChilrenSelected && !noneChildrenSelected);
484	}
485
486	private ITreeContentProvider getContentProviderForTree() {
487	if (fIsGroupedByLocation) {
488
489	//Content provider for grouped by location
490	return (new ITreeContentProvider() {
491
492	public Object[] getChildren(Object parentElement) {
493	if (parentElement instanceof File) {
494	HashMap files = (HashMap) fTreeViewerContents.get(parentElement);
495	if (files != null) {
496	Object[] result = files.keySet().toArray();
497	return result;
498	}
499	}
500	return new Object[0];
501	}
502
503	public Object getParent(Object element) {
504	if (element instanceof IResolvedBundle) {
505	IResolvedBundle bundle = (IResolvedBundle) element;
506	String installPath = bundle.getBundleInfo().getLocation().getPath();
507	if (installPath != null)
508	return new File(installPath).getParentFile();
509	}
510	return null;
511	}
512
513	public boolean hasChildren(Object element) {
514	if (element instanceof File)
515	return fTreeViewerContents.containsKey(element);
516	return false;
517	}
518
519	public Object[] getElements(Object inputElement) {
520	if (fTreeViewerContents == null)
521	return initializeTreeContents(fAllBundles).keySet().toArray();
522	return fTreeViewerContents.keySet().toArray();
523	}
524
525	public void dispose() {
526	}
527
528	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
529	}
530	});
531	}
532
533	//ungrouped content provider
534	return (new ITreeContentProvider() {
535	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
536	}
537
538	public void dispose() {
539	}
540
541	public Object[] getElements(Object inputElement) {
542	if (inputElement instanceof IResolvedBundle[]) {
543	return (IResolvedBundle[]) inputElement;
544	}
545	return new Object[] {inputElement};
546	}
547
548	public boolean hasChildren(Object element) {
549	return false;
550	}
551
552	public Object getParent(Object element) {
553	return null;
554	}
555
556	public Object[] getChildren(Object parentElement) {
557	return new Object[0];
558	}
559	});
560	}
561
562	/**
563	* Return the set of bundles to include in this bundle container based on what is
564	* checked in the tree. If all bundles in the container are checked or there was
565	* a problem getting the bundles from the container, this method will return
566	* <code>null</code>
567	*
568	* @return set of bundles to include or <code>null</code>
569	*/
570	public BundleInfo[] getIncludedBundles() {
571	if (fTree.getControl().isEnabled() && fAllBundles != null) {
572	Object[] checked = fTree.getCheckedElements();
573	if (fIsGroupedByLocation) {
574	int count = fTree.getCheckedElements().length;
575	Iterator iter = fTreeViewerContents.keySet().iterator();
576	while (iter.hasNext()) {
577	if (fTree.getChecked(iter.next())) {
578	--count;
579	}
580	}
581	if (count == fAllBundles.length)
582	return null;
583
584	} else if (checked.length == fAllBundles.length) {
585	return null;
586	}
587
588	java.util.List included = new ArrayList(checked.length);
589	for (int i = 0; i < checked.length; i++) {
590	if (checked[i] instanceof IResolvedBundle) {
591	included.add(new BundleInfo(((IResolvedBundle) checked[i]).getBundleInfo().getSymbolicName(), null, null, BundleInfo.NO_LEVEL, false));
592	}
593	}
594	return (BundleInfo[]) included.toArray(new BundleInfo[included.size()]);
595	}
596	return null;
597	}
598	}

Lines 23-33 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/EditDirectoryContainerPage.java (-69 / +26 lines)
23	import org.eclipse.pde.internal.core.PDECore;	23	import org.eclipse.pde.internal.core.PDECore;
24	import org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer;	24	import org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer;
25	import org.eclipse.pde.internal.core.target.impl.DirectoryBundleContainer;	25	import org.eclipse.pde.internal.core.target.impl.DirectoryBundleContainer;
26	import org.eclipse.pde.internal.core.target.provisional.*;	26	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
		27	import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
27	import org.eclipse.pde.internal.ui.PDEPlugin;	28	import org.eclipse.pde.internal.ui.PDEPlugin;
28	import org.eclipse.pde.internal.ui.SWTFactory;	29	import org.eclipse.pde.internal.ui.SWTFactory;
29	import org.eclipse.swt.SWT;	30	import org.eclipse.swt.SWT;
30	import org.eclipse.swt.custom.BusyIndicator;
31	import org.eclipse.swt.events.*;	31	import org.eclipse.swt.events.*;
32	import org.eclipse.swt.layout.GridData;	32	import org.eclipse.swt.layout.GridData;
33	import org.eclipse.swt.widgets.*;	33	import org.eclipse.swt.widgets.*;
Lines 42-53 Link Here
42	*/	42	*/
43	public class EditDirectoryContainerPage extends WizardPage {	43	public class EditDirectoryContainerPage extends WizardPage {
44		44
45	protected static final int TYPING_DELAY = 600;	45	/**
		46	* How long to wait before validating the directory
		47	*/
		48	protected static final int TYPING_DELAY = 200;
		49
46	private static ITargetPlatformService fTargetService;	50	private static ITargetPlatformService fTargetService;
47	protected Combo fInstallLocation;	51	protected Combo fInstallLocation;
48	protected IncludedBundlesTree fBundleTree;
49	protected IBundleContainer fContainer;	52	protected IBundleContainer fContainer;
50	private ITargetDefinition fTarget;
51	private Job fTextChangedJob;	53	private Job fTextChangedJob;
52		54
53	/**	55	/**
Lines 65-78 Link Here
65	*/	67	*/
66	private static final String SETTINGS_LOCATION_3 = "location3"; //$NON-NLS-1$	68	private static final String SETTINGS_LOCATION_3 = "location3"; //$NON-NLS-1$
67		69
68	protected EditDirectoryContainerPage(ITargetDefinition target, IBundleContainer container) {	70	protected EditDirectoryContainerPage(IBundleContainer container) {
69	this(target);	71	this();
70	fContainer = container;	72	fContainer = container;
71	}	73	}
72		74
73	protected EditDirectoryContainerPage(ITargetDefinition target) {	75	protected EditDirectoryContainerPage() {
74	super("EditDirectoryContainer"); //$NON-NLS-1$	76	super("EditDirectoryContainer"); //$NON-NLS-1$
75	fTarget = target;
76	}	77	}
77		78
78	/* (non-Javadoc)	79	/* (non-Javadoc)
Lines 81-89 Link Here
81	public void createControl(Composite parent) {	82	public void createControl(Composite parent) {
82	setMessage(getDefaultMessage());	83	setMessage(getDefaultMessage());
83	setTitle(getDefaultTitle());	84	setTitle(getDefaultTitle());
		85	setPageComplete(false);
84	Composite comp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH, 0, 0);	86	Composite comp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH, 0, 0);
85	createLocationArea(comp);	87	createLocationArea(comp);
86	createTableArea(comp);
87	setControl(comp);	88	setControl(comp);
88	initializeInputFields(fContainer);	89	initializeInputFields(fContainer);
89	}	90	}
Lines 171-188 Link Here
171	}	172	}
172		173
173	/**	174	/**
174	* Creates the area at the bottom of the page. Contains a table intended to display
175	* the current resolved bundles. This class may be overridden by subclasses to
176	* provide custom widgets.
177	* @param parent parent composite
178	*/
179	protected void createTableArea(Composite parent) {
180	Group tableGroup = SWTFactory.createGroup(parent, Messages.EditDirectoryContainerPage_2, 2, 1, GridData.FILL_BOTH);
181	fBundleTree = new IncludedBundlesTree(tableGroup);
182	fBundleTree.setInput(null);
183	}
184
185	/**
186	* Initializes the fields use to describe the container. They should be filled in using	175	* Initializes the fields use to describe the container. They should be filled in using
187	* the given container or set to default values if the container is <code>null</code>.	176	* the given container or set to default values if the container is <code>null</code>.
188	* @param container bundle container being edited, possibly <code>null</code>	177	* @param container bundle container being edited, possibly <code>null</code>
Lines 246-251 Link Here
246		235
247	/**	236	/**
248	* Store all of the dialog settings for this page	237	* Store all of the dialog settings for this page
		238	* Should be explicitly called during the perform finish call of the wizard
249	*/	239	*/
250	protected void storeSettings() {	240	protected void storeSettings() {
251	String newLocation = fInstallLocation.getText().trim();	241	String newLocation = fInstallLocation.getText().trim();
Lines 275-280 Link Here
275	}	265	}
276		266
277	/**	267	/**
		268	* @return bundle container created/edited in this wizard or <code>null</code>
		269	*/
		270	public IBundleContainer getBundleContainer() {
		271	return fContainer;
		272	}
		273
		274	/**
278	* Called whenever the location or another aspect of the container has changed	275	* Called whenever the location or another aspect of the container has changed
279	* in the UI. Will schedule a UIJob to verify and resolve the container	276	* in the UI. Will schedule a UIJob to verify and resolve the container
280	* reporting any problems to the user. If a previous job is running or sleeping	277	* reporting any problems to the user. If a previous job is running or sleeping
Lines 284-290 Link Here
284	*/	281	*/
285	protected void containerChanged(long delay) {	282	protected void containerChanged(long delay) {
286	if (fTextChangedJob == null) {	283	if (fTextChangedJob == null) {
287	fTextChangedJob = new ResolveJob(getShell().getDisplay(), Messages.EditDirectoryContainerPage_3);	284	fTextChangedJob = new CreateContainerJob(getShell().getDisplay(), Messages.EditDirectoryContainerPage_3);
288	} else {	285	} else {
289	fTextChangedJob.cancel();	286	fTextChangedJob.cancel();
290	}	287	}
Lines 301-309 Link Here
301	protected boolean validateInput() throws CoreException {	298	protected boolean validateInput() throws CoreException {
302	// Check if the text field is blank	299	// Check if the text field is blank
303	if (fInstallLocation.getText().trim().length() == 0) {	300	if (fInstallLocation.getText().trim().length() == 0) {
304	fBundleTree.setInput(null);
305	setMessage(getDefaultMessage());	301	setMessage(getDefaultMessage());
306	setPageComplete(false);
307	return false;	302	return false;
308	}	303	}
309		304
Lines 313-324 Link Here
313		308
314	// Check if directory exists	309	// Check if directory exists
315	if (!location.isDirectory()) {	310	if (!location.isDirectory()) {
316	fBundleTree.setInput(null);
317	setMessage(Messages.AddDirectoryContainerPage_6, IMessageProvider.WARNING);	311	setMessage(Messages.AddDirectoryContainerPage_6, IMessageProvider.WARNING);
318	setPageComplete(true);
319	} else {	312	} else {
320	setMessage(getDefaultMessage());	313	setMessage(getDefaultMessage());
321	setPageComplete(true);
322	}	314	}
323	return true;	315	return true;
324	}	316	}
Lines 332-338 Link Here
332	* @return a new or modified bundle container	324	* @return a new or modified bundle container
333	* @throws CoreException	325	* @throws CoreException
334	*/	326	*/
335	protected IBundleContainer refreshContainer(IBundleContainer previous) throws CoreException {	327	protected IBundleContainer createContainer(IBundleContainer previous) throws CoreException {
336	IBundleContainer container = getTargetPlatformService().newDirectoryContainer(fInstallLocation.getText());	328	IBundleContainer container = getTargetPlatformService().newDirectoryContainer(fInstallLocation.getText());
337	if (previous instanceof DirectoryBundleContainer) {	329	if (previous instanceof DirectoryBundleContainer) {
338	container.setIncludedBundles(previous.getIncludedBundles());	330	container.setIncludedBundles(previous.getIncludedBundles());
Lines 356-379 Link Here
356	return fTargetService;	348	return fTargetService;
357	}	349	}
358		350
359	/**	351	private class CreateContainerJob extends UIJob {
360	* Returns the bundle container created by this wizard page with the	352	public CreateContainerJob(Display jobDisplay, String name) {
361	* included bundles set on it based on what is checked in the tree.
362	* Will return <code>null</code> if there was a problem creating the
363	* bundle container.
364	*
365	* @return bundle container or <code>null</code>
366	*
367	*/
368	public IBundleContainer getBundleContainer() {
369	if (fBundleTree != null) {
370	fContainer.setIncludedBundles(fBundleTree.getIncludedBundles());
371	}
372	return fContainer;
373	}
374
375	private class ResolveJob extends UIJob {
376	public ResolveJob(Display jobDisplay, String name) {
377	super(jobDisplay, name);	353	super(jobDisplay, name);
378	}	354	}
379		355
Lines 386-419 Link Here
386	// Validate the location and any other text fields	362	// Validate the location and any other text fields
387	if (validateInput()) {	363	if (validateInput()) {
388	// Create a container from the input	364	// Create a container from the input
389	fContainer = refreshContainer(fContainer);	365	fContainer = createContainer(fContainer);
390	if (fContainer != null) {	366	setPageComplete(true);
391	// Resolve the container
392	BusyIndicator.showWhile(getDisplay(), new Runnable() {
393	public void run() {
394	IStatus result = fContainer.isResolved() ? Status.OK_STATUS : fContainer.resolve(fTarget, null);
395
396	if (!result.isOK() && !result.isMultiStatus()) {
397	// There was a specific problem preventing the resolution, warn the user
398	fBundleTree.setInput(null);
399	setMessage(result.getMessage(), IMessageProvider.WARNING);
400	} else {
401	// Resolution was successful
402	fBundleTree.setInput(fContainer);
403	setPageComplete(true);
404	}
405	}
406	});
407	// Store the input into dialog settings as it is valid
408	storeSettings();
409	}
410	} else {	367	} else {
411	fContainer = null;	368	fContainer = null;
		369	setPageComplete(false);
412	}	370	}
413	return Status.OK_STATUS;	371	return Status.OK_STATUS;
414	} catch (CoreException e) {	372	} catch (CoreException e) {
415	fContainer = null;	373	fContainer = null;
416	fBundleTree.setInput(null);
417	setErrorMessage(e.getMessage());	374	setErrorMessage(e.getMessage());
418	setPageComplete(false);	375	setPageComplete(false);
419	return e.getStatus();	376	return e.getStatus();

Lines 69-74 Link Here

(-)plugin.xml (+12 lines)
69	id="org.eclipse.pde.ui.TargetPlatformPreferencePage">	69	id="org.eclipse.pde.ui.TargetPlatformPreferencePage">
70	</keywordReference>	70	</keywordReference>
71	</page>	71	</page>
		72	<page
		73	category="org.eclipse.pde.ui.MainPreferencePage"
		74	class="org.eclipse.pde.internal.ui.preferences.TargetPlatformPreferencePage"
		75	id="org.eclipse.pde.ui.TargetPlatformPreferencePage"
		76	name="Target 2">
		77	<keywordReference
		78	id="org.eclipse.pde.ui.pde">
		79	</keywordReference>
		80	<keywordReference
		81	id="org.eclipse.pde.ui.TargetPlatformPreferencePage">
		82	</keywordReference>
		83	</page>
72	</extension>	84	</extension>
73	<extension	85	<extension
74	point="org.eclipse.ui.keywords">	86	point="org.eclipse.ui.keywords">

Added Link Here

(-)src/org/eclipse/pde/internal/ui/editor/targetdefinition/LocationSection.java (+86 lines)
1	/*******************************************************************************
2	* Copyright (c) 2005, 2009 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	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.editor.targetdefinition;
12
13	import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
14	import org.eclipse.pde.internal.ui.PDEUIMessages;
15	import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
16	import org.eclipse.pde.internal.ui.shared.target.ITargetChangedListener;
17	import org.eclipse.pde.internal.ui.shared.target.TargetLocationsGroup;
18	import org.eclipse.swt.layout.GridData;
19	import org.eclipse.swt.widgets.Composite;
20	import org.eclipse.ui.forms.SectionPart;
21	import org.eclipse.ui.forms.editor.FormPage;
22	import org.eclipse.ui.forms.widgets.*;
23
24	/**
25	* Section for editing the content of the target (bundle containers) in the target definition editor
26	* @see DefinitionPage
27	* @see TargetEditor
28	*/
29	public class LocationSection extends SectionPart {
30
31	private TargetLocationsGroup fContainerGroup;
32	private TargetEditor fEditor;
33
34	public LocationSection(FormPage page, Composite parent) {
35	super(parent, page.getManagedForm().getToolkit(), Section.DESCRIPTION \| ExpandableComposite.TITLE_BAR);
36	fEditor = (TargetEditor) page.getEditor();
37	createClient(getSection(), page.getEditor().getToolkit());
38	}
39
40	/**
41	* @return The target model backing this editor
42	*/
43	private ITargetDefinition getTarget() {
44	return fEditor.getTarget();
45	}
46
47	/**
48	* Creates the UI for this section.
49	*
50	* @param section section the UI is being added to
51	* @param toolkit form toolkit used to create the widgets
52	*/
53	protected void createClient(Section section, FormToolkit toolkit) {
54	section.setLayout(FormLayoutFactory.createClearTableWrapLayout(false, 1));
55	GridData sectionData = new GridData(GridData.FILL_BOTH \| GridData.GRAB_VERTICAL);
56	sectionData.horizontalSpan = 2;
57	section.setLayoutData(sectionData);
58	section.setText("Locations");
59
60	section.setDescription(PDEUIMessages.ContentSection_1);
61	Composite client = toolkit.createComposite(section);
62	client.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 1));
63	client.setLayoutData(new GridData(GridData.FILL_BOTH \| GridData.GRAB_VERTICAL));
64
65	fContainerGroup = TargetLocationsGroup.createInForm(client, toolkit);
66	fEditor.getTargetChangedListener().setLocationTree(fContainerGroup);
67	fContainerGroup.addTargetChangedListener(fEditor.getTargetChangedListener());
68	fContainerGroup.addTargetChangedListener(new ITargetChangedListener() {
69	public void contentsChanged(ITargetDefinition definition, boolean resolve) {
70	markDirty();
71	}
72	});
73
74	toolkit.paintBordersFor(client);
75	section.setClient(client);
76	}
77
78	/* (non-Javadoc)
79	* @see org.eclipse.ui.forms.AbstractFormPart#refresh()
80	*/
81	public void refresh() {
82	fContainerGroup.setInput(getTarget());
83	super.refresh();
84	}
85
86	}

Lines 299-305 Link Here

(-)src/org/eclipse/pde/internal/core/target/impl/AbstractBundleContainer.java (-6 / +6 lines)
299	sev = IStatus.INFO;	299	sev = IStatus.INFO;
300	message = NLS.bind(Messages.AbstractBundleContainer_2, new Object[] {info.getVersion(), info.getSymbolicName()});	300	message = NLS.bind(Messages.AbstractBundleContainer_2, new Object[] {info.getVersion(), info.getSymbolicName()});
301	}	301	}
302	return new ResolvedBundle(info, new Status(sev, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_VERSION_DOES_NOT_EXIST, message, null), false, optional, false);	302	return new ResolvedBundle(info, null, new Status(sev, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_VERSION_DOES_NOT_EXIST, message, null), false, optional, false);
303	}	303	}
304	// DOES NOT EXIST	304	// DOES NOT EXIST
305	int sev = IStatus.ERROR;	305	int sev = IStatus.ERROR;
Lines 308-314 Link Here
308	sev = IStatus.INFO;	308	sev = IStatus.INFO;
309	message = NLS.bind(Messages.AbstractBundleContainer_4, info.getSymbolicName());	309	message = NLS.bind(Messages.AbstractBundleContainer_4, info.getSymbolicName());
310	}	310	}
311	return new ResolvedBundle(info, new Status(sev, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_DOES_NOT_EXIST, message, null), false, optional, false);	311	return new ResolvedBundle(info, null, new Status(sev, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_DOES_NOT_EXIST, message, null), false, optional, false);
312	}	312	}
313		313
314	/**	314	/**
Lines 405-413 Link Here
405	}	405	}
406	return ManifestElement.parseBundleManifest(manifestStream, new Hashtable(10));	406	return ManifestElement.parseBundleManifest(manifestStream, new Hashtable(10));
407	} catch (BundleException e) {	407	} catch (BundleException e) {
408	throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_INVALID_MANIFEST, Messages.AbstractBundleContainer_5, e));	408	throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_INVALID_MANIFEST, NLS.bind(Messages.DirectoryBundleContainer_3, bundle.getSymbolicName()), e));
409	} catch (IOException e) {	409	} catch (IOException e) {
410	throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_INVALID_MANIFEST, Messages.AbstractBundleContainer_5, e));	410	throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, IResolvedBundle.STATUS_INVALID_MANIFEST, NLS.bind(Messages.DirectoryBundleContainer_3, bundle.getSymbolicName()), e));
411	} finally {	411	} finally {
412	closeZipFileAndStream(manifestStream, jarFile);	412	closeZipFileAndStream(manifestStream, jarFile);
413	}	413	}
Lines 501-507 Link Here
501	} catch (CoreException e) {	501	} catch (CoreException e) {
502	status = e.getStatus();	502	status = e.getStatus();
503	}	503	}
504	return new ResolvedBundle(info, status, source, false, fragment);	504	return new ResolvedBundle(info, this, status, source, false, fragment);
505	}	505	}
506		506
507	/**	507	/**
Lines 542-548 Link Here
542	}	542	}
543	boolean source = isSourceBundle(file, name, manifest);	543	boolean source = isSourceBundle(file, name, manifest);
544	boolean fragment = manifest.containsKey(Constants.FRAGMENT_HOST);	544	boolean fragment = manifest.containsKey(Constants.FRAGMENT_HOST);
545	ResolvedBundle rb = new ResolvedBundle(info, null, source, false, fragment);	545	ResolvedBundle rb = new ResolvedBundle(info, this, null, source, false, fragment);
546	rb.setSourcePath(fSourcePath);	546	rb.setSourcePath(fSourcePath);
547	return rb;	547	return rb;
548	}	548	}

Lines 89-99 Link Here

(-)src/org/eclipse/pde/internal/core/target/impl/ProfileBundleContainer.java (-1 / +6 lines)
89	* @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#resolveBundles(org.eclipse.pde.internal.core.target.provisional.ITargetDefinition, org.eclipse.core.runtime.IProgressMonitor)	89	* @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#resolveBundles(org.eclipse.pde.internal.core.target.provisional.ITargetDefinition, org.eclipse.core.runtime.IProgressMonitor)
90	*/	90	*/
91	protected IResolvedBundle[] resolveBundles(ITargetDefinition definition, IProgressMonitor monitor) throws CoreException {	91	protected IResolvedBundle[] resolveBundles(ITargetDefinition definition, IProgressMonitor monitor) throws CoreException {
92	URL configUrl = getConfigurationArea();
93	String home = resolveHomeLocation().toOSString();	92	String home = resolveHomeLocation().toOSString();
94	if (!new File(home).isDirectory()) {	93	if (!new File(home).isDirectory()) {
95	throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(Messages.ProfileBundleContainer_0, home)));	94	throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(Messages.ProfileBundleContainer_0, home)));
96	}	95	}
		96
		97	URL configUrl = getConfigurationArea();
		98	if (!new File(configUrl.getFile()).isDirectory()) {
		99	throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind("Configuration directory does not exist: {0}", home)));
		100	}
		101
97	BundleInfo[] infos = P2Utils.readBundles(home, configUrl);	102	BundleInfo[] infos = P2Utils.readBundles(home, configUrl);
98	if (infos == null) {	103	if (infos == null) {
99	IResolvedBundle[] platformXML = resolvePlatformXML(definition, home, monitor);	104	IResolvedBundle[] platformXML = resolvePlatformXML(definition, home, monitor);

Lines 13-32 Link Here

(-)src/org/eclipse/pde/internal/core/plugin/PluginObject.java (-16 / +13 lines)
13	import java.io.PrintWriter;	13	import java.io.PrintWriter;
14	import java.io.Serializable;	14	import java.io.Serializable;
15	import java.util.Vector;	15	import java.util.Vector;
16		16	import org.eclipse.core.runtime.*;
17	import org.eclipse.core.runtime.CoreException;	17	import org.eclipse.pde.core.*;
18	import org.eclipse.core.runtime.IStatus;	18	import org.eclipse.pde.core.plugin.*;
19	import org.eclipse.core.runtime.PlatformObject;
20	import org.eclipse.core.runtime.Status;
21	import org.eclipse.pde.core.IModel;
22	import org.eclipse.pde.core.IModelChangeProvider;
23	import org.eclipse.pde.core.IModelChangedEvent;
24	import org.eclipse.pde.core.ISourceObject;
25	import org.eclipse.pde.core.ModelChangedEvent;
26	import org.eclipse.pde.core.plugin.IPluginBase;
27	import org.eclipse.pde.core.plugin.IPluginModelBase;
28	import org.eclipse.pde.core.plugin.IPluginObject;
29	import org.eclipse.pde.core.plugin.ISharedPluginModel;
30	import org.eclipse.pde.internal.core.PDECore;	19	import org.eclipse.pde.internal.core.PDECore;
31	import org.eclipse.pde.internal.core.PDECoreMessages;	20	import org.eclipse.pde.internal.core.PDECoreMessages;
32	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelProvider;	21	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelProvider;
Lines 184-191 Link Here
184	}	173	}
185		174
186	public String toString() {	175	public String toString() {
187	if (fName != null)	176	String result = null;
188	return fName;	177	if (fName != null) {
		178	result = fName;
		179	}
		180	if ((result == null \|\| result.indexOf('%') >= 0) && fModel != null) {
		181	result = fModel.toString();
		182	}
		183	if (result != null) {
		184	return result;
		185	}
189	return super.toString();	186	return super.toString();
190	}	187	}
191		188

Added Link Here

(-)src/org/eclipse/pde/internal/core/target/impl/P2BundleContainer.java (+92 lines)
1	package org.eclipse.pde.internal.core.target.impl;
2
3	import org.eclipse.core.runtime.CoreException;
4	import org.eclipse.core.runtime.IProgressMonitor;
5	import org.eclipse.equinox.internal.p2.director.PermissiveSlicer;
6	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
7	import org.eclipse.equinox.p2.internal.repository.tools.Repo2Runnable;
8	import org.eclipse.equinox.p2.internal.repository.tools.RepositoryDescriptor;
9	import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;
10	import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
11
12	public class P2BundleContainer extends AbstractBundleContainer {
13
14	/**
15	* Constant describing the type of bundle container
16	*/
17	public static final String TYPE = "P2Repo"; //$NON-NLS-1$
18
19	private IInstallableUnit[] fUnits;
20	private String fDownloadDir;
21	private String[] fSourceRepos = null;
22
23	public P2BundleContainer() {
24	fDownloadDir = "/home/cwindatt/Desktop/Export";
25	}
26
27	/* (non-Javadoc)
28	* @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#getLocation(boolean)
29	*/
30	public String getLocation(boolean resolve) throws CoreException {
31	// TODO We are breaking getVMArguments and other places this method is used
32	return fDownloadDir;
33	}
34
35	public String[] getSourceRepos() {
36	return fSourceRepos;
37	}
38
39	public void setSourceRepos(String[] sourceRepos) {
40	fSourceRepos = sourceRepos;
41	}
42
43	public IInstallableUnit[] getRequiredUnits() {
44	return fUnits;
45	}
46
47	public void setRequiredUnits(IInstallableUnit[] units) {
48	fUnits = units;
49	}
50
51	/* (non-Javadoc)
52	* @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#getType()
53	*/
54	public String getType() {
55	return TYPE;
56	}
57
58	/* (non-Javadoc)
59	* @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#resolveBundles(org.eclipse.pde.internal.core.target.provisional.ITargetDefinition, org.eclipse.core.runtime.IProgressMonitor)
60	*/
61	protected IResolvedBundle[] resolveBundles(ITargetDefinition definition, IProgressMonitor monitor) throws CoreException {
62	// Create queryable for all source repos
63
64	// Use the slicer to get the complete list of ius to grab
65	PermissiveSlicer slicer = new PermissiveSlicer(null, null, true, true, true, true);
66	slicer.slice(fUnits, monitor);
67
68	// We need to get the features as well'
69	// org.eclipse.update.install.features=true
70
71	// Download artifacts to the folder
72	Repo2Runnable runnable = new Repo2Runnable();
73	runnable.addDestination(new RepositoryDescriptor());
74	runnable.run(monitor);
75
76	// try {
77	// Repo2Runnable tool = new Repo2Runnable();
78	// tool.setDestinationArtifactRepository(fInstallDir.toString());
79	// tool.setDestinationMetadataRepository(fInstallDir.toString());
80	// tool.setSourceIUs(Arrays.asList(fUnits));
81	// IStatus result = tool.run(SubMonitor.convert(monitor, 1));
82	// if (result.matches(IStatus.ERROR))
83	// throw new ProvisionException(result);
84	// fLocations = new File[] {fInstallDir};
85	// } catch (ProvisionException e) {
86	// throw new InvocationTargetException(e);
87	// }
88
89	// Use the iu's to create resolved bundles
90	return new IResolvedBundle[0];
91	}
92	}