Skip to content
Snippets Groups Projects
Commit 56b39c48 authored by dgelessus's avatar dgelessus
Browse files

Replace uses of deprecated Eclipse APIs that were removed in Rodin 3.9 

These APIs were deprecated since 2014, but our code that used them was
written in 2012...
parent b5eb4301
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 133 additions and 121 deletions
de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
+ 1
− 0
View file @ 56b39c48
...@@ -7,6 +7,7 @@ Bundle-Activator: de.bmotionstudio.gef.editor.BMotionEditorPlugin ...@@ -7,6 +7,7 @@ Bundle-Activator: de.bmotionstudio.gef.editor.BMotionEditorPlugin
Require-Bundle: de.prob.core;bundle-version="[9.5.2,9.6.0)";visibility:=reexport, Require-Bundle: de.prob.core;bundle-version="[9.5.2,9.6.0)";visibility:=reexport,
org.eclipse.core.databinding;bundle-version="[1.10.0,2.0.0)", org.eclipse.core.databinding;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.beans;bundle-version="[1.7.0,2.0.0)", org.eclipse.core.databinding.beans;bundle-version="[1.7.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.7.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
org.eclipse.gef;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, org.eclipse.gef;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/edit/IntEditingSupport.java
+ 4
− 4
View file @ 56b39c48
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
package de.bmotionstudio.gef.editor.edit; package de.bmotionstudio.gef.editor.edit;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport; import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport;
import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewer;
...@@ -47,13 +47,13 @@ public class IntEditingSupport extends ObservableValueEditingSupport { ...@@ -47,13 +47,13 @@ public class IntEditingSupport extends ObservableValueEditingSupport {
@Override @Override
protected IObservableValue doCreateCellEditorObservable( protected IObservableValue doCreateCellEditorObservable(
CellEditor cellEditor) { CellEditor cellEditor) {
return SWTObservables.observeText(cellEditor.getControl(), SWT.Modify); return WidgetProperties.text(SWT.Modify).observe(cellEditor.getControl());
} }
@Override @Override
protected IObservableValue doCreateElementObservable(Object element, protected IObservableValue doCreateElementObservable(Object element,
ViewerCell cell) { ViewerCell cell) {
return BeansObservables.observeValue(element, atr); return BeanProperties.value(atr).observe(element);
} }
@Override @Override
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/edit/PredicateEditingSupport.java
+ 4
− 4
View file @ 56b39c48
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
package de.bmotionstudio.gef.editor.edit; package de.bmotionstudio.gef.editor.edit;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport; import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport;
import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewer;
...@@ -41,13 +41,13 @@ public class PredicateEditingSupport extends ObservableValueEditingSupport { ...@@ -41,13 +41,13 @@ public class PredicateEditingSupport extends ObservableValueEditingSupport {
@Override @Override
protected IObservableValue doCreateCellEditorObservable( protected IObservableValue doCreateCellEditorObservable(
CellEditor cellEditor) { CellEditor cellEditor) {
return SWTObservables.observeText(cellEditor.getControl(), SWT.Modify); return WidgetProperties.text(SWT.Modify).observe(cellEditor.getControl());
} }
@Override @Override
protected IObservableValue doCreateElementObservable(Object element, protected IObservableValue doCreateElementObservable(Object element,
ViewerCell cell) { ViewerCell cell) {
return BeansObservables.observeValue(element, property); return BeanProperties.value(property).observe(element);
} }
@Override @Override
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/edit/TextEditingSupport.java
+ 4
− 4
View file @ 56b39c48
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
package de.bmotionstudio.gef.editor.edit; package de.bmotionstudio.gef.editor.edit;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport; import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport;
import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ColumnViewer; import org.eclipse.jface.viewers.ColumnViewer;
...@@ -34,13 +34,13 @@ public class TextEditingSupport extends ObservableValueEditingSupport { ...@@ -34,13 +34,13 @@ public class TextEditingSupport extends ObservableValueEditingSupport {
@Override @Override
protected IObservableValue doCreateCellEditorObservable( protected IObservableValue doCreateCellEditorObservable(
CellEditor cellEditor) { CellEditor cellEditor) {
return SWTObservables.observeText(cellEditor.getControl(), SWT.Modify); return WidgetProperties.text(SWT.Modify).observe(cellEditor.getControl());
} }
@Override @Override
protected IObservableValue doCreateElementObservable(Object element, protected IObservableValue doCreateElementObservable(Object element,
ViewerCell cell) { ViewerCell cell) {
return BeansObservables.observeValue(element, property); return BeanProperties.value(property).observe(element);
} }
@Override @Override
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/edit/TypeEditingSupport.java
+ 4
− 4
View file @ 56b39c48
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
package de.bmotionstudio.gef.editor.edit; package de.bmotionstudio.gef.editor.edit;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport; import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport;
import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ColumnViewer; import org.eclipse.jface.viewers.ColumnViewer;
...@@ -33,13 +33,13 @@ public class TypeEditingSupport extends ObservableValueEditingSupport { ...@@ -33,13 +33,13 @@ public class TypeEditingSupport extends ObservableValueEditingSupport {
@Override @Override
protected IObservableValue doCreateCellEditorObservable( protected IObservableValue doCreateCellEditorObservable(
CellEditor cellEditor) { CellEditor cellEditor) {
return SWTObservables.observeSelection(cellEditor.getControl()); return WidgetProperties.widgetSelection().observe(cellEditor.getControl());
} }
@Override @Override
protected IObservableValue doCreateElementObservable(Object element, protected IObservableValue doCreateElementObservable(Object element,
ViewerCell cell) { ViewerCell cell) {
return BeansObservables.observeValue(element, propertyName); return BeanProperties.value(propertyName).observe(element);
} }
@Override @Override
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardColumnObserver.java
+ 9
− 8
View file @ 56b39c48
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
package de.bmotionstudio.gef.editor.observer.wizard; package de.bmotionstudio.gef.editor.observer.wizard;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.wizard.WizardPage; import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
...@@ -75,14 +75,15 @@ public class WizardColumnObserver extends ObserverWizard { ...@@ -75,14 +75,15 @@ public class WizardColumnObserver extends ObserverWizard {
private void initBindings(DataBindingContext dbc) { private void initBindings(DataBindingContext dbc) {
dbc.bindValue(SWTObservables.observeText(txtPredicate, SWT.Modify), dbc.bindValue(
BeansObservables.observeValue( WidgetProperties.text(SWT.Modify).observe(txtPredicate),
(ColumnObserver) getObserver(), "predicate")); BeanProperties.value(ColumnObserver.class, "predicate")
.observe((ColumnObserver) getObserver()));
dbc.bindValue( dbc.bindValue(
SWTObservables.observeText(txtExpression, SWT.Modify), WidgetProperties.text(SWT.Modify).observe(txtExpression),
BeansObservables.observeValue( BeanProperties.value(ColumnObserver.class, "expression")
(ColumnObserver) getObserver(), "expression")); .observe((ColumnObserver) getObserver()));
} }
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverCSwitchCoordinates.java
+ 9
− 7
View file @ 56b39c48
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
package de.bmotionstudio.gef.editor.observer.wizard; package de.bmotionstudio.gef.editor.observer.wizard;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
...@@ -41,6 +41,7 @@ import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport; ...@@ -41,6 +41,7 @@ import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
import de.bmotionstudio.gef.editor.edit.TextEditingSupport; import de.bmotionstudio.gef.editor.edit.TextEditingSupport;
import de.bmotionstudio.gef.editor.model.BControl; import de.bmotionstudio.gef.editor.model.BControl;
import de.bmotionstudio.gef.editor.observer.Observer; import de.bmotionstudio.gef.editor.observer.Observer;
import de.bmotionstudio.gef.editor.observer.ObserverEvalObject;
import de.bmotionstudio.gef.editor.observer.ObserverWizard; import de.bmotionstudio.gef.editor.observer.ObserverWizard;
import de.bmotionstudio.gef.editor.observer.SwitchChildCoordinates; import de.bmotionstudio.gef.editor.observer.SwitchChildCoordinates;
import de.bmotionstudio.gef.editor.observer.ToggleObjectCoordinates; import de.bmotionstudio.gef.editor.observer.ToggleObjectCoordinates;
...@@ -168,12 +169,13 @@ public class WizardObserverCSwitchCoordinates extends ObserverWizard { ...@@ -168,12 +169,13 @@ public class WizardObserverCSwitchCoordinates extends ObserverWizard {
ObservableListContentProvider contentProvider = new ObservableListContentProvider(); ObservableListContentProvider contentProvider = new ObservableListContentProvider();
tableViewer.setContentProvider(contentProvider); tableViewer.setContentProvider(contentProvider);
tableViewer tableViewer.setLabelProvider(new ObserverLabelProvider(new IObservableMap[] {
.setLabelProvider(new ObserverLabelProvider( BeanProperties.value(ObserverEvalObject.class, "eval").observeDetail(contentProvider.getKnownElements()),
BeansObservables.observeMaps( BeanProperties.value(ToggleObjectCoordinates.class, "bcontrol").observeDetail(contentProvider.getKnownElements()),
contentProvider.getKnownElements(), BeanProperties.value(ToggleObjectCoordinates.class, "x").observeDetail(contentProvider.getKnownElements()),
new String[] { "eval", "bcontrol", "x", BeanProperties.value(ToggleObjectCoordinates.class, "y").observeDetail(contentProvider.getKnownElements()),
"y", "animate" }))); BeanProperties.value(ToggleObjectCoordinates.class, "animate").observeDetail(contentProvider.getKnownElements()),
}));
final WritableList input = new WritableList( final WritableList input = new WritableList(
((SwitchChildCoordinates) getObserver()).getToggleObjects(), ((SwitchChildCoordinates) getObserver()).getToggleObjects(),
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverListenOperationByPredicate.java
+ 9
− 6
View file @ 56b39c48
...@@ -10,7 +10,7 @@ import java.util.ArrayList; ...@@ -10,7 +10,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.list.ComputedList; import org.eclipse.core.databinding.observable.list.ComputedList;
import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.map.IObservableMap;
...@@ -55,6 +55,7 @@ import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport; ...@@ -55,6 +55,7 @@ import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
import de.bmotionstudio.gef.editor.model.BControl; import de.bmotionstudio.gef.editor.model.BControl;
import de.bmotionstudio.gef.editor.observer.ListenOperationByPredicate; import de.bmotionstudio.gef.editor.observer.ListenOperationByPredicate;
import de.bmotionstudio.gef.editor.observer.Observer; import de.bmotionstudio.gef.editor.observer.Observer;
import de.bmotionstudio.gef.editor.observer.ObserverEvalObject;
import de.bmotionstudio.gef.editor.observer.ObserverWizard; import de.bmotionstudio.gef.editor.observer.ObserverWizard;
import de.bmotionstudio.gef.editor.property.CheckboxCellEditorHelper; import de.bmotionstudio.gef.editor.property.CheckboxCellEditorHelper;
import de.bmotionstudio.gef.editor.scheduler.PredicateOperation; import de.bmotionstudio.gef.editor.scheduler.PredicateOperation;
...@@ -169,11 +170,13 @@ public class WizardObserverListenOperationByPredicate extends ObserverWizard { ...@@ -169,11 +170,13 @@ public class WizardObserverListenOperationByPredicate extends ObserverWizard {
ObservableListContentProvider contentProvider = new ObservableListContentProvider(); ObservableListContentProvider contentProvider = new ObservableListContentProvider();
tableViewer.setContentProvider(contentProvider); tableViewer.setContentProvider(contentProvider);
tableViewer.setLabelProvider(new ObserverLabelProvider( tableViewer.setLabelProvider(new ObserverLabelProvider(new IObservableMap[] {
BeansObservables.observeMaps( BeanProperties.value(PredicateOperation.class, "operationName").observeDetail(contentProvider.getKnownElements()),
contentProvider.getKnownElements(), new String[] { BeanProperties.value(PredicateOperation.class, "predicate").observeDetail(contentProvider.getKnownElements()),
"operationName", "predicate", "attribute", BeanProperties.value(ObserverEvalObject.class, "attribute").observeDetail(contentProvider.getKnownElements()),
"value", "isExpressionMode" }))); BeanProperties.value(ObserverEvalObject.class, "value").observeDetail(contentProvider.getKnownElements()),
BeanProperties.value(ObserverEvalObject.class, "isExpressionMode").observeDetail(contentProvider.getKnownElements()),
}));
final WritableList input = new WritableList( final WritableList input = new WritableList(
((ListenOperationByPredicate) getObserver()).getList(), ((ListenOperationByPredicate) getObserver()).getList(),
PredicateOperation.class); PredicateOperation.class);
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSetAttribute.java
+ 8
− 6
View file @ 56b39c48
...@@ -9,7 +9,7 @@ import java.util.ArrayList; ...@@ -9,7 +9,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.list.ComputedList; import org.eclipse.core.databinding.observable.list.ComputedList;
import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.map.IObservableMap;
...@@ -54,6 +54,7 @@ import de.bmotionstudio.gef.editor.edit.IsExpressionModeEditingSupport; ...@@ -54,6 +54,7 @@ import de.bmotionstudio.gef.editor.edit.IsExpressionModeEditingSupport;
import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport; import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
import de.bmotionstudio.gef.editor.model.BControl; import de.bmotionstudio.gef.editor.model.BControl;
import de.bmotionstudio.gef.editor.observer.Observer; import de.bmotionstudio.gef.editor.observer.Observer;
import de.bmotionstudio.gef.editor.observer.ObserverEvalObject;
import de.bmotionstudio.gef.editor.observer.ObserverWizard; import de.bmotionstudio.gef.editor.observer.ObserverWizard;
import de.bmotionstudio.gef.editor.observer.SetAttribute; import de.bmotionstudio.gef.editor.observer.SetAttribute;
import de.bmotionstudio.gef.editor.observer.SetAttributeObject; import de.bmotionstudio.gef.editor.observer.SetAttributeObject;
...@@ -161,11 +162,12 @@ public class WizardObserverSetAttribute extends ObserverWizard { ...@@ -161,11 +162,12 @@ public class WizardObserverSetAttribute extends ObserverWizard {
ObservableListContentProvider contentProvider = new ObservableListContentProvider(); ObservableListContentProvider contentProvider = new ObservableListContentProvider();
tableViewer.setContentProvider(contentProvider); tableViewer.setContentProvider(contentProvider);
tableViewer.setLabelProvider(new ObserverLabelProvider( tableViewer.setLabelProvider(new ObserverLabelProvider(new IObservableMap[] {
BeansObservables.observeMaps( BeanProperties.value(ObserverEvalObject.class, "eval").observeDetail(contentProvider.getKnownElements()),
contentProvider.getKnownElements(), new String[] { BeanProperties.value(ObserverEvalObject.class, "attribute").observeDetail(contentProvider.getKnownElements()),
"eval", "attribute", "value", BeanProperties.value(ObserverEvalObject.class, "value").observeDetail(contentProvider.getKnownElements()),
"isExpressionMode" }))); BeanProperties.value(ObserverEvalObject.class, "isExpressionMode").observeDetail(contentProvider.getKnownElements()),
}));
input = new WritableList( input = new WritableList(
((SetAttribute) getObserver()).getSetAttributeObjects(), ((SetAttribute) getObserver()).getSetAttributeObjects(),
SetAttributeObject.class); SetAttributeObject.class);
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSimpleValueDisplay.java
+ 11
− 12
View file @ 56b39c48
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
package de.bmotionstudio.gef.editor.observer.wizard; package de.bmotionstudio.gef.editor.observer.wizard;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Font;
...@@ -93,18 +93,17 @@ public class WizardObserverSimpleValueDisplay extends ObserverWizard { ...@@ -93,18 +93,17 @@ public class WizardObserverSimpleValueDisplay extends ObserverWizard {
private void initBindings(DataBindingContext dbc) { private void initBindings(DataBindingContext dbc) {
dbc.bindValue(SWTObservables.observeText(txtPredicate, SWT.Modify), dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(txtPredicate),
BeansObservables.observeValue( BeanProperties.value(SimpleValueDisplay.class, "predicate")
(SimpleValueDisplay) getObserver(), "predicate")); .observe((SimpleValueDisplay) getObserver()));
dbc.bindValue( dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(txtExpression),
SWTObservables.observeText(txtExpression, SWT.Modify), BeanProperties.value(SimpleValueDisplay.class, "eval")
BeansObservables.observeValue( .observe((SimpleValueDisplay) getObserver()));
(SimpleValueDisplay) getObserver(), "eval"));
dbc.bindValue(SWTObservables.observeText(txtReplacementString, dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(txtReplacementString),
SWT.Modify), BeansObservables.observeValue( BeanProperties.value(SimpleValueDisplay.class, "replacementString")
(SimpleValueDisplay) getObserver(), "replacementString")); .observe((SimpleValueDisplay) getObserver()));
} }
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchCoordinates.java
+ 7
− 5
View file @ 56b39c48
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
package de.bmotionstudio.gef.editor.observer.wizard; package de.bmotionstudio.gef.editor.observer.wizard;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
...@@ -42,6 +42,7 @@ import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport; ...@@ -42,6 +42,7 @@ import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
import de.bmotionstudio.gef.editor.edit.TextEditingSupport; import de.bmotionstudio.gef.editor.edit.TextEditingSupport;
import de.bmotionstudio.gef.editor.model.BControl; import de.bmotionstudio.gef.editor.model.BControl;
import de.bmotionstudio.gef.editor.observer.Observer; import de.bmotionstudio.gef.editor.observer.Observer;
import de.bmotionstudio.gef.editor.observer.ObserverEvalObject;
import de.bmotionstudio.gef.editor.observer.ObserverWizard; import de.bmotionstudio.gef.editor.observer.ObserverWizard;
import de.bmotionstudio.gef.editor.observer.SwitchCoordinates; import de.bmotionstudio.gef.editor.observer.SwitchCoordinates;
import de.bmotionstudio.gef.editor.observer.ToggleObjectCoordinates; import de.bmotionstudio.gef.editor.observer.ToggleObjectCoordinates;
...@@ -154,10 +155,11 @@ public class WizardObserverSwitchCoordinates extends ObserverWizard { ...@@ -154,10 +155,11 @@ public class WizardObserverSwitchCoordinates extends ObserverWizard {
ObservableListContentProvider contentProvider = new ObservableListContentProvider(); ObservableListContentProvider contentProvider = new ObservableListContentProvider();
tableViewer.setContentProvider(contentProvider); tableViewer.setContentProvider(contentProvider);
tableViewer.setLabelProvider(new ObserverLabelProvider( tableViewer.setLabelProvider(new ObserverLabelProvider(new IObservableMap[] {
BeansObservables.observeMaps( BeanProperties.value(ObserverEvalObject.class, "eval").observeDetail(contentProvider.getKnownElements()),
contentProvider.getKnownElements(), new String[] { BeanProperties.value(ToggleObjectCoordinates.class, "x").observeDetail(contentProvider.getKnownElements()),
"eval", "x", "y" }))); BeanProperties.value(ToggleObjectCoordinates.class, "y").observeDetail(contentProvider.getKnownElements()),
}));
final WritableList input = new WritableList( final WritableList input = new WritableList(
((SwitchCoordinates) getObserver()).getToggleObjects(), ((SwitchCoordinates) getObserver()).getToggleObjects(),
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchImage.java
+ 7
− 5
View file @ 56b39c48
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
package de.bmotionstudio.gef.editor.observer.wizard; package de.bmotionstudio.gef.editor.observer.wizard;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
...@@ -44,6 +44,7 @@ import de.bmotionstudio.gef.editor.edit.IsExpressionModeEditingSupport; ...@@ -44,6 +44,7 @@ import de.bmotionstudio.gef.editor.edit.IsExpressionModeEditingSupport;
import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport; import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
import de.bmotionstudio.gef.editor.model.BControl; import de.bmotionstudio.gef.editor.model.BControl;
import de.bmotionstudio.gef.editor.observer.Observer; import de.bmotionstudio.gef.editor.observer.Observer;
import de.bmotionstudio.gef.editor.observer.ObserverEvalObject;
import de.bmotionstudio.gef.editor.observer.ObserverWizard; import de.bmotionstudio.gef.editor.observer.ObserverWizard;
import de.bmotionstudio.gef.editor.observer.SwitchImage; import de.bmotionstudio.gef.editor.observer.SwitchImage;
import de.bmotionstudio.gef.editor.observer.ToggleObjectImage; import de.bmotionstudio.gef.editor.observer.ToggleObjectImage;
...@@ -144,10 +145,11 @@ public class WizardObserverSwitchImage extends ObserverWizard { ...@@ -144,10 +145,11 @@ public class WizardObserverSwitchImage extends ObserverWizard {
ObservableListContentProvider contentProvider = new ObservableListContentProvider(); ObservableListContentProvider contentProvider = new ObservableListContentProvider();
tableViewer.setContentProvider(contentProvider); tableViewer.setContentProvider(contentProvider);
tableViewer.setLabelProvider(new ObserverLabelProvider( tableViewer.setLabelProvider(new ObserverLabelProvider(new IObservableMap[] {
BeansObservables.observeMaps( BeanProperties.value(ObserverEvalObject.class, "eval").observeDetail(contentProvider.getKnownElements()),
contentProvider.getKnownElements(), new String[] { BeanProperties.value(ToggleObjectImage.class, "image").observeDetail(contentProvider.getKnownElements()),
"eval", "image", "isExpressionMode" }))); BeanProperties.value(ObserverEvalObject.class, "isExpressionMode").observeDetail(contentProvider.getKnownElements()),
}));
final WritableList input = new WritableList( final WritableList input = new WritableList(
((SwitchImage) getObserver()).getToggleObjects(), ((SwitchImage) getObserver()).getToggleObjects(),
ToggleObjectImage.class); ToggleObjectImage.class);
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardTableObserver.java
+ 14
− 15
View file @ 56b39c48
...@@ -9,8 +9,8 @@ package de.bmotionstudio.gef.editor.observer.wizard; ...@@ -9,8 +9,8 @@ package de.bmotionstudio.gef.editor.observer.wizard;
import java.util.ArrayList; import java.util.ArrayList;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.wizard.WizardPage; import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
...@@ -152,22 +152,21 @@ public class WizardTableObserver extends ObserverWizard { ...@@ -152,22 +152,21 @@ public class WizardTableObserver extends ObserverWizard {
private void initBindings(DataBindingContext dbc) { private void initBindings(DataBindingContext dbc) {
dbc.bindValue(SWTObservables.observeText(txtPredicate, SWT.Modify), dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(txtPredicate),
BeansObservables.observeValue( BeanProperties.value(TableObserver.class, "predicate")
(TableObserver) getObserver(), "predicate")); .observe((TableObserver) getObserver()));
dbc.bindValue( dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(txtExpression),
SWTObservables.observeText(txtExpression, SWT.Modify), BeanProperties.value(TableObserver.class, "expression")
BeansObservables.observeValue( .observe((TableObserver) getObserver()));
(TableObserver) getObserver(), "expression"));
dbc.bindValue(SWTObservables.observeSelection(cbOverrideCells), dbc.bindValue(WidgetProperties.widgetSelection().observe(cbOverrideCells),
BeansObservables.observeValue( BeanProperties.value(TableObserver.class, "overrideCells")
(TableObserver) getObserver(), "overrideCells")); .observe((TableObserver) getObserver()));
dbc.bindValue(SWTObservables.observeSelection(cbKeepHeader), dbc.bindValue(WidgetProperties.widgetSelection().observe(cbKeepHeader),
BeansObservables.observeValue( BeanProperties.value(TableObserver.class, "keepHeader")
(TableObserver) getObserver(), "keepHeader")); .observe((TableObserver) getObserver()));
} }
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/SchedulerObjectDialog.java
+ 7
− 5
View file @ 56b39c48
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
package de.bmotionstudio.gef.editor.scheduler.wizard; package de.bmotionstudio.gef.editor.scheduler.wizard;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider; import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.Dialog;
...@@ -100,10 +101,11 @@ public class SchedulerObjectDialog extends Dialog { ...@@ -100,10 +101,11 @@ public class SchedulerObjectDialog extends Dialog {
ObservableListContentProvider contentProvider = new ObservableListContentProvider(); ObservableListContentProvider contentProvider = new ObservableListContentProvider();
tableViewer.setContentProvider(contentProvider); tableViewer.setContentProvider(contentProvider);
tableViewer.setLabelProvider(new ObservableMapLabelProvider( tableViewer.setLabelProvider(new ObservableMapLabelProvider(new IObservableMap[] {
BeansObservables.observeMaps( BeanProperties.value(AnimationScriptStep.class, "command").observeDetail(contentProvider.getKnownElements()),
contentProvider.getKnownElements(), new String[] { BeanProperties.value(AnimationScriptStep.class, "parameter").observeDetail(contentProvider.getKnownElements()),
"command", "parameter", "maxrandom" })) { BeanProperties.value(AnimationScriptStep.class, "maxrandom").observeDetail(contentProvider.getKnownElements()),
}) {
@Override @Override
public Image getColumnImage(final Object element, public Image getColumnImage(final Object element,
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteOperationByPredicate.java
+ 21
− 25
View file @ 56b39c48
...@@ -7,17 +7,17 @@ ...@@ -7,17 +7,17 @@
package de.bmotionstudio.gef.editor.scheduler.wizard; package de.bmotionstudio.gef.editor.scheduler.wizard;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.IValueChangeListener; import org.eclipse.core.databinding.observable.value.IValueChangeListener;
import org.eclipse.core.databinding.observable.value.ValueChangeEvent; import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.ColorConstants;
import org.eclipse.jface.databinding.swt.SWTObservables; import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider; import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
import org.eclipse.jface.databinding.viewers.ViewersObservables; import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.ComboViewer; import org.eclipse.jface.viewers.ComboViewer;
...@@ -46,6 +46,7 @@ import de.bmotionstudio.gef.editor.eventb.MachineContentObject; ...@@ -46,6 +46,7 @@ import de.bmotionstudio.gef.editor.eventb.MachineContentObject;
import de.bmotionstudio.gef.editor.eventb.MachineOperation; import de.bmotionstudio.gef.editor.eventb.MachineOperation;
import de.bmotionstudio.gef.editor.model.BControl; import de.bmotionstudio.gef.editor.model.BControl;
import de.bmotionstudio.gef.editor.scheduler.ExecuteOperationByPredicate; import de.bmotionstudio.gef.editor.scheduler.ExecuteOperationByPredicate;
import de.bmotionstudio.gef.editor.scheduler.PredicateOperation;
import de.bmotionstudio.gef.editor.scheduler.SchedulerEvent; import de.bmotionstudio.gef.editor.scheduler.SchedulerEvent;
import de.bmotionstudio.gef.editor.scheduler.SchedulerWizard; import de.bmotionstudio.gef.editor.scheduler.SchedulerWizard;
...@@ -173,9 +174,9 @@ public class WizardExecuteOperationByPredicate extends SchedulerWizard { ...@@ -173,9 +174,9 @@ public class WizardExecuteOperationByPredicate extends SchedulerWizard {
ObservableListContentProvider cbOpContentProvider = new ObservableListContentProvider(); ObservableListContentProvider cbOpContentProvider = new ObservableListContentProvider();
cbOperation.setContentProvider(cbOpContentProvider); cbOperation.setContentProvider(cbOpContentProvider);
IObservableMap[] attributeMaps = BeansObservables.observeMaps( IObservableMap[] attributeMaps = {
cbOpContentProvider.getKnownElements(), BeanProperties.value(MachineContentObject.class, "label").observeDetail(cbOpContentProvider.getKnownElements()),
MachineContentObject.class, new String[] { "label" }); };
cbOperation.setLabelProvider(new ObservableMapLabelProvider( cbOperation.setLabelProvider(new ObservableMapLabelProvider(
attributeMaps)); attributeMaps));
cbOperation.setInput(new WritableList(EventBHelper cbOperation.setInput(new WritableList(EventBHelper
...@@ -185,19 +186,16 @@ public class WizardExecuteOperationByPredicate extends SchedulerWizard { ...@@ -185,19 +186,16 @@ public class WizardExecuteOperationByPredicate extends SchedulerWizard {
new Font(Display.getDefault(), new FontData("Arial", 10, new Font(Display.getDefault(), new FontData("Arial", 10,
SWT.NONE))); SWT.NONE)));
final IObservableValue observeSelection = ViewersObservables IObservableValue observeSelection = ViewerProperties.singleSelection().observe(cbOperation);
.observeSingleSelection(cbOperation);
dbc.bindValue(SWTObservables.observeSelection(cbOperation dbc.bindValue(WidgetProperties.widgetSelection().observe(cbOperation.getCombo()),
.getCombo()), BeansObservables.observeValue( BeanProperties.value(PredicateOperation.class, "operationName")
((ExecuteOperationByPredicate) getScheduler()) .observe(((ExecuteOperationByPredicate) getScheduler()).getPredicateOperation()),
.getPredicateOperation(), "operationName"), null, null, null);
null);
dbc.bindValue(SWTObservables.observeText(txtPredicate, SWT.Modify), dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(txtPredicate),
BeansObservables.observeValue( BeanProperties.value(PredicateOperation.class, "predicate")
((ExecuteOperationByPredicate) getScheduler()) .observe(((ExecuteOperationByPredicate) getScheduler()).getPredicateOperation()));
.getPredicateOperation(), "predicate"));
observeSelection.addValueChangeListener(new IValueChangeListener() { observeSelection.addValueChangeListener(new IValueChangeListener() {
public void handleValueChange(ValueChangeEvent event) { public void handleValueChange(ValueChangeEvent event) {
...@@ -206,15 +204,13 @@ public class WizardExecuteOperationByPredicate extends SchedulerWizard { ...@@ -206,15 +204,13 @@ public class WizardExecuteOperationByPredicate extends SchedulerWizard {
} }
}); });
dbc.bindValue(SWTObservables.observeSelection(checkboxRandomMode), dbc.bindValue(WidgetProperties.widgetSelection().observe(checkboxRandomMode),
BeansObservables.observeValue( BeanProperties.value(PredicateOperation.class, "random")
((ExecuteOperationByPredicate) getScheduler()) .observe(((ExecuteOperationByPredicate) getScheduler()).getPredicateOperation()));
.getPredicateOperation(), "random"));
dbc.bindValue(SWTObservables.observeText(txtMaxRandomOperations, dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(txtMaxRandomOperations),
SWT.Modify), BeansObservables.observeValue( BeanProperties.value(PredicateOperation.class, "maxrandom")
((ExecuteOperationByPredicate) getScheduler()) .observe(((ExecuteOperationByPredicate) getScheduler()).getPredicateOperation()));
.getPredicateOperation(), "maxrandom"));
} }
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteOperationByPredicateMulti.java
+ 8
− 6
View file @ 56b39c48
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
package de.bmotionstudio.gef.editor.scheduler.wizard; package de.bmotionstudio.gef.editor.scheduler.wizard;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider; import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
...@@ -98,11 +99,12 @@ public class WizardExecuteOperationByPredicateMulti extends SchedulerWizard { ...@@ -98,11 +99,12 @@ public class WizardExecuteOperationByPredicateMulti extends SchedulerWizard {
ObservableListContentProvider contentProvider = new ObservableListContentProvider(); ObservableListContentProvider contentProvider = new ObservableListContentProvider();
tableViewer.setContentProvider(contentProvider); tableViewer.setContentProvider(contentProvider);
tableViewer.setLabelProvider(new ObservableMapLabelProvider( tableViewer.setLabelProvider(new ObservableMapLabelProvider(new IObservableMap[] {
BeansObservables.observeMaps( BeanProperties.value(PredicateOperation.class, "executePredicate").observeDetail(contentProvider.getKnownElements()),
contentProvider.getKnownElements(), new String[] { BeanProperties.value(PredicateOperation.class, "operationName").observeDetail(contentProvider.getKnownElements()),
"executePredicate", "operationName", BeanProperties.value(PredicateOperation.class, "predicate").observeDetail(contentProvider.getKnownElements()),
"predicate", "maxrandom" }))); BeanProperties.value(PredicateOperation.class, "maxrandom").observeDetail(contentProvider.getKnownElements()),
}));
final WritableList input = new WritableList( final WritableList input = new WritableList(
((ExecuteOperationByPredicateMulti) getScheduler()) ((ExecuteOperationByPredicateMulti) getScheduler())
.getOperationList(), .getOperationList(),
......
de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteScheduler.java
+ 6
− 5
View file @ 56b39c48
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
package de.bmotionstudio.gef.editor.scheduler.wizard; package de.bmotionstudio.gef.editor.scheduler.wizard;
import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.typed.BeanProperties;
import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider; import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.Dialog;
...@@ -40,6 +41,7 @@ import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport; ...@@ -40,6 +41,7 @@ import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
import de.bmotionstudio.gef.editor.model.BControl; import de.bmotionstudio.gef.editor.model.BControl;
import de.bmotionstudio.gef.editor.scheduler.AnimationScriptObject; import de.bmotionstudio.gef.editor.scheduler.AnimationScriptObject;
import de.bmotionstudio.gef.editor.scheduler.ExecuteAnimationScript; import de.bmotionstudio.gef.editor.scheduler.ExecuteAnimationScript;
import de.bmotionstudio.gef.editor.scheduler.PredicateOperation;
import de.bmotionstudio.gef.editor.scheduler.SchedulerEvent; import de.bmotionstudio.gef.editor.scheduler.SchedulerEvent;
import de.bmotionstudio.gef.editor.scheduler.SchedulerWizard; import de.bmotionstudio.gef.editor.scheduler.SchedulerWizard;
import de.bmotionstudio.gef.editor.util.BMotionWizardUtil; import de.bmotionstudio.gef.editor.util.BMotionWizardUtil;
...@@ -84,10 +86,9 @@ public class WizardExecuteScheduler extends SchedulerWizard { ...@@ -84,10 +86,9 @@ public class WizardExecuteScheduler extends SchedulerWizard {
ObservableListContentProvider contentProvider = new ObservableListContentProvider(); ObservableListContentProvider contentProvider = new ObservableListContentProvider();
tableViewer.setContentProvider(contentProvider); tableViewer.setContentProvider(contentProvider);
tableViewer.setLabelProvider(new ObservableMapLabelProvider( tableViewer.setLabelProvider(new ObservableMapLabelProvider(new IObservableMap[] {
BeansObservables.observeMaps( BeanProperties.value(PredicateOperation.class, "predicate").observeDetail(contentProvider.getKnownElements()),
contentProvider.getKnownElements(), }) {
new String[] { "predicate" })) {
@Override @Override
public String getColumnText(Object element, int columnIndex) { public String getColumnText(Object element, int columnIndex) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment