Merge luna changes
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/TimerEventDefinitionDetailComposite.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/TimerEventDefinitionDetailComposite.java
index b9290df..45d3942 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/TimerEventDefinitionDetailComposite.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/events/TimerEventDefinitionDetailComposite.java
@@ -18,7 +18,6 @@
import org.eclipse.bpmn2.modeler.core.merrimac.clad.AbstractBpmn2PropertySection;
import org.eclipse.bpmn2.modeler.core.merrimac.clad.DefaultDetailComposite;
import org.eclipse.bpmn2.modeler.core.merrimac.dialogs.TextObjectEditor;
-import org.eclipse.bpmn2.modeler.core.utils.ModelUtil;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
@@ -128,11 +127,15 @@
domain.getCommandStack().execute(new RecordingCommand(domain) {
@Override
protected void doExecute() {
- FormalExpression exp = createModelObject(FormalExpression.class);
+ FormalExpression exp = expression; //createModelObject(FormalExpression.class);
event.eUnset(PACKAGE.getTimerEventDefinition_TimeCycle());
event.eUnset(PACKAGE.getTimerEventDefinition_TimeDuration());
event.setTimeDate(exp);
+ String body = exp.getBody();
+ if (body==null || "null".equals(body))
+ body = "";
exp.setBody(""); //$NON-NLS-1$
+ exp.setBody(body);
timeValueEditor.setObject(exp);
timerType = TimerType.TIMEDATE;
}
@@ -149,11 +152,15 @@
domain.getCommandStack().execute(new RecordingCommand(domain) {
@Override
protected void doExecute() {
- FormalExpression exp = createModelObject(FormalExpression.class);
+ FormalExpression exp = expression; //createModelObject(FormalExpression.class);
event.eUnset(PACKAGE.getTimerEventDefinition_TimeDate());
event.eUnset(PACKAGE.getTimerEventDefinition_TimeDuration());
event.setTimeCycle(exp);
+ String body = exp.getBody();
+ if (body==null || "null".equals(body))
+ body = "";
exp.setBody(""); //$NON-NLS-1$
+ exp.setBody(body);
timeValueEditor.setObject(exp);
timerType = TimerType.TIMECYCLE;
}
@@ -170,11 +177,15 @@
domain.getCommandStack().execute(new RecordingCommand(domain) {
@Override
protected void doExecute() {
- FormalExpression exp = createModelObject(FormalExpression.class);
+ FormalExpression exp = expression; //createModelObject(FormalExpression.class);
event.eUnset(PACKAGE.getTimerEventDefinition_TimeDate());
event.eUnset(PACKAGE.getTimerEventDefinition_TimeCycle());
event.setTimeDuration(exp);
+ String body = exp.getBody();
+ if (body==null || "null".equals(body))
+ body = "";
exp.setBody(""); //$NON-NLS-1$
+ exp.setBody(body);
timeValueEditor.setObject(exp);
timerType = TimerType.TIMEDURATION;
}
