diff options
author | Ed Willink | 2015-04-26 13:35:02 +0000 |
---|---|---|
committer | Ed Willink | 2015-04-29 13:41:58 +0000 |
commit | 34503374d08aff8c8f7fa9d3a6aaaf7743b948ee (patch) | |
tree | c73ceec8a9980f9a56a0b2862494d033d51abc5e | |
parent | 205efeb3addf8256def3d0576b93c793cc1aab2f (diff) | |
download | org.eclipse.qvtd-34503374d08aff8c8f7fa9d3a6aaaf7743b948ee.tar.gz org.eclipse.qvtd-34503374d08aff8c8f7fa9d3a6aaaf7743b948ee.tar.xz org.eclipse.qvtd-34503374d08aff8c8f7fa9d3a6aaaf7743b948ee.zip |
[454555] Eliminate MiddlePropertyCallExp/Assignment in AS
31 files changed, 9 insertions, 1081 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 a8e3a8f6e..79aa821a4 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 @@ -101,8 +101,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding; import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop; import org.eclipse.qvtd.pivot.qvtimperative.MappingSequence; import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate; import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiTransformationAnalysis; import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor; @@ -566,16 +564,6 @@ public class QVTiAS2CGVisitor extends AS2CGVisitor implements QVTimperativeVisit } @Override - public @Nullable CGNamedElement visitMiddlePropertyAssignment(@NonNull MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - @Override - public @Nullable CGNamedElement visitMiddlePropertyCallExp(@NonNull MiddlePropertyCallExp object) { - return visitOppositePropertyCallExp(object); - } - - @Override public @Nullable CGNamedElement visitPattern(@NonNull Pattern object) { return visiting(object); } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTimperativeStepperVisitor.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTimperativeStepperVisitor.java index f2f3b7018..e577a12e8 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTimperativeStepperVisitor.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTimperativeStepperVisitor.java @@ -51,14 +51,6 @@ public abstract class AbstractQVTimperativeStepperVisitor return visitElement(object); } - public @Nullable IStepper visitMiddlePropertyAssignment(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - public @Nullable IStepper visitMiddlePropertyCallExp(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp object) { - return visitOppositePropertyCallExp(object); - } - public @Nullable IStepper visitVariablePredicate(@NonNull org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate object) { return visitPredicate(object); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTdStdlib.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTdStdlib.java index 90dd5f985..6c5b3c79d 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTdStdlib.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTdStdlib.java @@ -84,7 +84,7 @@ public class QVTdStdlib extends ASResourceImpl public static @NonNull QVTdStdlib getDefault() { QVTdStdlib oclstdlib = INSTANCE; if (oclstdlib == null) { - Contents contents = new Contents("http://www.eclipse.org/qvt/2015/QVTbase", "qvtbase", "qvtb", "http://www.eclipse.org/qvt/2015/QVTbase"); + Contents contents = new Contents("http://www.eclipse.org/qvt/2015/QVTbase"); oclstdlib = INSTANCE = new QVTdStdlib(STDLIB_URI + PivotConstants.DOT_OCL_AS_FILE_EXTENSION, contents.getModel()); } return oclstdlib; @@ -142,8 +142,8 @@ public class QVTdStdlib extends ASResourceImpl * Construct a copy of the OCL Standard Library with specified resource URI, * and package name, prefix and namespace URI. */ - public static @NonNull QVTdStdlib create(@NonNull String asURI, @NonNull String name, @NonNull String nsPrefix, @NonNull String nsURI) { - Contents contents = new Contents(asURI, name, nsPrefix, nsURI); + public static @NonNull QVTdStdlib create(@NonNull String asURI) { + Contents contents = new Contents(asURI); return new QVTdStdlib(asURI, contents.getModel()); } @@ -223,7 +223,8 @@ public class QVTdStdlib extends ASResourceImpl private final @NonNull Library ocl; private final @NonNull Library qvtbase; - private Contents(@NonNull String asURI, @NonNull String name, @NonNull String nsPrefix, @NonNull String nsURI) { + private Contents(@NonNull String asURI) + { model = createModel(asURI); orphanage = createPackage("$$", "orphanage", "http://www.eclipse.org/ocl/2015/Orphanage", null); ocl = createLibrary("ocl", "ocl", "http://www.eclipse.org/ocl/2015/Pivot", null); diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MiddlePropertyAssignment.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MiddlePropertyAssignment.java deleted file mode 100644 index 0bb52e9ca..000000000 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MiddlePropertyAssignment.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 E.D.Willink and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * E.D.Willink - Initial API and implementation - *******************************************************************************/ -package org.eclipse.qvtd.pivot.qvtimperative; - -import org.eclipse.qvtd.pivot.qvtcorebase.PropertyAssignment; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Middle Property Assignment</b></em>'. - * <!-- end-user-doc --> - * - * <!-- begin-model-doc --> - * A MiddlePropertyAssignment identifies a property assignment to the middle model. - * It adds an additional feature to facilitate efficient access to a cache of - * non-navigable outer-to-middle opposites. - * <!-- end-model-doc --> - * - * - * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMiddlePropertyAssignment() - * @generated - */ -public interface MiddlePropertyAssignment extends PropertyAssignment { - -} // MiddlePropertyAssignment diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MiddlePropertyCallExp.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MiddlePropertyCallExp.java deleted file mode 100644 index c4a7cce3f..000000000 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MiddlePropertyCallExp.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 E.D.Willink and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * E.D.Willink - Initial API and implementation - *******************************************************************************/ -package org.eclipse.qvtd.pivot.qvtimperative; - -import org.eclipse.ocl.pivot.OppositePropertyCallExp; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Middle Property Call Exp</b></em>'. - * <!-- end-user-doc --> - * - * <!-- begin-model-doc --> - * A MiddlePropertyCallExp identifies a property call from the middle model. - * It adds an additional feature to facilitate efficient access to a cache of - * non-navigable outer-to-middle opposites. - * <!-- end-model-doc --> - * - * - * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMiddlePropertyCallExp() - * @generated - */ -public interface MiddlePropertyCallExp extends OppositePropertyCallExp { - -} // MiddlePropertyCallExp diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java index be5629ab4..0939ff717 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeFactory.java @@ -84,24 +84,6 @@ public interface QVTimperativeFactory extends EFactory { MappingSequence createMappingSequence(); /** - * Returns a new object of class '<em>Middle Property Assignment</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>Middle Property Assignment</em>'. - * @generated - */ - MiddlePropertyAssignment createMiddlePropertyAssignment(); - - /** - * Returns a new object of class '<em>Middle Property Call Exp</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return a new object of class '<em>Middle Property Call Exp</em>'. - * @generated - */ - MiddlePropertyCallExp createMiddlePropertyCallExp(); - - /** * Returns a new object of class '<em>Variable Predicate</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java index ee61ba6f2..89a908114 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java @@ -886,269 +886,6 @@ public interface QVTimperativePackage extends EPackage { int MAPPING_SEQUENCE_FEATURE_COUNT = MAPPING_STATEMENT_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MiddlePropertyAssignmentImpl <em>Middle Property Assignment</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.qvtd.pivot.qvtimperative.impl.MiddlePropertyAssignmentImpl - * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMiddlePropertyAssignment() - * @generated - */ - int MIDDLE_PROPERTY_ASSIGNMENT = 7; - - /** - * The feature id for the '<em><b>Annotating Comments</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_ASSIGNMENT__ANNOTATING_COMMENTS = QVTcoreBasePackage.PROPERTY_ASSIGNMENT__ANNOTATING_COMMENTS; - - /** - * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_ASSIGNMENT__OWNED_ANNOTATIONS = QVTcoreBasePackage.PROPERTY_ASSIGNMENT__OWNED_ANNOTATIONS; - - /** - * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_ASSIGNMENT__OWNED_COMMENTS = QVTcoreBasePackage.PROPERTY_ASSIGNMENT__OWNED_COMMENTS; - - /** - * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_ASSIGNMENT__OWNED_EXTENSIONS = QVTcoreBasePackage.PROPERTY_ASSIGNMENT__OWNED_EXTENSIONS; - - /** - * The feature id for the '<em><b>Bottom Pattern</b></em>' container reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_ASSIGNMENT__BOTTOM_PATTERN = QVTcoreBasePackage.PROPERTY_ASSIGNMENT__BOTTOM_PATTERN; - - /** - * The feature id for the '<em><b>Value</b></em>' containment reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_ASSIGNMENT__VALUE = QVTcoreBasePackage.PROPERTY_ASSIGNMENT__VALUE; - - /** - * The feature id for the '<em><b>Is Default</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_ASSIGNMENT__IS_DEFAULT = QVTcoreBasePackage.PROPERTY_ASSIGNMENT__IS_DEFAULT; - - /** - * The feature id for the '<em><b>Slot Expression</b></em>' containment reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_ASSIGNMENT__SLOT_EXPRESSION = QVTcoreBasePackage.PROPERTY_ASSIGNMENT__SLOT_EXPRESSION; - - /** - * The feature id for the '<em><b>Target Property</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_ASSIGNMENT__TARGET_PROPERTY = QVTcoreBasePackage.PROPERTY_ASSIGNMENT__TARGET_PROPERTY; - - /** - * The number of structural features of the '<em>Middle Property Assignment</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_ASSIGNMENT_FEATURE_COUNT = QVTcoreBasePackage.PROPERTY_ASSIGNMENT_FEATURE_COUNT + 0; - - /** - * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MiddlePropertyCallExpImpl <em>Middle Property Call Exp</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.qvtd.pivot.qvtimperative.impl.MiddlePropertyCallExpImpl - * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMiddlePropertyCallExp() - * @generated - */ - int MIDDLE_PROPERTY_CALL_EXP = 8; - - /** - * The feature id for the '<em><b>Annotating Comments</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__ANNOTATING_COMMENTS = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__ANNOTATING_COMMENTS; - - /** - * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__OWNED_ANNOTATIONS = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__OWNED_ANNOTATIONS; - - /** - * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__OWNED_COMMENTS = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__OWNED_COMMENTS; - - /** - * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__OWNED_EXTENSIONS = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__OWNED_EXTENSIONS; - - /** - * The feature id for the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__NAME = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__NAME; - - /** - * The feature id for the '<em><b>Is Many</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__IS_MANY = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__IS_MANY; - - /** - * The feature id for the '<em><b>Is Required</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__IS_REQUIRED = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__IS_REQUIRED; - - /** - * The feature id for the '<em><b>Type</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__TYPE = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__TYPE; - - /** - * The feature id for the '<em><b>Type Value</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__TYPE_VALUE = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__TYPE_VALUE; - - /** - * The feature id for the '<em><b>Is Implicit</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__IS_IMPLICIT = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__IS_IMPLICIT; - - /** - * The feature id for the '<em><b>Is Safe</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__IS_SAFE = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__IS_SAFE; - - /** - * The feature id for the '<em><b>Owned Source</b></em>' containment reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__OWNED_SOURCE = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__OWNED_SOURCE; - - /** - * The feature id for the '<em><b>Is Pre</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__IS_PRE = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__IS_PRE; - - /** - * The feature id for the '<em><b>Navigation Source</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__NAVIGATION_SOURCE = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__NAVIGATION_SOURCE; - - /** - * The feature id for the '<em><b>Qualifiers</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__QUALIFIERS = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__QUALIFIERS; - - /** - * The feature id for the '<em><b>Referred Property</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP__REFERRED_PROPERTY = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP__REFERRED_PROPERTY; - - /** - * The number of structural features of the '<em>Middle Property Call Exp</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int MIDDLE_PROPERTY_CALL_EXP_FEATURE_COUNT = PivotPackage.OPPOSITE_PROPERTY_CALL_EXP_FEATURE_COUNT + 0; - - /** * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.VariablePredicateImpl <em>Variable Predicate</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1156,7 +893,7 @@ public interface QVTimperativePackage extends EPackage { * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getVariablePredicate() * @generated */ - int VARIABLE_PREDICATE = 9; + int VARIABLE_PREDICATE = 7; /** * The feature id for the '<em><b>Annotating Comments</b></em>' reference list. @@ -1389,26 +1126,6 @@ public interface QVTimperativePackage extends EPackage { EClass getMappingStatement(); /** - * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment <em>Middle Property Assignment</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Middle Property Assignment</em>'. - * @see org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment - * @generated - */ - EClass getMiddlePropertyAssignment(); - - /** - * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp <em>Middle Property Call Exp</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Middle Property Call Exp</em>'. - * @see org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp - * @generated - */ - EClass getMiddlePropertyCallExp(); - - /** * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate <em>Variable Predicate</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1586,26 +1303,6 @@ public interface QVTimperativePackage extends EPackage { EClass MAPPING_STATEMENT = eINSTANCE.getMappingStatement(); /** - * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MiddlePropertyAssignmentImpl <em>Middle Property Assignment</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.qvtd.pivot.qvtimperative.impl.MiddlePropertyAssignmentImpl - * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMiddlePropertyAssignment() - * @generated - */ - EClass MIDDLE_PROPERTY_ASSIGNMENT = eINSTANCE.getMiddlePropertyAssignment(); - - /** - * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MiddlePropertyCallExpImpl <em>Middle Property Call Exp</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.qvtd.pivot.qvtimperative.impl.MiddlePropertyCallExpImpl - * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMiddlePropertyCallExp() - * @generated - */ - EClass MIDDLE_PROPERTY_CALL_EXP = eINSTANCE.getMiddlePropertyCallExp(); - - /** * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.VariablePredicateImpl <em>Variable Predicate</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MiddlePropertyAssignmentImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MiddlePropertyAssignmentImpl.java deleted file mode 100644 index c44de7ba5..000000000 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MiddlePropertyAssignmentImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 E.D.Willink and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * E.D.Willink - Initial API and implementation - *******************************************************************************/ -package org.eclipse.qvtd.pivot.qvtimperative.impl; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.ocl.pivot.util.Visitor; -import org.eclipse.qvtd.pivot.qvtcorebase.impl.PropertyAssignmentImpl; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment; -import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage; -import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Middle Property Assignment</b></em>'. - * <!-- end-user-doc --> - * - * @generated - */ -public class MiddlePropertyAssignmentImpl extends PropertyAssignmentImpl implements MiddlePropertyAssignment { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected MiddlePropertyAssignmentImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EClass eStaticClass() { - return QVTimperativePackage.Literals.MIDDLE_PROPERTY_ASSIGNMENT; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public @Nullable <R> R accept(@NonNull Visitor<R> visitor) { - return (R) ((QVTimperativeVisitor<?>)visitor).visitMiddlePropertyAssignment(this); - } -} //MiddlePropertyAssignmentImpl diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MiddlePropertyCallExpImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MiddlePropertyCallExpImpl.java deleted file mode 100644 index a2ec20ea3..000000000 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MiddlePropertyCallExpImpl.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 E.D.Willink and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * E.D.Willink - Initial API and implementation - *******************************************************************************/ -package org.eclipse.qvtd.pivot.qvtimperative.impl; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.ocl.pivot.Property; -import org.eclipse.ocl.pivot.internal.OppositePropertyCallExpImpl; -import org.eclipse.ocl.pivot.util.Visitor; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; -import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage; -import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Middle Property Call Exp</b></em>'. - * <!-- end-user-doc --> - * - * @generated - */ -public class MiddlePropertyCallExpImpl extends OppositePropertyCallExpImpl implements MiddlePropertyCallExp { - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected MiddlePropertyCallExpImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EClass eStaticClass() { - return QVTimperativePackage.Literals.MIDDLE_PROPERTY_CALL_EXP; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public @Nullable <R> R accept(@NonNull Visitor<R> visitor) { - return (R) ((QVTimperativeVisitor<?>)visitor).visitMiddlePropertyCallExp(this); - } - - @Override - public Property getReferredProperty() { - // TODO Auto-generated method stub - return super.getReferredProperty(); - } - - @Override - public void setReferredProperty(Property newReferredProperty) { - // TODO Auto-generated method stub - super.setReferredProperty(newReferredProperty); - } -} //MiddlePropertyCallExpImpl diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java index e6ee56feb..67c99094d 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativeFactoryImpl.java @@ -15,14 +15,15 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.qvtd.pivot.qvtimperative.*; import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel; import org.eclipse.qvtd.pivot.qvtimperative.Mapping; import org.eclipse.qvtd.pivot.qvtimperative.MappingCall; import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; +import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop; +import org.eclipse.qvtd.pivot.qvtimperative.MappingSequence; import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativeFactory; import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage; +import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate; /** * <!-- begin-user-doc --> @@ -74,8 +75,6 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat case QVTimperativePackage.MAPPING_CALL_BINDING: return createMappingCallBinding(); case QVTimperativePackage.MAPPING_LOOP: return createMappingLoop(); case QVTimperativePackage.MAPPING_SEQUENCE: return createMappingSequence(); - case QVTimperativePackage.MIDDLE_PROPERTY_ASSIGNMENT: return createMiddlePropertyAssignment(); - case QVTimperativePackage.MIDDLE_PROPERTY_CALL_EXP: return createMiddlePropertyCallExp(); case QVTimperativePackage.VARIABLE_PREDICATE: return createVariablePredicate(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); @@ -154,28 +153,6 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat * @generated */ @Override - public MiddlePropertyAssignment createMiddlePropertyAssignment() { - MiddlePropertyAssignmentImpl middlePropertyAssignment = new MiddlePropertyAssignmentImpl(); - return middlePropertyAssignment; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public MiddlePropertyCallExp createMiddlePropertyCallExp() { - MiddlePropertyCallExpImpl middlePropertyCallExp = new MiddlePropertyCallExpImpl(); - return middlePropertyCallExp; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override public VariablePredicate createVariablePredicate() { VariablePredicateImpl variablePredicate = new VariablePredicateImpl(); return variablePredicate; diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java index d63426803..cb28f14be 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java @@ -25,8 +25,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding; import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop; import org.eclipse.qvtd.pivot.qvtimperative.MappingSequence; import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativeFactory; import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage; import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate; @@ -92,20 +90,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat * <!-- end-user-doc --> * @generated */ - private EClass middlePropertyAssignmentEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass middlePropertyCallExpEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ private EClass variablePredicateEClass = null; /** @@ -328,26 +312,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat * @generated */ @Override - public EClass getMiddlePropertyAssignment() { - return middlePropertyAssignmentEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public EClass getMiddlePropertyCallExp() { - return middlePropertyCallExpEClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override public EClass getVariablePredicate() { return variablePredicateEClass; } @@ -413,10 +377,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat mappingStatementEClass = createEClass(MAPPING_STATEMENT); - middlePropertyAssignmentEClass = createEClass(MIDDLE_PROPERTY_ASSIGNMENT); - - middlePropertyCallExpEClass = createEClass(MIDDLE_PROPERTY_CALL_EXP); - variablePredicateEClass = createEClass(VARIABLE_PREDICATE); createEReference(variablePredicateEClass, VARIABLE_PREDICATE__TARGET_VARIABLE); } @@ -463,8 +423,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat mappingLoopEClass.getESuperTypes().add(this.getMappingStatement()); mappingSequenceEClass.getESuperTypes().add(this.getMappingStatement()); mappingStatementEClass.getESuperTypes().add(thePivotPackage.getOCLExpression()); - middlePropertyAssignmentEClass.getESuperTypes().add(theQVTcoreBasePackage.getPropertyAssignment()); - middlePropertyCallExpEClass.getESuperTypes().add(thePivotPackage.getOppositePropertyCallExp()); variablePredicateEClass.getESuperTypes().add(theQVTbasePackage.getPredicate()); // Initialize classes and features; add operations and parameters @@ -492,10 +450,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat initEClass(mappingStatementEClass, MappingStatement.class, "MappingStatement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(middlePropertyAssignmentEClass, MiddlePropertyAssignment.class, "MiddlePropertyAssignment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(middlePropertyCallExpEClass, MiddlePropertyCallExp.class, "MiddlePropertyCallExp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(variablePredicateEClass, VariablePredicate.class, "VariablePredicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getVariablePredicate_TargetVariable(), thePivotPackage.getVariable(), null, "targetVariable", null, 1, 1, VariablePredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java index 67d3633eb..9e7693ee0 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractDelegatingQVTimperativeVisitor.java @@ -72,16 +72,6 @@ public abstract class AbstractDelegatingQVTimperativeVisitor<R, C, D extends QVT } @Override - public @Nullable R visitMiddlePropertyAssignment(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment object) { - return delegate.visitMiddlePropertyAssignment(object); - } - - @Override - public @Nullable R visitMiddlePropertyCallExp(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp object) { - return delegate.visitMiddlePropertyCallExp(object); - } - - @Override public @Nullable R visitVariablePredicate(@NonNull org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate object) { return delegate.visitVariablePredicate(object); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java index e408cd802..3cd677f05 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractExtendingQVTimperativeVisitor.java @@ -76,16 +76,6 @@ public abstract class AbstractExtendingQVTimperativeVisitor<R, C> } @Override - public @Nullable R visitMiddlePropertyAssignment(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - @Override - public @Nullable R visitMiddlePropertyCallExp(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp object) { - return visitOppositePropertyCallExp(object); - } - - @Override public @Nullable R visitVariablePredicate(@NonNull org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate object) { return visitPredicate(object); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java index 575646278..a6ee4432c 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractNullQVTimperativeVisitor.java @@ -72,16 +72,6 @@ public abstract class AbstractNullQVTimperativeVisitor<R, C> } @Override - public @Nullable R visitMiddlePropertyAssignment(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment object) { - return null; - } - - @Override - public @Nullable R visitMiddlePropertyCallExp(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp object) { - return null; - } - - @Override public @Nullable R visitVariablePredicate(@NonNull org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate object) { return null; } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java index 21fc6bbc4..986c159df 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2MonikerVisitor.java @@ -79,16 +79,6 @@ public abstract class AbstractQVTimperativeAS2MonikerVisitor } @Override - public @Nullable Object visitMiddlePropertyAssignment(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - @Override - public @Nullable Object visitMiddlePropertyCallExp(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp object) { - return visitOppositePropertyCallExp(object); - } - - @Override public @Nullable Object visitVariablePredicate(@NonNull org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate object) { return visitPredicate(object); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java index 35a6029c7..c7d1b88de 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java @@ -79,16 +79,6 @@ public abstract class AbstractQVTimperativeAS2XMIidVisitor } @Override - public @Nullable Boolean visitMiddlePropertyAssignment(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - @Override - public @Nullable Boolean visitMiddlePropertyCallExp(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp object) { - return visitOppositePropertyCallExp(object); - } - - @Override public @Nullable Boolean visitVariablePredicate(@NonNull org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate object) { return visitPredicate(object); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java index 6200e6319..9b404d2bd 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverLocateVisitor.java @@ -79,16 +79,6 @@ public abstract class AbstractQVTimperativeASSaverLocateVisitor } @Override - public @Nullable Object visitMiddlePropertyAssignment(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - @Override - public @Nullable Object visitMiddlePropertyCallExp(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp object) { - return visitOppositePropertyCallExp(object); - } - - @Override public @Nullable Object visitVariablePredicate(@NonNull org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate object) { return visitPredicate(object); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java index f84b96d3c..8acdbe3df 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverNormalizeVisitor.java @@ -81,16 +81,6 @@ public abstract class AbstractQVTimperativeASSaverNormalizeVisitor } @Override - public @Nullable Object visitMiddlePropertyAssignment(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - @Override - public @Nullable Object visitMiddlePropertyCallExp(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp object) { - return visitOppositePropertyCallExp(object); - } - - @Override public @Nullable Object visitVariablePredicate(@NonNull org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate object) { return visitPredicate(object); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java index 2f9971675..0543facc9 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeASSaverResolveVisitor.java @@ -79,16 +79,6 @@ public abstract class AbstractQVTimperativeASSaverResolveVisitor } @Override - public @Nullable Object visitMiddlePropertyAssignment(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - @Override - public @Nullable Object visitMiddlePropertyCallExp(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp object) { - return visitOppositePropertyCallExp(object); - } - - @Override public @Nullable Object visitVariablePredicate(@NonNull org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate object) { return visitPredicate(object); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java index e5cd8220e..c400adbb9 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractWrappingQVTimperativeVisitor.java @@ -116,30 +116,6 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, D extends QVTim } @Override - public @Nullable R visitMiddlePropertyAssignment(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment object) { - P prologue = preVisit(object); - try { - R result = delegate.visitMiddlePropertyAssignment(object); - return postVisit(object, prologue, result); - } - catch (Throwable e) { - return badVisit(object, prologue, e); - } - } - - @Override - public @Nullable R visitMiddlePropertyCallExp(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp object) { - P prologue = preVisit(object); - try { - R result = delegate.visitMiddlePropertyCallExp(object); - return postVisit(object, prologue, result); - } - catch (Throwable e) { - return badVisit(object, prologue, e); - } - } - - @Override public @Nullable R visitVariablePredicate(@NonNull org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate object) { P prologue = preVisit(object); try { diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java index 1da80167a..99610afbb 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeAdapterFactory.java @@ -16,14 +16,11 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; import org.eclipse.ocl.pivot.CallExp; import org.eclipse.ocl.pivot.Element; -import org.eclipse.ocl.pivot.FeatureCallExp; import org.eclipse.ocl.pivot.LoopExp; import org.eclipse.ocl.pivot.Model; import org.eclipse.ocl.pivot.NamedElement; import org.eclipse.ocl.pivot.Namespace; -import org.eclipse.ocl.pivot.NavigationCallExp; import org.eclipse.ocl.pivot.OCLExpression; -import org.eclipse.ocl.pivot.OppositePropertyCallExp; import org.eclipse.ocl.pivot.ReferringElement; import org.eclipse.ocl.pivot.TypedElement; import org.eclipse.ocl.pivot.util.Visitable; @@ -33,9 +30,6 @@ import org.eclipse.qvtd.pivot.qvtbase.Predicate; import org.eclipse.qvtd.pivot.qvtbase.Rule; import org.eclipse.qvtd.pivot.qvtcorebase.AbstractMapping; import org.eclipse.qvtd.pivot.qvtcorebase.Area; -import org.eclipse.qvtd.pivot.qvtcorebase.Assignment; -import org.eclipse.qvtd.pivot.qvtcorebase.PropertyAssignment; -import org.eclipse.qvtd.pivot.qvtimperative.*; import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel; import org.eclipse.qvtd.pivot.qvtimperative.Mapping; import org.eclipse.qvtd.pivot.qvtimperative.MappingCall; @@ -43,7 +37,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding; import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop; import org.eclipse.qvtd.pivot.qvtimperative.MappingSequence; import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage; import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate; @@ -132,14 +125,6 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl { return createMappingStatementAdapter(); } @Override - public Adapter caseMiddlePropertyAssignment(MiddlePropertyAssignment object) { - return createMiddlePropertyAssignmentAdapter(); - } - @Override - public Adapter caseMiddlePropertyCallExp(MiddlePropertyCallExp object) { - return createMiddlePropertyCallExpAdapter(); - } - @Override public Adapter caseVariablePredicate(VariablePredicate object) { return createVariablePredicateAdapter(); } @@ -204,26 +189,6 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl { return createLoopExpAdapter(); } @Override - public Adapter caseAssignment(Assignment object) { - return createAssignmentAdapter(); - } - @Override - public Adapter casePropertyAssignment(PropertyAssignment object) { - return createPropertyAssignmentAdapter(); - } - @Override - public Adapter caseFeatureCallExp(FeatureCallExp object) { - return createFeatureCallExpAdapter(); - } - @Override - public Adapter caseNavigationCallExp(NavigationCallExp object) { - return createNavigationCallExpAdapter(); - } - @Override - public Adapter caseOppositePropertyCallExp(OppositePropertyCallExp object) { - return createOppositePropertyCallExpAdapter(); - } - @Override public Adapter casePredicate(Predicate object) { return createPredicateAdapter(); } @@ -374,34 +339,6 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment <em>Middle Property Assignment</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment - * @generated - */ - public Adapter createMiddlePropertyAssignmentAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp <em>Middle Property Call Exp</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp - * @generated - */ - public Adapter createMiddlePropertyCallExpAdapter() { - return null; - } - - /** * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate <em>Variable Predicate</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; @@ -598,76 +535,6 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtcorebase.Assignment <em>Assignment</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.qvtd.pivot.qvtcorebase.Assignment - * @generated - */ - public Adapter createAssignmentAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtcorebase.PropertyAssignment <em>Property Assignment</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.qvtd.pivot.qvtcorebase.PropertyAssignment - * @generated - */ - public Adapter createPropertyAssignmentAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.ocl.pivot.FeatureCallExp <em>Feature Call Exp</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.ocl.pivot.FeatureCallExp - * @generated - */ - public Adapter createFeatureCallExpAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.ocl.pivot.NavigationCallExp <em>Navigation Call Exp</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.ocl.pivot.NavigationCallExp - * @generated - */ - public Adapter createNavigationCallExpAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.ocl.pivot.OppositePropertyCallExp <em>Opposite Property Call Exp</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.ocl.pivot.OppositePropertyCallExp - * @generated - */ - public Adapter createOppositePropertyCallExpAdapter() { - return null; - } - - /** * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtbase.Predicate <em>Predicate</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java index 4d420c123..91d655b41 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeSwitch.java @@ -15,14 +15,11 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.util.Switch; import org.eclipse.ocl.pivot.CallExp; import org.eclipse.ocl.pivot.Element; -import org.eclipse.ocl.pivot.FeatureCallExp; import org.eclipse.ocl.pivot.LoopExp; import org.eclipse.ocl.pivot.Model; import org.eclipse.ocl.pivot.NamedElement; import org.eclipse.ocl.pivot.Namespace; -import org.eclipse.ocl.pivot.NavigationCallExp; import org.eclipse.ocl.pivot.OCLExpression; -import org.eclipse.ocl.pivot.OppositePropertyCallExp; import org.eclipse.ocl.pivot.ReferringElement; import org.eclipse.ocl.pivot.TypedElement; import org.eclipse.ocl.pivot.util.Visitable; @@ -32,9 +29,6 @@ import org.eclipse.qvtd.pivot.qvtbase.Predicate; import org.eclipse.qvtd.pivot.qvtbase.Rule; import org.eclipse.qvtd.pivot.qvtcorebase.AbstractMapping; import org.eclipse.qvtd.pivot.qvtcorebase.Area; -import org.eclipse.qvtd.pivot.qvtcorebase.Assignment; -import org.eclipse.qvtd.pivot.qvtcorebase.PropertyAssignment; -import org.eclipse.qvtd.pivot.qvtimperative.*; import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel; import org.eclipse.qvtd.pivot.qvtimperative.Mapping; import org.eclipse.qvtd.pivot.qvtimperative.MappingCall; @@ -42,7 +36,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding; import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop; import org.eclipse.qvtd.pivot.qvtimperative.MappingSequence; import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage; import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate; @@ -191,32 +184,6 @@ public class QVTimperativeSwitch<T> extends Switch<T> { if (result == null) result = defaultCase(theEObject); return result; } - case QVTimperativePackage.MIDDLE_PROPERTY_ASSIGNMENT: { - MiddlePropertyAssignment middlePropertyAssignment = (MiddlePropertyAssignment)theEObject; - T result = caseMiddlePropertyAssignment(middlePropertyAssignment); - if (result == null) result = casePropertyAssignment(middlePropertyAssignment); - if (result == null) result = caseAssignment(middlePropertyAssignment); - if (result == null) result = caseElement(middlePropertyAssignment); - if (result == null) result = caseVisitable(middlePropertyAssignment); - if (result == null) result = defaultCase(theEObject); - return result; - } - case QVTimperativePackage.MIDDLE_PROPERTY_CALL_EXP: { - MiddlePropertyCallExp middlePropertyCallExp = (MiddlePropertyCallExp)theEObject; - T result = caseMiddlePropertyCallExp(middlePropertyCallExp); - if (result == null) result = caseOppositePropertyCallExp(middlePropertyCallExp); - if (result == null) result = caseNavigationCallExp(middlePropertyCallExp); - if (result == null) result = caseFeatureCallExp(middlePropertyCallExp); - if (result == null) result = caseCallExp(middlePropertyCallExp); - if (result == null) result = caseOCLExpression(middlePropertyCallExp); - if (result == null) result = caseTypedElement(middlePropertyCallExp); - if (result == null) result = caseNamedElement(middlePropertyCallExp); - if (result == null) result = caseElement(middlePropertyCallExp); - if (result == null) result = caseNameable(middlePropertyCallExp); - if (result == null) result = caseVisitable(middlePropertyCallExp); - if (result == null) result = defaultCase(theEObject); - return result; - } case QVTimperativePackage.VARIABLE_PREDICATE: { VariablePredicate variablePredicate = (VariablePredicate)theEObject; T result = caseVariablePredicate(variablePredicate); @@ -366,36 +333,6 @@ public class QVTimperativeSwitch<T> extends Switch<T> { } /** - * Returns the result of interpreting the object as an instance of '<em>Middle Property Assignment</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Middle Property Assignment</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseMiddlePropertyAssignment(MiddlePropertyAssignment object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Middle Property Call Exp</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Middle Property Call Exp</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseMiddlePropertyCallExp(MiddlePropertyCallExp object) { - return null; - } - - /** * Returns the result of interpreting the object as an instance of '<em>Variable Predicate</em>'. * <!-- begin-user-doc --> * This implementation returns null; @@ -606,81 +543,6 @@ public class QVTimperativeSwitch<T> extends Switch<T> { } /** - * Returns the result of interpreting the object as an instance of '<em>Assignment</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Assignment</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseAssignment(Assignment object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Property Assignment</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Property Assignment</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T casePropertyAssignment(PropertyAssignment object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Feature Call Exp</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Feature Call Exp</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseFeatureCallExp(FeatureCallExp object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Navigation Call Exp</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Navigation Call Exp</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseNavigationCallExp(NavigationCallExp object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Opposite Property Call Exp</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Opposite Property Call Exp</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseOppositePropertyCallExp(OppositePropertyCallExp object) { - return null; - } - - /** * Returns the result of interpreting the object as an instance of '<em>Predicate</em>'. * <!-- begin-user-doc --> * This implementation returns null; diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java index cce7b40d0..07354c787 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeVisitor.java @@ -31,7 +31,5 @@ public interface QVTimperativeVisitor<R> extends org.eclipse.qvtd.pivot.qvtcoreb @Nullable R visitMappingLoop(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MappingLoop object); @Nullable R visitMappingSequence(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MappingSequence object); @Nullable R visitMappingStatement(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MappingStatement object); - @Nullable R visitMiddlePropertyAssignment(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment object); - @Nullable R visitMiddlePropertyCallExp(@NonNull org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp object); @Nullable R visitVariablePredicate(@NonNull org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate object); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore index b2e39383e..5dbae94ad 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore @@ -81,16 +81,6 @@ <details key="documentation" value="A MappingCall specifies the invocation of a referredMapping with a set of bindings
of the bound variables of the referredMapping to values provided in the invocation.
Where Collections of values are provided for isLoop bindings, a distinct invocation
is performed for each distinct permutation of Collection elements."/> </eAnnotations> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="MiddlePropertyAssignment" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore#//PropertyAssignment"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="A MiddlePropertyAssignment identifies a property assignment to the middle model.
It adds an additional feature to facilitate efficient access to a cache of
non-navigable outer-to-middle opposites."/> - </eAnnotations> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="MiddlePropertyCallExp" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#//OppositePropertyCallExp"> - <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="A MiddlePropertyCallExp identifies a property call from the middle model.
It adds an additional feature to facilitate efficient access to a cache of
non-navigable outer-to-middle opposites."/> - </eAnnotations> - </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="VariablePredicate" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#//Predicate"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="A VariablePredicate validates the initialization of a guard pattern varaible."/> diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ocl b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ocl index f3ad8e5b7..a8e3b9fad 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ocl +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ocl @@ -39,12 +39,6 @@ inv UniqueCallBindings: binding->isUnique(boundVariable) context MappingCallBinding inv CompatibleBinding: value.type.conformsTo(boundVariable.type) or boundVariable.type.conformsTo(value.type) ---context MiddlePropertyAssignment ---inv IsMiddleProperty: true --TODO - -context MiddlePropertyCallExp -inv IsMiddleProperty: true --TODO - endpackage package qvtcorebase diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiAbstractEvaluationVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiAbstractEvaluationVisitor.java index 653e04918..fcc9ca420 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiAbstractEvaluationVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiAbstractEvaluationVisitor.java @@ -54,8 +54,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding; import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop; import org.eclipse.qvtd.pivot.qvtimperative.MappingSequence; import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate; /** @@ -373,16 +371,6 @@ public abstract class QVTiAbstractEvaluationVisitor extends OCLEvaluationVisitor } @Override - public @Nullable Object visitMiddlePropertyAssignment(@NonNull MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - @Override - public @Nullable Object visitMiddlePropertyCallExp(@NonNull MiddlePropertyCallExp pPropertyCallExp) { - return visitOppositePropertyCallExp(pPropertyCallExp); - } - - @Override public Object visitOppositePropertyCallExp(@NonNull OppositePropertyCallExp oppositePropertyCallExp) { Integer cacheIndex = transformationAnalysis.getCacheIndex(oppositePropertyCallExp); if (cacheIndex == null) { diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiAbstractTracingEvaluationVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiAbstractTracingEvaluationVisitor.java index 1a58d7a08..7207a17c0 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiAbstractTracingEvaluationVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiAbstractTracingEvaluationVisitor.java @@ -43,8 +43,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCall; import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop; import org.eclipse.qvtd.pivot.qvtimperative.MappingSequence; import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate; /** @@ -301,19 +299,6 @@ public abstract class QVTiAbstractTracingEvaluationVisitor extends QVTiEvaluatio public @Nullable Object visitMappingStatement(@NonNull MappingStatement vappingStatement) { return visiting(vappingStatement); } - - @Override - public @Nullable Object visitMiddlePropertyAssignment(@NonNull MiddlePropertyAssignment object) { - return delegate.visitMiddlePropertyAssignment(object); - } - - /* (non-Javadoc) - * @see org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor#visitMiddlePropertyCallExp(org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp) - */ - @Override - public Object visitMiddlePropertyCallExp(@NonNull MiddlePropertyCallExp callExp) { - return delegate.visitMiddlePropertyCallExp(callExp); - } /* (non-Javadoc) * @see org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiEvaluationVisitorDecorator#visitPropertyAssignment(org.eclipse.qvtd.pivot.qvtcorebase.PropertyAssignment) diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativeDomainUsageAnalysis.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativeDomainUsageAnalysis.java index 3538fe219..77fe3576f 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativeDomainUsageAnalysis.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativeDomainUsageAnalysis.java @@ -23,8 +23,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding; import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop; import org.eclipse.qvtd.pivot.qvtimperative.MappingSequence; import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate; import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor; @@ -92,16 +90,6 @@ public class QVTimperativeDomainUsageAnalysis extends RootDomainUsageAnalysis im } @Override - public @Nullable DomainUsage visitMiddlePropertyAssignment(@NonNull MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - @Override - public @Nullable DomainUsage visitMiddlePropertyCallExp(@NonNull MiddlePropertyCallExp object) { - return visitOppositePropertyCallExp(object); - } - - @Override public @Nullable DomainUsage visitVariablePredicate(@NonNull VariablePredicate object) { return visitPredicate(object); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativePrettyPrintVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativePrettyPrintVisitor.java index f8b3a9043..05eb11076 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativePrettyPrintVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativePrettyPrintVisitor.java @@ -31,8 +31,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding; import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop; import org.eclipse.qvtd.pivot.qvtimperative.MappingSequence; import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate; import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor; @@ -153,16 +151,6 @@ public class QVTimperativePrettyPrintVisitor extends QVTcoreBasePrettyPrintVisit } @Override - public Object visitMiddlePropertyAssignment(@NonNull MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - @Override - public Object visitMiddlePropertyCallExp(@NonNull MiddlePropertyCallExp object) { - return visitOppositePropertyCallExp(object); - } - - @Override public Object visitPredicate(@NonNull Predicate pPredicate) { safeVisit(pPredicate.getConditionExpression()); return null; diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativeToStringVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativeToStringVisitor.java index 2378a69fe..f6e447a8d 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativeToStringVisitor.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/utilities/QVTimperativeToStringVisitor.java @@ -20,8 +20,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding; import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop; import org.eclipse.qvtd.pivot.qvtimperative.MappingSequence; import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate; import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor; @@ -79,16 +77,6 @@ public class QVTimperativeToStringVisitor extends QVTcoreBaseToStringVisitor imp } @Override - public @Nullable String visitMiddlePropertyAssignment(@NonNull MiddlePropertyAssignment object) { - return visitPropertyAssignment(object); - } - - @Override - public @Nullable String visitMiddlePropertyCallExp(@NonNull MiddlePropertyCallExp object) { - return visitOppositePropertyCallExp(object); - } - - @Override public @Nullable String visitVariablePredicate(@NonNull VariablePredicate variablePredicate) { appendName(variablePredicate.getTargetVariable()); append(" := "); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/as2cs/QVTimperativeDeclarationVisitor.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/as2cs/QVTimperativeDeclarationVisitor.java index 9b8a2ed62..a1592533a 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/as2cs/QVTimperativeDeclarationVisitor.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src/org/eclipse/qvtd/xtext/qvtimperative/as2cs/QVTimperativeDeclarationVisitor.java @@ -44,8 +44,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding; import org.eclipse.qvtd.pivot.qvtimperative.MappingLoop; import org.eclipse.qvtd.pivot.qvtimperative.MappingSequence; import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyAssignment; -import org.eclipse.qvtd.pivot.qvtimperative.MiddlePropertyCallExp; import org.eclipse.qvtd.pivot.qvtimperative.VariablePredicate; import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor; import org.eclipse.qvtd.xtext.qvtcorebase.as2cs.QVTcoreBaseDeclarationVisitor; @@ -211,16 +209,6 @@ public class QVTimperativeDeclarationVisitor extends QVTcoreBaseDeclarationVisit } @Override - public ElementCS visitMiddlePropertyAssignment(@NonNull MiddlePropertyAssignment asMiddlePropertyAssignment) { - return visitPropertyAssignment(asMiddlePropertyAssignment); - } - - @Override - public ElementCS visitMiddlePropertyCallExp(@NonNull MiddlePropertyCallExp asMiddlePropertyCallExp) { - return visitOppositePropertyCallExp(asMiddlePropertyCallExp); - } - - @Override public ElementCS visitVariable(@NonNull Variable asVariable) { if (asVariable.eContainer() instanceof MappingLoop) { VariableCS csVariable = context.refreshNamedElement(VariableCS.class, EssentialOCLCSPackage.Literals.VARIABLE_CS, asVariable); |