Attachment #115962 for bug #237856

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




 *     Boris Bokowski - bug 218269
 *     Matthew Hall - bug 218269, 240444, 239900
 *     Ashley Cambrell - bug 199179 
 *     Ovidio Mallo - bug 235195, 237856
 *******************************************************************************/
package org.eclipse.jface.databinding.wizard;


 * given wizard page, updating the wizard page's completion state and its error
 * message accordingly.
 * 
 * <p>
 * The completion state of the wizard page will only be set to <code>true</code>
 * if <i>all</i> of the following conditions are met:
 * <ul>
 * <li>The validation result from the data binding context has none of the
 * severities {@link IStatus#ERROR} or {@link IStatus#CANCEL}.</li>
 * <li>None of the validation status observables of the data binding context is
 * stale.</li>
 * </ul>
 * </p>
 * 
 * @noextend This class is not intended to be subclassed by clients.
 *
 * @since 1.1

Lines 9-14 Link Here

(-)src/org/eclipse/jface/databinding/dialog/DialogPageSupport.java (+11 lines)
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* (through WizardPageSupport.java)	10	* (through WizardPageSupport.java)
11	* Matthew Hall - initial API and implementation (bug 239900)	11	* Matthew Hall - initial API and implementation (bug 239900)
		12	* Matthew Hall - bug 237856
		13	* Ovidio Mallo - bug 237856
12	******************************************************************************/	14	******************************************************************************/
13		15
14	package org.eclipse.jface.databinding.dialog;	16	package org.eclipse.jface.databinding.dialog;
Lines 21-26 Link Here
21	import org.eclipse.core.databinding.observable.ChangeEvent;	23	import org.eclipse.core.databinding.observable.ChangeEvent;
22	import org.eclipse.core.databinding.observable.IChangeListener;	24	import org.eclipse.core.databinding.observable.IChangeListener;
23	import org.eclipse.core.databinding.observable.IObservable;	25	import org.eclipse.core.databinding.observable.IObservable;
		26	import org.eclipse.core.databinding.observable.IStaleListener;
		27	import org.eclipse.core.databinding.observable.StaleEvent;
24	import org.eclipse.core.databinding.observable.list.IListChangeListener;	28	import org.eclipse.core.databinding.observable.list.IListChangeListener;
25	import org.eclipse.core.databinding.observable.list.IObservableList;	29	import org.eclipse.core.databinding.observable.list.IObservableList;
26	import org.eclipse.core.databinding.observable.list.ListChangeEvent;	30	import org.eclipse.core.databinding.observable.list.ListChangeEvent;
Lines 148-154 Link Here
148	handleStatusChanged();	152	handleStatusChanged();
149	}	153	}
150	});	154	});
		155	aggregateStatus.addStaleListener(new IStaleListener() {
		156	public void handleStale(StaleEvent staleEvent) {
		157	currentStatusStale = true;
		158	handleStatusChanged();
		159	}
		160	});
151	currentStatus = (IStatus) aggregateStatus.getValue();	161	currentStatus = (IStatus) aggregateStatus.getValue();
		162	currentStatusStale = aggregateStatus.isStale();
152	handleStatusChanged();	163	handleStatusChanged();
153	dbc.getValidationStatusProviders().addListChangeListener(	164	dbc.getValidationStatusProviders().addListChangeListener(
154	validationStatusProvidersListener);	165	validationStatusProvidersListener);




 *
 * Contributors:
 *     Ovidio Mallo - initial API and implementation (bug 235195)
 *     Ovidio Mallo - bug 237856
 ******************************************************************************/

package org.eclipse.jface.tests.databinding.wizard;

import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.ValidationStatusProvider;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.ObservableTracker;
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.value.AbstractObservableValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.core.databinding.validation.ValidationStatus;
import org.eclipse.core.internal.commands.util.Util;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.databinding.wizard.WizardPageSupport;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;

		loadWizardPage(page);
	}

	public void testPageCompleteOnValidationStaleness() {
		IWizardPage page = new WizardPage("Page") {
			public void createControl(Composite parent) {
				setControl(parent);

				ValidationObservable validation = new ValidationObservable();

				DataBindingContext dbc = new DataBindingContext();
				dbc.addValidationStatusProvider(new ValidationProvider(
						validation));

				WizardPageSupport.create(this, dbc);

				assertTrue(isPageComplete());

				validation.setStale(true);
				assertFalse(isPageComplete());

				validation.setStale(false);
				assertTrue(isPageComplete());
			}
		};

		loadWizardPage(page);
	}

	private void loadWizardPage(IWizardPage page) {
		Wizard wizard = new Wizard() {
			public boolean performFinish() {

		dialog.create();
	}

	private static class ValidationObservable extends AbstractObservableValue {

		private Object value = ValidationStatus.ok();

		private boolean stale = false;

		public ValidationObservable() {
			super(Realm.getDefault());
		}

		protected Object doGetValue() {
			return value;
		}

		protected void doSetValue(Object value) {
			Object oldValue = this.value;
			this.value = value;
			if (!Util.equals(oldValue, value)) {
				fireValueChange(Diffs.createValueDiff(oldValue, value));
			}
		}

		public boolean isStale() {
			ObservableTracker.getterCalled(this);
			return stale;
		}

		public void setStale(boolean stale) {
			if (this.stale != stale) {
				this.stale = stale;
				if (stale) {
					fireStale();
				} else {
					fireValueChange(Diffs.createValueDiff(value, value));
				}
			}
		}

		public Object getValueType() {
			return IStatus.class;
		}
	}

	private static class ValidationProvider extends ValidationStatusProvider {

		private final IObservableValue validation;


Return to bug 237856

Lines 10-16 Link Here

(-)src/org/eclipse/jface/databinding/wizard/WizardPageSupport.java (-1 / +12 lines)
10	* Boris Bokowski - bug 218269	10	* Boris Bokowski - bug 218269
11	* Matthew Hall - bug 218269, 240444, 239900	11	* Matthew Hall - bug 218269, 240444, 239900
12	* Ashley Cambrell - bug 199179	12	* Ashley Cambrell - bug 199179
13	* Ovidio Mallo - bug 235195	13	* Ovidio Mallo - bug 235195, 237856
14	*******************************************************************************/	14	*******************************************************************************/
15	package org.eclipse.jface.databinding.wizard;	15	package org.eclipse.jface.databinding.wizard;
16		16
Lines 24-29 Link Here
24	* given wizard page, updating the wizard page's completion state and its error	24	* given wizard page, updating the wizard page's completion state and its error
25	* message accordingly.	25	* message accordingly.
26	*	26	*
		27	* <p>
		28	* The completion state of the wizard page will only be set to <code>true</code>
		29	* if <i>all</i> of the following conditions are met:
		30	* <ul>
		31	* <li>The validation result from the data binding context has none of the
		32	* severities {@link IStatus#ERROR} or {@link IStatus#CANCEL}.</li>
		33	* <li>None of the validation status observables of the data binding context is
		34	* stale.</li>
		35	* </ul>
		36	* </p>
		37	*
27	* @noextend This class is not intended to be subclassed by clients.	38	* @noextend This class is not intended to be subclassed by clients.
28	*	39	*
29	* @since 1.1	40	* @since 1.1

Lines 7-23 Link Here

(-)src/org/eclipse/jface/tests/databinding/wizard/WizardPageSupportTest.java (-1 / +76 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Ovidio Mallo - initial API and implementation (bug 235195)	9	* Ovidio Mallo - initial API and implementation (bug 235195)
		10	* Ovidio Mallo - bug 237856
10	******************************************************************************/	11	******************************************************************************/
11		12
12	package org.eclipse.jface.tests.databinding.wizard;	13	package org.eclipse.jface.tests.databinding.wizard;
13		14
14	import org.eclipse.core.databinding.DataBindingContext;	15	import org.eclipse.core.databinding.DataBindingContext;
15	import org.eclipse.core.databinding.ValidationStatusProvider;	16	import org.eclipse.core.databinding.ValidationStatusProvider;
		17	import org.eclipse.core.databinding.observable.Diffs;
		18	import org.eclipse.core.databinding.observable.ObservableTracker;
16	import org.eclipse.core.databinding.observable.Observables;	19	import org.eclipse.core.databinding.observable.Observables;
		20	import org.eclipse.core.databinding.observable.Realm;
17	import org.eclipse.core.databinding.observable.list.IObservableList;	21	import org.eclipse.core.databinding.observable.list.IObservableList;
		22	import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
18	import org.eclipse.core.databinding.observable.value.IObservableValue;	23	import org.eclipse.core.databinding.observable.value.IObservableValue;
19	import org.eclipse.core.databinding.observable.value.WritableValue;	24	import org.eclipse.core.databinding.observable.value.WritableValue;
20	import org.eclipse.core.databinding.validation.ValidationStatus;	25	import org.eclipse.core.databinding.validation.ValidationStatus;
		26	import org.eclipse.core.internal.commands.util.Util;
21	import org.eclipse.core.runtime.IStatus;	27	import org.eclipse.core.runtime.IStatus;
22	import org.eclipse.jface.databinding.wizard.WizardPageSupport;	28	import org.eclipse.jface.databinding.wizard.WizardPageSupport;
23	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;	29	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
Lines 69-74 Link Here
69	loadWizardPage(page);	75	loadWizardPage(page);
70	}	76	}
71		77
		78	public void testPageCompleteOnValidationStaleness() {
		79	IWizardPage page = new WizardPage("Page") {
		80	public void createControl(Composite parent) {
		81	setControl(parent);
		82
		83	ValidationObservable validation = new ValidationObservable();
		84
		85	DataBindingContext dbc = new DataBindingContext();
		86	dbc.addValidationStatusProvider(new ValidationProvider(
		87	validation));
		88
		89	WizardPageSupport.create(this, dbc);
		90
		91	assertTrue(isPageComplete());
		92
		93	validation.setStale(true);
		94	assertFalse(isPageComplete());
		95
		96	validation.setStale(false);
		97	assertTrue(isPageComplete());
		98	}
		99	};
		100
		101	loadWizardPage(page);
		102	}
		103
72	private void loadWizardPage(IWizardPage page) {	104	private void loadWizardPage(IWizardPage page) {
73	Wizard wizard = new Wizard() {	105	Wizard wizard = new Wizard() {
74	public boolean performFinish() {	106	public boolean performFinish() {
Lines 81-87 Link Here
81	dialog.create();	113	dialog.create();
82	}	114	}
83		115
84	private class ValidationProvider extends ValidationStatusProvider {	116	private static class ValidationObservable extends AbstractObservableValue {
		117
		118	private Object value = ValidationStatus.ok();
		119
		120	private boolean stale = false;
		121
		122	public ValidationObservable() {
		123	super(Realm.getDefault());
		124	}
		125
		126	protected Object doGetValue() {
		127	return value;
		128	}
		129
		130	protected void doSetValue(Object value) {
		131	Object oldValue = this.value;
		132	this.value = value;
		133	if (!Util.equals(oldValue, value)) {
		134	fireValueChange(Diffs.createValueDiff(oldValue, value));
		135	}
		136	}
		137
		138	public boolean isStale() {
		139	ObservableTracker.getterCalled(this);
		140	return stale;
		141	}
		142
		143	public void setStale(boolean stale) {
		144	if (this.stale != stale) {
		145	this.stale = stale;
		146	if (stale) {
		147	fireStale();
		148	} else {
		149	fireValueChange(Diffs.createValueDiff(value, value));
		150	}
		151	}
		152	}
		153
		154	public Object getValueType() {
		155	return IStatus.class;
		156	}
		157	}
		158
		159	private static class ValidationProvider extends ValidationStatusProvider {
85		160
86	private final IObservableValue validation;	161	private final IObservableValue validation;
87		162