Attachment #196643 for bug #269417




/*******************************************************************************
 * Copyright (c) 2006 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.contentassist.display;

import java.io.IOException;
import java.io.StringReader;
import java.util.Iterator;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.text.*;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.editor.text.HTMLPrinter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTError;
import org.eclipse.swt.browser.*;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.events.*;
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;

/**
 * Displays textual information in a {@link org.eclipse.swt.browser.Browser}
 * widget.
 *
 * <p>
 * This class may be instantiated; it is not intended to be subclassed.
 * </p>
 * <p>
 * Current problems:
 * - the size computation is too small
 * - focusLost event is not sent (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=84532)
 * </p>
 *
 * @since 3.1
 */
public class BrowserInformationControl implements IInformationControl, IInformationControlExtension, IInformationControlExtension3, DisposeListener {

	/**
	 * Tells whether the SWT Browser widget and hence this information
	 * control is available.
	 *
	 * @param parent the parent component used for checking or <code>null</code> if none
	 * @return <code>true</code> if this control is available
	 */
	public static boolean isAvailable(Composite parent) {
		if (!fgAvailabilityChecked) {
			try {
				if (parent == null)
					parent = PDEPlugin.getActiveWorkbenchShell();
				if (parent == null)
					return false; // don't store this value - try again later

				Browser browser = new Browser(parent, SWT.NONE);
				browser.dispose();
				fgIsAvailable = true;
			} catch (SWTError er) {
				fgIsAvailable = false;
			} finally {
				fgAvailabilityChecked = true;
			}
		}

		return fgIsAvailable;
	}

	/** Border thickness in pixels. */
	private static final int BORDER = 1;

	/**
	 * Minimal size constraints.
	 * @since 3.2
	 */
	private static final int MIN_WIDTH = 80;
	private static final int MIN_HEIGHT = 80;

	/**
	 * Availability checking cache.
	 */
	private static boolean fgIsAvailable = false;
	private static boolean fgAvailabilityChecked = false;

	/** The control's shell */
	private Shell fShell;
	/** The control's browser widget */
	private Browser fBrowser;
	/** Tells whether the browser has content */
	private boolean fBrowserHasContent;
	/** The control width constraint */
	private int fMaxWidth = -1;
	/** The control height constraint */
	private int fMaxHeight = -1;
	private Font fStatusTextFont;
	private Label fStatusTextField;
	private String fStatusFieldText;
	private boolean fHideScrollBars;
	private Listener fDeactivateListener;
	private ListenerList fFocusListeners = new ListenerList();
	private Label fSeparator;
	private String fInputText;
	private TextLayout fTextLayout;

	private TextStyle fBoldStyle;

	/**
	 * Creates a default information control with the given shell as parent. The given
	 * information presenter is used to process the information to be displayed. The given
	 * styles are applied to the created styled text widget.
	 *
	 * @param parent the parent shell
	 * @param shellStyle the additional styles for the shell
	 * @param style the additional styles for the styled text widget
	 */
	public BrowserInformationControl(Shell parent, int shellStyle, int style) {
		this(parent, shellStyle, style, null);
	}

	/**
	 * Creates a default information control with the given shell as parent. The given
	 * information presenter is used to process the information to be displayed. The given
	 * styles are applied to the created styled text widget.
	 *
	 * @param parent the parent shell
	 * @param shellStyle the additional styles for the shell
	 * @param style the additional styles for the styled text widget
	 * @param statusFieldText the text to be used in the optional status field
	 *                         or <code>null</code> if the status field should be hidden
	 */
	public BrowserInformationControl(Shell parent, int shellStyle, int style, String statusFieldText) {
		fStatusFieldText = statusFieldText;

		fShell = new Shell(parent, SWT.NO_FOCUS | SWT.ON_TOP | shellStyle);
		Display display = fShell.getDisplay();
		fShell.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
		fTextLayout = new TextLayout(display);

		Composite composite = fShell;
		GridLayout layout = new GridLayout(1, false);
		int border = ((shellStyle & SWT.NO_TRIM) == 0) ? 0 : BORDER;
		layout.marginHeight = border;
		layout.marginWidth = border;
		composite.setLayout(layout);

		if (statusFieldText != null) {
			composite = new Composite(composite, SWT.NONE);
			layout = new GridLayout(1, false);
			layout.marginHeight = 0;
			layout.marginWidth = 0;
			layout.verticalSpacing = 1;
			layout.horizontalSpacing = 1;
			composite.setLayout(layout);

			GridData gd = new GridData(GridData.FILL_BOTH);
			composite.setLayoutData(gd);

			composite.setForeground(display.getSystemColor(SWT.COLOR_INFO_FOREGROUND));
			composite.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
		}

		// Browser field
		fBrowser = new Browser(composite, SWT.NONE);

		// Disable javascript for security reasons, see bug 265808
		fBrowser.setJavascriptEnabled(false);

		fHideScrollBars = (style & SWT.V_SCROLL) == 0 && (style & SWT.H_SCROLL) == 0;

		GridData gd = new GridData(GridData.BEGINNING | GridData.FILL_BOTH);
		fBrowser.setLayoutData(gd);

		fBrowser.setForeground(display.getSystemColor(SWT.COLOR_INFO_FOREGROUND));
		fBrowser.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
		fBrowser.addKeyListener(new KeyListener() {

			public void keyPressed(KeyEvent e) {
				if (e.character == 0x1B) // ESC
					fShell.dispose();
			}

			public void keyReleased(KeyEvent e) {
			}
		});
		/*
		 * XXX revisit when the Browser support is better 
		 * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=107629. Choosing a link to a
		 * non-available target will show an error dialog behind the ON_TOP shell that seemingly
		 * blocks the workbench. Disable links completely for now.
		 */
		fBrowser.addLocationListener(new LocationAdapter() {
			/*
			 * @see org.eclipse.swt.browser.LocationAdapter#changing(org.eclipse.swt.browser.LocationEvent)
			 */
			public void changing(LocationEvent event) {
				String location = event.location;
				if (!"about:blank".equals(location)) //$NON-NLS-1$
					event.doit = false;
			}
		});

		// Replace browser's built-in context menu with none
		fBrowser.setMenu(new Menu(fShell, SWT.NONE));

		// Status field
		if (statusFieldText != null) {

			fSeparator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL | SWT.LINE_DOT);
			fSeparator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

			// Status field label
			fStatusTextField = new Label(composite, SWT.RIGHT);
			fStatusTextField.setText(statusFieldText);
			Font font = fStatusTextField.getFont();
			FontData[] fontDatas = font.getFontData();
			for (int i = 0; i < fontDatas.length; i++)
				fontDatas[i].setHeight(fontDatas[i].getHeight() * 9 / 10);
			fStatusTextFont = new Font(fStatusTextField.getDisplay(), fontDatas);
			fStatusTextField.setFont(fStatusTextFont);
			gd = new GridData(GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
			fStatusTextField.setLayoutData(gd);

			fStatusTextField.setForeground(display.getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));

			fStatusTextField.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
		}

		addDisposeListener(this);
		createTextLayout();
	}

	/**
	 * Creates a default information control with the given shell as parent. The given
	 * information presenter is used to process the information to be displayed. The given
	 * styles are applied to the created styled text widget.
	 *
	 * @param parent the parent shell
	 * @param style the additional styles for the browser widget
	 */
	public BrowserInformationControl(Shell parent, int style) {
		this(parent, SWT.TOOL | SWT.NO_TRIM, style);
	}

	/**
	 * Creates a default information control with the given shell as parent.
	 * No information presenter is used to process the information
	 * to be displayed. No additional styles are applied to the styled text widget.
	 *
	 * @param parent the parent shell
	 */
	public BrowserInformationControl(Shell parent) {
		this(parent, SWT.NONE);
	}

	/*
	 * @see IInformationControl#setInformation(String)
	 */
	public void setInformation(String content) {
		fBrowserHasContent = content != null && content.length() > 0;

		if (!fBrowserHasContent)
			content = "<html><body ></html>"; //$NON-NLS-1$

		fInputText = content;

		int shellStyle = fShell.getStyle();
		boolean RTL = (shellStyle & SWT.RIGHT_TO_LEFT) != 0;

		String[] styles = null;
		if (RTL && !fHideScrollBars)
			styles = new String[] {"direction:rtl;", "word-wrap:break-word;"}; //$NON-NLS-1$ //$NON-NLS-2$
		else if (RTL && fHideScrollBars)
			styles = new String[] {"direction:rtl;", "overflow:hidden;", "word-wrap:break-word;"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		else if (fHideScrollBars && true)
			styles = new String[] {"overflow:hidden;", "word-wrap: break-word;"}; //$NON-NLS-1$ //$NON-NLS-2$

		if (styles != null) {
			StringBuffer buffer = new StringBuffer(content);
			HTMLPrinter.insertStyles(buffer, styles);
			content = buffer.toString();
		}

		fBrowser.setText(content);

	}

	/*
	 * @see org.eclipse.jdt.internal.ui.text.IInformationControlExtension4#setStatusText(java.lang.String)
	 * @since 3.2
	 */
	public void setStatusText(String statusFieldText) {
		fStatusFieldText = statusFieldText;
	}

	/*
	 * @see IInformationControl#setVisible(boolean)
	 */
	public void setVisible(boolean visible) {
		if (fShell.isVisible() == visible)
			return;

		if (visible) {
			if (fStatusTextField != null) {
				boolean state = fStatusFieldText != null;
				if (state)
					fStatusTextField.setText(fStatusFieldText);
				fStatusTextField.setVisible(state);
				fSeparator.setVisible(state);
			}
		}

		fShell.setVisible(visible);
		if (!visible)
			setInformation(""); //$NON-NLS-1$
	}

	/**
	 * Creates and initializes the text layout used
	 * to compute the size hint.
	 * 
	 * @since 3.2
	 */
	private void createTextLayout() {
		fTextLayout = new TextLayout(fBrowser.getDisplay());

		// Initialize fonts
		Font font = fBrowser.getFont();
		fTextLayout.setFont(font);
		fTextLayout.setWidth(-1);
		FontData[] fontData = font.getFontData();
		for (int i = 0; i < fontData.length; i++)
			fontData[i].setStyle(SWT.BOLD);
		font = new Font(fShell.getDisplay(), fontData);
		fBoldStyle = new TextStyle(font, null, null);

		// Compute and set tab width
		fTextLayout.setText("    "); //$NON-NLS-1$
		int tabWidth = fTextLayout.getBounds().width;
		fTextLayout.setTabs(new int[] {tabWidth});

		fTextLayout.setText(""); //$NON-NLS-1$
	}

	/*
	 * @see IInformationControl#dispose()
	 */
	public void dispose() {
		fTextLayout.dispose();
		fTextLayout = null;
		fBoldStyle.font.dispose();
		fBoldStyle = null;
		if (fShell != null && !fShell.isDisposed())
			fShell.dispose();
		else
			widgetDisposed(null);
	}

	/*
	 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
	 */
	public void widgetDisposed(DisposeEvent event) {
		if (fStatusTextFont != null && !fStatusTextFont.isDisposed())
			fStatusTextFont.dispose();

		fShell = null;
		fBrowser = null;
		fStatusTextFont = null;
	}

	/*
	 * @see IInformationControl#setSize(int, int)
	 */
	public void setSize(int width, int height) {
		fShell.setSize(Math.min(width, fMaxWidth), Math.min(height, fMaxHeight));
	}

	/*
	 * @see IInformationControl#setLocation(Point)
	 */
	public void setLocation(Point location) {
		fShell.setLocation(location);
	}

	/*
	 * @see IInformationControl#setSizeConstraints(int, int)
	 */
	public void setSizeConstraints(int maxWidth, int maxHeight) {
		fMaxWidth = maxWidth;
		fMaxHeight = maxHeight;
	}

	/*
	 * @see IInformationControl#computeSizeHint()
	 */
	public Point computeSizeHint() {
		TextPresentation presentation = new TextPresentation();
		HTML2TextReader reader = new HTML2TextReader(new StringReader(fInputText), presentation);
		String text;
		try {
			text = reader.getString();
		} catch (IOException e) {
			text = ""; //$NON-NLS-1$
		}

		fTextLayout.setText(text);
		Iterator iter = presentation.getAllStyleRangeIterator();
		while (iter.hasNext()) {
			StyleRange sr = (StyleRange) iter.next();
			if (sr.fontStyle == SWT.BOLD)
				fTextLayout.setStyle(fBoldStyle, sr.start, sr.start + sr.length - 1);
		}
		Rectangle bounds = fTextLayout.getBounds();
		int width = bounds.width;
		int height = bounds.height;

		width += 15;
		height += 25;

		if (fStatusFieldText != null && fSeparator != null) {
			fTextLayout.setText(fStatusFieldText);
			Rectangle statusBounds = fTextLayout.getBounds();
			Rectangle separatorBounds = fSeparator.getBounds();
			width = Math.max(width, statusBounds.width);
			height = height + statusBounds.height + separatorBounds.height;
		}

		// Apply size constraints
		if (fMaxWidth != SWT.DEFAULT)
			width = Math.min(fMaxWidth, width);
		if (fMaxHeight != SWT.DEFAULT)
			height = Math.min(fMaxHeight, height);

		// Ensure minimal size
		width = Math.max(MIN_WIDTH, width);
		height = Math.max(MIN_HEIGHT, height);

		return new Point(width, height);
	}

	/*
	 * @see org.eclipse.jface.text.IInformationControlExtension3#computeTrim()
	 */
	public Rectangle computeTrim() {
		return fShell.computeTrim(0, 0, 0, 0);
	}

	/*
	 * @see org.eclipse.jface.text.IInformationControlExtension3#getBounds()
	 */
	public Rectangle getBounds() {
		return fShell.getBounds();
	}

	/*
	 * @see org.eclipse.jface.text.IInformationControlExtension3#restoresLocation()
	 */
	public boolean restoresLocation() {
		return false;
	}

	/*
	 * @see org.eclipse.jface.text.IInformationControlExtension3#restoresSize()
	 */
	public boolean restoresSize() {
		return false;
	}

	/*
	 * @see IInformationControl#addDisposeListener(DisposeListener)
	 */
	public void addDisposeListener(DisposeListener listener) {
		fShell.addDisposeListener(listener);
	}

	/*
	 * @see IInformationControl#removeDisposeListener(DisposeListener)
	 */
	public void removeDisposeListener(DisposeListener listener) {
		fShell.removeDisposeListener(listener);
	}

	/*
	 * @see IInformationControl#setForegroundColor(Color)
	 */
	public void setForegroundColor(Color foreground) {
		fBrowser.setForeground(foreground);
	}

	/*
	 * @see IInformationControl#setBackgroundColor(Color)
	 */
	public void setBackgroundColor(Color background) {
		fBrowser.setBackground(background);
	}

	/*
	 * @see IInformationControl#isFocusControl()
	 */
	public boolean isFocusControl() {
		return fBrowser.isFocusControl();
	}

	/*
	 * @see IInformationControl#setFocus()
	 */
	public void setFocus() {
		fShell.forceFocus();
		fBrowser.setFocus();
	}

	/*
	 * @see IInformationControl#addFocusListener(FocusListener)
	 */
	public void addFocusListener(final FocusListener listener) {
		fBrowser.addFocusListener(listener);

		/*
		 * FIXME:	This is a workaround for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=84532
		 * 			(Browser widget does not send focusLost event)
		 */
		if (fFocusListeners.isEmpty()) {
			fDeactivateListener = new Listener() {
				public void handleEvent(Event event) {
					Object[] listeners = fFocusListeners.getListeners();
					for (int i = 0; i < listeners.length; i++)
						((FocusListener) listeners[i]).focusLost(new FocusEvent(event));
				}
			};
			fBrowser.getShell().addListener(SWT.Deactivate, fDeactivateListener);
		}
		fFocusListeners.add(listener);
	}

	/*
	 * @see IInformationControl#removeFocusListener(FocusListener)
	 */
	public void removeFocusListener(FocusListener listener) {
		fBrowser.removeFocusListener(listener);

		/*
		 * FIXME:	This is a workaround for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=84532
		 * 			(Browser widget does not send focusLost event)
		 */
		fFocusListeners.remove(listener);
		if (fFocusListeners.isEmpty()) {
			fBrowser.getShell().removeListener(SWT.Deactivate, fDeactivateListener);
			fDeactivateListener = null;
		}
	}

	/*
	 * @see IInformationControlExtension#hasContents()
	 */
	public boolean hasContents() {
		return fBrowserHasContent;
	}
}




<<<<<<< ArgumentsSection.java
/*******************************************************************************
 * 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.debug.ui.StringVariableSelectionDialog;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.PDEPluginImages;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
import org.eclipse.pde.internal.ui.parts.FormEntry;
import org.eclipse.pde.internal.ui.shared.target.ArgumentsFromContainerSelectionDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.IFormColors;
import org.eclipse.ui.forms.SectionPart;
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.*;

/**
 * Section for editing VM and program arguments in the target definition editor
 * @see EnvironmentPage
 * @see TargetEditor
 */
public class ArgumentsSection extends SectionPart {

	private CTabFolder fTabFolder;
	private FormEntry fProgramArguments;
	private FormEntry fVMArguments;
	private Image fImage;
	private TargetEditor fEditor;

	public ArgumentsSection(FormPage page, Composite parent) {
		super(parent, page.getManagedForm().getToolkit(), Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
		fEditor = (TargetEditor) page.getEditor();
		fImage = PDEPluginImages.DESC_ARGUMENT_TAB.createImage();
		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.createClearGridLayout(false, 1));
		section.setText(PDEUIMessages.ArgumentsSection_editorTitle);
		section.setDescription(PDEUIMessages.ArgumentsSection_description);
		GridData data = new GridData(GridData.FILL_BOTH);
		data.horizontalSpan = 1;
		section.setLayoutData(data);

		Composite client = toolkit.createComposite(section);
		client.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 1));
		GridData gd = new GridData(GridData.FILL_BOTH);
		gd.widthHint = 100;
		client.setLayoutData(gd);

		fTabFolder = new CTabFolder(client, SWT.FLAT | SWT.TOP);
		toolkit.adapt(fTabFolder, true, true);
		gd = new GridData(GridData.FILL_BOTH);
		fTabFolder.setLayoutData(gd);
		toolkit.getColors().initializeSectionToolBarColors();
		Color selectedColor = toolkit.getColors().getColor(IFormColors.TB_BG);
		fTabFolder.setSelectionBackground(new Color[] {selectedColor, toolkit.getColors().getBackground()}, new int[] {100}, true);

		Composite programComp = toolkit.createComposite(fTabFolder);
		programComp.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 1));
		programComp.setLayoutData(new GridData(GridData.FILL_BOTH));
		fProgramArguments = new FormEntry(programComp, toolkit, PDEUIMessages.ArgumentsSection_0, SWT.MULTI | SWT.WRAP);
		fProgramArguments.getText().setLayoutData(new GridData(GridData.FILL_BOTH));
		fProgramArguments.setFormEntryListener(new SimpleFormEntryAdapter(this) {
			public void textValueChanged(FormEntry entry) {
				String value = entry.getValue().trim();
				getTarget().setProgramArguments(value.length() > 0 ? value : null);
			}
		});
		Button variables = toolkit.createButton(programComp, PDEUIMessages.ArgumentsSection_variableButtonTitle, SWT.NONE);
		variables.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
		variables.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getSection().getShell());
				dialog.open();
				String variable = dialog.getVariableExpression();
				if (variable != null) {
					fProgramArguments.getText().insert(variable);
				}
			}
		});
		CTabItem programTab = new CTabItem(fTabFolder, SWT.NULL);
		programTab.setText(PDEUIMessages.ArgumentsSection_programTabLabel);
		programTab.setImage(fImage);
		programTab.setControl(programComp);
		toolkit.paintBordersFor(programComp);

		Composite vmComp = toolkit.createComposite(fTabFolder);
		vmComp.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 1));
		vmComp.setLayoutData(new GridData(GridData.FILL_BOTH));
		fVMArguments = new FormEntry(vmComp, toolkit, PDEUIMessages.ArgumentsSection_1, SWT.MULTI | SWT.WRAP);
		fVMArguments.getText().setLayoutData(new GridData(GridData.FILL_BOTH));
		fVMArguments.setFormEntryListener(new SimpleFormEntryAdapter(this) {
			public void textValueChanged(FormEntry entry) {
				String value = entry.getValue().trim();
				getTarget().setVMArguments(value.length() > 0 ? value : null);
			}
		});

		Composite buttons = new Composite(vmComp, SWT.NONE);
		buttons.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 2));
		buttons.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
		Button vmArgs = toolkit.createButton(buttons, PDEUIMessages.ArgumentsSection_argumentsButtonTitle, SWT.NONE);
		vmArgs.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
		vmArgs.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				ArgumentsFromContainerSelectionDialog dialog = new ArgumentsFromContainerSelectionDialog(getSection().getShell(), getTarget());
				if (dialog.open() == Dialog.OK) {
					String[] args = dialog.getSelectedArguments();
					if (args != null && args.length > 0) {
						StringBuffer resultBuffer = new StringBuffer();
						for (int index = 0; index < args.length; ++index) {
							resultBuffer.append(args[index] + " "); //$NON-NLS-1$
						}
						fVMArguments.getText().insert(resultBuffer.toString());
					}
				}
			}
		});

		variables = toolkit.createButton(buttons, PDEUIMessages.ArgumentsSection_variableButtonTitle, SWT.NONE);
		variables.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
		variables.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getSection().getShell());
				dialog.open();
				String variable = dialog.getVariableExpression();
				if (variable != null) {
					fVMArguments.getText().insert(variable);
				}
			}
		});
		CTabItem vmTab = new CTabItem(fTabFolder, SWT.NULL);
		vmTab.setText(PDEUIMessages.ArgumentsSection_vmTabLabel);
		vmTab.setImage(fImage);
		vmTab.setControl(vmComp);
		toolkit.paintBordersFor(vmComp);

		fTabFolder.setSelection(programTab);

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

	/* (non-Javadoc)
	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
	 */
	public void refresh() {
		fProgramArguments.setValue(getTarget().getProgramArguments(), true);
		fVMArguments.setValue(getTarget().getVMArguments(), true);
		super.refresh();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
	 */
	public void commit(boolean onSave) {
		fProgramArguments.commit();
		fVMArguments.commit();
		super.commit(onSave);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
	 */
	public void dispose() {
		if (fImage != null)
			fImage.dispose();
		super.dispose();
	}

}
=======
/*******************************************************************************
 * 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.debug.ui.StringVariableSelectionDialog;
import org.eclipse.jface.window.Window;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.PDEPluginImages;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
import org.eclipse.pde.internal.ui.parts.FormEntry;
import org.eclipse.pde.internal.ui.shared.target.ArgumentsFromContainerSelectionDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.IFormColors;
import org.eclipse.ui.forms.SectionPart;
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.*;

/**
 * Section for editing VM and program arguments in the target definition editor
 * @see EnvironmentPage
 * @see TargetEditor
 */
public class ArgumentsSection extends SectionPart {

	private CTabFolder fTabFolder;
	private FormEntry fProgramArguments;
	private FormEntry fVMArguments;
	private Image fImage;
	private TargetEditor fEditor;

	public ArgumentsSection(FormPage page, Composite parent) {
		super(parent, page.getManagedForm().getToolkit(), Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
		fEditor = (TargetEditor) page.getEditor();
		fImage = PDEPluginImages.DESC_ARGUMENT_TAB.createImage();
		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.createClearGridLayout(false, 1));
		section.setText(PDEUIMessages.ArgumentsSection_editorTitle);
		section.setDescription(PDEUIMessages.ArgumentsSection_description);
		GridData data = new GridData(GridData.FILL_BOTH);
		data.horizontalSpan = 1;
		section.setLayoutData(data);

		Composite client = toolkit.createComposite(section);
		client.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 1));
		GridData gd = new GridData(GridData.FILL_BOTH);
		gd.widthHint = 100;
		client.setLayoutData(gd);

		fTabFolder = new CTabFolder(client, SWT.FLAT | SWT.TOP);
		toolkit.adapt(fTabFolder, true, true);
		gd = new GridData(GridData.FILL_BOTH);
		fTabFolder.setLayoutData(gd);
		toolkit.getColors().initializeSectionToolBarColors();
		Color selectedColor = toolkit.getColors().getColor(IFormColors.TB_BG);
		fTabFolder.setSelectionBackground(new Color[] {selectedColor, toolkit.getColors().getBackground()}, new int[] {100}, true);

		Composite programComp = toolkit.createComposite(fTabFolder);
		programComp.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 1));
		programComp.setLayoutData(new GridData(GridData.FILL_BOTH));
		fProgramArguments = new FormEntry(programComp, toolkit, PDEUIMessages.ArgumentsSection_0, SWT.MULTI | SWT.WRAP);
		fProgramArguments.getText().setLayoutData(new GridData(GridData.FILL_BOTH));
		fProgramArguments.setFormEntryListener(new SimpleFormEntryAdapter(this) {
			public void textValueChanged(FormEntry entry) {
				String value = entry.getValue().trim();
				getTarget().setProgramArguments(value.length() > 0 ? value : null);
			}
		});
		Button variables = toolkit.createButton(programComp, PDEUIMessages.ArgumentsSection_variableButtonTitle, SWT.NONE);
		variables.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
		variables.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getSection().getShell());
				dialog.open();
				String variable = dialog.getVariableExpression();
				if (variable != null) {
					fProgramArguments.getText().insert(variable);
				}
			}
		});
		CTabItem programTab = new CTabItem(fTabFolder, SWT.NULL);
		programTab.setText(PDEUIMessages.ArgumentsSection_programTabLabel);
		programTab.setImage(fImage);
		programTab.setControl(programComp);
		toolkit.paintBordersFor(programComp);

		Composite vmComp = toolkit.createComposite(fTabFolder);
		vmComp.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 1));
		vmComp.setLayoutData(new GridData(GridData.FILL_BOTH));
		fVMArguments = new FormEntry(vmComp, toolkit, PDEUIMessages.ArgumentsSection_1, SWT.MULTI | SWT.WRAP);
		fVMArguments.getText().setLayoutData(new GridData(GridData.FILL_BOTH));
		fVMArguments.setFormEntryListener(new SimpleFormEntryAdapter(this) {
			public void textValueChanged(FormEntry entry) {
				String value = entry.getValue().trim();
				getTarget().setVMArguments(value.length() > 0 ? value : null);
			}
		});

		Composite buttons = new Composite(vmComp, SWT.NONE);
		GridLayout layout = FormLayoutFactory.createSectionClientGridLayout(false, 2);
		layout.marginTop = 0;
		layout.marginBottom = 0;
		layout.marginRight = 0;
		layout.marginLeft = 0;
		buttons.setLayout(layout);
		buttons.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
		Button vmArgs = toolkit.createButton(buttons, PDEUIMessages.ArgumentsSection_argumentsButtonTitle, SWT.NONE);
		vmArgs.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
		vmArgs.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				ArgumentsFromContainerSelectionDialog dialog = new ArgumentsFromContainerSelectionDialog(getSection().getShell(), getTarget());
				if (dialog.open() == Window.OK) {
					String[] args = dialog.getSelectedArguments();
					if (args != null && args.length > 0) {
						StringBuffer resultBuffer = new StringBuffer();
						for (int index = 0; index < args.length; ++index) {
							resultBuffer.append(args[index] + " "); //$NON-NLS-1$
						}
						fVMArguments.getText().insert(resultBuffer.toString());
					}
				}
			}
		});

		variables = toolkit.createButton(buttons, PDEUIMessages.ArgumentsSection_variableButtonTitle, SWT.NONE);
		variables.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
		variables.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getSection().getShell());
				dialog.open();
				String variable = dialog.getVariableExpression();
				if (variable != null) {
					fVMArguments.getText().insert(variable);
				}
			}
		});
		CTabItem vmTab = new CTabItem(fTabFolder, SWT.NULL);
		vmTab.setText(PDEUIMessages.ArgumentsSection_vmTabLabel);
		vmTab.setImage(fImage);
		vmTab.setControl(vmComp);
		toolkit.paintBordersFor(vmComp);

		fTabFolder.setSelection(programTab);

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

	/* (non-Javadoc)
	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
	 */
	public void refresh() {
		fProgramArguments.setValue(getTarget().getProgramArguments(), true);
		fVMArguments.setValue(getTarget().getVMArguments(), true);
		super.refresh();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
	 */
	public void commit(boolean onSave) {
		fProgramArguments.commit();
		fVMArguments.commit();
		super.commit(onSave);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
	 */
	public void dispose() {
		if (fImage != null)
			fImage.dispose();
		super.dispose();
	}

}
>>>>>>> 1.7




<<<<<<< ImplicitDependenciesSection.java
/*******************************************************************************
 * 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 java.util.*;
import java.util.List;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.jface.viewers.*;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;
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.plugin.ManifestEditor;
import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
import org.eclipse.pde.internal.ui.shared.target.BundleInfoLabelProvider;
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.dialogs.ElementListSelectionDialog;
import org.eclipse.ui.forms.IFormColors;
import org.eclipse.ui.forms.SectionPart;
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.*;

/**
 * Section for editing implicit dependencies in the target definition editor
 * @see EnvironmentPage
 * @see TargetEditor
 */
public class ImplicitDependenciesSection extends SectionPart {

	private TableViewer fViewer;
	private TargetEditor fEditor;
	private Button fAdd;
	private Button fRemove;
	private Button fRemoveAll;
	private Label fCount;

	public ImplicitDependenciesSection(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.createClearGridLayout(false, 1));
		section.setText(PDEUIMessages.ImplicitDependenicesSection_Title);
		section.setDescription(PDEUIMessages.TargetImplicitPluginsTab_desc);
		Composite container = toolkit.createComposite(section);
		container.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 2));
		container.setLayoutData(new GridData(GridData.FILL_BOTH));

		createTableViewer(toolkit, container);

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

		createButtons(toolkit, buttonComp);

		toolkit.paintBordersFor(container);
		section.setClient(container);
		GridData gd = new GridData(GridData.FILL_BOTH);
		section.setLayoutData(gd);
		updateButtons();
	}

	/**
	 * Creates the table viewer in this section
	 * @param toolkit toolkit used to create the widgets
	 * @param parent parent composite
	 */
	private void createTableViewer(FormToolkit toolkit, Composite parent) {
		// TODO Support global delete action, maybe copy/paste as well
		Table table = toolkit.createTable(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
		table.setLayoutData(new GridData(GridData.FILL_BOTH));
		fViewer = new TableViewer(table);
		fViewer.setContentProvider(new DefaultTableProvider() {
			public Object[] getElements(Object inputElement) {
				BundleInfo[] bundles = getTarget().getImplicitDependencies();
				if (bundles == null) {
					return new BundleInfo[0];
				}
				return bundles;
			}
		});
		fViewer.setLabelProvider(new BundleInfoLabelProvider(true));
		fViewer.setComparator(new ViewerComparator() {
			public int compare(Viewer viewer, Object e1, Object e2) {
				BundleInfo bundle1 = (BundleInfo) e1;
				BundleInfo bundle2 = (BundleInfo) e2;
				return super.compare(viewer, bundle1.getSymbolicName(), bundle2.getSymbolicName());
			}
		});
		fViewer.setInput(getTarget());
		fViewer.addSelectionChangedListener(new ISelectionChangedListener() {
			public void selectionChanged(SelectionChangedEvent event) {
				updateButtons();
			}
		});
		fViewer.addDoubleClickListener(new IDoubleClickListener() {
			public void doubleClick(DoubleClickEvent event) {
				Object object = ((IStructuredSelection) event.getSelection()).getFirstElement();
				ManifestEditor.openPluginEditor(((BundleInfo) object).getSymbolicName());
			}
		});
	}

	/**
	 * Creates the buttons that sit beside the table
	 * @param toolkit toolkit used to create widgets
	 * @param parent parent composite
	 */
	private void createButtons(FormToolkit toolkit, Composite parent) {
		fAdd = toolkit.createButton(parent, PDEUIMessages.ImplicitDependenicesSection_Add, SWT.PUSH);
		fAdd.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING));
		fAdd.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleAdd();
			}
		});
		SWTFactory.setButtonDimensionHint(fAdd);
		fRemove = toolkit.createButton(parent, PDEUIMessages.ImplicitDependenicesSection_Remove, SWT.PUSH);
		fRemove.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING));
		fRemove.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleRemove();
			}
		});
		SWTFactory.setButtonDimensionHint(fRemove);
		fRemoveAll = toolkit.createButton(parent, PDEUIMessages.ImplicitDependenicesSection_RemoveAll, SWT.PUSH);
		fRemoveAll.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING));
		fRemoveAll.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				handleRemoveAll();
			}
		});
		SWTFactory.setButtonDimensionHint(fRemoveAll);
		Composite countComp = toolkit.createComposite(parent);
		GridLayout layout = new GridLayout();
		layout.marginWidth = layout.marginHeight = 0;
		countComp.setLayout(layout);
		countComp.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_END | GridData.FILL_BOTH));
		fCount = toolkit.createLabel(parent, ""); //$NON-NLS-1$
		fCount.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
		fCount.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
	}

	private void updateButtons() {
		fRemove.setEnabled(!fViewer.getSelection().isEmpty());
		fRemoveAll.setEnabled(fViewer.getTable().getItemCount() > 0);
	}

	/**
	 * Updates the label in the bottom right with the current count of implicit plug-ins
	 */
	private void updateCount() {
		if (fCount != null && !fCount.isDisposed())
			fCount.setText(NLS.bind(PDEUIMessages.TableSection_itemCount, Integer.toString(fViewer.getTable().getItemCount())));
	}

	protected void handleAdd() {
		ElementListSelectionDialog dialog = new ElementListSelectionDialog(PDEPlugin.getActiveWorkbenchShell(), new BundleInfoLabelProvider(false));
		dialog.setTitle(PDEUIMessages.PluginSelectionDialog_title);
		dialog.setMessage(PDEUIMessages.PluginSelectionDialog_message);
		dialog.setMultipleSelection(true);
		try {
			dialog.setElements(getValidBundles());
		} catch (CoreException e) {
			dialog.setMessage(e.getMessage());
		}

		if (dialog.open() == Window.OK) {
			Object[] models = dialog.getResult();
			ArrayList pluginsToAdd = new ArrayList();
			for (int i = 0; i < models.length; i++) {
				BundleInfo selected = ((BundleInfo) models[i]);
				pluginsToAdd.add(new BundleInfo(selected.getSymbolicName(), null, null, BundleInfo.NO_LEVEL, false));
			}
			Set allDependencies = new HashSet();
			allDependencies.addAll(pluginsToAdd);
			BundleInfo[] currentBundles = getTarget().getImplicitDependencies();
			if (currentBundles != null) {
				allDependencies.addAll(Arrays.asList(currentBundles));
			}
			getTarget().setImplicitDependencies((BundleInfo[]) allDependencies.toArray(new BundleInfo[allDependencies.size()]));
			markDirty();
			refresh();
		}
	}

	/**
	 * Gets a list of all the bundles that can be added as implicit dependencies
	 * @return list of possible dependencies
	 */
	protected BundleInfo[] getValidBundles() throws CoreException {
		BundleInfo[] current = getTarget().getImplicitDependencies();
		Set currentBundles = new HashSet();
		if (current != null) {
			for (int i = 0; i < current.length; i++) {
				currentBundles.add(current[i].getSymbolicName());
			}
		}

		List targetBundles = new ArrayList();
		IResolvedBundle[] allTargetBundles = getTarget().getBundles();
		if (allTargetBundles == null || allTargetBundles.length == 0) {
			throw new CoreException(new Status(IStatus.WARNING, PDEPlugin.getPluginId(), PDEUIMessages.ImplicitDependenciesSection_0));
		}
		for (int i = 0; i < allTargetBundles.length; i++) {
			if (!currentBundles.contains(allTargetBundles[i].getBundleInfo().getSymbolicName())) {
				targetBundles.add(allTargetBundles[i].getBundleInfo());
			}
		}

		return (BundleInfo[]) targetBundles.toArray(new BundleInfo[targetBundles.size()]);
	}

	private void handleRemove() {
		LinkedList bundles = new LinkedList();
		bundles.addAll(Arrays.asList(getTarget().getImplicitDependencies()));
		Object[] removeBundles = ((IStructuredSelection) fViewer.getSelection()).toArray();
		if (removeBundles.length > 0) {
			for (int i = 0; i < removeBundles.length; i++) {
				if (removeBundles[i] instanceof BundleInfo) {
					bundles.remove(removeBundles[i]);
				}
			}
			getTarget().setImplicitDependencies((BundleInfo[]) bundles.toArray((new BundleInfo[bundles.size()])));
			markDirty();
			refresh();
		}
	}

	private void handleRemoveAll() {
		getTarget().setImplicitDependencies(null);
		markDirty();
		refresh();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
	 */
	public void refresh() {
		// TODO Try to retain selection during refresh, add and remove operations
		fViewer.setInput(getTarget());
		fViewer.refresh();
		updateButtons();
		updateCount();
		super.refresh();
	}

}
=======
/*******************************************************************************
 * Copyright (c) 2005, 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials

	}

}
>>>>>>> 1.10




/*******************************************************************************
 * 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.jface.dialogs.IMessageProvider;
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.editor.validation.ControlValidationUtility;
import org.eclipse.pde.internal.ui.editor.validation.TextValidator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.SectionPart;
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.*;

/**
 * Section for editing target name and description in the target definition editor
 * @see DefinitionPage
 * @see TargetEditor
 */
public class InformationSection extends SectionPart {

	private Text fNameText;
	private TargetEditor fEditor;

	private TextValidator fNameTextValidator;
	private FormPage fPage;

	public InformationSection(FormPage page, Composite parent) {
		super(parent, page.getManagedForm().getToolkit(), Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
		fPage = page;
		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.createClearGridLayout(false, 1));
		GridData data = new GridData(GridData.FILL_HORIZONTAL);
		data.verticalAlignment = SWT.TOP;
		data.horizontalSpan = 2;
		section.setLayoutData(data);

		section.setText(PDEUIMessages.InformationSection_0);
		section.setDescription(PDEUIMessages.InformationSection_1);

		Composite client = toolkit.createComposite(section);
		client.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 2));
		client.setLayoutData(new GridData(GridData.FILL_BOTH));

		fNameText = toolkit.createText(client, getTarget().getName());
		fNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		fNameText.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				String value = fNameText.getText().trim();
				getTarget().setName(value.length() > 0 ? value : null);
				markDirty();
			}
		});

		fNameTextValidator = new TextValidator(fPage.getManagedForm(), fNameText, null, true) {

			protected boolean autoEnable() {
				if (getText().getEditable() == false) {
					return false;
				}
				return true;
			}

			protected boolean validateControl() {
				return ControlValidationUtility.validateRequiredField(fNameText.getText(), fNameTextValidator, IMessageProvider.ERROR);
			}
		};
		toolkit.paintBordersFor(client);
		section.setClient(client);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
	 */
	public void refresh() {
		fNameText.setText(getTarget().getName() != null ? getTarget().getName() : ""); //$NON-NLS-1$
		super.refresh();
	}

}




/*******************************************************************************
 * 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.wizards;

import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.swt.widgets.Combo;

/**
 * Provides helper methods to load and save provider names from and to combo boxes.
 * 
 * @author <a href="mailto:phil.kursawe@gmail.com">Philipp Kursawe</a>
 *
 */
public class BundleProviderUtil {
	/**
	 * Dialog settings constants
	 */
	private final static String S_PROVIDERS = "providers"; //$NON-NLS-1$

	/**
	 * Loads the history of providers from the given settings.
	 * <h2>Note</h2>
	 * <p>
	 * This method also selects the first entry of the history into
	 * the given combo. This might trigger a <code>SWT.Modify</code> event.
	 * </p> 
	 */
	public static void loadHistory(Combo combo, IDialogSettings settings) {
		if (null == combo || null == settings) {
			return;
		}
		String providers[] = settings.getArray(S_PROVIDERS);
		if (null != providers) {
			for (int i = 0; i < providers.length; ++i) {
				combo.add(providers[i]);
			}
		}
	}

	/**
	 * Saves the items of the given combo to the given settings.
	 * 
	 * <p>
	 * If the combo text is not in the list of history items yet, it will be
	 * added. The combo text will be the most recent history value (saved first).
	 * </p>
	 * @param combo
	 * @param settings
	 */
	public static void saveHistory(Combo combo, IDialogSettings settings) {
		if (null == combo) {
			return;
		}
		// Save all providers from the combo list + the newly entered
		String text = combo.getText();
		if (0 == text.length()) {
			return;
		}
		int indexOfText = combo.indexOf(text);
		// If the item was already in the list, remove it now 
		if (indexOfText != -1) {
			combo.remove(indexOfText);
		}
		// And always add the entered text as the most recent one to the top of 
		// the list
		combo.add(text, 0);
		String[] items = combo.getItems();
		if (items != null && items.length > 0) {
			settings.put(S_PROVIDERS, items);
		}
	}
}

Lines 13-18 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/feature/AbstractFeatureSpecPage.java (+3 lines)
13		13
14	import org.eclipse.core.runtime.IStatus;	14	import org.eclipse.core.runtime.IStatus;
15	import org.eclipse.jface.dialogs.Dialog;	15	import org.eclipse.jface.dialogs.Dialog;
		16	import org.eclipse.jface.dialogs.IDialogSettings;
16	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;	17	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
17	import org.eclipse.pde.internal.core.util.IdUtil;	18	import org.eclipse.pde.internal.core.util.IdUtil;
18	import org.eclipse.pde.internal.core.util.VersionUtil;	19	import org.eclipse.pde.internal.core.util.VersionUtil;
Lines 61-66 Link Here
61		62
62	protected abstract String getHelpId();	63	protected abstract String getHelpId();
63		64
		65	protected abstract void saveSettings(IDialogSettings settings);
		66
64	protected void createCommonInput(Composite common) {	67	protected void createCommonInput(Composite common) {
65	Label label = new Label(common, SWT.NULL);	68	Label label = new Label(common, SWT.NULL);
66	label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_name);	69	label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_name);

Lines 105-110 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/feature/AbstractNewFeatureWizard.java (+1 lines)
105	public boolean performFinish() {	105	public boolean performFinish() {
106	try {	106	try {
107	IDialogSettings settings = getDialogSettings();	107	IDialogSettings settings = getDialogSettings();
		108	fSpecPage.saveSettings(settings);
108	if (settings != null && fSecondPage != null)	109	if (settings != null && fSecondPage != null)
109	fSecondPage.saveSettings(settings);	110	fSecondPage.saveSettings(settings);
110		111





package org.eclipse.pde.internal.ui.wizards.feature;

import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.pde.internal.core.util.IdUtil;
import org.eclipse.pde.internal.ui.IHelpContextIds;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.wizards.BundleProviderUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;


public class FeatureSpecPage extends AbstractFeatureSpecPage {

	private Combo fFeatureProviderCombo;
	private Text fFeatureIdText;

	public FeatureSpecPage() {

		FeatureData data = new FeatureData();
		data.id = fFeatureIdText.getText();
		data.version = fFeatureVersionText.getText();
		data.provider = fFeatureProviderCombo.getText();
		data.name = fFeatureNameText.getText();
		data.library = getInstallHandlerLibrary();
		return data;


		label = new Label(group, SWT.NULL);
		label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_provider);
		fFeatureProviderCombo = new Combo(group, SWT.BORDER | SWT.DROP_DOWN);
		fFeatureProviderCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		BundleProviderUtil.loadHistory(fFeatureProviderCombo, getDialogSettings());

		createInstallHandlerText(group);
	}

	protected void attachListeners(ModifyListener listener) {
		fFeatureProviderCombo.addModifyListener(listener);
		fFeatureIdText.addModifyListener(listener);
	}


		String id = IdUtil.getValidId(getProjectName());
		fFeatureIdText.setText(id);
		fFeatureNameText.setText(IdUtil.getValidName(id));
		if (0 == fFeatureProviderCombo.getText().length()) {
			fFeatureProviderCombo.setText(IdUtil.getValidProvider(id));
		}
		fSelfModification = false;
	}

	protected void saveSettings(IDialogSettings settings) {
		BundleProviderUtil.saveHistory(fFeatureProviderCombo, settings);
	}
}





package org.eclipse.pde.internal.ui.wizards.feature;

import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.IWizardPage;

import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.dialogs.FeatureSelectionDialog;
import org.eclipse.pde.internal.ui.util.SWTUtil;
import org.eclipse.pde.internal.ui.wizards.BundleProviderUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.GridData;


public class PatchSpecPage extends AbstractFeatureSpecPage {

	private Combo fPatchProviderCombo;
	private Button fBrowseButton;
	private Text fPatchIdText;
	private Text fPatchNameText;

	}

	private String getPatchProvider() {
		if (fPatchProviderCombo == null)
			return ""; //$NON-NLS-1$
		return fPatchProviderCombo.getText();
	}

	public FeatureData getFeatureData() {


		label = new Label(patchGroup, SWT.NULL);
		label.setText(PDEUIMessages.NewFeaturePatch_SpecPage_provider);
		fPatchProviderCombo = new Combo(patchGroup, SWT.BORDER | SWT.DROP_DOWN);
		fPatchProviderCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		BundleProviderUtil.loadHistory(fPatchProviderCombo, getDialogSettings());

		createInstallHandlerText(patchGroup);
	}

	protected void attachListeners(ModifyListener listener) {
		fPatchIdText.addModifyListener(listener);
		fPatchNameText.addModifyListener(listener);
		fPatchProviderCombo.addModifyListener(listener);
		fFeatureIdText.addModifyListener(listener);
	}


		String id = IdUtil.getValidId(getProjectName());
		fPatchIdText.setText(id);
		fPatchNameText.setText(IdUtil.getValidName(id));
		if (0 == fPatchProviderCombo.getText().length()) {
			fPatchProviderCombo.setText(IdUtil.getValidProvider(id));
		}
		fSelfModification = false;
	}

	protected void saveSettings(IDialogSettings settings) {
		BundleProviderUtil.saveHistory(fPatchProviderCombo, settings);
	}
}




package org.eclipse.pde.internal.ui.wizards.plugin;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.pde.internal.core.PDECoreMessages;

import org.eclipse.pde.internal.core.util.VersionUtil;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.util.PDELabelUtility;
import org.eclipse.pde.internal.ui.wizards.BundleProviderUtil;
import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
import org.eclipse.pde.ui.IFieldData;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*;
import org.eclipse.swt.widgets.Text;

public abstract class ContentPage extends WizardPage {


	protected Text fIdText;
	protected Text fVersionText;
	protected Text fNameText;
	protected Combo fProviderCombo;

	protected NewProjectCreationPage fMainPage;
	protected AbstractFieldData fData;

		return text;
	}

	protected Combo createProviderCombo(Composite parent, ModifyListener listener, int horizSpan) {
		Combo combo = new Combo(parent, SWT.BORDER | SWT.DROP_DOWN);
		GridData data = new GridData(GridData.FILL_HORIZONTAL);
		data.horizontalSpan = horizSpan;
		combo.setLayoutData(data);
		BundleProviderUtil.loadHistory(combo, getDialogSettings());
		// Add listener only now, otherwise combo.select(0) would trigger it
		// and cause a NPE during validation.
		combo.addModifyListener(listener);
		return combo;
	}

	protected abstract void validatePage();

	protected String validateProperties() {

				fIdText.setText(id);
				fVersionText.setText("1.0.0.qualifier"); //$NON-NLS-1$
				fNameText.setText(IdUtil.getValidName(id));
				if (0 == fProviderCombo.getText().length()) {
					fProviderCombo.setText(IdUtil.getValidProvider(id));
				}
				fChangedGroups = oldfChanged;
			}
			if (fInitialized)

		return IdUtil.getValidId(fProjectProvider.getProjectName());
	}

	public void saveSettings(IDialogSettings settings) {
		BundleProviderUtil.saveHistory(fProviderCombo, settings);
	}

	public void updateData() {
		fData.setId(fIdText.getText().trim());
		fData.setVersion(fVersionText.getText().trim());
		fData.setName(fNameText.getText().trim());
		fData.setProvider(fProviderCombo.getText().trim());
	}

	public IFieldData getData() {

Lines 107-113 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java (-1 / +1 lines)
107		107
108	label = new Label(propertiesGroup, SWT.NONE);	108	label = new Label(propertiesGroup, SWT.NONE);
109	label.setText(PDEUIMessages.ContentPage_fprovider);	109	label.setText(PDEUIMessages.ContentPage_fprovider);
110	fProviderText = createText(propertiesGroup, propertiesListener, 2);	110	fProviderCombo = createProviderCombo(propertiesGroup, propertiesListener, 2);
111		111
112	createExecutionEnvironmentControls(propertiesGroup);	112	createExecutionEnvironmentControls(propertiesGroup);
113	}	113	}

Lines 13-18 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java (+8 lines)
13	import java.lang.reflect.InvocationTargetException;	13	import java.lang.reflect.InvocationTargetException;
14	import org.eclipse.core.resources.IProject;	14	import org.eclipse.core.resources.IProject;
15	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
		16	import org.eclipse.jface.dialogs.IDialogSettings;
16	import org.eclipse.jface.wizard.IWizardPage;	17	import org.eclipse.jface.wizard.IWizardPage;
17	import org.eclipse.pde.internal.ui.*;	18	import org.eclipse.pde.internal.ui.*;
18	import org.eclipse.pde.internal.ui.wizards.IProjectProvider;	19	import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
Lines 30-35 Link Here
30		31
31	public NewFragmentProjectWizard() {	32	public NewFragmentProjectWizard() {
32	setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWFRAGPRJ_WIZ);	33	setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWFRAGPRJ_WIZ);
		34	setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
33	setWindowTitle(PDEUIMessages.NewFragmentProjectWizard_title);	35	setWindowTitle(PDEUIMessages.NewFragmentProjectWizard_title);
34	setNeedsProgressMonitor(true);	36	setNeedsProgressMonitor(true);
35	PDEPlugin.getDefault().getLabelProvider().connect(this);	37	PDEPlugin.getDefault().getLabelProvider().connect(this);
Lines 79-84 Link Here
79	try {	81	try {
80	fMainPage.updateData();	82	fMainPage.updateData();
81	fContentPage.updateData();	83	fContentPage.updateData();
		84	IDialogSettings settings = getDialogSettings();
		85	if (settings != null) {
		86	fMainPage.saveSettings(settings);
		87	fContentPage.saveSettings(settings);
		88	}
		89
82	BasicNewProjectResourceWizard.updatePerspective(fConfig);	90	BasicNewProjectResourceWizard.updatePerspective(fConfig);
83	getContainer().run(false, true, new NewProjectCreationOperation(fFragmentData, fProjectProvider, null));	91	getContainer().run(false, true, new NewProjectCreationOperation(fFragmentData, fProjectProvider, null));
84		92

Lines 125-131 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java (-1 / +2 lines)
125		125
126	label = new Label(propertiesGroup, SWT.NONE);	126	label = new Label(propertiesGroup, SWT.NONE);
127	label.setText(PDEUIMessages.ContentPage_pprovider);	127	label.setText(PDEUIMessages.ContentPage_pprovider);
128	fProviderText = createText(propertiesGroup, propertiesListener, 2);	128	fProviderCombo = createProviderCombo(propertiesGroup, propertiesListener, 2);
129		129
130	createExecutionEnvironmentControls(propertiesGroup);	130	createExecutionEnvironmentControls(propertiesGroup);
131	}	131	}
Lines 367-372 Link Here
367	* @param settings	367	* @param settings
368	*/	368	*/
369	public void saveSettings(IDialogSettings settings) {	369	public void saveSettings(IDialogSettings settings) {
		370	super.saveSettings(settings);
370	settings.put(S_GENERATE_ACTIVATOR, !fGenerateActivator.getSelection());	371	settings.put(S_GENERATE_ACTIVATOR, !fGenerateActivator.getSelection());
371	if (fUIPlugin.isEnabled()) {	372	if (fUIPlugin.isEnabled()) {
372	settings.put(S_UI_PLUGIN, !fUIPlugin.getSelection());	373	settings.put(S_UI_PLUGIN, !fUIPlugin.getSelection());




/*******************************************************************************
 * Copyright (c) 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.internal.ui.wizards.provisioner.p2;

import org.eclipse.osgi.util.NLS;

public class ProvisionerMessages extends NLS {
	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ui.wizards.provisioner.p2.ProvisionerMessages"; //$NON-NLS-1$
	public static String P2TargetProvisionerWizard_1;
	public static String P2TargetProvisionerWizard_10;
	public static String P2TargetProvisionerWizard_2;
	public static String P2TargetProvisionerWizard_3;
	public static String P2TargetProvisionerWizard_7;
	public static String P2TargetProvisionerWizard_9;
	public static String P2TargetProvisionerWizardPage_0;
	public static String P2TargetProvisionerWizardPage_11;
	public static String P2TargetProvisionerWizardPage_14;
	public static String P2TargetProvisionerWizardPage_16;
	public static String P2TargetProvisionerWizardPage_17;
	public static String P2TargetProvisionerWizardPage_1;
	public static String P2TargetProvisionerWizardPage_2;
	public static String P2TargetProvisionerWizardPage_3;
	public static String P2TargetProvisionerWizardPage_4;
	public static String P2TargetProvisionerWizardPage_5;
	public static String P2TargetProvisionerWizardPage_6;
	public static String P2TargetProvisionerWizardPage_7;
	public static String P2TargetProvisionerWizardPage_8;
	public static String P2TargetProvisionerWizardPage_9;
	public static String P2TargetProvisionerWizardPage_10;
	static {
		// initialize resource bundle
		NLS.initializeMessages(BUNDLE_NAME, ProvisionerMessages.class);
	}

	private ProvisionerMessages() {
	}
}




/*******************************************************************************
 * 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.wizards.target;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
import org.eclipse.pde.internal.ui.PDEPlugin;

/**
 * Wizard to edit a target definition, creates a working copy to edit.  Any changes are
 * not saved by this wizard and must be done by the client.  The edited target 
 * can be accessed using {@link #getTargetDefinition()}
 */
public class EditTargetDefinitionWizard extends Wizard {

	/**
	 * The target definition being edited - a copy of the original
	 */
	private ITargetDefinition fDefinition;

	/**
	 * Constructs a wizard to edit the given definition.
	 * 
	 * @param definition target definition being edited
	 * @param createWorkingCopy if true, a copy of the definition will be created to edit, if false the definition will be edited directly 
	 */
	public EditTargetDefinitionWizard(ITargetDefinition definition, boolean createWorkingCopy) {
		setTargetDefinition(definition, createWorkingCopy);
		setNeedsProgressMonitor(true);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
	 */
	public boolean performFinish() {
		// Do nothing, edited target is available 
		return true;

	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.wizard.Wizard#addPages()
	 */
	public void addPages() {
		addPage(new TargetDefinitionContentPage(fDefinition));
	}

	/**
	 * Sets the target definition to be edited. Will delegate to pages to
	 * refresh controls if already created.
	 * 
	 * @param definition target definition
	 * @param createWorkingCopy if true, a copy of the definition will be created to edit, if false the definition will be edited directly
	 */
	public void setTargetDefinition(ITargetDefinition definition, boolean createWorkingCopy) {
		ITargetDefinition workingCopy = null;
		if (createWorkingCopy) {
			try {
				ITargetPlatformService service = TargetDefinitionPage.getTargetService();
				if (service != null) {
					if (definition.getHandle().exists()) {
						// Make a copy from the handle
						workingCopy = definition.getHandle().getTargetDefinition();
					} else {
						// If no handle use the service to create a new one
						workingCopy = service.newTarget();
					}
					service.copyTargetDefinition(definition, workingCopy);
				}
			} catch (CoreException e) {
				PDEPlugin.log(e);
			}
		} else {
			workingCopy = definition;
		}
		fDefinition = workingCopy;
		IWizardPage[] pages = getPages();
		for (int i = 0; i < pages.length; i++) {
			((TargetDefinitionPage) pages[i]).targetChanged(workingCopy);
		}
	}

	/**
	 * Returns the target definition being edited
	 * 
	 * @return target definition
	 */
	public ITargetDefinition getTargetDefinition() {
		return fDefinition;
	}
}




/*******************************************************************************
 * 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.wizards.target;

import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardNode;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.swt.graphics.Point;

/**
 * Embedded wizard to edit a target
 */
public class EditTargetNode implements IWizardNode {

	private EditTargetDefinitionWizard fWizard;
	private ITargetDefinition fDefinition;

	/* (non-Javadoc)
	 * @see org.eclipse.jface.wizard.IWizardNode#dispose()
	 */
	public void dispose() {
		if (fWizard != null) {
			fWizard.dispose();
			fWizard = null;
			fDefinition = null;
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.wizard.IWizardNode#getExtent()
	 */
	public Point getExtent() {
		return new Point(-1, -1);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.wizard.IWizardNode#getWizard()
	 */
	public IWizard getWizard() {
		if (fWizard == null) {
			fWizard = new EditTargetDefinitionWizard(fDefinition, false);
			fWizard.setWindowTitle(PDEUIMessages.EditTargetNode_0);
		}
		return fWizard;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.wizard.IWizardNode#isContentCreated()
	 */
	public boolean isContentCreated() {
		return fWizard != null;
	}

	/**
	 * Sets the target being edited.
	 * 
	 * @param definition
	 */
	public void setTargetDefinition(ITargetDefinition definition) {
		fDefinition = definition;
		if (fWizard != null) {
			fWizard.setTargetDefinition(definition, false);
		}
	}

}

Return to bug 269417

Lines 1-3 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java (+285 lines)
		1	<<<<<<< ImplicitDependenciesSection.java
		2	/*******************************************************************************
		3	* Copyright (c) 2005, 2009 IBM Corporation and others.
		4	* All rights reserved. This program and the accompanying materials
		5	* are made available under the terms of the Eclipse Public License v1.0
		6	* which accompanies this distribution, and is available at
		7	* http://www.eclipse.org/legal/epl-v10.html
		8	*
		9	* Contributors:
		10	* IBM Corporation - initial API and implementation
		11	*******************************************************************************/
		12	package org.eclipse.pde.internal.ui.editor.targetdefinition;
		13
		14	import java.util.*;
		15	import java.util.List;
		16	import org.eclipse.core.runtime.*;
		17	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
		18	import org.eclipse.jface.viewers.*;
		19	import org.eclipse.jface.window.Window;
		20	import org.eclipse.osgi.util.NLS;
		21	import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;
		22	import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
		23	import org.eclipse.pde.internal.ui.*;
		24	import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
		25	import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
		26	import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
		27	import org.eclipse.pde.internal.ui.shared.target.BundleInfoLabelProvider;
		28	import org.eclipse.swt.SWT;
		29	import org.eclipse.swt.events.SelectionAdapter;
		30	import org.eclipse.swt.events.SelectionEvent;
		31	import org.eclipse.swt.layout.GridData;
		32	import org.eclipse.swt.layout.GridLayout;
		33	import org.eclipse.swt.widgets.*;
		34	import org.eclipse.ui.dialogs.ElementListSelectionDialog;
		35	import org.eclipse.ui.forms.IFormColors;
		36	import org.eclipse.ui.forms.SectionPart;
		37	import org.eclipse.ui.forms.editor.FormPage;
		38	import org.eclipse.ui.forms.widgets.*;
		39
		40	/**
		41	* Section for editing implicit dependencies in the target definition editor
		42	* @see EnvironmentPage
		43	* @see TargetEditor
		44	*/
		45	public class ImplicitDependenciesSection extends SectionPart {
		46
		47	private TableViewer fViewer;
		48	private TargetEditor fEditor;
		49	private Button fAdd;
		50	private Button fRemove;
		51	private Button fRemoveAll;
		52	private Label fCount;
		53
		54	public ImplicitDependenciesSection(FormPage page, Composite parent) {
		55	super(parent, page.getManagedForm().getToolkit(), Section.DESCRIPTION \| ExpandableComposite.TITLE_BAR);
		56	fEditor = (TargetEditor) page.getEditor();
		57	createClient(getSection(), page.getEditor().getToolkit());
		58	}
		59
		60	/**
		61	* @return The target model backing this editor
		62	*/
		63	private ITargetDefinition getTarget() {
		64	return fEditor.getTarget();
65	}
66
67	/**
68	* Creates the UI for this section.
69	*
70	* @param section section the UI is being added to
71	* @param toolkit form toolkit used to create the widgets
72	*/
73	protected void createClient(Section section, FormToolkit toolkit) {
74	section.setLayout(FormLayoutFactory.createClearGridLayout(false, 1));
75	section.setText(PDEUIMessages.ImplicitDependenicesSection_Title);
76	section.setDescription(PDEUIMessages.TargetImplicitPluginsTab_desc);
77	Composite container = toolkit.createComposite(section);
78	container.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, 2));
79	container.setLayoutData(new GridData(GridData.FILL_BOTH));
80
81	createTableViewer(toolkit, container);
82
83	Composite buttonComp = toolkit.createComposite(container);
84	GridLayout layout = new GridLayout();
85	layout.marginWidth = layout.marginHeight = 0;
86	buttonComp.setLayout(layout);
87	buttonComp.setLayoutData(new GridData(GridData.FILL_VERTICAL));
88
89	createButtons(toolkit, buttonComp);
90
91	toolkit.paintBordersFor(container);
92	section.setClient(container);
93	GridData gd = new GridData(GridData.FILL_BOTH);
94	section.setLayoutData(gd);
95	updateButtons();
96	}
97
98	/**
99	* Creates the table viewer in this section
100	* @param toolkit toolkit used to create the widgets
101	* @param parent parent composite
102	*/
103	private void createTableViewer(FormToolkit toolkit, Composite parent) {
104	// TODO Support global delete action, maybe copy/paste as well
105	Table table = toolkit.createTable(parent, SWT.H_SCROLL \| SWT.V_SCROLL \| SWT.MULTI);
106	table.setLayoutData(new GridData(GridData.FILL_BOTH));
107	fViewer = new TableViewer(table);
108	fViewer.setContentProvider(new DefaultTableProvider() {
109	public Object[] getElements(Object inputElement) {
110	BundleInfo[] bundles = getTarget().getImplicitDependencies();
111	if (bundles == null) {
112	return new BundleInfo[0];
113	}
114	return bundles;
115	}
116	});
117	fViewer.setLabelProvider(new BundleInfoLabelProvider(true));
118	fViewer.setComparator(new ViewerComparator() {
119	public int compare(Viewer viewer, Object e1, Object e2) {
120	BundleInfo bundle1 = (BundleInfo) e1;
121	BundleInfo bundle2 = (BundleInfo) e2;
122	return super.compare(viewer, bundle1.getSymbolicName(), bundle2.getSymbolicName());
123	}
124	});
125	fViewer.setInput(getTarget());
126	fViewer.addSelectionChangedListener(new ISelectionChangedListener() {
127	public void selectionChanged(SelectionChangedEvent event) {
128	updateButtons();
129	}
130	});
131	fViewer.addDoubleClickListener(new IDoubleClickListener() {
132	public void doubleClick(DoubleClickEvent event) {
133	Object object = ((IStructuredSelection) event.getSelection()).getFirstElement();
134	ManifestEditor.openPluginEditor(((BundleInfo) object).getSymbolicName());
135	}
136	});
137	}
138
139	/**
140	* Creates the buttons that sit beside the table
141	* @param toolkit toolkit used to create widgets
142	* @param parent parent composite
143	*/
144	private void createButtons(FormToolkit toolkit, Composite parent) {
145	fAdd = toolkit.createButton(parent, PDEUIMessages.ImplicitDependenicesSection_Add, SWT.PUSH);
146	fAdd.setLayoutData(new GridData(GridData.FILL_HORIZONTAL \| GridData.VERTICAL_ALIGN_BEGINNING));
147	fAdd.addSelectionListener(new SelectionAdapter() {
148	public void widgetSelected(SelectionEvent e) {
149	handleAdd();
150	}
151	});
152	SWTFactory.setButtonDimensionHint(fAdd);
153	fRemove = toolkit.createButton(parent, PDEUIMessages.ImplicitDependenicesSection_Remove, SWT.PUSH);
154	fRemove.setLayoutData(new GridData(GridData.FILL_HORIZONTAL \| GridData.VERTICAL_ALIGN_BEGINNING));
155	fRemove.addSelectionListener(new SelectionAdapter() {
156	public void widgetSelected(SelectionEvent e) {
157	handleRemove();
158	}
159	});
160	SWTFactory.setButtonDimensionHint(fRemove);
161	fRemoveAll = toolkit.createButton(parent, PDEUIMessages.ImplicitDependenicesSection_RemoveAll, SWT.PUSH);
162	fRemoveAll.setLayoutData(new GridData(GridData.FILL_HORIZONTAL \| GridData.VERTICAL_ALIGN_BEGINNING));
163	fRemoveAll.addSelectionListener(new SelectionAdapter() {
164	public void widgetSelected(SelectionEvent e) {
165	handleRemoveAll();
166	}
167	});
168	SWTFactory.setButtonDimensionHint(fRemoveAll);
169	Composite countComp = toolkit.createComposite(parent);
170	GridLayout layout = new GridLayout();
171	layout.marginWidth = layout.marginHeight = 0;
172	countComp.setLayout(layout);
173	countComp.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_END \| GridData.FILL_BOTH));
174	fCount = toolkit.createLabel(parent, ""); //$NON-NLS-1$
175	fCount.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
176	fCount.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
177	}
178
179	private void updateButtons() {
180	fRemove.setEnabled(!fViewer.getSelection().isEmpty());
181	fRemoveAll.setEnabled(fViewer.getTable().getItemCount() > 0);
182	}
183
184	/**
185	* Updates the label in the bottom right with the current count of implicit plug-ins
186	*/
187	private void updateCount() {
188	if (fCount != null && !fCount.isDisposed())
189	fCount.setText(NLS.bind(PDEUIMessages.TableSection_itemCount, Integer.toString(fViewer.getTable().getItemCount())));
190	}
191
192	protected void handleAdd() {
193	ElementListSelectionDialog dialog = new ElementListSelectionDialog(PDEPlugin.getActiveWorkbenchShell(), new BundleInfoLabelProvider(false));
194	dialog.setTitle(PDEUIMessages.PluginSelectionDialog_title);
195	dialog.setMessage(PDEUIMessages.PluginSelectionDialog_message);
196	dialog.setMultipleSelection(true);
197	try {
198	dialog.setElements(getValidBundles());
199	} catch (CoreException e) {
200	dialog.setMessage(e.getMessage());
201	}
202
203	if (dialog.open() == Window.OK) {
204	Object[] models = dialog.getResult();
205	ArrayList pluginsToAdd = new ArrayList();
206	for (int i = 0; i < models.length; i++) {
207	BundleInfo selected = ((BundleInfo) models[i]);
208	pluginsToAdd.add(new BundleInfo(selected.getSymbolicName(), null, null, BundleInfo.NO_LEVEL, false));
209	}
210	Set allDependencies = new HashSet();
211	allDependencies.addAll(pluginsToAdd);
212	BundleInfo[] currentBundles = getTarget().getImplicitDependencies();
213	if (currentBundles != null) {
214	allDependencies.addAll(Arrays.asList(currentBundles));
215	}
216	getTarget().setImplicitDependencies((BundleInfo[]) allDependencies.toArray(new BundleInfo[allDependencies.size()]));
217	markDirty();
218	refresh();
219	}
220	}
221
222	/**
223	* Gets a list of all the bundles that can be added as implicit dependencies
224	* @return list of possible dependencies
225	*/
226	protected BundleInfo[] getValidBundles() throws CoreException {
227	BundleInfo[] current = getTarget().getImplicitDependencies();
228	Set currentBundles = new HashSet();
229	if (current != null) {
230	for (int i = 0; i < current.length; i++) {
231	currentBundles.add(current[i].getSymbolicName());
232	}
233	}
234
235	List targetBundles = new ArrayList();
236	IResolvedBundle[] allTargetBundles = getTarget().getBundles();
237	if (allTargetBundles == null \|\| allTargetBundles.length == 0) {
238	throw new CoreException(new Status(IStatus.WARNING, PDEPlugin.getPluginId(), PDEUIMessages.ImplicitDependenciesSection_0));
239	}
240	for (int i = 0; i < allTargetBundles.length; i++) {
241	if (!currentBundles.contains(allTargetBundles[i].getBundleInfo().getSymbolicName())) {
242	targetBundles.add(allTargetBundles[i].getBundleInfo());
243	}
244	}
245
246	return (BundleInfo[]) targetBundles.toArray(new BundleInfo[targetBundles.size()]);
247	}
248
249	private void handleRemove() {
250	LinkedList bundles = new LinkedList();
251	bundles.addAll(Arrays.asList(getTarget().getImplicitDependencies()));
252	Object[] removeBundles = ((IStructuredSelection) fViewer.getSelection()).toArray();
253	if (removeBundles.length > 0) {
254	for (int i = 0; i < removeBundles.length; i++) {
255	if (removeBundles[i] instanceof BundleInfo) {
256	bundles.remove(removeBundles[i]);
257	}
258	}
259	getTarget().setImplicitDependencies((BundleInfo[]) bundles.toArray((new BundleInfo[bundles.size()])));
260	markDirty();
261	refresh();
262	}
263	}
264
265	private void handleRemoveAll() {
266	getTarget().setImplicitDependencies(null);
267	markDirty();
268	refresh();
269	}
270
271	/* (non-Javadoc)
272	* @see org.eclipse.ui.forms.AbstractFormPart#refresh()
273	*/
274	public void refresh() {
275	// TODO Try to retain selection during refresh, add and remove operations
276	fViewer.setInput(getTarget());
277	fViewer.refresh();
278	updateButtons();
279	updateCount();
280	super.refresh();
281	}
282
283	}
284	=======
1	/*******************************************************************************	285	/*******************************************************************************
2	* Copyright (c) 2005, 2010 IBM Corporation and others.	286	* Copyright (c) 2005, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	287	* All rights reserved. This program and the accompanying materials
Lines 281-283 Link Here
281	}	565	}
282		566
283	}	567	}
		568	>>>>>>> 1.10

Lines 11-19 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/feature/FeatureSpecPage.java (-6 / +15 lines)
11		11
12	package org.eclipse.pde.internal.ui.wizards.feature;	12	package org.eclipse.pde.internal.ui.wizards.feature;
13		13
		14	import org.eclipse.jface.dialogs.IDialogSettings;
14	import org.eclipse.pde.internal.core.util.IdUtil;	15	import org.eclipse.pde.internal.core.util.IdUtil;
15	import org.eclipse.pde.internal.ui.IHelpContextIds;	16	import org.eclipse.pde.internal.ui.IHelpContextIds;
16	import org.eclipse.pde.internal.ui.PDEUIMessages;	17	import org.eclipse.pde.internal.ui.PDEUIMessages;
		18	import org.eclipse.pde.internal.ui.wizards.BundleProviderUtil;
17	import org.eclipse.swt.SWT;	19	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.events.ModifyListener;	20	import org.eclipse.swt.events.ModifyListener;
19	import org.eclipse.swt.layout.GridData;	21	import org.eclipse.swt.layout.GridData;
Lines 22-28 Link Here
22		24
23	public class FeatureSpecPage extends AbstractFeatureSpecPage {	25	public class FeatureSpecPage extends AbstractFeatureSpecPage {
24		26
25	private Text fFeatureProviderText;	27	private Combo fFeatureProviderCombo;
26	private Text fFeatureIdText;	28	private Text fFeatureIdText;
27		29
28	public FeatureSpecPage() {	30	public FeatureSpecPage() {
Lines 45-51 Link Here
45	FeatureData data = new FeatureData();	47	FeatureData data = new FeatureData();
46	data.id = fFeatureIdText.getText();	48	data.id = fFeatureIdText.getText();
47	data.version = fFeatureVersionText.getText();	49	data.version = fFeatureVersionText.getText();
48	data.provider = fFeatureProviderText.getText();	50	data.provider = fFeatureProviderCombo.getText();
49	data.name = fFeatureNameText.getText();	51	data.name = fFeatureNameText.getText();
50	data.library = getInstallHandlerLibrary();	52	data.library = getInstallHandlerLibrary();
51	return data;	53	return data;
Lines 77-90 Link Here
77		79
78	label = new Label(group, SWT.NULL);	80	label = new Label(group, SWT.NULL);
79	label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_provider);	81	label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_provider);
80	fFeatureProviderText = new Text(group, SWT.BORDER);	82	fFeatureProviderCombo = new Combo(group, SWT.BORDER \| SWT.DROP_DOWN);
81	fFeatureProviderText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	83	fFeatureProviderCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		84	BundleProviderUtil.loadHistory(fFeatureProviderCombo, getDialogSettings());
82		85
83	createInstallHandlerText(group);	86	createInstallHandlerText(group);
84	}	87	}
85		88
86	protected void attachListeners(ModifyListener listener) {	89	protected void attachListeners(ModifyListener listener) {
87	fFeatureProviderText.addModifyListener(listener);	90	fFeatureProviderCombo.addModifyListener(listener);
88	fFeatureIdText.addModifyListener(listener);	91	fFeatureIdText.addModifyListener(listener);
89	}	92	}
90		93
Lines 99-105 Link Here
99	String id = IdUtil.getValidId(getProjectName());	102	String id = IdUtil.getValidId(getProjectName());
100	fFeatureIdText.setText(id);	103	fFeatureIdText.setText(id);
101	fFeatureNameText.setText(IdUtil.getValidName(id));	104	fFeatureNameText.setText(IdUtil.getValidName(id));
102	fFeatureProviderText.setText(IdUtil.getValidProvider(id));	105	if (0 == fFeatureProviderCombo.getText().length()) {
		106	fFeatureProviderCombo.setText(IdUtil.getValidProvider(id));
		107	}
103	fSelfModification = false;	108	fSelfModification = false;
104	}	109	}
		110
		111	protected void saveSettings(IDialogSettings settings) {
		112	BundleProviderUtil.saveHistory(fFeatureProviderCombo, settings);
		113	}
105	}	114	}