Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2016-11-02 15:56:07 +0000
committerEd Willink2016-11-02 15:56:07 +0000
commit2ec2f396df79d2966dc211fa8c07ca8a3a427315 (patch)
treedf40aae8edb1ec1b74c0e99305bc166fe5a0af35
parent2c5f8b04544fd5fe05d6b4eca2d52021186fe45f (diff)
downloadorg.eclipse.qvtd-2ec2f396df79d2966dc211fa8c07ca8a3a427315.tar.gz
org.eclipse.qvtd-2ec2f396df79d2966dc211fa8c07ca8a3a427315.tar.xz
org.eclipse.qvtd-2ec2f396df79d2966dc211fa8c07ca8a3a427315.zip
[unrelated] Avoid creating duplicate FinalAnalysis
-rw-r--r--plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtp2qvts/DependencyAnalyzer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtp2qvts/DependencyAnalyzer.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtp2qvts/DependencyAnalyzer.java
index 2d7d83cbf..8387114e5 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtp2qvts/DependencyAnalyzer.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtp2qvts/DependencyAnalyzer.java
@@ -60,8 +60,8 @@ import org.eclipse.ocl.pivot.VariableDeclaration;
import org.eclipse.ocl.pivot.VariableExp;
import org.eclipse.ocl.pivot.VoidType;
import org.eclipse.ocl.pivot.ids.OperationId;
-import org.eclipse.ocl.pivot.internal.complete.CompleteModelInternal;
import org.eclipse.ocl.pivot.internal.manager.FinalAnalysis;
+import org.eclipse.ocl.pivot.internal.manager.PivotMetamodelManager;
import org.eclipse.ocl.pivot.util.Visitable;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
import org.eclipse.ocl.pivot.utilities.EnvironmentFactory;
@@ -1312,7 +1312,7 @@ public class DependencyAnalyzer
this.standardLibrary = environmentFactory.getStandardLibrary();
this.domainUsageAnalysis = scheduler.getDomainAnalysis();
this.scheduler = scheduler;
- this.finalAnalysis = new FinalAnalysis((CompleteModelInternal) environmentFactory.getCompleteModel());
+ this.finalAnalysis = ((PivotMetamodelManager)metamodelManager).getFinalAnalysis(); //new FinalAnalysis((CompleteModelInternal) environmentFactory.getCompleteModel());
CompleteModel completeModel = environmentFactory.getCompleteModel();
this.oclVoidCompleteClass = completeModel.getCompleteClass(standardLibrary.getOclVoidType());
this.oclInvalidCompleteClass = completeModel.getCompleteClass(standardLibrary.getOclInvalidType());

Back to the top