Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeremie.tatibouet2015-05-04 06:01:20 -0400
committerArnaud Cuccuru2015-05-05 12:46:40 -0400
commitac3565d88897376cbc0dc639c32faca257e5b5b7 (patch)
tree3cdfe205c30f27c358c14794e2deb42816715255 /extraplugins/alf
parent42736e1a70828172709c7244728057d7d7d6072c (diff)
downloadorg.eclipse.papyrus-ac3565d88897376cbc0dc639c32faca257e5b5b7.tar.gz
org.eclipse.papyrus-ac3565d88897376cbc0dc639c32faca257e5b5b7.tar.xz
org.eclipse.papyrus-ac3565d88897376cbc0dc639c32faca257e5b5b7.zip
After the compilation, the serialization of an activity is not
re-generated. This temporarily avoid the serialization problem returning an activity specification without a body. Change-Id: I21c8bc7fa441445b6f2c6d04a50579100ed68741 Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr> Reviewed-on: https://git.eclipse.org/r/47153 Tested-by: Hudson CI Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr> Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
Diffstat (limited to 'extraplugins/alf')
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfCompilationJob.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfCompilationJob.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfCompilationJob.java
index cf87db6d3e1..de19f764d39 100644
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfCompilationJob.java
+++ b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/job/AlfCompilationJob.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.papyrus.uml.alf.text.generation.DefaultEditStringRetrievalStrategy;
import org.eclipse.papyrus.uml.alf.text.representation.AlfTextualRepresentation;
import org.eclipse.papyrus.uml.alf.transaction.commands.AlfCommandFactory;
+import org.eclipse.uml2.uml.Activity;
public class AlfCompilationJob extends AlfAbstractJob {
@@ -50,7 +51,10 @@ public class AlfCompilationJob extends AlfAbstractJob {
}
/* 3. Save the textual representation within the model */
if (jobStatus.equals(Status.OK_STATUS)) {
- this.modelElementState.setText(new DefaultEditStringRetrievalStrategy().getGeneratedEditString(this.modelElementState.getOwner()));
+ /*NOTE: does not update textual representation after compilation (u)*/
+ if(!(this.modelElementState.getOwner() instanceof Activity)){
+ this.modelElementState.setText(new DefaultEditStringRetrievalStrategy().getGeneratedEditString(this.modelElementState.getOwner()));
+ }
/* 3. Execute the commands */
try {
domain.getCommandStack().execute(AlfCommandFactory.getInstance().creatSaveCommand(this.modelElementState));

Back to the top