Attachment #130475 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);
	}


			} 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;
		}

Lines 356-362 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/BundleContainerTable.java (-1 / +1 lines)
356	}	356	}
357	if (oldContainer != null) {	357	if (oldContainer != null) {
358	Shell parent = fTreeViewer.getTree().getShell();	358	Shell parent = fTreeViewer.getTree().getShell();
359	EditBundleContainerWizard wizard = new EditBundleContainerWizard(fTarget, oldContainer);	359	EditBundleContainerWizard wizard = new EditBundleContainerWizard(oldContainer);
360	WizardDialog dialog = new WizardDialog(parent, wizard);	360	WizardDialog dialog = new WizardDialog(parent, wizard);
361	if (dialog.open() == Window.OK) {	361	if (dialog.open() == Window.OK) {
362	// Replace the old container with the new one	362	// Replace the old container with the new one

Lines 69-75 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/messages.properties (-1 lines)
69	EditBundleContainerWizard_0=Edit Content	69	EditBundleContainerWizard_0=Edit Content
70	EditDirectoryContainerPage_0=Edit Directory	70	EditDirectoryContainerPage_0=Edit Directory
71	EditDirectoryContainerPage_1=&Variables...	71	EditDirectoryContainerPage_1=&Variables...
72	EditDirectoryContainerPage_2=Included Plug-ins
73	EditDirectoryContainerPage_3=Resolve Container Job	72	EditDirectoryContainerPage_3=Resolve Container Job
74	EditFeatureContainerPage_0=Edit Feature	73	EditFeatureContainerPage_0=Edit Feature
75	EditFeatureContainerPage_1=Edit the plug-ins included in this feature	74	EditFeatureContainerPage_1=Edit the plug-ins included in this feature

Lines 63-69 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/Messages.java (-1 lines)
63	public static String EditBundleContainerWizard_0;	63	public static String EditBundleContainerWizard_0;
64	public static String EditDirectoryContainerPage_0;	64	public static String EditDirectoryContainerPage_0;
65	public static String EditDirectoryContainerPage_1;	65	public static String EditDirectoryContainerPage_1;
66	public static String EditDirectoryContainerPage_2;
67	public static String EditDirectoryContainerPage_3;	66	public static String EditDirectoryContainerPage_3;
68	public static String EditFeatureContainerPage_0;	67	public static String EditFeatureContainerPage_0;
69	public static String EditFeatureContainerPage_1;	68	public static String EditFeatureContainerPage_1;




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.IResolvedBundle;
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;
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(ITargetDefinition 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;
	}
}

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.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.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 {

		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);
		}


				if (validateInput()) {
					// Create a container from the input
					fContainer = refreshContainer(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();

Lines 3-9 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/EditFeatureContainerPage.java (-3 / +2 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)




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)

			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 {

Lines 18-23 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/BundleInfoLabelProvider.java (+11 lines)
18	import org.eclipse.pde.internal.ui.PDEPluginImages;	18	import org.eclipse.pde.internal.ui.PDEPluginImages;
19	import org.eclipse.pde.internal.ui.util.SharedLabelProvider;	19	import org.eclipse.pde.internal.ui.util.SharedLabelProvider;
20	import org.eclipse.swt.graphics.Image;	20	import org.eclipse.swt.graphics.Image;
		21	import org.eclipse.ui.ISharedImages;
		22	import org.eclipse.ui.PlatformUI;
21		23
22	/**	24	/**
23	* Provides text and image labels for BundleInfo and IResolveBundle objects.	25	* Provides text and image labels for BundleInfo and IResolveBundle objects.
Lines 58-63 Link Here
58	return buf.toString();	60	return buf.toString();
59	} else if (element instanceof IResolvedBundle) {	61	} else if (element instanceof IResolvedBundle) {
60	return getText(((IResolvedBundle) element).getBundleInfo());	62	return getText(((IResolvedBundle) element).getBundleInfo());
		63	} else if (element instanceof IStatus) {
		64	return ((IStatus) element).getMessage();
61	}	65	}
62	return super.getText(element);	66	return super.getText(element);
63	}	67	}
Lines 84-89 Link Here
84	}	88	}
85	} else if (element instanceof BundleInfo) {	89	} else if (element instanceof BundleInfo) {
86	return PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_PLUGIN_OBJ);	90	return PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_PLUGIN_OBJ);
		91	} else if (element instanceof IStatus) {
		92	int severity = ((IStatus) element).getSeverity();
		93	if (severity == IStatus.WARNING) {
		94	return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
		95	} else if (severity == IStatus.ERROR) {
		96	return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
		97	}
87	}	98	}
88	return super.getImage(element);	99	return super.getImage(element);
89	}	100	}




/*******************************************************************************
 * 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.AvailableIUGroup;
import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.RepositorySelectionGroup;
import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.RepositorySelectionGroup.IRepositorySelectionListener;
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().getRepositoryManipulator(), 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;
	}

}




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.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) {
		fPreviewTable = new TableViewer(parent);
		fPreviewTable.setLabelProvider(new BundleInfoLabelProvider(false));
		fPreviewTable.setContentProvider(new ArrayContentProvider());
		fPreviewTable.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
		setControl(fPreviewTable.getControl());
	}

	/**
	 * 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());
		}
	}

}

Return to bug 270626

Lines 51-59 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/BundleContainerLabelProvider.java (-11 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 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	}

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 23-33 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/EditDirectoryContainerPage.java (-64 / +24 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-307 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);	302	setPageComplete(false);
307	return false;	303	return false;
Lines 313-319 Link Here
313		309
314	// Check if directory exists	310	// Check if directory exists
315	if (!location.isDirectory()) {	311	if (!location.isDirectory()) {
316	fBundleTree.setInput(null);
317	setMessage(Messages.AddDirectoryContainerPage_6, IMessageProvider.WARNING);	312	setMessage(Messages.AddDirectoryContainerPage_6, IMessageProvider.WARNING);
318	setPageComplete(true);	313	setPageComplete(true);
319	} else {	314	} else {
Lines 356-379 Link Here
356	return fTargetService;	351	return fTargetService;
357	}	352	}
358		353
359	/**	354	private class CreateContainerJob extends UIJob {
360	* Returns the bundle container created by this wizard page with the	355	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);	356	super(jobDisplay, name);
378	}	357	}
379		358
Lines 387-419 Link Here
387	if (validateInput()) {	366	if (validateInput()) {
388	// Create a container from the input	367	// Create a container from the input
389	fContainer = refreshContainer(fContainer);	368	fContainer = refreshContainer(fContainer);
390	if (fContainer != null) {	369	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 {	370	} else {
411	fContainer = null;	371	fContainer = null;
		372	setPageComplete(false);
412	}	373	}
413	return Status.OK_STATUS;	374	return Status.OK_STATUS;
414	} catch (CoreException e) {	375	} catch (CoreException e) {
415	fContainer = null;	376	fContainer = null;
416	fBundleTree.setInput(null);
417	setErrorMessage(e.getMessage());	377	setErrorMessage(e.getMessage());
418	setPageComplete(false);	378	setPageComplete(false);
419	return e.getStatus();	379	return e.getStatus();

Lines 20-26 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/EditProfileContainerPage.java (-7 / +4 lines)
20	import org.eclipse.jface.dialogs.IMessageProvider;	20	import org.eclipse.jface.dialogs.IMessageProvider;
21	import org.eclipse.pde.internal.core.target.impl.ProfileBundleContainer;	21	import org.eclipse.pde.internal.core.target.impl.ProfileBundleContainer;
22	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;	22	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
23	import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
24	import org.eclipse.pde.internal.ui.SWTFactory;	23	import org.eclipse.pde.internal.ui.SWTFactory;
25	import org.eclipse.swt.SWT;	24	import org.eclipse.swt.SWT;
26	import org.eclipse.swt.events.*;	25	import org.eclipse.swt.events.*;
Lines 57-68 Link Here
57	*/	56	*/
58	private static final String SETTINGS_CONFIG_3 = "config3"; //$NON-NLS-1$	57	private static final String SETTINGS_CONFIG_3 = "config3"; //$NON-NLS-1$
59		58
60	public EditProfileContainerPage(ITargetDefinition target) {	59	public EditProfileContainerPage() {
61	super(target);	60	super();
62	}	61	}
63		62
64	public EditProfileContainerPage(ITargetDefinition target, IBundleContainer container) {	63	public EditProfileContainerPage(IBundleContainer container) {
65	super(target, container);	64	super(container);
66	}	65	}
67		66
68	/* (non-Javadoc)	67	/* (non-Javadoc)
Lines 241-247 Link Here
241	if (fConfigLocation.isEnabled()) {	240	if (fConfigLocation.isEnabled()) {
242	// Check if the text field is blank	241	// Check if the text field is blank
243	if (fConfigLocation.getText().trim().length() == 0) {	242	if (fConfigLocation.getText().trim().length() == 0) {
244	fBundleTree.setInput(null);
245	setMessage(Messages.EditProfileContainerPage_2);	243	setMessage(Messages.EditProfileContainerPage_2);
246	setPageComplete(false);	244	setPageComplete(false);
247	return false;	245	return false;
Lines 253-259 Link Here
253		251
254	// Check that the directory exists	252	// Check that the directory exists
255	if (!configLocation.isDirectory()) {	253	if (!configLocation.isDirectory()) {
256	fBundleTree.setInput(null);
257	setMessage(Messages.AddProfileContainerPage_8, IMessageProvider.WARNING);	254	setMessage(Messages.AddProfileContainerPage_8, IMessageProvider.WARNING);
258	setPageComplete(true);	255	setPageComplete(true);
259	} else {	256	} else {

Added Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/AddP2ContainerPage.java (+177 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.net.URI;
14	import org.eclipse.core.runtime.IStatus;
15	import org.eclipse.core.runtime.Status;
16	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
17	import org.eclipse.equinox.internal.provisional.p2.ui.actions.PropertyDialogAction;
18	import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.AvailableIUGroup;
19	import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.RepositorySelectionGroup;
20	import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.RepositorySelectionGroup.IRepositorySelectionListener;
21	import org.eclipse.equinox.internal.provisional.p2.ui.policy.IUViewQueryContext;
22	import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;
23	import org.eclipse.jface.action.IAction;
24	import org.eclipse.jface.viewers.CheckStateChangedEvent;
25	import org.eclipse.jface.viewers.ICheckStateListener;
26	import org.eclipse.jface.window.SameShellProvider;
27	import org.eclipse.jface.wizard.WizardPage;
28	import org.eclipse.pde.internal.core.target.impl.P2BundleContainer;
29	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
30	import org.eclipse.pde.internal.ui.*;
31	import org.eclipse.pde.internal.ui.wizards.provisioner.p2.ProvisionerMessages;
32	import org.eclipse.swt.SWT;
33	import org.eclipse.swt.events.SelectionAdapter;
34	import org.eclipse.swt.events.SelectionEvent;
35	import org.eclipse.swt.layout.GridData;
36	import org.eclipse.swt.widgets.*;
37	import org.eclipse.ui.PlatformUI;
38
39	/**
40	* Wizard page allowing users to select which IUs they would like to download
41	*
42	* @since 3.5
43	*/
44	public class AddP2ContainerPage extends WizardPage {
45
46	static final IStatus BAD_IU_SELECTION = new Status(IStatus.ERROR, PDEPlugin.getPluginId(), ProvisionerMessages.P2TargetProvisionerWizardPage_1);
47	IStatus fSelectedIUStatus = BAD_IU_SELECTION;
48
49	P2BundleContainer fContainer;
50	IUViewQueryContext fQueryContext;
51
52	RepositorySelectionGroup fRepoSelector;
53	AvailableIUGroup fAvailableIUGroup;
54
55	Button fPropertiesButton;
56	private IAction fPropertyAction;
57
58	protected AddP2ContainerPage() {
59	super("AddP2Container"); //$NON-NLS-1$
60	// TODO Use the target service to create?
61	fContainer = new P2BundleContainer();
62	}
63
64	/* (non-Javadoc)
65	* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
66	*/
67	public void createControl(Composite parent) {
68	setMessage("Select content from a repository to be downloaded and added to your target");
69	setTitle("Add Repository or Update Site");
70	Composite composite = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH, 0, 0);
71
72	createQueryContext();
73	createRepositoryComboArea(composite);
74	createAvailableIUArea(composite);
75	createDetailsArea(composite);
76	createCheckboxArea(composite);
77
78	setPageComplete(false);
79	restoreWidgetState();
80	setControl(composite);
81	PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.P2_PROVISIONING_PAGE);
82	}
83
84	private void createCheckboxArea(Composite parent) {
85	// Categories, provisioning context/store sites/
86	Composite checkComp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL, 0, 0);
87	// TODO Update labels with mnemonics
88	SWTFactory.createCheckButton(checkComp, "Group by Category", null, true, 1);
89	SWTFactory.createCheckButton(checkComp, "Show only the latest version", null, true, 1);
90	SWTFactory.createCheckButton(checkComp, "Download all dependencies", null, true, 1);
91	SWTFactory.createCheckButton(checkComp, "Include the repo location in the target", null, true, 1);
92
93	}
94
95	private void createQueryContext() {
96	fQueryContext = Policy.getDefault().getQueryContext();
97	}
98
99	private void createRepositoryComboArea(Composite parent) {
100	RepositorySelectionGroup repoSelector = new RepositorySelectionGroup(getContainer(), parent, Policy.getDefault().getRepositoryManipulator(), fQueryContext);
101	repoSelector.addRepositorySelectionListener(new IRepositorySelectionListener() {
102	public void repositorySelectionChanged(int repoChoice, URI repoLocation) {
103	fAvailableIUGroup.setRepositoryFilter(repoChoice, repoLocation);
104	}
105	});
106	}
107
108	/**
109	* Create the UI area where the user will be able to select which IUs they
110	* would like to download. There will also be buttons to see properties for
111	* the selection and open the manage sites dialog.
112	*
113	* @param parent parent composite
114	*/
115	private void createAvailableIUArea(Composite parent) {
116	fAvailableIUGroup = new AvailableIUGroup(parent);
117	fAvailableIUGroup.getCheckboxTreeViewer().addCheckStateListener(new ICheckStateListener() {
118	public void checkStateChanged(CheckStateChangedEvent event) {
119	IInstallableUnit[] units = fAvailableIUGroup.getCheckedLeafIUs();
120	fPropertiesButton.setEnabled(units.length > 0);
121	if (units.length > 0) {
122	fSelectedIUStatus = Status.OK_STATUS;
123	fContainer.setRequiredUnits(units);
124	} else {
125	fSelectedIUStatus = BAD_IU_SELECTION;
126	fContainer.setRequiredUnits(null);
127	}
128	pageChanged();
129	}
130	});
131	fAvailableIUGroup.setUseBoldFontForFilteredItems(true);
132	GridData data = (GridData) fAvailableIUGroup.getStructuredViewer().getControl().getLayoutData();
133	data.heightHint = 200;
134	}
135
136	private void createDetailsArea(Composite parent) {
137	Group detailsGroup = SWTFactory.createGroup(parent, "Details", 1, 1, GridData.FILL_HORIZONTAL);
138
139	fPropertiesButton = new Button(detailsGroup, SWT.PUSH);
140	fPropertiesButton.setText(ProvisionerMessages.P2TargetProvisionerWizardPage_10);
141	fPropertiesButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
142	fPropertiesButton.addSelectionListener(new SelectionAdapter() {
143	public void widgetSelected(SelectionEvent event) {
144	fPropertyAction.run();
145	}
146	});
147	fPropertyAction = new PropertyDialogAction(new SameShellProvider(getShell()), fAvailableIUGroup.getStructuredViewer());
148	}
149
150	/**
151	* Checks if the page is complete, updating messages and finish button.
152	*/
153	void pageChanged() {
154	if (fSelectedIUStatus.getSeverity() == IStatus.ERROR) {
155	setErrorMessage(fSelectedIUStatus.getMessage());
156	setPageComplete(false);
157	} else {
158	setErrorMessage(null);
159	setPageComplete(true);
160	}
161	}
162
163	/**
164	* Restores the state of the wizard from previous invocations
165	*/
166	private void restoreWidgetState() {
167	// TODO Init check boxes
168	}
169
170	/**
171	* @return bundle container created by this wizard or <code>null</code>
172	*/
173	public IBundleContainer getBundleContainer() {
174	return fContainer;
175	}
176
177	}

Added Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/PreviewContainerPage.java (+92 lines)
1	package org.eclipse.pde.internal.ui.shared.target;
2
3	import java.lang.reflect.InvocationTargetException;
4	import org.eclipse.core.runtime.IProgressMonitor;
5	import org.eclipse.core.runtime.IStatus;
6	import org.eclipse.jface.operation.IRunnableWithProgress;
7	import org.eclipse.jface.viewers.ArrayContentProvider;
8	import org.eclipse.jface.viewers.TableViewer;
9	import org.eclipse.jface.wizard.WizardPage;
10	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;
11	import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
12	import org.eclipse.pde.internal.ui.PDEPlugin;
13	import org.eclipse.swt.layout.GridData;
14	import org.eclipse.swt.widgets.Composite;
15
16	public class PreviewContainerPage extends WizardPage {
17
18	private ITargetDefinition fTarget;
19	private EditDirectoryContainerPage fPage1;
20	protected TableViewer fPreviewTable;
21	protected Object fInput;
22
23	protected PreviewContainerPage(ITargetDefinition definition, EditDirectoryContainerPage page1) {
24	super("ContainerPreviewPage");
25	setTitle("Preview Contents");
26	setMessage("The plug-ins found in the container are visible below");
27	fTarget = definition;
28	fPage1 = page1;
29	}
30
31	/* (non-Javadoc)
32	* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
33	*/
34	public void createControl(Composite parent) {
35	fPreviewTable = new TableViewer(parent);
36	fPreviewTable.setLabelProvider(new BundleInfoLabelProvider(false));
37	fPreviewTable.setContentProvider(new ArrayContentProvider());
38	fPreviewTable.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
39	setControl(fPreviewTable.getControl());
40	}
41
42	/**
43	* Refreshes the contents of the preview table, possible resolving the container
44	* @param resolve whether the current container should be resolved if it hasn't been already
45	*/
46	protected void setInput(final IBundleContainer container) {
47	if (container == null) {
48	fInput = null;
49	fPreviewTable.setInput(null);
50	return;
51	}
52
53	if (container.isResolved()) {
54	fInput = container.getAllBundles();
55	fPreviewTable.setInput(fInput);
56	return;
57	}
58
59	try {
60	getContainer().run(true, true, new IRunnableWithProgress() {
61	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
62	IStatus result = container.resolve(fTarget, monitor);
63	if (monitor.isCanceled()) {
64	fInput = null;
65	} else if (!result.isOK() && !result.isMultiStatus()) {
66	fInput = new Object[] {result};
67	} else {
68	fInput = container.getAllBundles();
69	}
70
71	}
72	});
73	fPreviewTable.setInput(fInput);
74	} catch (InvocationTargetException e) {
75	PDEPlugin.log(e);
76	setErrorMessage(e.getMessage());
77	} catch (InterruptedException e) {
78	}
79
80	}
81
82	/* (non-Javadoc)
83	* @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
84	*/
85	public void setVisible(boolean visible) {
86	super.setVisible(visible);
87	if (visible) {
88	setInput(fPage1.getBundleContainer());
89	}
90	}
91
92	}