diff options
| author | Ed Willink | 2016-09-07 15:03:51 +0000 |
|---|---|---|
| committer | Ed Willink | 2016-09-19 11:15:19 +0000 |
| commit | 6d6692786ab700efdae0a660c50e2633314b08c8 (patch) | |
| tree | afac66998ad362f3542587615639e4eb4ba42028 /plugins/org.eclipse.qvtd.codegen | |
| parent | 9aa57f26b2ae18b6922815b0bbfe020d7152a449 (diff) | |
| download | org.eclipse.qvtd-6d6692786ab700efdae0a660c50e2633314b08c8.tar.gz org.eclipse.qvtd-6d6692786ab700efdae0a660c50e2633314b08c8.tar.xz org.eclipse.qvtd-6d6692786ab700efdae0a660c50e2633314b08c8.zip | |
[500369] Reduce QVTcoreBase usage
Diffstat (limited to 'plugins/org.eclipse.qvtd.codegen')
2 files changed, 4 insertions, 6 deletions
diff --git a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/analyzer/QVTiAS2CGVisitor.java b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/analyzer/QVTiAS2CGVisitor.java index 04ee72eaa..8eeebf1dc 100644 --- a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/analyzer/QVTiAS2CGVisitor.java +++ b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/analyzer/QVTiAS2CGVisitor.java @@ -114,7 +114,6 @@ import org.eclipse.qvtd.pivot.qvtcorebase.OppositePropertyAssignment; import org.eclipse.qvtd.pivot.qvtcorebase.PropertyAssignment; import org.eclipse.qvtd.pivot.qvtcorebase.RealizedVariable; import org.eclipse.qvtd.pivot.qvtcorebase.VariableAssignment; -import org.eclipse.qvtd.pivot.qvtcorebase.utilities.QVTcoreBaseUtil; import org.eclipse.qvtd.pivot.qvtimperative.ConnectionAssignment; import org.eclipse.qvtd.pivot.qvtimperative.ConnectionStatement; import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable; @@ -685,7 +684,7 @@ public class QVTiAS2CGVisitor extends AS2CGVisitor implements QVTimperativeVisit } protected @NonNull CGTypedModel getTypedModel(@NonNull Variable pVariable) { - Area pArea = ClassUtil.nonNullState(QVTcoreBaseUtil.getContainingArea(pVariable)); + Area pArea = ClassUtil.nonNullState(QVTimperativeUtil.getContainingArea(pVariable)); TypedModel asTypedModel = null; if (pArea instanceof Domain) { asTypedModel = ClassUtil.nonNullState(((Domain)pArea).getTypedModel()); @@ -942,7 +941,7 @@ public class QVTiAS2CGVisitor extends AS2CGVisitor implements QVTimperativeVisit CGMiddlePropertyAssignment cgPropertyAssignment = QVTiCGModelFactory.eINSTANCE.createCGMiddlePropertyAssignment(); setAst(cgPropertyAssignment, asNavigationAssignment); cgPropertyAssignment.setSlotValue(doVisit(CGValuedElement.class, asNavigationAssignment.getSlotExpression())); - Property asProperty = QVTcoreBaseUtil.getTargetProperty(asNavigationAssignment); + Property asProperty = QVTimperativeUtil.getTargetProperty(asNavigationAssignment); cgPropertyAssignment.setReferredProperty(asProperty); // cgPredicate.setName(asPredicate.getName()); cgPropertyAssignment.setTypeId(analyzer.getTypeId(TypeId.OCL_VOID)); @@ -960,7 +959,7 @@ public class QVTiAS2CGVisitor extends AS2CGVisitor implements QVTimperativeVisit return cgPropertyAssignment; } else { - Property asTargetProperty = QVTcoreBaseUtil.getTargetProperty(asNavigationAssignment); + Property asTargetProperty = QVTimperativeUtil.getTargetProperty(asNavigationAssignment); LibraryProperty libraryProperty = metamodelManager.getImplementation(asNavigationAssignment, null, asTargetProperty); CGPropertyAssignment cgPropertyAssignment = null; if (isEcoreProperty(libraryProperty)) { diff --git a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCG2JavaVisitor.java b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCG2JavaVisitor.java index d584c4f07..847d61886 100644 --- a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCG2JavaVisitor.java +++ b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCG2JavaVisitor.java @@ -105,7 +105,6 @@ import org.eclipse.qvtd.pivot.qvtcorebase.BottomPattern; import org.eclipse.qvtd.pivot.qvtcorebase.NavigationAssignment; import org.eclipse.qvtd.pivot.qvtcorebase.PropertyAssignment; import org.eclipse.qvtd.pivot.qvtcorebase.RealizedVariable; -import org.eclipse.qvtd.pivot.qvtcorebase.utilities.QVTcoreBaseUtil; import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable; import org.eclipse.qvtd.pivot.qvtimperative.ImperativeArea; import org.eclipse.qvtd.pivot.qvtimperative.Mapping; @@ -191,7 +190,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato protected void doAddRealization(@NonNull CGRealizedVariable cgRealizedVariable) { RealizedVariable pRealizedVariable = (RealizedVariable)cgRealizedVariable.getAst(); - Area pArea = QVTcoreBaseUtil.getContainingArea(pRealizedVariable); + Area pArea = QVTimperativeUtil.getContainingArea(pRealizedVariable); if (pArea != null) { BottomPattern pBottomPattern = pArea.getBottomPattern(); if (pBottomPattern != null) { |