Fix incorrect refresh of the ALF editor a compilation.

Fix unecessary creation of textual representation comments.

Fix automated population of error log with debug messages

Change-Id: If5d01a83c90935a848377bf5f0ea8654a32526a5
Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>
Reviewed-on: https://git.eclipse.org/r/48342
Tested-by: Hudson CI
Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>

3 files changed, 27 insertions, 5 deletions

diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/CommitScenario.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/CommitScenario.java
index b3017c20764..0cd452e2a45 100644
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/CommitScenario.java
+++ b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/CommitScenario.java
@@ -13,7 +13,7 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.alf.transaction.commit;

 

-import static org.eclipse.papyrus.uml.alf.transaction.ActivatorTransaction.logger;

+//import static org.eclipse.papyrus.uml.alf.transaction.ActivatorTransaction.logger;

 

 import java.sql.Timestamp;

 import java.util.Calendar;

@@ -24,6 +24,8 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.papyrus.uml.alf.libraries.helper.BackupState;

 import org.eclipse.papyrus.uml.alf.libraries.helper.BackupState.EditionStatus;

 import org.eclipse.papyrus.uml.alf.transaction.job.AlfCompilationJob;

+import org.eclipse.swt.custom.StyledText;

+import org.eclipse.swt.widgets.Display;

 import org.eclipse.uml2.uml.NamedElement;

 

 

@@ -37,12 +39,21 @@ public class CommitScenario extends ChangeScenario {
 	 * Flag use to know if the commit is required. it may change in the before method

 	 */

 	private boolean isCommitRequired;

+	

+	/**

+	 * Text editor that can be updated when the commit scenario is done

+	 */

+	private StyledText view;

 

 	public CommitScenario() {

 		super();

 		this.isCommitRequired = true;

 	}

 

+	public void bindView(StyledText view){

+		this.view = view;

+	}

+	

 	/**

 	 * Update the user model state edition status

 	 */

@@ -89,8 +100,15 @@ public class CommitScenario extends ChangeScenario {
 	/**

 	 * This method is automatically called after the job scheduled by this scenario terminates.

 	 */

-	public void after() {

-		logger.info("Compilation Job Done");

+	public void after() {
+		if(this.view!=null && !this.view.isDisposed()){

+			Display.getDefault().syncExec(new Runnable() {

+				@Override

+				public void run() {

+					CommitScenario.this.view.setText(CommitScenario.this.modelStateToBeCommitted.getContent());

+				}

+			});

+		}
 	}

 

 }

diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SaveScenario.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SaveScenario.java
index f877869e1fa..de7ee69f5e2 100644
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SaveScenario.java
+++ b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.transaction/src/org/eclipse/papyrus/uml/alf/transaction/commit/SaveScenario.java
@@ -13,7 +13,7 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.alf.transaction.commit;

 

-import static org.eclipse.papyrus.uml.alf.transaction.ActivatorTransaction.logger;

+//import static org.eclipse.papyrus.uml.alf.transaction.ActivatorTransaction.logger;

 

 import java.sql.Timestamp;

 import java.util.Calendar;

@@ -95,6 +95,6 @@ public class SaveScenario extends ChangeScenario {
 	 * This method is automatically called after the job scheduled by this scenario terminates.

 	 */

 	public void after() {

-		logger.info("Save Job Done");

+		//logger.info("Save Job Done");

 	}

 }

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 de19f764d39..218c2dc3b54 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
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.papyrus.uml.alf.libraries.helper.AlfUtil;

 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;

@@ -57,6 +58,9 @@ public class AlfCompilationJob extends AlfAbstractJob {
 					}

 					/* 3. Execute the commands */

 					try {

+						if(this.modelElementState.getSource()==null){

+							this.modelElementState.setSource(AlfUtil.getInstance().getTextualRepresentationComment(this.modelElementState.getOwner()));

+						}

 						domain.getCommandStack().execute(AlfCommandFactory.getInstance().creatSaveCommand(this.modelElementState));

 					} catch (Exception e) {

 						e.printStackTrace();