[486722] Fix QVTr launch

2 files changed, 9 insertions, 9 deletions

diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTrCompilerChain.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTrCompilerChain.java
index 0cbd6397a..89e68da77 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTrCompilerChain.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTrCompilerChain.java
@@ -17,13 +17,13 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.utilities.ClassUtil;
 import org.eclipse.ocl.pivot.utilities.XMIUtil;
 import org.eclipse.qvtd.compiler.internal.etl.mtc.QVTuConfiguration;
 import org.eclipse.qvtd.compiler.internal.qvtr2qvtc.QVTrToQVTc;
 import org.eclipse.qvtd.pivot.qvtbase.Transformation;
-import org.eclipse.qvtd.pivot.qvtbase.utilities.QVTbaseUtil;
 import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiEnvironmentFactory;
-import org.eclipse.qvtd.pivot.qvtrelation.RelationModel;
+import org.eclipse.qvtd.pivot.qvtrelation.utilities.QVTrelationUtil;
 
 /**
  * The QVTcCompilerChain supports generation of a QVTi Transformation from a QVTc Transformation.
@@ -36,11 +36,10 @@ public class QVTrCompilerChain extends AbstractCompilerChain
 
 	@Override
 	public @NonNull Transformation compile(@NonNull String enforcedOutputName) throws IOException {
-		URI qvtrURI = getURI(QVTR_STEP, URI_KEY);
-		Transformation transformation = QVTbaseUtil.loadTransformation(RelationModel.class, environmentFactory, qvtrURI, false);
-		Resource rResource = transformation.eResource();
-		assert rResource != null;
-		Resource cResource = qvtr2qvtc(rResource);;
+		Transformation loadTransformation = QVTrelationUtil.loadTransformation(environmentFactory, txURI, false);
+		Resource rResource = ClassUtil.nonNullState(loadTransformation.eResource());
+		compiled(QVTR_STEP, rResource);
+		Resource cResource = qvtr2qvtc(rResource);
 		assert cResource != null;
 		QVTuConfiguration qvtuConfiguration = createQVTuConfiguration(cResource, QVTuConfiguration.Mode.ENFORCE, enforcedOutputName);
 		Resource pResource = qvtc2qvtp(cResource, qvtuConfiguration);
@@ -54,11 +53,12 @@ public class QVTrCompilerChain extends AbstractCompilerChain
 		Resource traceResource = createResource(traceURI);
     	QVTrToQVTc t = new QVTrToQVTc(environmentFactory, rResource, cResource);
 		t.prepare();
-		t.execute();		
+		t.execute();
         t.saveTrace(traceResource, XMIUtil.createSaveOptions());
         assertNoResourceErrors("Trace save", traceResource);
         t.saveCore(cResource, XMIUtil.createSaveOptions());
         assertNoResourceErrors("Core save", cResource);
+		compiled(QVTC_STEP, cResource);
 		return cResource;
 	}
 }
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java
index 43c36ac70..7c16b07c8 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java
+++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java
@@ -343,7 +343,7 @@ public abstract class MainTab extends AbstractMainTab implements QVTiLaunchConst
 	}
 
 	protected void cancelCompileJob(boolean force) {
-		if (!compileButton.isDisposed()) {
+		if ((compileButton != null) && !compileButton.isDisposed()) {
 			compileButton.setText(force ? "Compile" : "Recompile");
 		}
 		CompileJob compileJob2 = compileJob;