From 51f4de6ddda61b311c66de39fcb290d1faef3e5d Mon Sep 17 00:00:00 2001
From: Lukas Ladenberger <lukas.ladenberger@googlemail.com>
Date: Tue, 11 Dec 2012 11:07:41 +0100
Subject: [PATCH] working on observer view + cleanup
---
.../icons/icon_add.gif | Bin 386 -> 0 bytes
.../icons/icon_ascript.png | Bin 489 -> 0 bytes
.../icons/icon_motion.gif | Bin 1017 -> 0 bytes
.../icons/icon_motion_wiz.gif | Bin 1112 -> 0 bytes
.../icons/icon_screenshot.gif | Bin 613 -> 0 bytes
.../gef/editor/BMotionAbstractWizard.java | 49 ++-
.../gef/editor/EditorImageRegistry.java | 12 +-
.../gef/editor/observer/ObserverWizard.java | 8 -
.../gef/editor/observer/SetAttribute.java | 25 --
.../editor/observer/view/ObserverPage.java | 2 +-
.../observer/wizard/WizardColumnObserver.java | 2 +-
.../WizardObserverCSwitchCoordinates.java | 2 +-
...ardObserverListenOperationByPredicate.java | 2 +-
.../wizard/WizardObserverSetAttribute.java | 2 +-
.../WizardObserverSimpleValueDisplay.java | 2 +-
.../WizardObserverSwitchCoordinates.java | 2 +-
.../wizard/WizardObserverSwitchImage.java | 2 +-
.../observer/wizard/WizardTableObserver.java | 2 +-
.../gef/editor/scheduler/SchedulerWizard.java | 15 -
.../wizard/ObserverCallBackDialog.java | 335 ------------------
.../wizard/SchedulerObjectDialog.java | 2 +-
.../WizardExecuteOperationByPredicate.java | 2 +-
...izardExecuteOperationByPredicateMulti.java | 4 +-
.../wizard/WizardExecuteScheduler.java | 4 +-
de.prob.ui/plugin.xml | 33 +-
25 files changed, 100 insertions(+), 407 deletions(-)
delete mode 100644 de.bmotionstudio.gef.editor/icons/icon_add.gif
delete mode 100644 de.bmotionstudio.gef.editor/icons/icon_ascript.png
delete mode 100644 de.bmotionstudio.gef.editor/icons/icon_motion.gif
delete mode 100644 de.bmotionstudio.gef.editor/icons/icon_motion_wiz.gif
delete mode 100644 de.bmotionstudio.gef.editor/icons/icon_screenshot.gif
delete mode 100644 de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/scheduler/wizard/ObserverCallBackDialog.java
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
GIT binary patch
literal 0
HcmV?d00001
literal 386
zcmZ?wbhEHb<Y(Y#xXJ(m|Ns9NcB>R|uM+jB7W1qT_o|ifu9Nhsm-20p_G^^!Z;}mY
zRtRoW4(n8l?6ECa>`=VSv1GYZ=?a(fRjw7QJ*wBaSFQD|S?^W5!MkpwPyHsp#x1@L
zn**A+1-0%7Y2Ovvu{*qLZ&>G^$e#VteFtOu55-P696#x3;*{eFlaD1$J&`i~RPwZw
z>9fve&ApH_|5Dz<EBTAAPCxZ`=9&NV&;S4b|3Ao;II!YR7DfgJGX@=yJjhQBZ1Wvv
z7kKF0%Hn5AoM<4y!sFJY<}xS6=!W*UNqgh8+9y27+8VJ&^wu7)p3~`J33s!&c~^vR
zZRJ|=LtCB8iCtYqMNO4aNlj5vmCcD$Nr7?NbVg}q4kuQbKB=j4^0KmW6V2EprPoL>
z%1BE}%FZ!k7nhO}m1Yzd+a$)^vSZhpeFqMi@d^kEiVBGc3kqFfaWdv$XXj+)VdY}I
MZ|e5M*^$8-0B{9^r~m)}
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
GIT binary patch
literal 0
HcmV?d00001
literal 489
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L*T#^NA%Cx&(BWL`2bFzgEO
z32{Af?(Uawe}4S@^Y#0mFW-Kz-+nT^c4bz>>Q7&PfBW(0=dV9Me*VsFUR%<&xwvyv
zRsZ&esk<Ae?e3a)XyUxB??3+%H;QeabD($8k%>!>Z`ynQ-isffzx}@V;``ILKVN<L
z`TgggZ$ExNc=hAWr(a*b|9<r5`}6lde*F4VTk2O`;@?>A+g0P;R_Wbe=Q+R4c~-OQ
ztQOa)jqV%!?N)U=EbVk!(&4nA&E>&~{w))1*Y()1>$ShKDdWnf%v*bFu5QZA<-I%+
z<fW1zzhDN3XE)M7oFs2|7lsa2Sq}yV2F?PH$YKTtZeb8+WSBKaf`Ng7y~NYkmHj3s
zKM$9L55LR}1_p-No-U3d5|@4ZZ}K%c@Gyj%bUcz>t)i51J^84x&4&a3|Lc0cmU_PQ
zY>L@zt))fXzb2WtPB&fo_{hHfUESqck1les?JcV<)1Fr@cGD$0_Ttu6*Ce~U#e3ZU
z<}H6(l`i)CVZU~_vKOPCT*MqDmmUFzfO&7Gr825=cBgo;vSu7Db7W=s%XA>g_<2L(
qM!v%W56(*@XBfLJo0F`rD<82!#NjpXgzXFr3=E#GelF{r5}E+@(&TIa
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
GIT binary patch
literal 0
HcmV?d00001
literal 1017
zcmZ?wbhEHb6krfwc)o-|M`x3+?jBRKJ`<x|X67p_%y&6BRC{;?+uL1pa5(H_f6~eE
zw5NB1i{mvn=Zik>Gd!HG`}+s_`j_~*UGobp4ho9%^|<KcamCMXX>dqlK)@tF{~ZB=
z3j>2EhJ{CmhR%xczY!gs5)s)S9h(sqJv}BqD<L5_Au&HOF)t=&OH%mVgrxGM<npA%
zp4625l$4^xnCqGGdsE`?XJ+MPW>#cn<z{CU<Ybp+=QL;M))W?%7ZkP>6t?GQJS{G*
zEh}p%DV<ziURPE=p*;U?Wo1oS`GTsdhRT9hRaKoerH86(r_|OhYiR6jskqtH*xg+I
zp}FQvQ`6jr#&s<%tt~AbEma@dTKhVxzqGclYi--u)w!^z?PPD$$NtvK-Q6qu`uZod
zKJD#YIic;v#J0D66Q=f0oHljJycv^D&6>G*_MFA@=FOkCVCmv{XO=8pyL9QYmCN_6
zU3qTJx{Vt*ZQrta@6PS#ckbG^Yxn+LyASN!x9`xQLx&DtK78oR$&(k)pSyDI{N;-m
zZeP53<<iC5mo8noa{1b|tJkkxyLRLHy}NfF+`aSo;e#iS9=?3^_{r0!FJHWP_2R|b
zSFc{bdHw$V`wt&Ke)$AKUq65T{1pVgfBW|R`}dz<@cS1C{04(RVDR_v-@pI=|7REl
z7$KnelZBCs;Xi{8NCuQA7&xvmxO2*QY*=uxncX?_kjY8GMfO$qmM|X4T(I1==EZ@;
z;xz6lDmITIq&i;qP18#_((^DV)q~rp-{aKHi%(8XR<=z!a3R3y!U2!6nj-;>hnkug
zS%cQBFuuS$RghoJA)`Top@CQA6wjPR%FT`3d}1mJ3JaPinKJJ`W1+~%+|IA!Vvz7?
z`9%j)xgv(hCe`jKO6)x<LZ$-#yef%%Tm+k%U0Ky@t$5D}E3)*8YxwNg@sYWAp)WJH
n;6}kCT{F#!zp(_la9%m!)xsv5#Nv5rsn2XXLAMju3Jlf&4*G;@
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
GIT binary patch
literal 0
HcmV?d00001
literal 1112
zcmZ?wbhEHb6k!lycz%aLN@}5&)^<bVWIet8W|r=ThC6L-ZLRFwt*y&#?1LR0U5u^Q
z+F4I=a&oh_?X|Hy?Be2TZGF|vEyUjLs=eJcPp@zT?^#~n0nRRKoSk?1IBj%syzb`F
z<Kle8-RZQe^C=gn>uye0Je{t3xZL&+hzJY}_3$_q5E$<tQ0(t^-N*B?pa1mWkeHCr
zxX{qpAg{}zp>Y9T_rt>zBf=9RBH|(<lS0BKhDW6a240R1xEURj8Wr6Y7oU@ukd~O3
zl8}^@kW`o)elH=hEh!~CIVCS8xjH2^KOy#3LgLo+wEWbx(xkYX=^2ITnfYn)57N>n
zr)BhIW;N#}-pS6X&CV;!%gfJ6d76=NB{#o0FTb;(ptUG(RzYD)adAm;aan%u+0x?1
zh6aZ6@`{SQ*X0#csw!KnO1D&1H8<7UR91CXR`pd@&8n_#tt&fRSKHK3@}Z`7RYOB#
zT|;kE?fRDT&rK~o%~c<onwPh<ENbiM>#q6U(z?05eSTM0cTe-#p2kmoEmu3cHg<RK
z>g`=Sp>OWQ_6HMNzf9^nJ*n;M#NN#lCrqE*_N}jP=hXIZlP67?GI7JCDYK?^znk9k
zdCHV+Q~Te|m@#Ym%z3kBE}Ai8*X&t~XU<+YXU@Di)88&wuyFCB)k_v{Ub<-i%GK-E
zZP>DL<EAZJwr<^geB0LjJ9q5gv-`xpy=M*_JaXvZ+2cnqoIZ2@?Ac2fE?l^H>B^-`
zw=Q44cJ<1=YuBz{zkch+^+$JZKfQbB;hnqp@7;Uw;KAdE4<9{x^y<lzXHT9!d-43;
z^A|5)zI^rS<@;B!UcY|*?#-Jw|Nk?*ef#PC`wt)9fBEp?^T!WgK79Q6<;%A(U%r3+
z`t|#_pFcq0=Z_!1e*OCW`}ZF(`1|+o-+%x9{r~@;fsR1&CkrDN!+!=Hke#4B!NBp4
zVLPXc$A$$5o7oR5$jtDK+MKXEY2hUiwV4Mqj}+~U3grq}WSMrW#d6t%1>2$)$;p0V
zUJ;<;nRr2Fw&b!U2f|9XnMAdmxFBym#iEyodF=unGuJN{DvghIO;+~a*CP38^#VO_
z`z0(VKOQ>F%+0;7C6lRJVWqECUWSLF5=#dsBg2CS1qvbu?WT4xBnl)SVdD~H6ESFX
z@sn#Rthu7l;Bd5^Ptw3bU_t|zN+^qUY2qT*qg>L~Ee@4Mi`ds?v${JPG^L)M>(ImU
zwo%#f;K~fv_)g2i?3b4~R-8!b3}W<AOTEQ$$>@SYuasW!ln)aeA2IcM9}eJu61vod
zTS6zs?2JcH+lA#J+h(LHXPlWRZr)`xGs*OIn0~^Ed7<8RA7&ZEAJuv6V{#=Vnb+)Q
P#^L);JZ3Kv92l$t@5Tl)
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
GIT binary patch
literal 0
HcmV?d00001
literal 613
zcmZ?wbhEHb6krfwc*ejG8<ZU3m$-bv`cU7L>XNPy-;@B))Bvy4{LHqJg1*@^*1I`p
zx;kgZMAg^T&W?<zv$M<o_wT=%MUI_)wwq_UrG1x?S%!&4wvJJ@iB-OeZjP#M&g=z8
z<ur5Bi~EY}XV-NtiOp_HE$%C6oKw;`yS`^>>!j5)mh7Ifc-N{eCwCscapK~W)=8^Y
zY&p4p*STFsZ#;Yd@8X>|@4o;4{qxb^$IQRK?)!0*@6Yp)Kd-X?zRv&iD*w;x{6Ft{
z|Gb~_`_t+_UyuL!cH;MsM}J@C|M|H3&jr?he}De}|DR##0L7myj0_BJ3_2hugW`mN
z{ZNBjQ**PegNwCGdrMEdh`C5t4->;whlwUGA`WhhJZ?<J4t6$9E-tRityox@+1S{*
zHcdBkF`La|w2MoBub_j)L~|nt4kK-@-JGIr?UqM*^|elNDJq&OatU(TaPx}jYVrwk
zsygZ^a2oMBbBjo7sPjM3GceG5#c$6oDWRq&kfPDyXy9hVp`(_t!QfGI3kQ?1$^+HM
yOr6|f3Kaqm8JpK}?2SwK;2^}r&MO_X$mirFRdzQSs}pZNOqzIhb`ujLgEatam$_5`
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 a7ca5fb9..a1ff60af 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 56b16757..22a64fdc 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 786b3230..9fdcc5b3 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 13ad0ab7..3fdd5cbb 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 73f3a287..23204cc4 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 3143ab77..dc48f9c0 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 d8977b1a..c76bf57e 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 96efd197..83adaee4 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 3f2afafd..9a6d6dbc 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 4813dfac..5d63d4cf 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 ac3ed59a..8e502a6f 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 41a7ee58..ff5d09ea 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 db9f40a7..d38110cd 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 7ec5c760..a9698cc8 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 568c5f09..00000000
--- 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 58f0627c..5542930b 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 82aa9fd7..f763a9a8 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 5462888d..4b9e029a 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 f2c8b4fe..504d38d3 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 a8edde20..a64882ef 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
--
GitLab