diff --git a/de.bmotionstudio.gef.editor/lib/ext/._antlr-2.7.7.jar1851805142189607825.tmp b/de.bmotionstudio.gef.editor/lib/ext/._antlr-2.7.7.jar1851805142189607825.tmp
new file mode 100644
index 0000000000000000000000000000000000000000..5e5f14b35584eac2a9f0f888769f0ab93ca6d849
Binary files /dev/null and b/de.bmotionstudio.gef.editor/lib/ext/._antlr-2.7.7.jar1851805142189607825.tmp differ
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverCSwitchCoordinates.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverCSwitchCoordinates.java
index 3a5b8b09e05c56eb8d139898c317cb86ac5caddb..d03fa3f9aa13d32d0b6efb38bfb3319bb3474b01 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverCSwitchCoordinates.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverCSwitchCoordinates.java
@@ -13,12 +13,10 @@ import org.eclipse.core.databinding.observable.map.IObservableMap;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableColorProvider;
 import org.eclipse.jface.viewers.ITableFontProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -36,7 +34,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 import de.be4.classicalb.core.parser.BParser;
-import de.bmotionstudio.gef.editor.AttributeConstants;
 import de.bmotionstudio.gef.editor.BMotionAbstractWizard;
 import de.bmotionstudio.gef.editor.BMotionStudioImage;
 import de.bmotionstudio.gef.editor.EditorImageRegistry;
@@ -44,7 +41,6 @@ import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
 import de.bmotionstudio.gef.editor.edit.TextEditingSupport;
 import de.bmotionstudio.gef.editor.model.BControl;
 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.SwitchChildCoordinates;
 import de.bmotionstudio.gef.editor.observer.ToggleObjectCoordinates;
@@ -52,7 +48,7 @@ import de.bmotionstudio.gef.editor.util.BMotionWizardUtil;
 
 public class WizardObserverCSwitchCoordinates extends ObserverWizard {
 
-	private String lastChangedControlID;
+	// private String lastChangedControlID;
 
 	private class ObserverCSwitchCoordinatesPage extends
 			AbstractObserverWizardPage {
@@ -75,40 +71,42 @@ public class WizardObserverCSwitchCoordinates extends ObserverWizard {
 			tableViewer = BMotionWizardUtil.createBMotionWizardTableViewer(
 					container, ToggleObjectCoordinates.class,
 					((BMotionAbstractWizard) getWizard()).getName());
-			tableViewer
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-
-						@Override
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) event
-									.getSelection();
-							Object firstElement = selection.getFirstElement();
-							if (firstElement instanceof ObserverEvalObject) {
-								restorePreview();
-								ObserverEvalObject observerEvalObject = (ObserverEvalObject) firstElement;
-								if (!observerEvalObject.isExpressionMode()) {
-									BControl control = getBControl();
-									ToggleObjectCoordinates toggleObjectCoordinates = (ToggleObjectCoordinates) observerEvalObject;
-									String attributeX = AttributeConstants.ATTRIBUTE_X;
-									String attributeY = AttributeConstants.ATTRIBUTE_Y;
-									String x = toggleObjectCoordinates.getX();
-									String y = toggleObjectCoordinates.getY();
-									String controlID = toggleObjectCoordinates
-											.getBcontrol();
-									BControl bControl = control
-											.getChild(controlID);
-									if (bControl != null) {
-										bControl.setAttributeValue(attributeX,
-												x, true, false);
-										bControl.setAttributeValue(attributeY,
-												y, true, false);
-									}
-									lastChangedControlID = controlID;
-								}
-							}
-						}
-
-					});
+			// tableViewer
+			// .addSelectionChangedListener(new ISelectionChangedListener() {
+			//
+			// @Override
+			// public void selectionChanged(SelectionChangedEvent event) {
+			// IStructuredSelection selection = (IStructuredSelection) event
+			// .getSelection();
+			// Object firstElement = selection.getFirstElement();
+			// if (firstElement instanceof ObserverEvalObject) {
+			// restorePreview();
+			// ObserverEvalObject observerEvalObject = (ObserverEvalObject)
+			// firstElement;
+			// if (!observerEvalObject.isExpressionMode()) {
+			// BControl control = getBControl();
+			// ToggleObjectCoordinates toggleObjectCoordinates =
+			// (ToggleObjectCoordinates) observerEvalObject;
+			// String attributeX = AttributeConstants.ATTRIBUTE_X;
+			// String attributeY = AttributeConstants.ATTRIBUTE_Y;
+			// String x = toggleObjectCoordinates.getX();
+			// String y = toggleObjectCoordinates.getY();
+			// String controlID = toggleObjectCoordinates
+			// .getBcontrol();
+			// BControl bControl = control
+			// .getChild(controlID);
+			// if (bControl != null) {
+			// bControl.setAttributeValue(attributeX,
+			// x, true, false);
+			// bControl.setAttributeValue(attributeY,
+			// y, true, false);
+			// }
+			// lastChangedControlID = controlID;
+			// }
+			// }
+			// }
+			//
+			// });
 
 			TableViewerColumn column = new TableViewerColumn(tableViewer,
 					SWT.NONE);
@@ -229,7 +227,7 @@ public class WizardObserverCSwitchCoordinates extends ObserverWizard {
 
 	@Override
 	protected Boolean prepareToFinish() {
-		restorePreview();
+		// restorePreview();
 		if (((SwitchChildCoordinates) getObserver()).getToggleObjects().size() == 0) {
 			setObserverDelete(true);
 		} else {
@@ -247,19 +245,19 @@ public class WizardObserverCSwitchCoordinates extends ObserverWizard {
 		return true;
 	}
 
-	private void restorePreview() {
-		if (lastChangedControlID != null) {
-			BControl bControl = getBControl().getChild(lastChangedControlID);
-			if (bControl != null) {
-				bControl.restoreDefaultValue(AttributeConstants.ATTRIBUTE_X);
-				bControl.restoreDefaultValue(AttributeConstants.ATTRIBUTE_Y);
-			}
-		}
-	}
+	// private void restorePreview() {
+	// if (lastChangedControlID != null) {
+	// BControl bControl = getBControl().getChild(lastChangedControlID);
+	// if (bControl != null) {
+	// bControl.restoreDefaultValue(AttributeConstants.ATTRIBUTE_X);
+	// bControl.restoreDefaultValue(AttributeConstants.ATTRIBUTE_Y);
+	// }
+	// }
+	// }
 
 	@Override
 	public boolean performCancel() {
-		restorePreview();
+		// restorePreview();
 		return super.performCancel();
 	}
 
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverListenOperationByPredicate.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverListenOperationByPredicate.java
index 856cd5a2e88267505c1a347a7bea6059713752a7..5369bc5cc1f4a17b9347fd5722a6336c94c10412 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverListenOperationByPredicate.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverListenOperationByPredicate.java
@@ -20,13 +20,11 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ComboBoxViewerCellEditor;
 import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableColorProvider;
 import org.eclipse.jface.viewers.ITableFontProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -57,7 +55,6 @@ import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
 import de.bmotionstudio.gef.editor.model.BControl;
 import de.bmotionstudio.gef.editor.observer.ListenOperationByPredicate;
 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.property.CheckboxCellEditorHelper;
 import de.bmotionstudio.gef.editor.scheduler.PredicateOperation;
@@ -65,7 +62,7 @@ import de.bmotionstudio.gef.editor.util.BMotionWizardUtil;
 
 public class WizardObserverListenOperationByPredicate extends ObserverWizard {
 
-	private String lastChangedAttributeID;
+	// private String lastChangedAttributeID;
 
 	private class ObserverListenOperationByPredicatePage extends
 			AbstractObserverWizardPage {
@@ -90,39 +87,40 @@ public class WizardObserverListenOperationByPredicate extends ObserverWizard {
 			tableViewer = BMotionWizardUtil.createBMotionWizardTableViewer(
 					container, PredicateOperation.class,
 					((BMotionAbstractWizard) getWizard()).getName());
-			tableViewer
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-
-						@Override
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) event
-									.getSelection();
-							Object firstElement = selection.getFirstElement();
-							if (firstElement instanceof ObserverEvalObject) {
-
-								ObserverEvalObject observerEvalObject = (ObserverEvalObject) firstElement;
-								BControl control = getBControl();
-
-								if (lastChangedAttributeID != null)
-									control.restoreDefaultValue(lastChangedAttributeID);
-
-								PredicateOperation obj = (PredicateOperation) observerEvalObject;
-
-								if (!obj.isExpressionMode()) {
-
-									String attribute = obj.getAttribute();
-									Object value = obj.getValue();
-									control.setAttributeValue(attribute, value,
-											true, false);
-
-									lastChangedAttributeID = attribute;
-
-								}
-
-							}
-						}
-
-					});
+			// tableViewer
+			// .addSelectionChangedListener(new ISelectionChangedListener() {
+			//
+			// @Override
+			// public void selectionChanged(SelectionChangedEvent event) {
+			// IStructuredSelection selection = (IStructuredSelection) event
+			// .getSelection();
+			// Object firstElement = selection.getFirstElement();
+			// if (firstElement instanceof ObserverEvalObject) {
+			//
+			// ObserverEvalObject observerEvalObject = (ObserverEvalObject)
+			// firstElement;
+			// BControl control = getBControl();
+			//
+			// if (lastChangedAttributeID != null)
+			// control.restoreDefaultValue(lastChangedAttributeID);
+			//
+			// PredicateOperation obj = (PredicateOperation) observerEvalObject;
+			//
+			// if (!obj.isExpressionMode()) {
+			//
+			// String attribute = obj.getAttribute();
+			// Object value = obj.getValue();
+			// control.setAttributeValue(attribute, value,
+			// true, false);
+			//
+			// lastChangedAttributeID = attribute;
+			//
+			// }
+			//
+			// }
+			// }
+			//
+			// });
 
 			TableViewerColumn column = new TableViewerColumn(tableViewer,
 					SWT.NONE);
@@ -357,13 +355,13 @@ public class WizardObserverListenOperationByPredicate extends ObserverWizard {
 
 	@Override
 	public boolean performCancel() {
-		getBControl().restoreDefaultValue(lastChangedAttributeID);
+		// getBControl().restoreDefaultValue(lastChangedAttributeID);
 		return super.performCancel();
 	}
 
 	@Override
 	protected Boolean prepareToFinish() {
-		getBControl().restoreDefaultValue(lastChangedAttributeID);
+		// getBControl().restoreDefaultValue(lastChangedAttributeID);
 		if (((ListenOperationByPredicate) getObserver()).getList().size() == 0) {
 			setObserverDelete(true);
 		} else {
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSetAttribute.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSetAttribute.java
index 8817a572855ba8271c20bf61bd52d3ada2bcc0f4..be6162187aec2fd33695432d7f0d999fc13e677c 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSetAttribute.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSetAttribute.java
@@ -19,13 +19,11 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ComboBoxViewerCellEditor;
 import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableColorProvider;
 import org.eclipse.jface.viewers.ITableFontProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -56,7 +54,6 @@ import de.bmotionstudio.gef.editor.edit.IsExpressionModeEditingSupport;
 import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
 import de.bmotionstudio.gef.editor.model.BControl;
 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.SetAttribute;
 import de.bmotionstudio.gef.editor.observer.SetAttributeObject;
@@ -65,7 +62,7 @@ import de.bmotionstudio.gef.editor.util.BMotionWizardUtil;
 
 public class WizardObserverSetAttribute extends ObserverWizard {
 
-	private String lastChangedAttributeID;
+	// private String lastChangedAttributeID;
 
 	private class WizardSetAttributePage extends AbstractObserverWizardPage {
 
@@ -96,40 +93,42 @@ public class WizardObserverSetAttribute extends ObserverWizard {
 					container, SetAttributeObject.class,
 					((BMotionAbstractWizard) getWizard()).getName());
 
-			tableViewer
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-
-						@Override
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) event
-									.getSelection();
-							Object firstElement = selection.getFirstElement();
-							if (firstElement instanceof ObserverEvalObject) {
-
-								ObserverEvalObject observerEvalObject = (ObserverEvalObject) firstElement;
-								BControl control = getBControl();
-
-								if (lastChangedAttributeID != null)
-									control.restoreDefaultValue(lastChangedAttributeID);
-
-								SetAttributeObject setAttributeObj = (SetAttributeObject) observerEvalObject;
-
-								if (!setAttributeObj.isExpressionMode()) {
-
-									String attribute = setAttributeObj
-											.getAttribute();
-									Object value = setAttributeObj.getValue();
-									control.setAttributeValue(attribute, value,
-											true, false);
-
-									lastChangedAttributeID = attribute;
-
-								}
-
-							}
-						}
-
-					});
+			// tableViewer
+			// .addSelectionChangedListener(new ISelectionChangedListener() {
+			//
+			// @Override
+			// public void selectionChanged(SelectionChangedEvent event) {
+			// IStructuredSelection selection = (IStructuredSelection) event
+			// .getSelection();
+			// Object firstElement = selection.getFirstElement();
+			// if (firstElement instanceof ObserverEvalObject) {
+			//
+			// ObserverEvalObject observerEvalObject = (ObserverEvalObject)
+			// firstElement;
+			// BControl control = getBControl();
+			//
+			// if (lastChangedAttributeID != null)
+			// control.restoreDefaultValue(lastChangedAttributeID);
+			//
+			// SetAttributeObject setAttributeObj = (SetAttributeObject)
+			// observerEvalObject;
+			//
+			// if (!setAttributeObj.isExpressionMode()) {
+			//
+			// String attribute = setAttributeObj
+			// .getAttribute();
+			// Object value = setAttributeObj.getValue();
+			// control.setAttributeValue(attribute, value,
+			// true, false);
+			//
+			// lastChangedAttributeID = attribute;
+			//
+			// }
+			//
+			// }
+			// }
+			//
+			// });
 
 			TableViewerColumn column = new TableViewerColumn(tableViewer,
 					SWT.NONE);
@@ -321,7 +320,7 @@ public class WizardObserverSetAttribute extends ObserverWizard {
 
 	@Override
 	protected Boolean prepareToFinish() {
-		getBControl().restoreDefaultValue(lastChangedAttributeID);
+		// getBControl().restoreDefaultValue(lastChangedAttributeID);
 		if (((SetAttribute) getObserver()).getSetAttributeObjects().size() == 0) {
 			setObserverDelete(true);
 		} else {
@@ -340,7 +339,7 @@ public class WizardObserverSetAttribute extends ObserverWizard {
 
 	@Override
 	public boolean performCancel() {
-		getBControl().restoreDefaultValue(lastChangedAttributeID);
+		// getBControl().restoreDefaultValue(lastChangedAttributeID);
 		return super.performCancel();
 	}
 
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchCoordinates.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchCoordinates.java
index 14cd883a29fec574490b3605aa5ae24d8c572e5d..88248dcb8a2870351498906122aa15234c3fad4b 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchCoordinates.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchCoordinates.java
@@ -13,12 +13,10 @@ import org.eclipse.core.databinding.observable.map.IObservableMap;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableColorProvider;
 import org.eclipse.jface.viewers.ITableFontProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -37,7 +35,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 import de.be4.classicalb.core.parser.BParser;
-import de.bmotionstudio.gef.editor.AttributeConstants;
 import de.bmotionstudio.gef.editor.BMotionAbstractWizard;
 import de.bmotionstudio.gef.editor.BMotionStudioImage;
 import de.bmotionstudio.gef.editor.EditorImageRegistry;
@@ -45,7 +42,6 @@ import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
 import de.bmotionstudio.gef.editor.edit.TextEditingSupport;
 import de.bmotionstudio.gef.editor.model.BControl;
 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.SwitchCoordinates;
 import de.bmotionstudio.gef.editor.observer.ToggleObjectCoordinates;
@@ -75,32 +71,34 @@ public class WizardObserverSwitchCoordinates extends ObserverWizard {
 					container, ToggleObjectCoordinates.class,
 					((BMotionAbstractWizard) getWizard()).getName());
 
-			tableViewer
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-
-						@Override
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) event
-									.getSelection();
-							Object firstElement = selection.getFirstElement();
-							if (firstElement instanceof ObserverEvalObject) {
-								ObserverEvalObject observerEvalObject = (ObserverEvalObject) firstElement;
-								if (!observerEvalObject.isExpressionMode()) {
-									BControl control = getBControl();
-									ToggleObjectCoordinates toggleObjectCoordinates = (ToggleObjectCoordinates) observerEvalObject;
-									String attributeX = AttributeConstants.ATTRIBUTE_X;
-									String attributeY = AttributeConstants.ATTRIBUTE_Y;
-									String x = toggleObjectCoordinates.getX();
-									String y = toggleObjectCoordinates.getY();
-									control.setAttributeValue(attributeX, x,
-											true, false);
-									control.setAttributeValue(attributeY, y,
-											true, false);
-								}
-							}
-						}
-
-					});
+			// tableViewer
+			// .addSelectionChangedListener(new ISelectionChangedListener() {
+			//
+			// @Override
+			// public void selectionChanged(SelectionChangedEvent event) {
+			// IStructuredSelection selection = (IStructuredSelection) event
+			// .getSelection();
+			// Object firstElement = selection.getFirstElement();
+			// if (firstElement instanceof ObserverEvalObject) {
+			// ObserverEvalObject observerEvalObject = (ObserverEvalObject)
+			// firstElement;
+			// if (!observerEvalObject.isExpressionMode()) {
+			// BControl control = getBControl();
+			// ToggleObjectCoordinates toggleObjectCoordinates =
+			// (ToggleObjectCoordinates) observerEvalObject;
+			// String attributeX = AttributeConstants.ATTRIBUTE_X;
+			// String attributeY = AttributeConstants.ATTRIBUTE_Y;
+			// String x = toggleObjectCoordinates.getX();
+			// String y = toggleObjectCoordinates.getY();
+			// control.setAttributeValue(attributeX, x,
+			// true, false);
+			// control.setAttributeValue(attributeY, y,
+			// true, false);
+			// }
+			// }
+			// }
+			//
+			// });
 
 			TableViewerColumn column = new TableViewerColumn(tableViewer,
 					SWT.NONE);
@@ -217,8 +215,8 @@ public class WizardObserverSwitchCoordinates extends ObserverWizard {
 
 	@Override
 	protected Boolean prepareToFinish() {
-		getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_X);
-		getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_Y);
+		// getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_X);
+		// getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_Y);
 		if (((SwitchCoordinates) getObserver()).getToggleObjects().size() == 0) {
 			setObserverDelete(true);
 		} else {
@@ -237,8 +235,8 @@ public class WizardObserverSwitchCoordinates extends ObserverWizard {
 
 	@Override
 	public boolean performCancel() {
-		getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_X);
-		getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_Y);
+		// getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_X);
+		// getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_Y);
 		return super.performCancel();
 	}
 
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchImage.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchImage.java
index 40c1dd154d70fe6e4f9a2bfd24ecfa17a58b5c58..9c15caea177633be286db950970287681dfcd9d3 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchImage.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSwitchImage.java
@@ -13,12 +13,10 @@ import org.eclipse.core.databinding.observable.map.IObservableMap;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITableColorProvider;
 import org.eclipse.jface.viewers.ITableFontProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -46,7 +44,6 @@ import de.bmotionstudio.gef.editor.edit.IsExpressionModeEditingSupport;
 import de.bmotionstudio.gef.editor.edit.PredicateEditingSupport;
 import de.bmotionstudio.gef.editor.model.BControl;
 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.SwitchImage;
 import de.bmotionstudio.gef.editor.observer.ToggleObjectImage;
@@ -75,28 +72,30 @@ public class WizardObserverSwitchImage extends ObserverWizard {
 			tableViewer = BMotionWizardUtil.createBMotionWizardTableViewer(
 					container, ToggleObjectImage.class,
 					((BMotionAbstractWizard) getWizard()).getName());
-			tableViewer
-					.addSelectionChangedListener(new ISelectionChangedListener() {
-
-						@Override
-						public void selectionChanged(SelectionChangedEvent event) {
-							IStructuredSelection selection = (IStructuredSelection) event
-									.getSelection();
-							Object firstElement = selection.getFirstElement();
-							if (firstElement instanceof ObserverEvalObject) {
-								ObserverEvalObject observerEvalObject = (ObserverEvalObject) firstElement;
-								if (!observerEvalObject.isExpressionMode()) {
-									BControl control = getBControl();
-									ToggleObjectImage toggleObjImage = (ToggleObjectImage) observerEvalObject;
-									String attribute = AttributeConstants.ATTRIBUTE_IMAGE;
-									String image = toggleObjImage.getImage();
-									control.setAttributeValue(attribute, image,
-											true, false);
-								}
-							}
-						}
-
-					});
+			// tableViewer
+			// .addSelectionChangedListener(new ISelectionChangedListener() {
+			//
+			// @Override
+			// public void selectionChanged(SelectionChangedEvent event) {
+			// IStructuredSelection selection = (IStructuredSelection) event
+			// .getSelection();
+			// Object firstElement = selection.getFirstElement();
+			// if (firstElement instanceof ObserverEvalObject) {
+			// ObserverEvalObject observerEvalObject = (ObserverEvalObject)
+			// firstElement;
+			// if (!observerEvalObject.isExpressionMode()) {
+			// BControl control = getBControl();
+			// ToggleObjectImage toggleObjImage = (ToggleObjectImage)
+			// observerEvalObject;
+			// String attribute = AttributeConstants.ATTRIBUTE_IMAGE;
+			// String image = toggleObjImage.getImage();
+			// control.setAttributeValue(attribute, image,
+			// true, false);
+			// }
+			// }
+			// }
+			//
+			// });
 
 			TableViewerColumn column = new TableViewerColumn(tableViewer,
 					SWT.NONE);
@@ -203,7 +202,7 @@ public class WizardObserverSwitchImage extends ObserverWizard {
 
 	@Override
 	protected Boolean prepareToFinish() {
-		getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_IMAGE);
+		// getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_IMAGE);
 		if (((SwitchImage) getObserver()).getToggleObjects().size() == 0) {
 			setObserverDelete(true);
 		} else {
@@ -222,7 +221,7 @@ public class WizardObserverSwitchImage extends ObserverWizard {
 
 	@Override
 	public boolean performCancel() {
-		getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_IMAGE);
+		// getBControl().restoreDefaultValue(AttributeConstants.ATTRIBUTE_IMAGE);
 		return super.performCancel();
 	}
 
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/ExecuteOperationByPredicateMulti.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/ExecuteOperationByPredicateMulti.java
index eb2b2c88cd131ae74a22c58507c38db5f2564beb..6f9b9044c4fc87feb207c2ff6f15b5ec5cd917f1 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/ExecuteOperationByPredicateMulti.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/ExecuteOperationByPredicateMulti.java
@@ -27,7 +27,7 @@ public class ExecuteOperationByPredicateMulti extends SchedulerEvent {
 			String executePredicate = ((PredicateOperation) op)
 					.getExecutePredicate();
 
-			if (executePredicate.length() > 0) {
+			if (executePredicate != null && executePredicate.length() > 0) {
 				bolValue = BMSUtil.parsePredicate(executePredicate, control,
 						animation);
 			}