Attachment #122234 for bug #194734

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

View | Details | Raw Unified | Return to bug 194734 | Differences between

and this patch

Collapse All | Expand All




import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.Properties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
import org.eclipse.jface.databinding.viewers.ViewerProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.viewers.ComboViewer;

							"mother.mother.name", "mother.father.name",
							"father.mother.name", "father.father.name" });

			IObservableValue masterSelection = ViewerProperties
					.singleSelection().observe(peopleViewer);

			dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(nameText),
					BeanProperties.value(Person.class, "name").observeDetail(
							masterSelection), null, null);


			bindViewer(mothercomboViewer, viewModel.getPeople(), Person.class,
					"name");

			dbc.bindValue(ViewerProperties.singleSelection()
					.observe(mothercomboViewer), BeanProperties.value(
					Person.class, "mother").observeDetail(masterSelection),
					null, null);

			bindViewer(fatherComboViewer, viewModel.getPeople(), Person.class,
					"name");

			dbc.bindValue(ViewerProperties.singleSelection()
					.observe(fatherComboViewer), BeanProperties.value(
					Person.class, "father").observeDetail(masterSelection),
					null, null);




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ToolItemTooltipTextProperty;

/**
 * A factory for creating properties of SWT ToolItems
 * 
 * @since 1.3
 */
public class ToolItemProperties {
	/**
	 * Returns a value property for the tooltip text of a SWT ToolItems.
	 * 
	 * @return a value property for the tooltip text of a SWT ToolItems.
	 */
	public static IValueProperty tooltipText() {
		return new ToolItemTooltipTextProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleMaximumProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleMinimumProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleSelectionProperty;

/**
 * A factory for creating properties of SWT Scales.
 * 
 * @since 1.3
 */
public class ScaleProperties {
	/**
	 * Returns a value property for the selected value of a SWT Scale.
	 * 
	 * @return a value property for the selected value of a SWT Scale.
	 */
	public static IValueProperty selection() {
		return new ScaleSelectionProperty();
	}

	/**
	 * Returns a value property for the minimum value of a SWT Scale.
	 * 
	 * @return a value property for the minimum value of a SWT Scale.
	 */
	public static IValueProperty minimum() {
		return new ScaleMinimumProperty();
	}

	/**
	 * Returns a value property for the maximum value of a SWT Scale.
	 * 
	 * @return a value property for the maximum value of a SWT Scale.
	 */
	public static IValueProperty maximum() {
		return new ScaleMaximumProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.TextEditableProperty;
import org.eclipse.jface.internal.databinding.swt.TextTextProperty;
import org.eclipse.swt.SWT;

/**
 * A factory for creating properties of SWT Texts.
 * 
 * @since 1.3
 */
public class TextProperties {
	/**
	 * Returns a value property for the text of a SWT Text.
	 * 
	 * @param event
	 *            the SWT event type to register for change events. May be
	 *            {@link SWT#None}, {@link SWT#Modify} or {@link SWT#FocusOut}.
	 * 
	 * @return a value property for the text of a SWT Text.
	 */
	public static IValueProperty text(int event) {
		return new TextTextProperty(event);
	}

	/**
	 * Returns a value property for the editable state of a SWT Text.
	 * 
	 * @return a value property for the editable state of a SWT Text.
	 */
	public static IValueProperty editable() {
		return new TextEditableProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.TrayItemTooltipTextProperty;

/**
 * A factory for creating properties of SWT TrayItems
 * 
 * @since 1.3
 */
public class TrayItemProperties {
	/**
	 * Returns a value property for the tooltip text of a SWT TrayItems.
	 * 
	 * @return a value property for the tooltip text of a SWT TrayItems.
	 */
	public static IValueProperty tooltipText() {
		return new TrayItemTooltipTextProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.LabelTextProperty;

/**
 * A factory for creating properties of SWT Labels.
 * 
 * @since 1.3
 */
public class LabelProperties {
	/**
	 * Returns a value property for the text of a SWT Label.
	 * 
	 * @return a value property for the text of a SWT Label.
	 */
	public static IValueProperty text() {
		return new LabelTextProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerMaximumProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerMinimumProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerSelectionProperty;

/**
 * A factory for creating properties of SWT Spinners.
 * 
 * @since 1.3
 */
public class SpinnerProperties {
	/**
	 * Returns a value property for the selected value of a SWT Spinner.
	 * 
	 * @return a value property for the selected value of a SWT Spinner.
	 */
	public static IValueProperty selection() {
		return new SpinnerSelectionProperty();
	}

	/**
	 * Returns a value property for the minimum value of a SWT Spinner.
	 * 
	 * @return a value property for the minimum value of a SWT Spinner.
	 */
	public static IValueProperty minimum() {
		return new SpinnerMinimumProperty();
	}

	/**
	 * Returns a value property for the maximum value of a SWT Spinner.
	 * 
	 * @return a value property for the maximum value of a SWT Spinner.
	 */
	public static IValueProperty maximum() {
		return new SpinnerMaximumProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.TableSingleSelectionIndexProperty;

/**
 * A factory for creating properties of SWT Tables.
 * 
 * @since 1.3
 */
public class TableProperties {
	/**
	 * Returns a value property for the single selection index of a SWT Table.
	 * 
	 * @return a value property for the single selection index of a SWT Table.
	 */
	public static IValueProperty singleSelectionIndex() {
		return new TableSingleSelectionIndexProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ItemTextProperty;

/**
 * A factory for creating properties of SWT controls.
 * 
 * @since 1.3
 */
public class ItemProperties {
	/**
	 * Returns a value property for the text of a SWT Item.
	 * 
	 * @return a value property for the text of a SWT Item
	 */
	public static IValueProperty text() {
		return new ItemTextProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ControlBackgroundProperty;
import org.eclipse.jface.internal.databinding.swt.ControlBoundsProperty;
import org.eclipse.jface.internal.databinding.swt.ControlEnabledProperty;
import org.eclipse.jface.internal.databinding.swt.ControlFocusedProperty;
import org.eclipse.jface.internal.databinding.swt.ControlFontProperty;
import org.eclipse.jface.internal.databinding.swt.ControlForegroundProperty;
import org.eclipse.jface.internal.databinding.swt.ControlLocationProperty;
import org.eclipse.jface.internal.databinding.swt.ControlSizeProperty;
import org.eclipse.jface.internal.databinding.swt.ControlTooltipTextProperty;
import org.eclipse.jface.internal.databinding.swt.ControlVisibleProperty;

/**
 * A factory for creating properties of SWT controls.
 * 
 * @since 1.3
 */
public class ControlProperties {
	/**
	 * Returns a value property for the enablement state of a SWT Control.
	 * 
	 * @return a value property for the enablement state of a SWT Control.
	 */
	public static IValueProperty enabled() {
		return new ControlEnabledProperty();
	}

	/**
	 * Returns a value property for the visibility state of a SWT Control.
	 * 
	 * @return a value property for the visibility state of a SWT Control.
	 */
	public static IValueProperty visible() {
		return new ControlVisibleProperty();
	}

	/**
	 * Returns a value property for the tooltip text of a SWT Control.
	 * 
	 * @return a value property for the tooltip text of a SWT Control.
	 */
	public static IValueProperty toolTipText() {
		return new ControlTooltipTextProperty();
	}

	/**
	 * Returns a value property for the foreground color of a SWT Control.
	 * 
	 * @return a value property for the foreground color of a SWT Control.
	 */
	public static IValueProperty foreground() {
		return new ControlForegroundProperty();
	}

	/**
	 * Returns a value property for the background color of a SWT Control.
	 * 
	 * @return a value property for the background color of a SWT Control.
	 */
	public static IValueProperty background() {
		return new ControlBackgroundProperty();
	}

	/**
	 * Returns a value property for the font of a SWT Control.
	 * 
	 * @return a value property for the font of a SWT Control.
	 */
	public static IValueProperty font() {
		return new ControlFontProperty();
	}

	/**
	 * Returns a value property for the size of a SWT Control.
	 * 
	 * @return a value property for the size of a SWT Control.
	 */
	public static IValueProperty size() {
		return new ControlSizeProperty();
	}

	/**
	 * Returns a value property for the location of a SWT Control.
	 * 
	 * @return a value property for the location of a SWT Control.
	 */
	public static IValueProperty location() {
		return new ControlLocationProperty();
	}

	/**
	 * Returns a value property for the bounds of a SWT Control.
	 * 
	 * @return a value property for the bounds of a SWT Control.
	 */
	public static IValueProperty bounds() {
		return new ControlBoundsProperty();
	}

	/**
	 * Returns a value property for the focus state of a SWT Control.
	 * 
	 * @return a value property for the focus state of a SWT Control.
	 */
	public static IValueProperty focused() {
		return new ControlFocusedProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.CLabelTextProperty;

/**
 * A factory for creating properties of SWT Labels.
 * 
 * @since 1.3
 */
public class CLabelProperties {
	/**
	 * Returns a value property for the text of a SWT Label.
	 * 
	 * @return a value property for the text of a SWT Label.
	 */
	public static IValueProperty text() {
		return new CLabelTextProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.CTabItemTooltipTextProperty;

/**
 * A factory for creating properties of SWT CTabItems
 * 
 * @since 1.3
 */
public class CTabItemProperties {
	/**
	 * Returns a value property for the tooltip text of a SWT CTabItem.
	 * 
	 * @return a value property for the tooltip text of a SWT CTabItem.
	 */
	public static IValueProperty tooltipText() {
		return new CTabItemTooltipTextProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.TreeItemTooltipTextProperty;

/**
 * A factory for creating properties of SWT TabItems
 * 
 * @since 1.3
 */
public class TreeColumnProperties {
	/**
	 * Returns a value property for the tooltip text of a SWT TreeColumn.
	 * 
	 * @return a value property for the tooltip text of a SWT TreeColumn.
	 */
	public static IValueProperty tooltipText() {
		return new TreeItemTooltipTextProperty();
	}
}




import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.IVetoableValue;
import org.eclipse.core.databinding.observable.value.ValueChangingEvent;
import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.SWTDelayedObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTObservableListDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTVetoableValueDecorator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.custom.CTabItem;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Scale;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Spinner;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.swt.widgets.TrayItem;
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.Widget;

/**

				.observeDelayedValue(delay, observable), observable.getWidget());
	}

	private static ISWTObservableValue observeWidgetProperty(Widget widget,
			IValueProperty property) {
		return new SWTObservableValueDecorator(property.observe(getRealm(widget
				.getDisplay()), widget), widget);
	}

	/**
	 * Returns an observable value tracking the enabled state of the given
	 * control

	 *         control
	 */
	public static ISWTObservableValue observeEnabled(Control control) {
		return (ISWTObservableValue) WidgetProperties.enabled()
				.observe(control);
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeVisible(Control control) {
		return (ISWTObservableValue) WidgetProperties.visible()
				.observe(control);
	}

	/**

	 * @since 1.3
	 */
	public static ISWTObservableValue observeTooltipText(Widget widget) {
		return (ISWTObservableValue) WidgetProperties.tooltipText().observe(
				widget);
		}

		IValueProperty property;
		if (widget instanceof CTabItem) {
			property = CTabItemProperties.tooltipText();
		} else if (widget instanceof TabItem) {
			property = TabItemProperties.tooltipText();
		} else if (widget instanceof TableColumn) {
			property = TableColumnProperties.tooltipText();
		} else if (widget instanceof ToolItem) {
			property = ToolItemProperties.tooltipText();
		} else if (widget instanceof TrayItem) {
			property = TrayItemProperties.tooltipText();
		} else if (widget instanceof TreeColumn) {
			property = TreeColumnProperties.tooltipText();
		} else {
			throw new IllegalArgumentException(
					"Item [" + widget.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeWidgetProperty(widget, property);
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeTooltipText(Control control) {
		return (ISWTObservableValue) WidgetProperties.tooltipText().observe(
				control);
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeSelection(Control control) {
		return (ISWTObservableValue) WidgetProperties.selection().observe(
				control);
			property = SpinnerProperties.selection();
		} else if (control instanceof Button) {
			property = ButtonProperties.selection();
		} else if (control instanceof Combo) {
			property = ComboProperties.selection();
		} else if (control instanceof CCombo) {
			property = CComboProperties.selection();
		} else if (control instanceof List) {
			property = ListProperties.selection();
		} else if (control instanceof Scale) {
			property = ScaleProperties.selection();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeWidgetProperty(control, property);
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeMin(Control control) {
		return (ISWTObservableValue) WidgetProperties.minimum()
				.observe(control);
			property = SpinnerProperties.minimum();
		} else if (control instanceof Scale) {
			property = ScaleProperties.minimum();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeWidgetProperty(control, property);
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeMax(Control control) {
		return (ISWTObservableValue) WidgetProperties.maximum()
				.observe(control);
			property = SpinnerProperties.maximum();
		} else if (control instanceof Scale) {
			property = ScaleProperties.maximum();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeWidgetProperty(control, property);
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeText(Control control, int event) {
		return (ISWTObservableValue) WidgetProperties.text(event).observe(
				control);
			property = TextProperties.text(event);
		} else if (control instanceof StyledText) {
			property = StyledTextProperties.text(event);
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return new SWTVetoableValueDecorator(property.observe(getRealm(control
				.getDisplay()), control), control);
	}

	/**

	 * @since 1.3
	 */
	public static ISWTObservableValue observeText(Widget widget) {
		return (ISWTObservableValue) WidgetProperties.text().observe(widget);
			return observeText((Control) widget);
		} else if (widget instanceof Item) {
			return observeWidgetProperty(widget, ItemProperties.text());
		}

		throw new IllegalArgumentException(
				"Widget [" + widget.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeText(Control control) {
		return (ISWTObservableValue) WidgetProperties.text().observe(control);
			return observeText(control, SWT.None);
		}

		IValueProperty property;
		if (control instanceof Label) {
			property = LabelProperties.text();
		} else if (control instanceof Link) {
			property = LinkProperties.text();
		} else if (control instanceof CLabel) {
			property = CLabelProperties.text();
		} else if (control instanceof Combo) {
			property = ComboProperties.text();
		} else if (control instanceof CCombo) {
			property = CComboProperties.text();
		} else if (control instanceof Shell) {
			property = ShellProperties.text();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeWidgetProperty(control, property);
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static IObservableList observeItems(Control control) {
		return WidgetProperties.items().observe(control);
		if (control instanceof Combo) {
			property = ComboProperties.items();
		} else if (control instanceof CCombo) {
			property = CComboProperties.items();
		} else if (control instanceof List) {
			property = ListProperties.items();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return new SWTObservableListDecorator(property.observe(getRealm(control
				.getDisplay()), control), control);
	}

	/**

	 */
	public static ISWTObservableValue observeSingleSelectionIndex(
			Control control) {
		return (ISWTObservableValue) WidgetProperties.singleSelectionIndex()
				.observe(control);
			property = TableProperties.singleSelectionIndex();
		} else if (control instanceof Combo) {
			property = ComboProperties.singleSelectionIndex();
		} else if (control instanceof CCombo) {
			property = CComboProperties.singleSelectionIndex();
		} else if (control instanceof List) {
			property = ListProperties.singleSelectionIndex();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeWidgetProperty(control, property);
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeForeground(Control control) {
		return (ISWTObservableValue) WidgetProperties.foreground().observe(
				control);
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeBackground(Control control) {
		return (ISWTObservableValue) WidgetProperties.background().observe(
				control);
	}

	/**

	 * @return an observable value tracking the font of the given control
	 */
	public static ISWTObservableValue observeFont(Control control) {
		return (ISWTObservableValue) WidgetProperties.font().observe(control);
	}

	/**

	 * @since 1.3
	 */
	public static ISWTObservableValue observeSize(Control control) {
		return (ISWTObservableValue) WidgetProperties.size().observe(control);
	}

	/**

	 * @since 1.3
	 */
	public static ISWTObservableValue observeLocation(Control control) {
		return (ISWTObservableValue) WidgetProperties.location().observe(
				control);
	}

	/**

	 * @since 1.3
	 */
	public static ISWTObservableValue observeFocus(Control control) {
		return (ISWTObservableValue) WidgetProperties.focused()
				.observe(control);
	}

	/**

	 * @since 1.3
	 */
	public static ISWTObservableValue observeBounds(Control control) {
		return (ISWTObservableValue) WidgetProperties.bounds().observe(control);
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeEditable(Control control) {
		return (ISWTObservableValue) WidgetProperties.editable().observe(
				control);
			property = TextProperties.editable();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeWidgetProperty(control, property);
	}

	private static class DisplayRealm extends Realm {

			}
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see java.lang.Object#hashCode()
		 */
		public int hashCode() {
			return (display == null) ? 0 : display.hashCode();
		}

		/*
		 * (non-Javadoc)
		 * 
		 * @see java.lang.Object#equals(java.lang.Object)
		 */
		public boolean equals(Object obj) {
			if (this == obj)
				return true;




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.LinkTextProperty;

/**
 * A factory for creating properties of SWT Links.
 * 
 * @since 1.3
 */
public class LinkProperties {
	/**
	 * Returns a value property for the text of a SWT Link.
	 * 
	 * @return a value property for the text of a SWT Link.
	 */
	public static IValueProperty text() {
		return new LinkTextProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ButtonSelectionProperty;

/**
 * A factory for creating properties of SWT Buttons.
 * 
 * @since 1.3
 */
public class ButtonProperties {
	/**
	 * Returns a value property for the selection state of a SWT Button.
	 * 
	 * @return a value property for the selection state of a SWT Button.
	 */
	public static IValueProperty selection() {
		return new ButtonSelectionProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.CComboItemsProperty;
import org.eclipse.jface.internal.databinding.swt.CComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.CComboSingleSelectionIndexProperty;
import org.eclipse.jface.internal.databinding.swt.CComboTextProperty;

/**
 * A factory for creating properties of SWT CCombos
 * 
 * @since 1.3
 */
public class CComboProperties {
	/**
	 * Returns a value property for the selection text of a SWT CCombo.
	 * 
	 * @return a value property for the selection text of a SWT CCombo.
	 */
	public static IValueProperty selection() {
		return new CComboSelectionProperty();
	}

	/**
	 * Returns a value property for the text of a SWT CCombo.
	 * 
	 * @return a value property for the text of a SWT CCombo.
	 */
	public static IValueProperty text() {
		return new CComboTextProperty();
	}

	/**
	 * Returns a list property for the items of a SWT CCombo.
	 * 
	 * @return a list property for the items of a SWT CCombo.
	 */
	public static IListProperty items() {
		return new CComboItemsProperty();
	}

	/**
	 * Returns a value property for the single selection index of a SWT Combo.
	 * 
	 * @return a value property for the single selection index of a SWT Combo.
	 */
	public static IValueProperty singleSelectionIndex() {
		return new CComboSingleSelectionIndexProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.StyledTextTextProperty;
import org.eclipse.swt.SWT;

/**
 * A factory for creating properties of SWT StyledTexts.
 * 
 * @since 1.3
 */
public class StyledTextProperties {
	/**
	 * Returns a value property for the text of a SWT StyledText.
	 * 
	 * @param event
	 *            the SWT event type to register for change events. May be
	 *            {@link SWT#None}, {@link SWT#Modify} or {@link SWT#FocusOut}.
	 * 
	 * @return a value property for the text of a SWT StyledText.
	 */
	public static IValueProperty text(int event) {
		return new StyledTextTextProperty(event);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ShellTextProperty;

/**
 * A factory for creating properties of SWT Shells.
 * 
 * @since 1.3
 */
public class ShellProperties {
	/**
	 * Returns a value property for the text of a SWT Shell.
	 * 
	 * @return a value property for the text of a SWT Shell.
	 */
	public static IValueProperty text() {
		return new ShellTextProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ListItemsProperty;
import org.eclipse.jface.internal.databinding.swt.ListSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.ListSingleSelectionIndexProperty;

/**
 * A factory for creating properties of SWT List controls.
 * 
 * @since 1.3
 */
public class ListProperties {
	/**
	 * Returns a value property for observing the selection text of a SWT List.
	 * 
	 * @return a value property for observing the selection text of a SWT List.
	 */
	public static IValueProperty selection() {
		return new ListSelectionProperty();
	}

	/**
	 * Returns a list property for observing the items in a SWT List.
	 * 
	 * @return a list property for observing the items in a SWT List.
	 */
	public static IListProperty items() {
		return new ListItemsProperty();
	}

	/**
	 * Returns a value property for the single selection index of a SWT List.
	 * 
	 * @return a value property for the single selection index of a SWT List.
	 */
	public static IValueProperty singleSelectionIndex() {
		return new ListSingleSelectionIndexProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.TabItemTooltipTextProperty;

/**
 * A factory for creating properties of SWT TabItems
 * 
 * @since 1.3
 */
public class TabItemProperties {
	/**
	 * Returns a value property for the tooltip text of a SWT TabItem.
	 * 
	 * @return a value property for the tooltip text of a SWT TabItem.
	 */
	public static IValueProperty tooltipText() {
		return new TabItemTooltipTextProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ComboItemsProperty;
import org.eclipse.jface.internal.databinding.swt.ComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.ComboSingleSelectionIndexProperty;
import org.eclipse.jface.internal.databinding.swt.ComboTextProperty;

/**
 * A factory for creating properties of SWT Combos.
 * 
 * @since 1.3
 */
public class ComboProperties {
	/**
	 * Returns a value property for the selection text of a SWT Combo.
	 * 
	 * @return a value property for the selection text of a SWT Combo.
	 */
	public static IValueProperty selection() {
		return new ComboSelectionProperty();
	}

	/**
	 * Returns a value property for the text of a SWT Combo.
	 * 
	 * @return a value property for the text of a SWT Combo.
	 */
	public static IValueProperty text() {
		return new ComboTextProperty();
	}

	/**
	 * Returns a list property for the items of a SWT Combo.
	 * 
	 * @return a list property for the items of a SWT Combo.
	 */
	public static IListProperty items() {
		return new ComboItemsProperty();
	}

	/**
	 * Returns a value property for the single selection index of a SWT Combo.
	 * 
	 * @return a value property for the single selection index of a SWT Combo.
	 */
	public static IValueProperty singleSelectionIndex() {
		return new ComboSingleSelectionIndexProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.TableColumnTooltipTextProperty;

/**
 * A factory for creating properties of SWT TableColumns
 * 
 * @since 1.3
 */
public class TableColumnProperties {
	/**
	 * Returns a value property for the tooltip text of a SWT TableColumns.
	 * 
	 * @return a value property for the tooltip text of a SWT TableColumns.
	 */
	public static IValueProperty tooltipText() {
		return new TableColumnTooltipTextProperty();
	}
}




package org.eclipse.jface.databinding.viewers;

import org.eclipse.core.databinding.observable.Observables;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.set.ISetProperty;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.SWTDelayedObservableValueDecorator;
import org.eclipse.jface.internal.databinding.viewers.ViewerObservableListDecorator;
import org.eclipse.jface.internal.databinding.viewers.ViewerObservableSetDecorator;
import org.eclipse.jface.internal.databinding.viewers.ViewerObservableValueDecorator;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.CheckboxTreeViewer;

import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.widgets.Display;

/**
 * Factory methods for creating observables for JFace viewers

 * @since 1.1
 */
public class ViewersObservables {
	private static Object checkNull(Object obj) {
		return SWTObservables.getRealm(Display.getDefault());
	}

	private static Realm getRealm(Viewer viewer) {
		return SWTObservables.getRealm(viewer.getControl().getDisplay());
	}

	private static void checkNull(Object obj) {
		if (obj == null)
			throw new IllegalArgumentException();
		return obj;

	private static IObservableValue observeProperty(Object source,
			IValueProperty property) {
		checkNull(source);
		if (source instanceof Viewer) {
			return observeViewerProperty((Viewer) source, property);
		}
		return property.observe(getDefaultRealm(), source);
	}

	private static IViewerObservableValue observeViewerProperty(Viewer viewer,
			IValueProperty property) {
		checkNull(viewer);
		return new ViewerObservableValueDecorator(property.observe(
				getRealm(viewer), viewer), viewer);
	}

	private static IObservableSet observeProperty(Object source,
			ISetProperty property) {
		checkNull(source);
		if (source instanceof Viewer) {
			return observeViewerProperty((Viewer) source, property);
		}
		return property.observe(getDefaultRealm(), source);
	}

	private static IViewerObservableSet observeViewerProperty(Viewer viewer,
			ISetProperty property) {
		checkNull(viewer);
		return new ViewerObservableSetDecorator(property.observe(
				getRealm(viewer), viewer), viewer);
	}

	private static IObservableList observeProperty(Object source,
			IListProperty property) {
		checkNull(source);
		if (source instanceof Viewer) {
			return observeViewerProperty((Viewer) source, property);
		}
		Realm realm = getDefaultRealm();
		return property.observe(realm, source);
	}

	private static IViewerObservableList observeViewerProperty(Viewer viewer,
			IListProperty property) {
		checkNull(viewer);
		Realm realm = getRealm(viewer);
		return new ViewerObservableListDecorator(property
				.observe(realm, viewer), viewer);
	}

	/**

	 */
	public static IViewerObservableValue observeDelayedValue(int delay,
			IViewerObservableValue observable) {
		return new ViewerObservableValueDecorator(Observables
				.observeDelayedValue(delay, observable), observable.getViewer());
				new SWTDelayedObservableValueDecorator(Observables
						.observeDelayedValue(delay, observable), viewer
						.getControl()), viewer);
	}

	/**

	 */
	public static IObservableValue observeSingleSelection(
			ISelectionProvider selectionProvider) {
		return ViewerProperties.singleSelection().observe(
				checkNull(selectionProvider));
	}

	/**

	 */
	public static IObservableList observeMultiSelection(
			ISelectionProvider selectionProvider) {
		return ViewerProperties.multipleSelection().observe(
				checkNull(selectionProvider));
	}

	/**

	 * @since 1.2
	 */
	public static IViewerObservableValue observeSingleSelection(Viewer viewer) {
		return (IViewerObservableValue) ViewerProperties.singleSelection()
				.observe(checkNull(viewer));
	}

	/**

	 * @since 1.2
	 */
	public static IViewerObservableList observeMultiSelection(Viewer viewer) {
		return (IViewerObservableList) ViewerProperties.multipleSelection()
				.observe(checkNull(viewer));
	}

	/**

	 * @since 1.2
	 */
	public static IObservableValue observeInput(Viewer viewer) {
		return ViewerProperties.input().observe(checkNull(viewer));
	}

	/**

	 */
	public static IObservableSet observeCheckedElements(ICheckable checkable,
			Object elementType) {
		return ViewerProperties.checkedElements(elementType).observe(
				checkNull(checkable));
					elementType);
		}
		if (checkable instanceof CheckboxTreeViewer) {
			return observeCheckedElements((CheckboxTreeViewer) checkable,
					elementType);
		}
		return observeProperty(checkable, CheckableProperties
				.checkedElements(elementType));
	}

	/**

	 */
	public static IViewerObservableSet observeCheckedElements(
			CheckboxTableViewer viewer, Object elementType) {
		return (IViewerObservableSet) ViewerProperties.checkedElements(
				elementType).observe(checkNull(viewer));
	}

	/**

	 */
	public static IViewerObservableSet observeCheckedElements(
			CheckboxTreeViewer viewer, Object elementType) {
		return (IViewerObservableSet) ViewerProperties.checkedElements(
				elementType).observe(checkNull(viewer));
	}

	/**

	 * @since 1.3
	 */
	public static IViewerObservableSet observeFilters(StructuredViewer viewer) {
		return (IViewerObservableSet) ViewerProperties.filters().observe(
				checkNull(viewer));
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.viewers;

import org.eclipse.core.databinding.property.set.ISetProperty;
import org.eclipse.jface.internal.databinding.viewers.StructuredViewerFiltersProperty;

/**
 * A factory for creating properties of JFace StructuredViewers
 * 
 * @since 1.3
 */
public class StructuredViewerProperties {
	/**
	 * Returns a value property for the input of a JFace StructuredViewer.
	 * 
	 * @return a value property for the input of a JFace StructuredViewer.
	 */
	public static ISetProperty filters() {
		return new StructuredViewerFiltersProperty();
	}
}

Lines 11-18 Link Here

(-)src/org/eclipse/jface/databinding/viewers/ViewerProperties.java (+74 lines)
11		11
12	package org.eclipse.jface.databinding.viewers;	12	package org.eclipse.jface.databinding.viewers;
13		13
		14	import org.eclipse.core.databinding.property.list.IListProperty;
		15	import org.eclipse.core.databinding.property.set.DelegatingSetProperty;
		16	import org.eclipse.core.databinding.property.set.ISetProperty;
14	import org.eclipse.core.databinding.property.value.IValueProperty;	17	import org.eclipse.core.databinding.property.value.IValueProperty;
		18	import org.eclipse.jface.internal.databinding.viewers.CheckableCheckedElementsProperty;
		19	import org.eclipse.jface.internal.databinding.viewers.CheckboxTableViewerCheckedElementsProperty;
		20	import org.eclipse.jface.internal.databinding.viewers.CheckboxTreeViewerCheckedElementsProperty;
		21	import org.eclipse.jface.internal.databinding.viewers.SelectionProviderMultipleSelectionProperty;
		22	import org.eclipse.jface.internal.databinding.viewers.SelectionProviderSingleSelectionProperty;
		23	import org.eclipse.jface.internal.databinding.viewers.StructuredViewerFiltersProperty;
15	import org.eclipse.jface.internal.databinding.viewers.ViewerInputProperty;	24	import org.eclipse.jface.internal.databinding.viewers.ViewerInputProperty;
		25	import org.eclipse.jface.viewers.CheckboxTableViewer;
		26	import org.eclipse.jface.viewers.CheckboxTreeViewer;
		27	import org.eclipse.jface.viewers.ICheckable;
16		28
17	/**	29	/**
18	* A factory for creating properties of JFace Viewers	30	* A factory for creating properties of JFace Viewers
Lines 28-31 Link Here
28	public static IValueProperty input() {	40	public static IValueProperty input() {
29	return new ViewerInputProperty();	41	return new ViewerInputProperty();
30	}	42	}
		43
		44	/**
		45	* Returns a set property for the checked elements of a
		46	* {@link CheckboxTableViewer}, {@link CheckboxTreeViewer} or
		47	* {@link ICheckable}.
		48	*
		49	* @param elementType
		50	* the element type of the returned property
		51	*
		52	* @return a set property for the checked elements of a
		53	* {@link CheckboxTableViewer}, {@link CheckboxTreeViewer} or
		54	* {@link ICheckable}.
		55	*/
		56	public static ISetProperty checkedElements(final Object elementType) {
		57	return new DelegatingSetProperty(elementType) {
		58	ISetProperty checkable = new CheckableCheckedElementsProperty(
		59	elementType);
		60	ISetProperty checkboxTableViewer = new CheckboxTableViewerCheckedElementsProperty(
		61	elementType);
		62	ISetProperty checkboxTreeViewer = new CheckboxTreeViewerCheckedElementsProperty(
		63	elementType);
		64
		65	protected ISetProperty doGetDelegate(Object source) {
		66	if (source instanceof CheckboxTableViewer)
		67	return checkboxTableViewer;
		68	if (source instanceof CheckboxTreeViewer)
		69	return checkboxTreeViewer;
		70	return checkable;
		71	}
		72	};
		73	}
		74
		75	/**
		76	* Returns a value property for the single selection of a JFace
		77	* ISelectionProvider.
		78	*
		79	* @return a value property for the single selection of a JFace
		80	* ISelectionProvider.
		81	*/
		82	public static IValueProperty singleSelection() {
		83	return new SelectionProviderSingleSelectionProperty();
		84	}
		85
		86	/**
		87	* Returns a list property for the multiple selection of a JFace
		88	* ISelectionProvider.
		89	*
		90	* @return a list property for the multiple selection of a JFace
		91	* ISelectionProvider.
		92	*/
		93	public static IListProperty multipleSelection() {
		94	return new SelectionProviderMultipleSelectionProperty();
		95	}
		96
		97	/**
		98	* Returns a value property for the input of a JFace StructuredViewer.
		99	*
		100	* @return a value property for the input of a JFace StructuredViewer.
		101	*/
		102	public static ISetProperty filters() {
		103	return new StructuredViewerFiltersProperty();
		104	}
31	}	105	}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.viewers;

import org.eclipse.core.databinding.property.set.ISetProperty;
import org.eclipse.jface.internal.databinding.viewers.CheckboxTreeViewerCheckedElementsProperty;

/**
 * A factory for creating properties of JFace CheckboxTreeViewer
 * 
 * @since 1.3
 */
public class CheckboxTreeViewerProperties {
	/**
	 * Returns a set property for the checked elements of a JFace
	 * CheckboxTreeViewer.
	 * 
	 * @param elementType
	 *            the element type of the returned property
	 * 
	 * @return a set property for the checked elements of a JFace
	 *         CheckboxTreeViewer.
	 */
	public static ISetProperty checkedElements(Object elementType) {
		return new CheckboxTreeViewerCheckedElementsProperty(elementType);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.viewers;

import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.viewers.SelectionProviderMultipleSelectionProperty;
import org.eclipse.jface.internal.databinding.viewers.SelectionProviderSingleSelectionProperty;

/**
 * A factory for creating properties of JFace ISelectionProviders
 * 
 * @since 1.3
 */
public class SelectionProviderProperties {
	/**
	 * Returns a value property for the single selection of a JFace
	 * ISelectionProvider.
	 * 
	 * @return a value property for the single selection of a JFace
	 *         ISelectionProvider.
	 */
	public static IValueProperty singleSelection() {
		return new SelectionProviderSingleSelectionProperty();
	}

	/**
	 * Returns a list property for the multiple selection of a JFace
	 * ISelectionProvider.
	 * 
	 * @return a list property for the multiple selection of a JFace
	 *         ISelectionProvider.
	 */
	public static IListProperty multipleSelection() {
		return new SelectionProviderMultipleSelectionProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.viewers;

import org.eclipse.core.databinding.property.set.ISetProperty;
import org.eclipse.jface.internal.databinding.viewers.CheckboxTableViewerCheckedElementsProperty;

/**
 * A factory for creating properties of JFace CheckboxTableViewer
 * 
 * @since 1.3
 */
public class CheckboxTableViewerProperties {
	/**
	 * Returns a set property for the checked elements of a JFace
	 * CheckboxTableViewer.
	 * 
	 * @param elementType
	 *            the element type of the returned property
	 * 
	 * @return a set property for the checked elements of a JFace
	 *         CheckboxTableViewer.
	 */
	public static ISetProperty checkedElements(Object elementType) {
		return new CheckboxTableViewerCheckedElementsProperty(elementType);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.viewers;

import org.eclipse.core.databinding.property.set.ISetProperty;
import org.eclipse.jface.internal.databinding.viewers.CheckableCheckedElementsProperty;

/**
 * A factory for creating properties of JFace ICheckables
 * 
 * @since 1.3
 */
public class CheckableProperties {
	/**
	 * Returns a set property for the checked elements of a JFace ICheckable.
	 * 
	 * @param elementType
	 *            the element type of the returned property
	 * 
	 * @return a set property for the checked elements of a JFace ICheckable.
	 */
	public static ISetProperty checkedElements(Object elementType) {
		return new CheckableCheckedElementsProperty(elementType);
	}
}

Lines 11-18 Link Here

(-)src/org/eclipse/jface/internal/databinding/swt/TextTextProperty.java (+8 lines)
11		11
12	package org.eclipse.jface.internal.databinding.swt;	12	package org.eclipse.jface.internal.databinding.swt;
13		13
		14	import org.eclipse.core.databinding.observable.value.IObservableValue;
		15	import org.eclipse.jface.databinding.swt.ISWTObservableValue;
14	import org.eclipse.swt.SWT;	16	import org.eclipse.swt.SWT;
15	import org.eclipse.swt.widgets.Text;	17	import org.eclipse.swt.widgets.Text;
		18	import org.eclipse.swt.widgets.Widget;
16		19
17	/**	20	/**
18	* @since 3.3	21	* @since 3.3
Lines 49-52 Link Here
49	public String toString() {	52	public String toString() {
50	return "Text.text <String>"; //$NON-NLS-1$	53	return "Text.text <String>"; //$NON-NLS-1$
51	}	54	}
		55
		56	protected ISWTObservableValue wrapObservable(IObservableValue observable,
		57	Widget widget) {
		58	return new SWTVetoableValueDecorator(observable, widget);
		59	}
52	}	60	}




package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.INativePropertyListener;
import org.eclipse.core.databinding.property.IPropertyChangeListener;
import org.eclipse.core.databinding.property.PropertyChangeEvent;
import org.eclipse.core.databinding.property.value.SimpleValueProperty;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;

					WidgetValueProperty.this));
		}
	}

	public IObservableValue observe(Realm realm, Object source) {
		return wrapObservable(super.observe(realm, source), (Widget) source);
	}

	protected ISWTObservableValue wrapObservable(
			IObservableValue observable, Widget widget) {
		return new SWTObservableValueDecorator(observable, widget);
	}
}

Lines 12-17 Link Here

(-)src/org/eclipse/jface/internal/databinding/swt/WidgetListProperty.java (+5 lines)
12	package org.eclipse.jface.internal.databinding.swt;	12	package org.eclipse.jface.internal.databinding.swt;
13		13
14	import org.eclipse.core.databinding.observable.Realm;	14	import org.eclipse.core.databinding.observable.Realm;
		15	import org.eclipse.core.databinding.observable.list.IObservableList;
15	import org.eclipse.core.databinding.property.list.SimpleListProperty;	16	import org.eclipse.core.databinding.property.list.SimpleListProperty;
16	import org.eclipse.jface.databinding.swt.SWTObservables;	17	import org.eclipse.jface.databinding.swt.SWTObservables;
17	import org.eclipse.swt.widgets.Widget;	18	import org.eclipse.swt.widgets.Widget;
Lines 26-29 Link Here
26	return SWTObservables.getRealm(((Widget) source).getDisplay());	27	return SWTObservables.getRealm(((Widget) source).getDisplay());
27	return super.getPreferredRealm(source);	28	return super.getPreferredRealm(source);
28	}	29	}
		30
		31	public IObservableList observe(Realm realm, Object source) {
		32	return new SWTObservableListDecorator(super.observe(realm, source), (Widget) source);
		33	}
29	}	34	}





	private IObservableValue decorated;
	private Widget widget;
	private boolean updating;

	private IValueChangeListener valueListener = new IValueChangeListener() {
		public void handleValueChange(ValueChangeEvent event) {
			if (!updating)
				fireValueChange(event.diff);
		}
	};



	protected void doSetApprovedValue(Object value) {
		checkRealm();
		updating = true;
		try {
			decorated.setValue(value);
		} finally {
			updating = false;
		}
	}

	protected Object doGetValue() {

Lines 11-18 Link Here

(-)src/org/eclipse/jface/internal/databinding/swt/StyledTextTextProperty.java (+8 lines)
11		11
12	package org.eclipse.jface.internal.databinding.swt;	12	package org.eclipse.jface.internal.databinding.swt;
13		13
		14	import org.eclipse.core.databinding.observable.value.IObservableValue;
		15	import org.eclipse.jface.databinding.swt.ISWTObservableValue;
14	import org.eclipse.swt.SWT;	16	import org.eclipse.swt.SWT;
15	import org.eclipse.swt.custom.StyledText;	17	import org.eclipse.swt.custom.StyledText;
		18	import org.eclipse.swt.widgets.Widget;
16		19
17	/**	20	/**
18	* @since 3.3	21	* @since 3.3
Lines 49-52 Link Here
49	public String toString() {	52	public String toString() {
50	return "StyledText.text <String>"; //$NON-NLS-1$	53	return "StyledText.text <String>"; //$NON-NLS-1$
51	}	54	}
		55
		56	protected ISWTObservableValue wrapObservable(IObservableValue observable,
		57	Widget widget) {
		58	return new SWTVetoableValueDecorator(observable, widget);
		59	}
52	}	60	}

Lines 12-17 Link Here

(-)src/org/eclipse/jface/internal/databinding/viewers/ViewerListProperty.java (+9 lines)
12	package org.eclipse.jface.internal.databinding.viewers;	12	package org.eclipse.jface.internal.databinding.viewers;
13		13
14	import org.eclipse.core.databinding.observable.Realm;	14	import org.eclipse.core.databinding.observable.Realm;
		15	import org.eclipse.core.databinding.observable.list.IObservableList;
15	import org.eclipse.core.databinding.property.list.SimpleListProperty;	16	import org.eclipse.core.databinding.property.list.SimpleListProperty;
16	import org.eclipse.jface.databinding.swt.SWTObservables;	17	import org.eclipse.jface.databinding.swt.SWTObservables;
17	import org.eclipse.jface.viewers.Viewer;	18	import org.eclipse.jface.viewers.Viewer;
Lines 28-31 Link Here
28	}	29	}
29	return super.getPreferredRealm(source);	30	return super.getPreferredRealm(source);
30	}	31	}
		32
		33	public IObservableList observe(Realm realm, Object source) {
		34	IObservableList observable = super.observe(realm, source);
		35	if (source instanceof Viewer)
		36	observable = new ViewerObservableListDecorator(observable,
		37	(Viewer) source);
		38	return observable;
		39	}
31	}	40	}

Lines 12-17 Link Here

(-)src/org/eclipse/jface/internal/databinding/viewers/ViewerSetProperty.java (+8 lines)
12	package org.eclipse.jface.internal.databinding.viewers;	12	package org.eclipse.jface.internal.databinding.viewers;
13		13
14	import org.eclipse.core.databinding.observable.Realm;	14	import org.eclipse.core.databinding.observable.Realm;
		15	import org.eclipse.core.databinding.observable.set.IObservableSet;
15	import org.eclipse.core.databinding.property.set.SimpleSetProperty;	16	import org.eclipse.core.databinding.property.set.SimpleSetProperty;
16	import org.eclipse.jface.databinding.swt.SWTObservables;	17	import org.eclipse.jface.databinding.swt.SWTObservables;
17	import org.eclipse.jface.viewers.Viewer;	18	import org.eclipse.jface.viewers.Viewer;
Lines 28-31 Link Here
28	}	29	}
29	return super.getPreferredRealm(source);	30	return super.getPreferredRealm(source);
30	}	31	}
		32
		33	public IObservableSet observe(Realm realm, Object source) {
		34	IObservableSet observable = super.observe(realm, source);
		35	if (source instanceof Viewer)
		36	return new ViewerObservableSetDecorator(observable, (Viewer) source);
		37	return observable;
		38	}
31	}	39	}

Lines 12-17 Link Here

(-)src/org/eclipse/jface/internal/databinding/viewers/ViewerValueProperty.java (+9 lines)
12	package org.eclipse.jface.internal.databinding.viewers;	12	package org.eclipse.jface.internal.databinding.viewers;
13		13
14	import org.eclipse.core.databinding.observable.Realm;	14	import org.eclipse.core.databinding.observable.Realm;
		15	import org.eclipse.core.databinding.observable.value.IObservableValue;
15	import org.eclipse.core.databinding.property.value.SimpleValueProperty;	16	import org.eclipse.core.databinding.property.value.SimpleValueProperty;
16	import org.eclipse.jface.databinding.swt.SWTObservables;	17	import org.eclipse.jface.databinding.swt.SWTObservables;
17	import org.eclipse.jface.viewers.Viewer;	18	import org.eclipse.jface.viewers.Viewer;
Lines 28-31 Link Here
28	}	29	}
29	return super.getPreferredRealm(source);	30	return super.getPreferredRealm(source);
30	}	31	}
		32
		33	public IObservableValue observe(Realm realm, Object source) {
		34	IObservableValue observable = super.observe(realm, source);
		35	if (source instanceof Viewer)
		36	observable = new ViewerObservableValueDecorator(observable,
		37	(Viewer) source);
		38	return observable;
		39	}
31	}	40	}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.list.DelegatingListProperty;
import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.value.DelegatingValueProperty;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ButtonSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.CComboItemsProperty;
import org.eclipse.jface.internal.databinding.swt.CComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.CComboSingleSelectionIndexProperty;
import org.eclipse.jface.internal.databinding.swt.CComboTextProperty;
import org.eclipse.jface.internal.databinding.swt.CLabelTextProperty;
import org.eclipse.jface.internal.databinding.swt.CTabItemTooltipTextProperty;
import org.eclipse.jface.internal.databinding.swt.ComboItemsProperty;
import org.eclipse.jface.internal.databinding.swt.ComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.ComboSingleSelectionIndexProperty;
import org.eclipse.jface.internal.databinding.swt.ComboTextProperty;
import org.eclipse.jface.internal.databinding.swt.ControlBackgroundProperty;
import org.eclipse.jface.internal.databinding.swt.ControlBoundsProperty;
import org.eclipse.jface.internal.databinding.swt.ControlEnabledProperty;
import org.eclipse.jface.internal.databinding.swt.ControlFocusedProperty;
import org.eclipse.jface.internal.databinding.swt.ControlFontProperty;
import org.eclipse.jface.internal.databinding.swt.ControlForegroundProperty;
import org.eclipse.jface.internal.databinding.swt.ControlLocationProperty;
import org.eclipse.jface.internal.databinding.swt.ControlSizeProperty;
import org.eclipse.jface.internal.databinding.swt.ControlTooltipTextProperty;
import org.eclipse.jface.internal.databinding.swt.ControlVisibleProperty;
import org.eclipse.jface.internal.databinding.swt.ItemTextProperty;
import org.eclipse.jface.internal.databinding.swt.LabelTextProperty;
import org.eclipse.jface.internal.databinding.swt.LinkTextProperty;
import org.eclipse.jface.internal.databinding.swt.ListItemsProperty;
import org.eclipse.jface.internal.databinding.swt.ListSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.ListSingleSelectionIndexProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleMaximumProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleMinimumProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.ShellTextProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerMaximumProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerMinimumProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.StyledTextTextProperty;
import org.eclipse.jface.internal.databinding.swt.TabItemTooltipTextProperty;
import org.eclipse.jface.internal.databinding.swt.TableColumnTooltipTextProperty;
import org.eclipse.jface.internal.databinding.swt.TableSingleSelectionIndexProperty;
import org.eclipse.jface.internal.databinding.swt.TextEditableProperty;
import org.eclipse.jface.internal.databinding.swt.TextTextProperty;
import org.eclipse.jface.internal.databinding.swt.ToolItemTooltipTextProperty;
import org.eclipse.jface.internal.databinding.swt.TrayItemTooltipTextProperty;
import org.eclipse.jface.internal.databinding.swt.TreeItemTooltipTextProperty;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.custom.CTabItem;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Scale;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Spinner;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.swt.widgets.TrayItem;
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.TreeItem;

/**
 * A factory for creating properties of SWT controls.
 * 
 * @since 1.3
 */
public class WidgetProperties {
	/**
	 * Returns a value property for observing the background color of a
	 * {@link Control}.
	 * 
	 * @return a value property for observing the background color of a
	 *         {@link Control}.
	 */
	public static IValueProperty background() {
		return new ControlBackgroundProperty();
	}

	/**
	 * Returns a value property for observing the bounds of a {@link Control}.
	 * 
	 * @return a value property for observing the bounds of a {@link Control}.
	 */
	public static IValueProperty bounds() {
		return new ControlBoundsProperty();
	}

	/**
	 * Returns a value property for observing the editable state of a
	 * {@link Text}.
	 * 
	 * @return a value property for observing the editable state of a
	 *         {@link Text}.
	 */
	public static IValueProperty editable() {
		return new DelegatingValueProperty(Boolean.TYPE) {
			IValueProperty text = new TextEditableProperty();

			protected IValueProperty doGetDelegate(Object source) {
				if (source instanceof Text)
					return text;
				throw new IllegalArgumentException(
						"Widget [" + source.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
			}
		};
	}

	/**
	 * Returns a value property for observing the enablement state of a
	 * {@link Control}.
	 * 
	 * @return a value property for observing the enablement state of a
	 *         {@link Control}.
	 */
	public static IValueProperty enabled() {
		return new ControlEnabledProperty();
	}

	/**
	 * Returns a value property for observing the focus state of a
	 * {@link Control}.
	 * 
	 * @return a value property for observing the focus state of a
	 *         {@link Control}.
	 */
	public static IValueProperty focused() {
		return new ControlFocusedProperty();
	}

	/**
	 * Returns a value property for observing the font of a {@link Control}.
	 * 
	 * @return a value property for observing the font of a {@link Control}.
	 */
	public static IValueProperty font() {
		return new ControlFontProperty();
	}

	/**
	 * Returns a value property for observing the foreground color of a
	 * {@link Control}.
	 * 
	 * @return a value property for observing the foreground color of a
	 *         {@link Control}.
	 */
	public static IValueProperty foreground() {
		return new ControlForegroundProperty();
	}

	/**
	 * Returns a list property for observing the items of a {@link CCombo},
	 * {@link Combo} or {@link List}.
	 * 
	 * @return a list property for observing the items of a {@link CCombo},
	 *         {@link Combo} or {@link List}.
	 */
	public static IListProperty items() {
		return new DelegatingListProperty(String.class) {
			private IListProperty cCombo = new CComboItemsProperty();
			private IListProperty combo = new ComboItemsProperty();
			private IListProperty list = new ListItemsProperty();

			protected IListProperty doGetDelegate(Object source) {
				if (source instanceof CCombo)
					return cCombo;
				if (source instanceof Combo)
					return combo;
				if (source instanceof List)
					return list;
				throw new IllegalArgumentException(
						"Widget [" + source.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
			}
		};
	}

	/**
	 * Returns a value property for observing the location of a {@link Control}.
	 * 
	 * @return a value property for observing the location of a {@link Control}.
	 */
	public static IValueProperty location() {
		return new ControlLocationProperty();
	}

	/**
	 * Returns a value property for observing the maximum value of a
	 * {@link Scale} or {@link Spinner}.
	 * 
	 * @return a value property for observing the maximum value of a
	 *         {@link Scale} or {@link Spinner}.
	 */
	public static IValueProperty maximum() {
		return new DelegatingValueProperty(Integer.TYPE) {
			private IValueProperty scale = new ScaleMaximumProperty();
			private IValueProperty spinner = new SpinnerMaximumProperty();

			protected IValueProperty doGetDelegate(Object source) {
				if (source instanceof Scale)
					return scale;
				if (source instanceof Spinner)
					return spinner;
				throw new IllegalArgumentException(
						"Widget [" + source.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
			}
		};
	}

	/**
	 * Returns a value property for observing the minimum value of a
	 * {@link Scale} or {@link Spinner}.
	 * 
	 * @return a value property for observing the minimum value of a
	 *         {@link Scale} or {@link Spinner}.
	 */
	public static IValueProperty minimum() {
		return new DelegatingValueProperty(Integer.TYPE) {
			private IValueProperty scale = new ScaleMinimumProperty();
			private IValueProperty spinner = new SpinnerMinimumProperty();

			protected IValueProperty doGetDelegate(Object source) {
				if (source instanceof Scale)
					return scale;
				if (source instanceof Spinner)
					return spinner;
				throw new IllegalArgumentException(
						"Widget [" + source.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
			}
		};
	}

	/**
	 * Returns a value property for observing the selection state of a
	 * {@link Button}, {@link CCombo}, {@link Combo}, {@link List},
	 * {@link Scale} or {@link Spinner}.
	 * 
	 * @return a value property for observing the selection state of a
	 *         {@link Button}, {@link CCombo}, {@link Combo}, {@link List},
	 *         {@link Scale} or {@link Spinner}.
	 */
	public static IValueProperty selection() {
		return new DelegatingValueProperty() {
			private IValueProperty button = new ButtonSelectionProperty();
			private IValueProperty cCombo = new CComboSelectionProperty();
			private IValueProperty combo = new ComboSelectionProperty();
			private IValueProperty list = new ListSelectionProperty();
			private IValueProperty scale = new ScaleSelectionProperty();
			private IValueProperty spinner = new SpinnerSelectionProperty();

			protected IValueProperty doGetDelegate(Object source) {
				if (source instanceof Button)
					return button;
				if (source instanceof CCombo)
					return cCombo;
				if (source instanceof Combo)
					return combo;
				if (source instanceof List)
					return list;
				if (source instanceof Scale)
					return scale;
				if (source instanceof Spinner)
					return spinner;
				throw new IllegalArgumentException(
						"Widget [" + source.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
			}
		};
	}

	/**
	 * Returns a value property for observing the single selection index of a
	 * {@link CCombo}, {@link Combo}, {@link List} or {@link Table}.
	 * 
	 * @return a value property for the single selection index of a SWT Combo.
	 */
	public static IValueProperty singleSelectionIndex() {
		return new DelegatingValueProperty(Integer.TYPE) {
			private IValueProperty cCombo = new CComboSingleSelectionIndexProperty();
			private IValueProperty combo = new ComboSingleSelectionIndexProperty();
			private IValueProperty list = new ListSingleSelectionIndexProperty();
			private IValueProperty table = new TableSingleSelectionIndexProperty();

			protected IValueProperty doGetDelegate(Object source) {
				if (source instanceof CCombo)
					return cCombo;
				if (source instanceof Combo)
					return combo;
				if (source instanceof List)
					return list;
				if (source instanceof Table)
					return table;
				throw new IllegalArgumentException(
						"Widget [" + source.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
			}
		};
	}

	/**
	 * Returns a value property for observing the size of a {@link Control}.
	 * 
	 * @return a value property for observing the size of a {@link Control}.
	 */
	public static IValueProperty size() {
		return new ControlSizeProperty();
	}

	/**
	 * Returns a value property for observing the text of a {@link CCombo},
	 * {@link CLabel}, {@link Combo}, {@link Label}, {@link Item}, {@link Link},
	 * {@link Shell} or {@link Text}.
	 * 
	 * @return a value property for observing the text of a {@link CCombo},
	 *         {@link CLabel}, {@link Combo}, {@link Label}, {@link Item},
	 *         {@link Link}, {@link Shell} or {@link Text}.
	 */
	public static IValueProperty text() {
		return new DelegatingValueProperty(String.class) {
			private IValueProperty cCombo = new CComboTextProperty();
			private IValueProperty cLabel = new CLabelTextProperty();
			private IValueProperty combo = new ComboTextProperty();
			private IValueProperty item = new ItemTextProperty();
			private IValueProperty label = new LabelTextProperty();
			private IValueProperty link = new LinkTextProperty();
			private IValueProperty shell = new ShellTextProperty();
			private IValueProperty text = new TextTextProperty(SWT.None);

			protected IValueProperty doGetDelegate(Object source) {
				if (source instanceof CCombo)
					return cCombo;
				if (source instanceof CLabel)
					return cLabel;
				if (source instanceof Combo)
					return combo;
				if (source instanceof Item)
					return item;
				if (source instanceof Label)
					return label;
				if (source instanceof Link)
					return link;
				if (source instanceof Shell)
					return shell;
				if (source instanceof Text)
					return text;
				throw new IllegalArgumentException(
						"Widget [" + source.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
			}
		};
	}

	/**
	 * Returns a value property for observing the text of a {@link StyledText}
	 * or {@link Text}.
	 * 
	 * @param event
	 *            the SWT event type to register for change events. May be
	 *            {@link SWT#None}, {@link SWT#Modify} or {@link SWT#FocusOut}.
	 * 
	 * @return a value property for observing the text of a {@link StyledText}
	 *         or {@link Text}.
	 */
	public static IValueProperty text(final int event) {
		return new DelegatingValueProperty(String.class) {
			private IValueProperty styledText = new StyledTextTextProperty(
					event);
			private IValueProperty text = new TextTextProperty(event);

			protected IValueProperty doGetDelegate(Object source) {
				if (source instanceof StyledText)
					return styledText;
				if (source instanceof Text)
					return text;
				throw new IllegalArgumentException(
						"Widget [" + source.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
			}
		};
	}

	/**
	 * Returns a value property for observing the tooltip text of a
	 * {@link CTabItem}, {@link Control}, {@link TabItem}, {@link TableColumn},
	 * {@link ToolItem}, {@link TrayItem}, {@link TreeColumn} or
	 * {@link TreeItem}.
	 * 
	 * @return a value property for observing the tooltip text of a
	 *         {@link CTabItem}, {@link Control}, {@link TabItem},
	 *         {@link TableColumn}, {@link ToolItem}, {@link TrayItem},
	 *         {@link TreeColumn} or {@link TreeItem}.
	 */
	public static IValueProperty tooltipText() {
		return new DelegatingValueProperty(String.class) {
			private IValueProperty cTabItem = new CTabItemTooltipTextProperty();
			private IValueProperty control = new ControlTooltipTextProperty();
			private IValueProperty tabItem = new TabItemTooltipTextProperty();
			private IValueProperty tableColumn = new TableColumnTooltipTextProperty();
			private IValueProperty toolItem = new ToolItemTooltipTextProperty();
			private IValueProperty trayItem = new TrayItemTooltipTextProperty();
			private IValueProperty treeItem = new TreeItemTooltipTextProperty();

			protected IValueProperty doGetDelegate(Object source) {
				if (source instanceof CTabItem)
					return cTabItem;
				if (source instanceof Control)
					return control;
				if (source instanceof TabItem)
					return tabItem;
				if (source instanceof TableColumn)
					return tableColumn;
				if (source instanceof ToolItem)
					return toolItem;
				if (source instanceof TrayItem)
					return trayItem;
				if (source instanceof TreeItem)
					return treeItem;
				throw new IllegalArgumentException(
						"Item [" + source.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
			}
		};
	}

	/**
	 * Returns a value property for observing the visibility state of a
	 * {@link Control}.
	 * 
	 * @return a value property for observing the visibility state of a
	 *         {@link Control}.
	 */
	public static IValueProperty visible() {
		return new ControlVisibleProperty();
	}
}

Lines 22-28 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/ScaleObservableValueMaxTest.java (-2 / +2 lines)
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
24	import org.eclipse.jface.databinding.swt.SWTObservables;	24	import org.eclipse.jface.databinding.swt.SWTObservables;
25	import org.eclipse.jface.databinding.swt.ScaleProperties;	25	import org.eclipse.jface.databinding.swt.WidgetProperties;
26	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.widgets.Display;	27	import org.eclipse.swt.widgets.Display;
28	import org.eclipse.swt.widgets.Scale;	28	import org.eclipse.swt.widgets.Scale;
Lines 97-103 Link Here
97	}	97	}
98		98
99	public IObservableValue createObservableValue(Realm realm) {	99	public IObservableValue createObservableValue(Realm realm) {
100	return ScaleProperties.maximum().observe(realm, scale);	100	return WidgetProperties.maximum().observe(realm, scale);
101	}	101	}
102		102
103	public void change(IObservable observable) {	103	public void change(IObservable observable) {

Lines 23-29 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/TableSingleSelectionObservableValueTest.java (-2 / +2 lines)
23	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	23	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
24	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	24	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
25	import org.eclipse.jface.databinding.swt.SWTObservables;	25	import org.eclipse.jface.databinding.swt.SWTObservables;
26	import org.eclipse.jface.databinding.swt.TableProperties;	26	import org.eclipse.jface.databinding.swt.WidgetProperties;
27	import org.eclipse.swt.SWT;	27	import org.eclipse.swt.SWT;
28	import org.eclipse.swt.widgets.Display;	28	import org.eclipse.swt.widgets.Display;
29	import org.eclipse.swt.widgets.Shell;	29	import org.eclipse.swt.widgets.Shell;
Lines 109-115 Link Here
109	}	109	}
110		110
111	public IObservableValue createObservableValue(Realm realm) {	111	public IObservableValue createObservableValue(Realm realm) {
112	return TableProperties.singleSelectionIndex().observe(realm, table);	112	return WidgetProperties.singleSelectionIndex().observe(realm, table);
113	}	113	}
114		114
115	public Object getValueType(IObservableValue observable) {	115	public Object getValueType(IObservableValue observable) {




import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.CLabelProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.widgets.Display;

		}

		public IObservableValue createObservableValue(Realm realm) {
			return WidgetProperties.text().observe(realm, label);
		}

		public void change(IObservable observable) {

Lines 22-28 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/ScaleObservableValueSelectionTest.java (-2 / +2 lines)
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
24	import org.eclipse.jface.databinding.swt.SWTObservables;	24	import org.eclipse.jface.databinding.swt.SWTObservables;
25	import org.eclipse.jface.databinding.swt.ScaleProperties;	25	import org.eclipse.jface.databinding.swt.WidgetProperties;
26	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.widgets.Display;	27	import org.eclipse.swt.widgets.Display;
28	import org.eclipse.swt.widgets.Scale;	28	import org.eclipse.swt.widgets.Scale;
Lines 97-103 Link Here
97	}	97	}
98		98
99	public IObservableValue createObservableValue(Realm realm) {	99	public IObservableValue createObservableValue(Realm realm) {
100	return ScaleProperties.selection().observe(realm, scale);	100	return WidgetProperties.selection().observe(realm, scale);
101	}	101	}
102		102
103	public void change(IObservable observable) {	103	public void change(IObservable observable) {

Lines 21-27 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/TextObservableValueFocusOutTest.java (-2 / +2 lines)
21	import org.eclipse.core.databinding.observable.value.IObservableValue;	21	import org.eclipse.core.databinding.observable.value.IObservableValue;
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
24	import org.eclipse.jface.databinding.swt.TextProperties;	24	import org.eclipse.jface.databinding.swt.WidgetProperties;
25	import org.eclipse.swt.SWT;	25	import org.eclipse.swt.SWT;
26	import org.eclipse.swt.widgets.Shell;	26	import org.eclipse.swt.widgets.Shell;
27	import org.eclipse.swt.widgets.Text;	27	import org.eclipse.swt.widgets.Text;
Lines 54-60 Link Here
54	}	54	}
55		55
56	public IObservableValue createObservableValue(Realm realm) {	56	public IObservableValue createObservableValue(Realm realm) {
57	return TextProperties.text(SWT.FocusOut).observe(realm, text);	57	return WidgetProperties.text(SWT.FocusOut).observe(realm, text);
58	}	58	}
59		59
60	public Object getValueType(IObservableValue observable) {	60	public Object getValueType(IObservableValue observable) {

Lines 21-27 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/TextEditableObservableValueTest.java (-2 / +2 lines)
21	import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;	21	import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
24	import org.eclipse.jface.databinding.swt.TextProperties;	24	import org.eclipse.jface.databinding.swt.WidgetProperties;
25	import org.eclipse.swt.SWT;	25	import org.eclipse.swt.SWT;
26	import org.eclipse.swt.widgets.Shell;	26	import org.eclipse.swt.widgets.Shell;
27	import org.eclipse.swt.widgets.Text;	27	import org.eclipse.swt.widgets.Text;
Lines 102-108 Link Here
102	}	102	}
103		103
104	public IObservableValue createObservableValue(Realm realm) {	104	public IObservableValue createObservableValue(Realm realm) {
105	return TextProperties.editable().observe(realm, text);	105	return WidgetProperties.editable().observe(realm, text);
106	}	106	}
107		107
108	public Object getValueType(IObservableValue observable) {	108	public Object getValueType(IObservableValue observable) {




import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.LabelProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;

		}

		public IObservableValue createObservableValue(Realm realm) {
			return WidgetProperties.text().observe(realm, label);
		}

		public void change(IObservable observable) {




import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Shell;

	 */
	public void testConstructorUpdateEventTypes() {
		try {
			WidgetProperties.text(SWT.None);
			WidgetProperties.text(SWT.FocusOut);
			WidgetProperties.text(SWT.Modify);
			assertTrue(true);
		} catch (IllegalArgumentException e) {
			fail();
		}

		try {
			WidgetProperties.text(SWT.Verify);
			fail();
		} catch (IllegalArgumentException e) {
			assertTrue(true);

	 * @throws Exception
	 */
	public void testGetValueBeforeFocusOutChangeEventsFire() throws Exception {
		IObservableValue observableValue = WidgetProperties.text(SWT.FocusOut)
				.observe(Realm.getDefault(), text);
		observableValue.addValueChangeListener(listener);


	}

	public void testDispose() throws Exception {
		IObservableValue observableValue = WidgetProperties.text(SWT.Modify)
				.observe(Realm.getDefault(), text);
		ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();
		observableValue.addValueChangeListener(testCounterValueChangeListener);

Lines 22-28 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/StyledTextObservableValueFocusOutTest.java (-2 / +2 lines)
22	import org.eclipse.core.databinding.observable.value.IObservableValue;	22	import org.eclipse.core.databinding.observable.value.IObservableValue;
23	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	23	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
24	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	24	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
25	import org.eclipse.jface.databinding.swt.StyledTextProperties;	25	import org.eclipse.jface.databinding.swt.WidgetProperties;
26	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.custom.StyledText;	27	import org.eclipse.swt.custom.StyledText;
28	import org.eclipse.swt.widgets.Shell;	28	import org.eclipse.swt.widgets.Shell;
Lines 55-61 Link Here
55	}	55	}
56		56
57	public IObservableValue createObservableValue(Realm realm) {	57	public IObservableValue createObservableValue(Realm realm) {
58	return StyledTextProperties.text(SWT.FocusOut).observe(realm, text);	58	return WidgetProperties.text(SWT.FocusOut).observe(realm, text);
59	}	59	}
60		60
61	public Object getValueType(IObservableValue observable) {	61	public Object getValueType(IObservableValue observable) {




import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.CComboProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;

		}

		public IObservableValue createObservableValue(Realm realm) {
			return WidgetProperties.singleSelectionIndex()
					.observe(realm, combo);
		}


Lines 22-28 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/SpinnerObservableValueMinTest.java (-2 / +2 lines)
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
24	import org.eclipse.jface.databinding.swt.SWTObservables;	24	import org.eclipse.jface.databinding.swt.SWTObservables;
25	import org.eclipse.jface.databinding.swt.SpinnerProperties;	25	import org.eclipse.jface.databinding.swt.WidgetProperties;
26	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.widgets.Display;	27	import org.eclipse.swt.widgets.Display;
28	import org.eclipse.swt.widgets.Shell;	28	import org.eclipse.swt.widgets.Shell;
Lines 97-103 Link Here
97	}	97	}
98		98
99	public IObservableValue createObservableValue(Realm realm) {	99	public IObservableValue createObservableValue(Realm realm) {
100	return SpinnerProperties.minimum().observe(realm, spinner);	100	return WidgetProperties.minimum().observe(realm, spinner);
101	}	101	}
102		102
103	public void change(IObservable observable) {	103	public void change(IObservable observable) {




import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.ButtonProperties;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;

		}

		public IObservableValue createObservableValue(Realm realm) {
			return WidgetProperties.selection().observe(realm, button);
		}

		public Object getValueType(IObservableValue observable) {

Lines 22-28 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/SpinnerObservableValueMaxTest.java (-2 / +2 lines)
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
24	import org.eclipse.jface.databinding.swt.SWTObservables;	24	import org.eclipse.jface.databinding.swt.SWTObservables;
25	import org.eclipse.jface.databinding.swt.SpinnerProperties;	25	import org.eclipse.jface.databinding.swt.WidgetProperties;
26	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.widgets.Display;	27	import org.eclipse.swt.widgets.Display;
28	import org.eclipse.swt.widgets.Shell;	28	import org.eclipse.swt.widgets.Shell;
Lines 97-103 Link Here
97	}	97	}
98		98
99	public IObservableValue createObservableValue(Realm realm) {	99	public IObservableValue createObservableValue(Realm realm) {
100	return SpinnerProperties.maximum().observe(realm, spinner);	100	return WidgetProperties.maximum().observe(realm, spinner);
101	}	101	}
102		102
103	public void change(IObservable observable) {	103	public void change(IObservable observable) {

Lines 22-28 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/ScaleObservableValueMinTest.java (-2 / +2 lines)
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
24	import org.eclipse.jface.databinding.swt.SWTObservables;	24	import org.eclipse.jface.databinding.swt.SWTObservables;
25	import org.eclipse.jface.databinding.swt.ScaleProperties;	25	import org.eclipse.jface.databinding.swt.WidgetProperties;
26	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.widgets.Display;	27	import org.eclipse.swt.widgets.Display;
28	import org.eclipse.swt.widgets.Scale;	28	import org.eclipse.swt.widgets.Scale;
Lines 97-103 Link Here
97	}	97	}
98		98
99	public IObservableValue createObservableValue(Realm realm) {	99	public IObservableValue createObservableValue(Realm realm) {
100	return ScaleProperties.minimum().observe(realm, scale);	100	return WidgetProperties.minimum().observe(realm, scale);
101	}	101	}
102		102
103	public void change(IObservable observable) {	103	public void change(IObservable observable) {

Lines 22-28 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/ShellObservableValueTest.java (-2 / +2 lines)
22	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	22	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
23	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;	23	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
24	import org.eclipse.jface.databinding.swt.SWTObservables;	24	import org.eclipse.jface.databinding.swt.SWTObservables;
25	import org.eclipse.jface.databinding.swt.ShellProperties;	25	import org.eclipse.jface.databinding.swt.WidgetProperties;
26	import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;	26	import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
27	import org.eclipse.swt.widgets.Shell;	27	import org.eclipse.swt.widgets.Shell;
28		28
Lines 112-118 Link Here
112	}	112	}
113		113
114	public IObservableValue createObservableValue(Realm realm) {	114	public IObservableValue createObservableValue(Realm realm) {
115	return ShellProperties.text().observe(realm, shell);	115	return WidgetProperties.text().observe(realm, shell);
116	}	116	}
117		117
118	public Object getValueType(IObservableValue observable) {	118	public Object getValueType(IObservableValue observable) {

Lines 22-28 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/StyledTextObservableValueModifyTest.java (-2 / +2 lines)
22	import org.eclipse.core.databinding.observable.value.IObservableValue;	22	import org.eclipse.core.databinding.observable.value.IObservableValue;
23	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	23	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
24	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	24	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
25	import org.eclipse.jface.databinding.swt.StyledTextProperties;	25	import org.eclipse.jface.databinding.swt.WidgetProperties;
26	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.custom.StyledText;	27	import org.eclipse.swt.custom.StyledText;
28	import org.eclipse.swt.widgets.Shell;	28	import org.eclipse.swt.widgets.Shell;
Lines 55-61 Link Here
55	}	55	}
56		56
57	public IObservableValue createObservableValue(Realm realm) {	57	public IObservableValue createObservableValue(Realm realm) {
58	return StyledTextProperties.text(SWT.Modify).observe(realm, text);	58	return WidgetProperties.text(SWT.Modify).observe(realm, text);
59	}	59	}
60		60
61	public Object getValueType(IObservableValue observable) {	61	public Object getValueType(IObservableValue observable) {




import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.CComboProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;

		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(WidgetProperties.text()
					.observe(realm, combo), combo);
		}





import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.ComboProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;

		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(WidgetProperties.text()
					.observe(realm, combo), combo);
		}


Lines 22-28 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/SpinnerObservableValueSelectionTest.java (-2 / +2 lines)
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
24	import org.eclipse.jface.databinding.swt.SWTObservables;	24	import org.eclipse.jface.databinding.swt.SWTObservables;
25	import org.eclipse.jface.databinding.swt.SpinnerProperties;	25	import org.eclipse.jface.databinding.swt.WidgetProperties;
26	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.widgets.Display;	27	import org.eclipse.swt.widgets.Display;
28	import org.eclipse.swt.widgets.Shell;	28	import org.eclipse.swt.widgets.Shell;
Lines 97-103 Link Here
97	}	97	}
98		98
99	public IObservableValue createObservableValue(Realm realm) {	99	public IObservableValue createObservableValue(Realm realm) {
100	return SpinnerProperties.selection().observe(realm, spinner);	100	return WidgetProperties.selection().observe(realm, spinner);
101	}	101	}
102		102
103	public void change(IObservable observable) {	103	public void change(IObservable observable) {




import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.ComboProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.internal.databinding.swt.ComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.ComboTextProperty;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;

	}

	public void testSetValueWithNull() {
		testSetValueWithNull(WidgetProperties.text());
		testSetValueWithNull(WidgetProperties.selection());
	}

	protected void testSetValueWithNull(IValueProperty property) {




import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.CComboProperties;
import org.eclipse.jface.databinding.swt.ISWTObservable;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;

		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(WidgetProperties.selection()
					.observe(realm, combo), combo);
		}





import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.CComboProperties;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;

	}

	public void testSetValueWithNull() {
		testSetValueWithNull(WidgetProperties.text());
		testSetValueWithNull(WidgetProperties.selection());
	}

	protected void testSetValueWithNull(IValueProperty property) {

Lines 21-27 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/TextObservableValueModifyTest.java (-2 / +2 lines)
21	import org.eclipse.core.databinding.observable.value.IObservableValue;	21	import org.eclipse.core.databinding.observable.value.IObservableValue;
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
24	import org.eclipse.jface.databinding.swt.TextProperties;	24	import org.eclipse.jface.databinding.swt.WidgetProperties;
25	import org.eclipse.swt.SWT;	25	import org.eclipse.swt.SWT;
26	import org.eclipse.swt.widgets.Shell;	26	import org.eclipse.swt.widgets.Shell;
27	import org.eclipse.swt.widgets.Text;	27	import org.eclipse.swt.widgets.Text;
Lines 54-60 Link Here
54	}	54	}
55		55
56	public IObservableValue createObservableValue(Realm realm) {	56	public IObservableValue createObservableValue(Realm realm) {
57	return TextProperties.text(SWT.Modify).observe(realm, text);	57	return WidgetProperties.text(SWT.Modify).observe(realm, text);
58	}	58	}
59		59
60	public Object getValueType(IObservableValue observable) {	60	public Object getValueType(IObservableValue observable) {




import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.ComboProperties;
import org.eclipse.jface.databinding.swt.ISWTObservable;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;

		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(WidgetProperties.selection()
					.observe(realm, combo), combo);
		}


Return to bug 194734

Lines 23-32 Link Here

(-)src/org/eclipse/jface/examples/databinding/snippets/Snippet025TableViewerWithPropertyDerivedColumns.java (-6 / +6 lines)
23	import org.eclipse.core.databinding.observable.value.IObservableValue;	23	import org.eclipse.core.databinding.observable.value.IObservableValue;
24	import org.eclipse.core.databinding.property.Properties;	24	import org.eclipse.core.databinding.property.Properties;
25	import org.eclipse.jface.databinding.swt.SWTObservables;	25	import org.eclipse.jface.databinding.swt.SWTObservables;
26	import org.eclipse.jface.databinding.swt.TextProperties;	26	import org.eclipse.jface.databinding.swt.WidgetProperties;
27	import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;	27	import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
28	import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;	28	import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
29	import org.eclipse.jface.databinding.viewers.SelectionProviderProperties;	29	import org.eclipse.jface.databinding.viewers.ViewerProperties;
30	import org.eclipse.jface.layout.GridDataFactory;	30	import org.eclipse.jface.layout.GridDataFactory;
31	import org.eclipse.jface.layout.GridLayoutFactory;	31	import org.eclipse.jface.layout.GridLayoutFactory;
32	import org.eclipse.jface.viewers.ComboViewer;	32	import org.eclipse.jface.viewers.ComboViewer;
Lines 247-256 Link Here
247	"mother.mother.name", "mother.father.name",	247	"mother.mother.name", "mother.father.name",
248	"father.mother.name", "father.father.name" });	248	"father.mother.name", "father.father.name" });
249		249
250	IObservableValue masterSelection = SelectionProviderProperties	250	IObservableValue masterSelection = ViewerProperties
251	.singleSelection().observe(peopleViewer);	251	.singleSelection().observe(peopleViewer);
252		252
253	dbc.bindValue(TextProperties.text(SWT.Modify).observe(nameText),	253	dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(nameText),
254	BeanProperties.value(Person.class, "name").observeDetail(	254	BeanProperties.value(Person.class, "name").observeDetail(
255	masterSelection), null, null);	255	masterSelection), null, null);
256		256
Lines 258-264 Link Here
258	bindViewer(mothercomboViewer, viewModel.getPeople(), Person.class,	258	bindViewer(mothercomboViewer, viewModel.getPeople(), Person.class,
259	"name");	259	"name");
260		260
261	dbc.bindValue(SelectionProviderProperties.singleSelection()	261	dbc.bindValue(ViewerProperties.singleSelection()
262	.observe(mothercomboViewer), BeanProperties.value(	262	.observe(mothercomboViewer), BeanProperties.value(
263	Person.class, "mother").observeDetail(masterSelection),	263	Person.class, "mother").observeDetail(masterSelection),
264	null, null);	264	null, null);
Lines 267-273 Link Here
267	bindViewer(fatherComboViewer, viewModel.getPeople(), Person.class,	267	bindViewer(fatherComboViewer, viewModel.getPeople(), Person.class,
268	"name");	268	"name");
269		269
270	dbc.bindValue(SelectionProviderProperties.singleSelection()	270	dbc.bindValue(ViewerProperties.singleSelection()
271	.observe(fatherComboViewer), BeanProperties.value(	271	.observe(fatherComboViewer), BeanProperties.value(
272	Person.class, "father").observeDetail(masterSelection),	272	Person.class, "father").observeDetail(masterSelection),
273	null, null);	273	null, null);

Removed Link Here

(-)src/org/eclipse/jface/databinding/swt/ToolItemProperties.java (-31 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Matthew Hall 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	* Matthew Hall - initial API and implementation (bug 194734)
10	******************************************************************************/
11
12	package org.eclipse.jface.databinding.swt;
13
14	import org.eclipse.core.databinding.property.value.IValueProperty;
15	import org.eclipse.jface.internal.databinding.swt.ToolItemTooltipTextProperty;
16
17	/**
18	* A factory for creating properties of SWT ToolItems
19	*
20	* @since 1.3
21	*/
22	public class ToolItemProperties {
23	/**
24	* Returns a value property for the tooltip text of a SWT ToolItems.
25	*
26	* @return a value property for the tooltip text of a SWT ToolItems.
27	*/
28	public static IValueProperty tooltipText() {
29	return new ToolItemTooltipTextProperty();
30	}
31	}

Lines 37-46 Link Here

(-)src/org/eclipse/jface/internal/databinding/swt/SWTVetoableValueDecorator.java (-2 / +9 lines)
37		37
38	private IObservableValue decorated;	38	private IObservableValue decorated;
39	private Widget widget;	39	private Widget widget;
		40	private boolean updating;
40		41
41	private IValueChangeListener valueListener = new IValueChangeListener() {	42	private IValueChangeListener valueListener = new IValueChangeListener() {
42	public void handleValueChange(ValueChangeEvent event) {	43	public void handleValueChange(ValueChangeEvent event) {
43	fireValueChange(event.diff);	44	if (!updating)
		45	fireValueChange(event.diff);
44	}	46	}
45	};	47	};
46		48
Lines 102-108 Link Here
102		104
103	protected void doSetApprovedValue(Object value) {	105	protected void doSetApprovedValue(Object value) {
104	checkRealm();	106	checkRealm();
105	decorated.setValue(value);	107	updating = true;
		108	try {
		109	decorated.setValue(value);
		110	} finally {
		111	updating = false;
		112	}
106	}	113	}
107		114
108	protected Object doGetValue() {	115	protected Object doGetValue() {