diff --git a/de.bmotionstudio.gef.editor/icons/icon_add.gif b/de.bmotionstudio.gef.editor/icons/icon_add.gif
deleted file mode 100644
index 1b0630841412d754fd6546e33923ad1ac08a2a9b..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/icons/icon_add.gif and /dev/null differ
diff --git a/de.bmotionstudio.gef.editor/icons/icon_ascript.png b/de.bmotionstudio.gef.editor/icons/icon_ascript.png
deleted file mode 100644
index 4cd71dba209ec693a58b14e7351873b374080988..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/icons/icon_ascript.png and /dev/null differ
diff --git a/de.bmotionstudio.gef.editor/icons/icon_motion.gif b/de.bmotionstudio.gef.editor/icons/icon_motion.gif
deleted file mode 100644
index 173d240af99eff66594bbefb1d12d16da8d8b548..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/icons/icon_motion.gif and /dev/null differ
diff --git a/de.bmotionstudio.gef.editor/icons/icon_motion_wiz.gif b/de.bmotionstudio.gef.editor/icons/icon_motion_wiz.gif
deleted file mode 100644
index 1e9bf55a7b95055a4cc8bc7646266c58fb28e45f..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/icons/icon_motion_wiz.gif and /dev/null differ
diff --git a/de.bmotionstudio.gef.editor/icons/icon_screenshot.gif b/de.bmotionstudio.gef.editor/icons/icon_screenshot.gif
deleted file mode 100644
index 176830af2dc8be87218c4dd944ba7dc6ffb79756..0000000000000000000000000000000000000000
Binary files a/de.bmotionstudio.gef.editor/icons/icon_screenshot.gif and /dev/null differ
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/BMotionAbstractWizard.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/BMotionAbstractWizard.java
index a7ca5fb97f5bee78508b480e7653b34606609b6d..a1ff60af2db76dc37bb20bcd2efaa099bc1de4f9 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/BMotionAbstractWizard.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/BMotionAbstractWizard.java
@@ -6,15 +6,23 @@
package de.bmotionstudio.gef.editor;
-import org.eclipse.jface.window.Window;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TrayDialog;
+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.Control;
import org.eclipse.swt.widgets.Shell;
import de.bmotionstudio.gef.editor.model.BControl;
-public abstract class BMotionAbstractWizard extends Window {
+public abstract class BMotionAbstractWizard extends TrayDialog {
private BControl control;
+ public static final int CLOSE = 2;
+
public BMotionAbstractWizard(Shell shell, BControl control) {
super(shell);
this.control = control;
@@ -26,4 +34,41 @@ public abstract class BMotionAbstractWizard extends Window {
public abstract String getName();
+ @Override
+ protected Control createDialogArea(Composite parent) {
+
+ GridLayout layout = new GridLayout();
+ layout.marginHeight = 0;
+ layout.marginWidth = 0;
+ layout.verticalSpacing = 0;
+
+ Composite container = new Composite(parent, SWT.NONE);
+ container.setLayout(layout);
+ container.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+ createWizardContent(container);
+
+ return container;
+
+ }
+
+ @Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.CLOSE_ID,
+ IDialogConstants.CLOSE_LABEL, true);
+ }
+
+ @Override
+ protected void buttonPressed(int buttonId) {
+ if (IDialogConstants.CLOSE_ID == buttonId)
+ closePressed();
+ }
+
+ protected void closePressed() {
+ setReturnCode(CLOSE);
+ close();
+ }
+
+ public abstract Control createWizardContent(Composite parent);
+
}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/EditorImageRegistry.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/EditorImageRegistry.java
index 56b16757ec2c66df568c7fcd22408130837cacc3..22a64fdc3fd2d8365af5fea14d58aa1a30249c72 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/EditorImageRegistry.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/EditorImageRegistry.java
@@ -8,7 +8,7 @@ package de.bmotionstudio.gef.editor;
public class EditorImageRegistry implements IBMotionStudioImageRegistry {
- public static final String IMG_ICON_ADD = "icon_add";
+ // public static final String IMG_ICON_ADD = "icon_add";
public static final String IMG_ICON_CHOP = "icon_chop";
public static final String IMG_ICON_DELETE = "icon_delete";
public static final String IMG_ICON_DELETE21 = "icon_delete21";
@@ -18,7 +18,6 @@ public class EditorImageRegistry implements IBMotionStudioImageRegistry {
public static final String IMG_ICON_OBSERVER = "icon_observer";
public static final String IMG_ICON_LOADING = "icon_loading";
public static final String IMG_ICON_LIBRARY = "icon_library";
- public static final String IMG_ICON_ASCRIPT = "icon_ascript";
public static final String IMG_ICON_UP = "icon_up";
public static final String IMG_ICON_DOWN = "icon_down";
public static final String IMG_ICON_CONNECTION16 = "icon_connection16";
@@ -28,6 +27,7 @@ public class EditorImageRegistry implements IBMotionStudioImageRegistry {
public static final String IMG_ICON_TR_UP = "icon_tr_up";
public static final String IMG_ICON_TR_LEFT = "icon_tr_left";
public static final String IMG_ICON_CONTROL_HIDDEN = "icon_control_hidden";
+ public static final String IMG_ICON_HELP = "icon_help";
public static final String IMG_ICON_JPG = "icon_jpg";
public static final String IMG_ICON_GIF = "icon_gif";
@@ -36,8 +36,8 @@ public class EditorImageRegistry implements IBMotionStudioImageRegistry {
public void registerImages() {
- BMotionStudioImage.registerImage(IMG_ICON_ADD,
- BMotionEditorPlugin.PLUGIN_ID, "icons/icon_add.gif");
+ // BMotionStudioImage.registerImage(IMG_ICON_ADD,
+ // BMotionEditorPlugin.PLUGIN_ID, "icons/icon_add.gif");
BMotionStudioImage.registerImage(IMG_ICON_CHOP,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_chop.gif");
BMotionStudioImage.registerImage(IMG_ICON_DELETE,
@@ -54,8 +54,6 @@ public class EditorImageRegistry implements IBMotionStudioImageRegistry {
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_loading.gif");
BMotionStudioImage.registerImage(IMG_ICON_LIBRARY,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_library.gif");
- BMotionStudioImage.registerImage(IMG_ICON_ASCRIPT,
- BMotionEditorPlugin.PLUGIN_ID, "icons/icon_ascript.png");
BMotionStudioImage.registerImage(IMG_ICON_UP,
BMotionEditorPlugin.PLUGIN_ID, "icons/icon_up.gif");
BMotionStudioImage.registerImage(IMG_ICON_DOWN,
@@ -72,6 +70,8 @@ public class EditorImageRegistry implements IBMotionStudioImageRegistry {
"org.eclipse.ui", "$nl$/icons/full/etool16/delete_edit.gif");
BMotionStudioImage.registerImage(IMG_ICON_DELETE_EDIT,
"org.eclipse.ui", "$nl$/icons/full/etool16/delete_edit.gif");
+ BMotionStudioImage.registerImage(IMG_ICON_HELP, "org.eclipse.ui",
+ "$nl$/icons/full/dlcl16/linkto_help.gif");
BMotionStudioImage
.registerImage(IMG_ICON_TR_UP, BMotionEditorPlugin.PLUGIN_ID,
"icons/eclipse16/updated_co.gif");
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/ObserverWizard.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/ObserverWizard.java
index 786b3230794563342b2258817829b85f44577af9..9fdcc5b3e9f84727b5eb905943f5c4544aca86a6 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/ObserverWizard.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/ObserverWizard.java
@@ -7,8 +7,6 @@
package de.bmotionstudio.gef.editor.observer;
import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import de.bmotionstudio.gef.editor.BMotionAbstractWizard;
@@ -27,8 +25,6 @@ public abstract class ObserverWizard extends BMotionAbstractWizard {
private Observer observer;
- protected Boolean observerDelete = false;
-
public ObserverWizard(Shell shell, BControl control, Observer observer) {
super(shell, control);
this.observer = observer;
@@ -45,8 +41,4 @@ public abstract class ObserverWizard extends BMotionAbstractWizard {
return observer.getName();
}
- public Control createControl(Composite parent) {
- return createContents(parent);
- }
-
}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/SetAttribute.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/SetAttribute.java
index 13ad0ab7c7afdbbe3b4166fe06e26f7ade883010..3fdd5cbb44fb0a4617f8dc86d6ceab3a5f54d8a5 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/SetAttribute.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/SetAttribute.java
@@ -65,14 +65,6 @@ public class SetAttribute extends Observer {
attributeVal.toString(), control, animation);
String er = attributeObj.validateValue(strAtrVal, null);
if (er != null) {
- // addError(
- // control,
- // animation,
- // "You selected "
- // + attributeObj.getName()
- // +
- // " as attribute. There is a problem with your value: "
- // + strAtrVal + " - Reason: " + er);
obj.setHasError(true);
} else {
attributeVal = attributeObj.unmarshal(strAtrVal);
@@ -134,23 +126,6 @@ public class SetAttribute extends Observer {
@Override
public IFigure getToolTip(BControl control) {
- // // TODO: This method need rework!!!
- // StringBuilder builder = new StringBuilder();
- // builder.append("Set Attribute Observer:\n\n");
- // for (SetAttributeObject obj : getSetAttributeObjects()) {
- // if (obj.getEval() != null) {
- // builder.append("[Predicate: " + obj.getEval());
- // }
- // if (obj.getAttribute() != null) {
- // builder.append(" | Attribute: "
- // + control.getAttribute(obj.getAttribute()).getName());
- // }
- // if (obj.getValue() != null) {
- // builder.append(" | Value: " + obj.getValue() + "]");
- // }
- // builder.append("\n");
- // }
- // Label lb = new Label(builder.toString());
return null;
}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/view/ObserverPage.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/view/ObserverPage.java
index 73f3a287223801d6af3c49740fec70d767183aca..23204cc44350add61fb3539fb6900533297e67cd 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/view/ObserverPage.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/view/ObserverPage.java
@@ -131,7 +131,7 @@ public class ObserverPage extends Page implements ISelectionListener {
rightContainer.setLayoutData(new GridData(
GridData.FILL_BOTH));
rightContainer.setLayout(new FillLayout());
- wizard.createControl(rightContainer);
+ wizard.createWizardContent(rightContainer);
}
}
container.layout();
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardColumnObserver.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardColumnObserver.java
index 3143ab77c02f45162ada32da6faf8bb1a1f22418..dc48f9c0ca40ea7a5a80b012db6d49f90c1dcefb 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardColumnObserver.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardColumnObserver.java
@@ -33,7 +33,7 @@ public class WizardColumnObserver extends ObserverWizard {
private Text txtPredicate;
@Override
- protected Control createContents(Composite parent) {
+ public Control createWizardContent(Composite parent) {
final DataBindingContext dbc = new DataBindingContext();
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 d8977b1ae62104bbcf346b2ff2e491c6ba3271c7..c76bf57ec4f94b70f41da5fc8e7b529e7d045fac 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
@@ -50,7 +50,7 @@ public class WizardObserverCSwitchCoordinates extends ObserverWizard {
private TableViewer tableViewer;
@Override
- protected Control createContents(Composite parent) {
+ public Control createWizardContent(Composite parent) {
DataBindingContext dbc = new DataBindingContext();
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 96efd197b6bc05d9b43716e5b541c0cbce164ea9..83adaee4f663a2565965bfd3cc528f807d2bcfe1 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
@@ -66,7 +66,7 @@ public class WizardObserverListenOperationByPredicate extends ObserverWizard {
private TableViewer tableViewer;
@Override
- protected Control createContents(Composite parent) {
+ public Control createWizardContent(Composite parent) {
parent.setLayout(new FillLayout());
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 3f2afafd1dd9275d2684bcd5e9d9bb2b78e34c92..9a6d6dbca1d235a82cdf3a772fa066e82472c855 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
@@ -68,7 +68,7 @@ public class WizardObserverSetAttribute extends ObserverWizard {
private TableViewer tableViewer;
@Override
- protected Control createContents(Composite parent) {
+ public Control createWizardContent(Composite parent) {
parent.setLayout(new FillLayout());
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSimpleValueDisplay.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSimpleValueDisplay.java
index 4813dfac84c1ebe11f044ee3555b1da802812d58..5d63d4cfcd16ff5c44fe86dc0ee1023ad3d90881 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSimpleValueDisplay.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardObserverSimpleValueDisplay.java
@@ -35,7 +35,7 @@ public class WizardObserverSimpleValueDisplay extends ObserverWizard {
private Text txtPredicate;
@Override
- protected Control createContents(Composite parent) {
+ public Control createWizardContent(Composite parent) {
parent.setLayout(new FillLayout());
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 ac3ed59a6bd851350a7de1c8c1b0c54aeaa995f8..8e502a6ff3814e90041931476f69976650d4f74c 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
@@ -52,7 +52,7 @@ public class WizardObserverSwitchCoordinates extends ObserverWizard {
private TableViewer tableViewer;
@Override
- protected Control createContents(Composite parent) {
+ public Control createWizardContent(Composite parent) {
parent.setLayout(new FillLayout());
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 41a7ee5856cbff865ddc352c295956b07df7522e..ff5d09ea575689dc6a26eaafb92de38cf6e69130 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
@@ -55,7 +55,7 @@ public class WizardObserverSwitchImage extends ObserverWizard {
private TableViewer tableViewer;
@Override
- protected Control createContents(Composite parent) {
+ public Control createWizardContent(Composite parent) {
parent.setLayout(new FillLayout());
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardTableObserver.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardTableObserver.java
index db9f40a70bf90eb60ef2dedcae504697afd5ebde..d38110cd613c43aef7a7c2b12cea0e977225780f 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardTableObserver.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/wizard/WizardTableObserver.java
@@ -66,7 +66,7 @@ public class WizardTableObserver extends ObserverWizard {
}
@Override
- protected Control createContents(Composite parent) {
+ public Control createWizardContent(Composite parent) {
final DataBindingContext dbc = new DataBindingContext();
parent.setLayout(new GridLayout(1, true));
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/SchedulerWizard.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/SchedulerWizard.java
index 7ec5c7606f53a159c1d03739c2f5bbc641c4f491..a9698cc818446c096427f5eb6f8a58034217939e 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/SchedulerWizard.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/SchedulerWizard.java
@@ -37,21 +37,6 @@ public abstract class SchedulerWizard extends BMotionAbstractWizard {
return this.event;
}
- // protected abstract Boolean prepareToFinish();
-
- // @Override
- // public boolean performFinish() {
- // return prepareToFinish();
- // }
-
- // protected void setEventDelete(Boolean b) {
- // this.eventDelete = b;
- // }
- //
- // public Boolean isEventDelete() {
- // return this.eventDelete;
- // }
-
public abstract Point getSize();
@Override
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/ObserverCallBackDialog.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/ObserverCallBackDialog.java
deleted file mode 100644
index 568c5f0922ff44ead8f3173c40249ec7e669bf41..0000000000000000000000000000000000000000
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/ObserverCallBackDialog.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/**
- * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen,
- * Heinrich Heine Universitaet Duesseldorf
- * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
- * */
-
-package de.bmotionstudio.gef.editor.scheduler.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.list.ComputedList;
-import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ComboBoxViewerCellEditor;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-import de.bmotionstudio.gef.editor.BMotionStudioImage;
-import de.bmotionstudio.gef.editor.EditorImageRegistry;
-import de.bmotionstudio.gef.editor.model.BControl;
-import de.bmotionstudio.gef.editor.scheduler.AnimationScriptStep;
-import de.bmotionstudio.gef.editor.scheduler.ObserverCallBackObject;
-
-@Deprecated
-public class ObserverCallBackDialog extends Dialog {
-
- private TableViewer tableViewer;
-
- private final AnimationScriptStep animationScriptStep;
-
- private final BControl control;
-
- // private IObservableValue controlObservable;
-
- public ObserverCallBackDialog(final Shell parentShell,
- final AnimationScriptStep animationScriptStep,
- final BControl control) {
- super(parentShell);
- this.animationScriptStep = animationScriptStep;
- this.control = control;
- }
-
- @Override
- protected Control createDialogArea(final Composite parent) {
-
- // DataBindingContext dbc = new DataBindingContext();
-
- Composite container = (Composite) super.createDialogArea(parent);
- container.setLayout(new GridLayout(1, true));
-
- tableViewer = new TableViewer(container, SWT.BORDER
- | SWT.FULL_SELECTION);
- tableViewer.getTable().setLinesVisible(true);
- tableViewer.getTable().setHeaderVisible(true);
- tableViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
- tableViewer.getTable().setFont(
- new Font(Display.getDefault(), new FontData("Arial", 10,
- SWT.NONE)));
-
- TableViewerColumn column = new TableViewerColumn(tableViewer, SWT.NONE);
- column.getColumn().setText("Control");
- column.getColumn().setWidth(225);
- column.setEditingSupport(new ControlValueEditing(tableViewer, control));
-
- column = new TableViewerColumn(tableViewer, SWT.NONE);
- column.getColumn().setText("Observer");
- column.getColumn().setWidth(150);
- // column.setEditingSupport(new TextEditingSupport(tableViewer, dbc,
- // "observerID"));
- column.setEditingSupport(new ObserverValueEditing(tableViewer, control));
-
- ObservableListContentProvider contentProvider = new ObservableListContentProvider();
- tableViewer.setContentProvider(contentProvider);
- tableViewer.setLabelProvider(new ObservableMapLabelProvider(
- BeansObservables.observeMaps(
- contentProvider.getKnownElements(), new String[] {
- "control", "observerID" })) {
-
- @Override
- public String getColumnText(final Object element,
- final int columnIndex) {
- if (columnIndex == 0) {
-
- ObserverCallBackObject obj = (ObserverCallBackObject) element;
-
- if (obj.getControl() != null) {
- return obj.getControl().getID();
- }
- }
- return super.getColumnText(element, columnIndex);
- }
-
- @Override
- public Image getColumnImage(final Object element,
- final int columnIndex) {
- return null;
- }
-
- });
-
- final WritableList input = new WritableList(
- animationScriptStep.getCallBackList(),
- ObserverCallBackObject.class);
-
- tableViewer.setInput(input);
-
- Composite comp = new Composite(container, SWT.NONE);
- comp.setLayout(new RowLayout());
- comp.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
- Button btRemove = new Button(comp, SWT.PUSH);
- btRemove.setText("Remove");
- btRemove.setImage(BMotionStudioImage
- .getImage(EditorImageRegistry.IMG_ICON_DELETE));
- btRemove.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(final SelectionEvent e) {
- if (tableViewer.getSelection().isEmpty()) {
- return;
- }
- ObserverCallBackObject obj = (ObserverCallBackObject) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- input.remove(obj);
- }
- });
-
- Button btAdd = new Button(comp, SWT.PUSH);
- btAdd.setText("Add");
- btAdd.setImage(BMotionStudioImage
- .getImage(EditorImageRegistry.IMG_ICON_ADD));
- btAdd.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(final SelectionEvent e) {
- ObserverCallBackObject obj = new ObserverCallBackObject();
- input.add(obj);
- }
- });
-
- return container;
-
- }
-
- @Override
- protected Point getInitialSize() {
- return new Point(600, 500);
- }
-
- @Override
- protected void okPressed() {
- close();
- }
-
- @Override
- protected void configureShell(final Shell newShell) {
- super.configureShell(newShell);
- newShell.setText("BMotion Studio - Observer Callback Editor");
- }
-
- private class ControlValueEditing extends EditingSupport {
-
- private ComboBoxViewerCellEditor cellEditor = null;
-
- private final BControl control;
-
- public ControlValueEditing(final TableViewer cv, final BControl control) {
- super(cv);
- this.control = control;
- }
-
- @Override
- protected boolean canEdit(final Object element) {
- return true;
- }
-
- @Override
- protected Object getValue(final Object element) {
- if (((ObserverCallBackObject) element).getControl() != null) {
- return ((ObserverCallBackObject) element).getControl().getID();
- } else {
- return "";
- }
- }
-
- @Override
- protected void setValue(final Object element, final Object value) {
- if (value != null) {
- ((ObserverCallBackObject) element).setControl(control
- .getVisualization().getBControl(value.toString()));
- }
- }
-
- @Override
- protected CellEditor getCellEditor(final Object element) {
- if (cellEditor == null) {
- cellEditor = new ComboBoxViewerCellEditor(
- (Composite) getViewer().getControl(), SWT.READ_ONLY);
- cellEditor
- .setContenProvider(new ObservableListContentProvider());
- cellEditor.setInput(new ComputedList() {
- @Override
- protected List<String> calculate() {
- ArrayList<String> tmpList = new ArrayList<String>();
- for (String controlID : control.getVisualization()
- .getAllBControlIDs()) {
- tmpList.add(controlID);
- }
- return tmpList;
- }
- });
- ((CCombo) cellEditor.getControl())
- .addFocusListener(new FocusListener() {
-
- String oldValue;
-
- public void focusGained(final FocusEvent e) {
- oldValue = ((CCombo) cellEditor.getControl())
- .getText();
-
- }
-
- public void focusLost(final FocusEvent e) {
-
- if (!oldValue.equals(((CCombo) cellEditor
- .getControl()).getText())) {
-
- IStructuredSelection selection = (IStructuredSelection) getViewer()
- .getSelection();
-
- ObserverCallBackObject obj = (ObserverCallBackObject) selection
- .getFirstElement();
- obj.setObserverID("");
- tableViewer.refresh();
-
- }
- }
-
- });
- }
- return cellEditor;
- }
- }
-
- private static class ObserverValueEditing extends EditingSupport {
-
- private ComboBoxViewerCellEditor cellEditor = null;
-
- // private final BControl control;
-
- public ObserverValueEditing(final TableViewer cv, final BControl control) {
- super(cv);
- // this.control = control;
- }
-
- @Override
- protected boolean canEdit(final Object element) {
- return true;
- }
-
- @Override
- protected Object getValue(final Object element) {
- if (((ObserverCallBackObject) element).getObserverID() != null) {
- return ((ObserverCallBackObject) element).getObserverID();
- } else {
- return "";
- }
- }
-
- @Override
- protected void setValue(final Object element, final Object value) {
- if (value != null) {
- ((ObserverCallBackObject) element).setObserverID(value
- .toString());
- }
- }
-
- @Override
- protected CellEditor getCellEditor(final Object element) {
-
- if (cellEditor == null) {
- cellEditor = new ComboBoxViewerCellEditor(
- (Composite) getViewer().getControl(), SWT.READ_ONLY);
- cellEditor
- .setContenProvider(new ObservableListContentProvider());
- }
- // cellEditor.setInput(new ComputedList() {
- // @Override
- // protected List<String> calculate() {
- //
- // ArrayList<String> tmpList = new ArrayList<String>();
- //
- // ObserverCallBackObject obj = (ObserverCallBackObject) element;
- // BControl control = obj.getControl();
- // if (control != null) {
- //
- // for (String id : control.getObservers().keySet()) {
- // tmpList.add(id);
- // }
- //
- // }
- //
- // return tmpList;
- //
- // }
- // });
-
- return cellEditor;
- }
- }
-
-}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/SchedulerObjectDialog.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/SchedulerObjectDialog.java
index 58f0627cfc3d636fd2c249d7b8908947a499e153..5542930be38e6df21079b69c7250cc7c73d44746 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/SchedulerObjectDialog.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/SchedulerObjectDialog.java
@@ -141,7 +141,7 @@ public class SchedulerObjectDialog extends Dialog {
Button btAdd = new Button(comp, SWT.PUSH);
btAdd.setText("Add");
btAdd.setImage(BMotionStudioImage
- .getImage(EditorImageRegistry.IMG_ICON_ADD));
+ .getImage(EditorImageRegistry.IMG_ICON_NEW_WIZ));
btAdd.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(final SelectionEvent e) {
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteOperationByPredicate.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteOperationByPredicate.java
index 82aa9fd7404612479cd2e6e348206e83dccd40c1..f763a9a87d3815b800d54ab7db209aa6be81b31f 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteOperationByPredicate.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteOperationByPredicate.java
@@ -68,7 +68,7 @@ public class WizardExecuteOperationByPredicate extends SchedulerWizard {
private ScrolledComposite c1;
@Override
- protected Control createContents(Composite parent) {
+ public Control createWizardContent(Composite parent) {
final DataBindingContext dbc = new DataBindingContext();
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteOperationByPredicateMulti.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteOperationByPredicateMulti.java
index 5462888d1798294df37601c815c77db5963cc99d..4b9e029a1ecd28a42cceb179a85358b7a6a025e8 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteOperationByPredicateMulti.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteOperationByPredicateMulti.java
@@ -49,7 +49,7 @@ public class WizardExecuteOperationByPredicateMulti extends SchedulerWizard {
private TableViewer tableViewer;
@Override
- protected Control createContents(Composite parent) {
+ public Control createWizardContent(Composite parent) {
DataBindingContext dbc = new DataBindingContext();
Composite container = new Composite(parent, SWT.NONE);
@@ -119,7 +119,7 @@ public class WizardExecuteOperationByPredicateMulti extends SchedulerWizard {
Button btAdd = new Button(comp, SWT.PUSH);
btAdd.setText("Add");
btAdd.setImage(BMotionStudioImage
- .getImage(EditorImageRegistry.IMG_ICON_ADD));
+ .getImage(EditorImageRegistry.IMG_ICON_NEW_WIZ));
btAdd.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteScheduler.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteScheduler.java
index f2c8b4fef8a5fcf49ad13db0f692fba792ad4096..504d38d351973f4098531d92106f17f8c8c1df01 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteScheduler.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/WizardExecuteScheduler.java
@@ -48,7 +48,7 @@ public class WizardExecuteScheduler extends SchedulerWizard {
private TableViewer tableViewer;
@Override
- protected Control createContents(Composite parent) {
+ public Control createWizardContent(Composite parent) {
DataBindingContext dbc = new DataBindingContext();
@@ -123,7 +123,7 @@ public class WizardExecuteScheduler extends SchedulerWizard {
Button btAdd = new Button(comp, SWT.PUSH);
btAdd.setText("Add");
btAdd.setImage(BMotionStudioImage
- .getImage(EditorImageRegistry.IMG_ICON_ADD));
+ .getImage(EditorImageRegistry.IMG_ICON_NEW_WIZ));
btAdd.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
diff --git a/de.prob.ui/plugin.xml b/de.prob.ui/plugin.xml
index a8edde201a3de97737dd4a38086703bde5240114..a64882ef7a42135a4a34f5d12d6b38230c1960c2 100644
--- a/de.prob.ui/plugin.xml
+++ b/de.prob.ui/plugin.xml
@@ -183,7 +183,6 @@
name="Consistencychecking">
</command>
-
<command
defaultHandler="de.prob.ui.operationview.DoubleClickBehaviorHandler"
id="de.prob.ui.doubleclickbehaviour"
@@ -351,6 +350,11 @@
id="de.prob.ui.newcore.export"
name="Export for new Core">
</command>
+ <command
+ defaultHandler="de.prob.ui.csp.StartCSPAnimationHandler"
+ id="de.prob.command.startCspAnimation"
+ name="Start CSP Animation">
+ </command>
</extension>
<extension
point="org.eclipse.ui.handlers">
@@ -1134,6 +1138,33 @@
style="push">
</command>
</menuContribution>
+ <menuContribution
+ allPopups="false"
+ locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu">
+ <command
+ commandId="de.prob.command.startCspAnimation"
+ label="Start CSP Animation"
+ style="push">
+ <visibleWhen>
+ <with
+ variable="selection">
+ <iterate
+ operator="or">
+ <and>
+ <instanceof
+ value="org.eclipse.core.resources.IResource">
+ </instanceof>
+ <test
+ forcePluginActivation="true"
+ property="org.eclipse.core.resources.extension"
+ value="csp">
+ </test>
+ </and>
+ </iterate>
+ </with>
+ </visibleWhen>
+ </command>
+ </menuContribution>
</extension>
<extension