Fix for Bug 117965 [DataBinding] Change tests plugin to pre-req examples
diff --git a/examples/org.eclipse.jface.examples.databinding/META-INF/MANIFEST.MF b/examples/org.eclipse.jface.examples.databinding/META-INF/MANIFEST.MF
index 01f02de..ba04080 100644
--- a/examples/org.eclipse.jface.examples.databinding/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.jface.examples.databinding/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@
Eclipse-LazyStart: true
Export-Package: org.eclipse.jface.examples.databinding.compositetable,
org.eclipse.jface.examples.databinding.compositetable.reflect,
- org.eclipse.jface.examples.databinding.javabean
+ org.eclipse.jface.examples.databinding.model
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/JavaBeanUpdatableValue.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/JavaBeanUpdatableValue.java
deleted file mode 100644
index e00c474..0000000
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/JavaBeanUpdatableValue.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.examples.databinding.javabean;
-
-import java.beans.PropertyChangeListener;
-import java.lang.reflect.Method;
-
-import org.eclipse.jface.databinding.ChangeEvent;
-import org.eclipse.jface.databinding.UpdatableValue;
-
-/**
- * @since 3.2
- *
- */
-public class JavaBeanUpdatableValue extends UpdatableValue {
- private final Object object;
-
- private String propertyName;
-
- private Method getMethod;
-
- private Method setMethod;
-
- private PropertyChangeListener listener;
-
- private boolean updating = false;
-
- /**
- * @param object
- * @param propertyName
- */
- public JavaBeanUpdatableValue(final Object object, String propertyName) {
- this.object = object;
- this.propertyName = propertyName;
- hookListener();
- }
-
- private Method getSetMethod() {
- if (setMethod != null)
- return setMethod;
- try {
- String setMethodName = setMethodName(propertyName);
- setMethod = object.getClass().getMethod(setMethodName,
- new Class[] { getGetMethod().getReturnType() });
- } catch (NoSuchMethodException e) {
- }
- return setMethod;
- }
-
- private Method getGetMethod() {
- if (getMethod != null)
- return getMethod;
- try {
- String getMethodName = getMethodName(propertyName);
- getMethod = object.getClass().getMethod(getMethodName, null);
- } catch (NoSuchMethodException e) {
- }
- return getMethod;
- }
-
- /**
- * @param propertyName
- * @return
- */
- public static String getMethodName(String propertyName) {
- // TODO: <gm> need to deal with BeanInfo overrides </gm>
- StringBuffer getMethodName = new StringBuffer();
- getMethodName.append("get");
- getMethodName.append(propertyName.substring(0, 1).toUpperCase());
- getMethodName.append(propertyName.substring(1));
- return getMethodName.toString();
- }
-
- /**
- * @param propertyName
- * @return
- */
- public static String setMethodName(String propertyName) {
- // TODO: <gm> need to deal with BeanInfo overrides </gm>
- StringBuffer getMethodName = new StringBuffer();
- getMethodName.append("set");
- getMethodName.append(propertyName.substring(0, 1).toUpperCase());
- getMethodName.append(propertyName.substring(1));
- return getMethodName.toString();
- }
-
- private void hookListener() {
- listener = new PropertyChangeListener() {
- public void propertyChange(java.beans.PropertyChangeEvent event) {
- fireChangeEvent(ChangeEvent.CHANGE, event.getOldValue(), event
- .getNewValue());
- }
- };
- // See if the object implements the API for property change listener
- }
-
- public void setValue(Object value) {
- updating = true;
- try {
- Object oldValue = getValue();
- getSetMethod().invoke(object, new Object[] { value });
- fireChangeEvent(ChangeEvent.CHANGE, oldValue, getValue());
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- updating = false;
- }
- }
-
- public Object getValue() {
- try {
- return getGetMethod().invoke(object, null);
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
- public void dispose() {
- super.dispose();
- }
-
- public String toString() {
- return propertyName.toString() + " of " + object.toString();
- }
-
- public Class getValueType() {
- return getGetMethod().getReturnType();
- }
-
-}
\ No newline at end of file
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/Person.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/Person.java
deleted file mode 100644
index 23746dc..0000000
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/Person.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.examples.databinding.javabean;
-
-import java.util.List;
-
-public class Person {
-
- private Person spouse;
-
- private List managers;
-
- private String firstName;
-
- private String lastName;
-
- private int age;
-
- public int getAge() {
- return age;
- }
-
- public void setAge(int age) {
- this.age = age;
- }
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
- public Person getSpouse() {
- return spouse;
- }
-
- public void setSpouse(Person spouse) {
- this.spouse = spouse;
- }
-
-}
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/PersonSampleData.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/PersonSampleData.java
deleted file mode 100644
index 393912d..0000000
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/PersonSampleData.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.examples.databinding.javabean;
-
-import java.util.Map;
-
-import org.eclipse.jface.databinding.DataBinding;
-import org.eclipse.jface.databinding.IDataBindingContext;
-import org.eclipse.jface.databinding.IUpdatable;
-import org.eclipse.jface.databinding.IUpdatableFactory;
-import org.eclipse.jface.databinding.Property;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @since 3.2
- *
- */
-public class PersonSampleData {
-
- /**
- * @param aControl
- * @return the data binding service
- */
- public static IDataBindingContext getSWTtoJavaBeanDatabindingContext(
- Control aControl) {
-
- IDataBindingContext dbc = DataBinding.createContext(aControl);
-
- IUpdatableFactory emfValueFactory = new IUpdatableFactory() {
- public IUpdatable createUpdatable(Map properties,
- Object description, IDataBindingContext bindingContext) {
- if (description instanceof Property) {
- Property propertyDescription = (Property) description;
- Object object = propertyDescription.getObject();
- if (object instanceof Person) {
- return new JavaBeanUpdatableValue(object,
- (String) propertyDescription.getPropertyID());
- }
- }
- return null;
- }
- };
- dbc.addUpdatableFactory(emfValueFactory);
-
- return dbc;
-
- }
-
-}
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/TextBinding.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/TextBinding.java
deleted file mode 100644
index 801e624..0000000
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/javabean/TextBinding.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jface.examples.databinding.javabean;
-
-import org.eclipse.jface.databinding.IDataBindingContext;
-import org.eclipse.jface.databinding.Property;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @since 3.2
- *
- */
-public class TextBinding extends Composite {
-
- private IDataBindingContext dbc;
-
- private Group group = null;
-
- private Text txtDescription = null;
-
- private Label label2 = null;
-
- private Label label3 = null;
-
- private Label label5 = null;
-
- private Text txtName = null;
-
- private Text txtLocation = null;
-
- private Text txtDescription_1 = null;
-
- private Text txtName_1 = null;
-
- private Text txtLocation_1 = null;
-
- /**
- * @param parent
- * @param style
- */
- public TextBinding(Composite parent, int style) {
- super(parent, style);
- initialize();
- }
-
- /**
- * This method initializes sShell
- *
- */
- private void initialize() {
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- setLayout(gridLayout);
- createGroup();
- this.setSize(new org.eclipse.swt.graphics.Point(444, 215));
- bind();
- }
-
- private void bind() {
- dbc = PersonSampleData.getSWTtoJavaBeanDatabindingContext(this);
-
- Person person = new Person();
- person.setAge(35);
- person.setFirstName("John"); //$NON-NLS-1$
- person.setLastName("Doe"); //$NON-NLS-1$
-
- dbc.bind(txtDescription, new Property(person, "firstName"), null);//$NON-NLS-1$
- dbc.bind(txtDescription_1, new Property(person, "firstName"), null);//$NON-NLS-1$
-
- dbc.bind(txtName, new Property(person, "lastName"),null);//$NON-NLS-1$
- dbc.bind(txtName_1, new Property(person, "lastName"),null);//$NON-NLS-1$
-
- dbc.bind(txtLocation, new Property(person, "age"),null);//$NON-NLS-1$
- dbc.bind(txtLocation_1, new Property(person, "age"),null);//$NON-NLS-1$
-
- }
-
- /**
- * This method initializes group
- *
- */
- private void createGroup() {
- GridData gridData8 = new org.eclipse.swt.layout.GridData();
- gridData8.grabExcessHorizontalSpace = true;
- gridData8.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
- gridData8.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- GridData gridData7 = new org.eclipse.swt.layout.GridData();
- gridData7.grabExcessHorizontalSpace = true;
- gridData7.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
- gridData7.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- GridData gridData6 = new org.eclipse.swt.layout.GridData();
- gridData6.grabExcessHorizontalSpace = true;
- gridData6.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
- gridData6.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- GridData gridData5 = new org.eclipse.swt.layout.GridData();
- gridData5.grabExcessHorizontalSpace = true;
- gridData5.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
- gridData5.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- GridData gridData4 = new org.eclipse.swt.layout.GridData();
- gridData4.grabExcessHorizontalSpace = true;
- gridData4.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
- gridData4.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- GridData gridData3 = new org.eclipse.swt.layout.GridData();
- gridData3.grabExcessHorizontalSpace = true;
- gridData3.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER;
- gridData3.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- GridLayout gridLayout1 = new GridLayout();
- gridLayout1.numColumns = 3;
- GridData gridData2 = new org.eclipse.swt.layout.GridData();
- gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL;
- gridData2.horizontalSpan = 2;
- gridData2.grabExcessVerticalSpace = true;
- gridData2.grabExcessHorizontalSpace = true;
- gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.FILL;
- group = new Group(this, SWT.NONE);
- group.setText("Winter holiday");
- group.setLayout(gridLayout1);
- group.setLayoutData(gridData2);
- label2 = new Label(group, SWT.NONE);
- label2.setText("Description:");
- txtDescription = new Text(group, SWT.BORDER);
- txtDescription.setLayoutData(gridData3);
- txtDescription_1 = new Text(group, SWT.BORDER);
- txtDescription_1.setLayoutData(gridData8);
- label3 = new Label(group, SWT.NONE);
- label3.setText("Name:");
- txtName = new Text(group, SWT.BORDER);
- txtName.setLayoutData(gridData4);
- txtName_1 = new Text(group, SWT.BORDER);
- txtName_1.setLayoutData(gridData7);
- label5 = new Label(group, SWT.NONE);
- label5.setText("Location:");
- txtLocation = new Text(group, SWT.BORDER);
- txtLocation.setLayoutData(gridData5);
- txtLocation_1 = new Text(group, SWT.BORDER);
- txtLocation_1.setLayoutData(gridData6);
- }
-}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Account.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Account.java
similarity index 96%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Account.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Account.java
index c406db8..293abfa 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Account.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Account.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
public class Account extends ModelObject {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Adventure.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Adventure.java
similarity index 97%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Adventure.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Adventure.java
index 0560515..acef9af 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Adventure.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Adventure.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
import org.eclipse.jface.databinding.validator.IValidator;
import org.eclipse.jface.databinding.validators.String2IntValidator;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/AdventureFactory.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/AdventureFactory.java
similarity index 93%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/AdventureFactory.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/AdventureFactory.java
index f85166f..2b95e13 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/AdventureFactory.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/AdventureFactory.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
public class AdventureFactory {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/AggregateUpdatableValue.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/AggregateUpdatableValue.java
similarity index 97%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/AggregateUpdatableValue.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/AggregateUpdatableValue.java
index 408137a..afcf021 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/AggregateUpdatableValue.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/AggregateUpdatableValue.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
import java.util.StringTokenizer;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Cart.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Cart.java
similarity index 91%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Cart.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Cart.java
index fd5fadd..b82f45e 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Cart.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Cart.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
public class Cart {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Catalog.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Catalog.java
similarity index 96%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Catalog.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Catalog.java
index c2e0b4b..7ad7af0 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Catalog.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Catalog.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
import java.util.*;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Category.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Category.java
similarity index 94%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Category.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Category.java
index c1a7284..29461f0 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Category.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Category.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
public class Category extends ModelObject {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Lodging.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Lodging.java
similarity index 93%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Lodging.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Lodging.java
index fd5294d..d295cd8 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Lodging.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Lodging.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
public class Lodging extends ModelObject {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/ModelObject.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/ModelObject.java
similarity index 97%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/ModelObject.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/ModelObject.java
index b98373e..98c885b 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/ModelObject.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/ModelObject.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/PhoneConverter.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/PhoneConverter.java
similarity index 96%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/PhoneConverter.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/PhoneConverter.java
index 1feefb5..8233841 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/PhoneConverter.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/PhoneConverter.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
import org.eclipse.jface.databinding.converter.IConverter;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/PhoneValidator.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/PhoneValidator.java
similarity index 93%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/PhoneValidator.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/PhoneValidator.java
index 018c498..ce01bfc 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/PhoneValidator.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/PhoneValidator.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
import org.eclipse.jface.databinding.validator.IValidator;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/PriceModelObject.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/PriceModelObject.java
similarity index 96%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/PriceModelObject.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/PriceModelObject.java
index 591d7fa..f005cd4 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/PriceModelObject.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/PriceModelObject.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
public class PriceModelObject extends ModelObject {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/SampleData.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/SampleData.java
similarity index 98%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/SampleData.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/SampleData.java
index 249b9a2..274be7b 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/SampleData.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/SampleData.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Signon.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Signon.java
similarity index 94%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Signon.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Signon.java
index 86ce61c..d0e289e 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Signon.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Signon.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
public class Signon extends ModelObject {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/StateConverter.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/StateConverter.java
similarity index 97%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/StateConverter.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/StateConverter.java
index b392d33..01413de 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/StateConverter.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/StateConverter.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
import org.eclipse.jface.databinding.converter.IConverter;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Transportation.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Transportation.java
similarity index 94%
rename from tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Transportation.java
rename to examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Transportation.java
index 3ffdfb0..12a5074 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/model/Transportation.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/model/Transportation.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jface.tests.databinding.scenarios.model;
+package org.eclipse.jface.examples.databinding.model;
public class Transportation extends ModelObject {
diff --git a/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF b/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
index 492eeb4..74ddc12 100644
--- a/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
@@ -10,5 +10,6 @@
org.junit,
org.eclipse.swt,
org.eclipse.jface,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.jface.examples.databinding
Export-Package: org.eclipse.jface.tests.databinding.util
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ButtonControlScenario.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ButtonControlScenario.java
index ba6313b..37e3b77 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ButtonControlScenario.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ButtonControlScenario.java
@@ -11,8 +11,8 @@
package org.eclipse.jface.tests.databinding.scenarios;
import org.eclipse.jface.databinding.Property;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ComboViewerScenario.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ComboViewerScenario.java
index 9cad90d..d51213d 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ComboViewerScenario.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ComboViewerScenario.java
@@ -12,9 +12,9 @@
import org.eclipse.jface.databinding.Property;
import org.eclipse.jface.databinding.viewers.ViewersProperties;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.Catalog;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.Catalog;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.SWT;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/CustomConverterScenarios.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/CustomConverterScenarios.java
index c35deaa..bb60dd2 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/CustomConverterScenarios.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/CustomConverterScenarios.java
@@ -12,9 +12,9 @@
import org.eclipse.jface.databinding.Property;
import org.eclipse.jface.databinding.swt.SWTProperties;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.PriceModelObject;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.PriceModelObject;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Spinner;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/CustomScenarios.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/CustomScenarios.java
index a73484e..a0bec83 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/CustomScenarios.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/CustomScenarios.java
@@ -12,9 +12,9 @@
import org.eclipse.jface.databinding.IUpdatableValue;
import org.eclipse.jface.databinding.Property;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.AggregateUpdatableValue;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.AggregateUpdatableValue;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Text;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/LabelControlScenario.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/LabelControlScenario.java
index 8eb28e8..2f65d1a 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/LabelControlScenario.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/LabelControlScenario.java
@@ -11,8 +11,8 @@
package org.eclipse.jface.tests.databinding.scenarios;
import org.eclipse.jface.databinding.Property;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Label;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ListViewerScenario.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ListViewerScenario.java
index 3815825..560b3b5 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ListViewerScenario.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ListViewerScenario.java
@@ -12,9 +12,9 @@
import org.eclipse.jface.databinding.Property;
import org.eclipse.jface.databinding.viewers.ViewersProperties;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.Catalog;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.Catalog;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ListViewer;
import org.eclipse.swt.SWT;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/MasterDetailScenarios.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/MasterDetailScenarios.java
index 7746190..e8783bb 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/MasterDetailScenarios.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/MasterDetailScenarios.java
@@ -18,11 +18,11 @@
import org.eclipse.jface.databinding.swt.SWTProperties;
import org.eclipse.jface.databinding.updatables.ConditionalUpdatableValue;
import org.eclipse.jface.databinding.viewers.ViewersProperties;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.Catalog;
-import org.eclipse.jface.tests.databinding.scenarios.model.Category;
-import org.eclipse.jface.tests.databinding.scenarios.model.Lodging;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.Catalog;
+import org.eclipse.jface.examples.databinding.model.Category;
+import org.eclipse.jface.examples.databinding.model.Lodging;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.jface.viewers.ContentViewer;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/PropertyScenarios.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/PropertyScenarios.java
index 5782ef6..c866a55 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/PropertyScenarios.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/PropertyScenarios.java
@@ -25,9 +25,9 @@
import org.eclipse.jface.databinding.converters.IdentityConverter;
import org.eclipse.jface.databinding.swt.SWTProperties;
import org.eclipse.jface.databinding.validator.IValidator;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.Cart;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.Cart;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.FocusListener;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ReadOnlyComboScenarios.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ReadOnlyComboScenarios.java
index 901a205..0738745 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ReadOnlyComboScenarios.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ReadOnlyComboScenarios.java
@@ -20,11 +20,11 @@
import org.eclipse.jface.databinding.Property;
import org.eclipse.jface.databinding.swt.SWTProperties;
import org.eclipse.jface.databinding.viewers.ViewersProperties;
-import org.eclipse.jface.tests.databinding.scenarios.model.Account;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.Catalog;
-import org.eclipse.jface.tests.databinding.scenarios.model.Lodging;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Account;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.Catalog;
+import org.eclipse.jface.examples.databinding.model.Lodging;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredContentProvider;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ScenariosTestCase.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ScenariosTestCase.java
index 5d58798..e50ca03 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ScenariosTestCase.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/ScenariosTestCase.java
@@ -16,7 +16,7 @@
import org.eclipse.jface.databinding.IDataBindingContext;
import org.eclipse.jface.databinding.swt.SWTUpdatableFactory;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Button;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/SpinnerControlScenario.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/SpinnerControlScenario.java
index 545910f..6832f5b 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/SpinnerControlScenario.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/SpinnerControlScenario.java
@@ -11,8 +11,8 @@
package org.eclipse.jface.tests.databinding.scenarios;
import org.eclipse.jface.databinding.Property;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Spinner;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TableScenarios.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TableScenarios.java
index de782fa..dabacb3 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TableScenarios.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TableScenarios.java
@@ -15,14 +15,14 @@
import org.eclipse.jface.databinding.Property;
import org.eclipse.jface.databinding.converter.IConverter;
import org.eclipse.jface.databinding.viewers.TableViewerDescription;
-import org.eclipse.jface.tests.databinding.scenarios.model.Account;
-import org.eclipse.jface.tests.databinding.scenarios.model.Catalog;
-import org.eclipse.jface.tests.databinding.scenarios.model.Category;
-import org.eclipse.jface.tests.databinding.scenarios.model.PhoneConverter;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
-import org.eclipse.jface.tests.databinding.scenarios.model.Signon;
-import org.eclipse.jface.tests.databinding.scenarios.model.StateConverter;
-import org.eclipse.jface.tests.databinding.scenarios.model.Transportation;
+import org.eclipse.jface.examples.databinding.model.Account;
+import org.eclipse.jface.examples.databinding.model.Catalog;
+import org.eclipse.jface.examples.databinding.model.Category;
+import org.eclipse.jface.examples.databinding.model.PhoneConverter;
+import org.eclipse.jface.examples.databinding.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Signon;
+import org.eclipse.jface.examples.databinding.model.StateConverter;
+import org.eclipse.jface.examples.databinding.model.Transportation;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.TableViewer;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TextControlScenario.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TextControlScenario.java
index 240361d..6473bd1 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TextControlScenario.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TextControlScenario.java
@@ -14,12 +14,12 @@
import org.eclipse.jface.databinding.BindSpec;
import org.eclipse.jface.databinding.IDataBindingContext;
import org.eclipse.jface.databinding.Property;
-import org.eclipse.jface.tests.databinding.scenarios.model.Account;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.PhoneConverter;
-import org.eclipse.jface.tests.databinding.scenarios.model.PhoneValidator;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
-import org.eclipse.jface.tests.databinding.scenarios.model.Transportation;
+import org.eclipse.jface.examples.databinding.model.Account;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.PhoneConverter;
+import org.eclipse.jface.examples.databinding.model.PhoneValidator;
+import org.eclipse.jface.examples.databinding.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Transportation;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TreeScenarios.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TreeScenarios.java
index 585ceb7..80282ac 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TreeScenarios.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TreeScenarios.java
@@ -21,12 +21,12 @@
import org.eclipse.jface.databinding.TreeModelDescription;
import org.eclipse.jface.databinding.viewers.TreeViewerDescription;
import org.eclipse.jface.databinding.viewers.ViewersProperties;
-import org.eclipse.jface.tests.databinding.scenarios.model.Account;
-import org.eclipse.jface.tests.databinding.scenarios.model.Adventure;
-import org.eclipse.jface.tests.databinding.scenarios.model.Catalog;
-import org.eclipse.jface.tests.databinding.scenarios.model.Category;
-import org.eclipse.jface.tests.databinding.scenarios.model.Lodging;
-import org.eclipse.jface.tests.databinding.scenarios.model.SampleData;
+import org.eclipse.jface.examples.databinding.model.Account;
+import org.eclipse.jface.examples.databinding.model.Adventure;
+import org.eclipse.jface.examples.databinding.model.Catalog;
+import org.eclipse.jface.examples.databinding.model.Category;
+import org.eclipse.jface.examples.databinding.model.Lodging;
+import org.eclipse.jface.examples.databinding.model.SampleData;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
