diff options
371 files changed, 3003 insertions, 1028 deletions
diff --git a/examples/org.eclipse.qvtd.examples/src/org/eclipse/qvtd/examples/wizards/AbstractExampleWizard.java b/examples/org.eclipse.qvtd.examples/src/org/eclipse/qvtd/examples/wizards/AbstractExampleWizard.java index d627d0a04..8860fa438 100644 --- a/examples/org.eclipse.qvtd.examples/src/org/eclipse/qvtd/examples/wizards/AbstractExampleWizard.java +++ b/examples/org.eclipse.qvtd.examples/src/org/eclipse/qvtd/examples/wizards/AbstractExampleWizard.java @@ -118,6 +118,7 @@ public abstract class AbstractExampleWizard extends Wizard try { getContainer().run(true, false, new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { @@ -268,6 +269,7 @@ public abstract class AbstractExampleWizard extends Wizard } } + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { // No code is necessary. } 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 ed5f2ab80..b5250ae68 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -40,6 +40,7 @@ import org.eclipse.ocl.examples.codegen.cgmodel.CGParameter; import org.eclipse.ocl.examples.codegen.cgmodel.CGShadowExp; import org.eclipse.ocl.examples.codegen.cgmodel.CGShadowPart; import org.eclipse.ocl.examples.codegen.cgmodel.CGTypeId; +import org.eclipse.ocl.examples.codegen.cgmodel.CGUnboxExp; import org.eclipse.ocl.examples.codegen.cgmodel.CGValuedElement; import org.eclipse.ocl.examples.codegen.generator.TypeDescriptor; import org.eclipse.ocl.examples.codegen.java.CG2JavaVisitor; @@ -131,11 +132,11 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato { /** * The run-time API version. - * + * * @noreference this is solely for development usage. */ public static int RUN_TIME_EVALUATOR_API_VERSION = Transformer.RUN_TIME_EVALUATOR_API_VERSION_1_1_0_2; - + protected final @NonNull QVTiAnalyzer analyzer; protected final @NonNull CGPackage cgPackage; protected final @Nullable List<CGValuedElement> sortedGlobals; @@ -143,7 +144,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato protected boolean alwaysUseClasses = false; protected boolean useGot = true; protected QVTiTransformationAnalysis transformationAnalysis; - + public QVTiCG2JavaVisitor(@NonNull QVTiCodeGenerator codeGenerator, @NonNull CGPackage cgPackage, @Nullable List<CGValuedElement> sortedGlobals) { super(codeGenerator); @@ -199,7 +200,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato if (pProperty != null) { Property pOppositeProperty = pProperty.getOpposite(); if ((pOppositeProperty != null) && pOppositeProperty.isIsComposite()) { -// FIXME must check for null asssignment and correct target return; + // FIXME must check for null asssignment and correct target return; } } } @@ -335,7 +336,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato return new @NonNull String[]{ classIndex2classIdName, classIndex2allClassIndexes}; } return null; - } + } protected void doAssigned(@NonNull CGEcoreContainerAssignment cgPropertyAssignment) { EStructuralFeature eStructuralFeature = ClassUtil.nonNullModel(cgPropertyAssignment.getEStructuralFeature()); @@ -392,7 +393,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato } protected void doConstructor(@NonNull CGTransformation cgTransformation, @Nullable String oppositeName, @NonNull String @Nullable [] allInstancesNames) { -// String evaluatorName = ((QVTiGlobalContext)globalContext).getEvaluatorParameter().getName(); + // String evaluatorName = ((QVTiGlobalContext)globalContext).getEvaluatorParameter().getName(); String evaluatorName = JavaConstants.EXECUTOR_NAME; String className = cgTransformation.getName(); // @@ -401,7 +402,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append(" "); js.appendClassReference(Executor.class); js.append(" " + evaluatorName + ") {\n"); - js.pushIndentation(null); + js.pushIndentation(null); js.append("super(" + evaluatorName + ", new "); js.appendIsRequired(true); js.append(" String[] {"); @@ -432,8 +433,8 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append(", null, null"); } js.append(");\n"); -// doMappingConstructorInitializers(cgTransformation); -// doFunctionConstructorInitializers(cgTransformation); + // doMappingConstructorInitializers(cgTransformation); + // doFunctionConstructorInitializers(cgTransformation); js.popIndentation(); js.append("}\n"); } @@ -445,10 +446,10 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.appendClassReference(InvocationManager.class); js.append(" createInvocationManager() {\n"); js.pushIndentation(null); - js.append("return new "); - js.appendClassReference(IncrementalInvocationManager.class); - js.append("();\n"); - js.popIndentation(); + js.append("return new "); + js.appendClassReference(IncrementalInvocationManager.class); + js.append("();\n"); + js.popIndentation(); js.append("}\n"); js.append("\n"); js.append("protected "); @@ -457,12 +458,12 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.appendClassReference(ObjectManager.class); js.append(" createObjectManager() {\n"); js.pushIndentation(null); - js.append("return new "); - js.appendClassReference(IncrementalObjectManager.class); - js.append("(("); - js.appendClassReference(IncrementalInvocationManager.class); - js.append(")invocationManager);\n"); - js.popIndentation(); + js.append("return new "); + js.appendClassReference(IncrementalObjectManager.class); + js.append("(("); + js.appendClassReference(IncrementalInvocationManager.class); + js.append(")invocationManager);\n"); + js.popIndentation(); js.append("}\n"); } @@ -471,55 +472,55 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato ElementId elementId = cgFunction.getTypeId().getElementId(); js.append(" {\n"); js.pushIndentation(null); -// js.appendCastParameters(localContext2, cgParameters); -// JavaDependencyVisitor dependencyVisitor = new JavaDependencyVisitor(localContext2, null); -// dependencyVisitor.visit(body); -// dependencyVisitor.visitAll(localContext2.getLocalVariables()); -// Iterable<CGValuedElement> sortedDependencies = dependencyVisitor.getSortedDependencies(); -// for (CGValuedElement cgElement : sortedDependencies) { -// if (!cgElement.isInlined() && cgElement.isConstant() && !cgElement.isGlobal()) { -// cgElement.accept(this); -// } -// } - // FIXME merge locals into AST as LetExps. - if (cgFunction.getBody() != null) { - if (!js.appendLocalStatements(body)) { - return false; - } - js.append("return "); - js.appendValueName(body); - js.append(";\n"); + // js.appendCastParameters(localContext2, cgParameters); + // JavaDependencyVisitor dependencyVisitor = new JavaDependencyVisitor(localContext2, null); + // dependencyVisitor.visit(body); + // dependencyVisitor.visitAll(localContext2.getLocalVariables()); + // Iterable<CGValuedElement> sortedDependencies = dependencyVisitor.getSortedDependencies(); + // for (CGValuedElement cgElement : sortedDependencies) { + // if (!cgElement.isInlined() && cgElement.isConstant() && !cgElement.isGlobal()) { + // cgElement.accept(this); + // } + // } + // FIXME merge locals into AST as LetExps. + if (cgFunction.getBody() != null) { + if (!js.appendLocalStatements(body)) { + return false; } - else { - TypeId asTypeId = cgFunction.getASTypeId(); - if (asTypeId == TypeId.STRING) { // FIXME Fudge for body-less functions - js.append("return \"\";\n"); - } - else if (asTypeId == TypeId.REAL) { // FIXME Fudge for body-less functions - js.append("return 0;\n"); - } - else if (asTypeId == TypeId.INTEGER) { // FIXME Fudge for body-less functions - js.append("return 0;\n"); - } - else if (asTypeId instanceof CollectionTypeId) { // FIXME Fudge for body-less functions - if (js.isUseNullAnnotations()) { - js.append("@SuppressWarnings(\"null\")"); - js.appendIsRequired(true); - js.append(" "); - } - if (elementId != null) { - TypeDescriptor javaTypeDescriptor = context.getUnboxedDescriptor(elementId); - js.appendClassReference(javaTypeDescriptor); - } - js.append(" emptyList = "); - js.appendClassReference(Collections.class); - js.append(".emptyList();\n"); - js.append("return emptyList;\n"); + js.append("return "); + js.appendValueName(body); + js.append(";\n"); + } + else { + TypeId asTypeId = cgFunction.getASTypeId(); + if (asTypeId == TypeId.STRING) { // FIXME Fudge for body-less functions + js.append("return \"\";\n"); + } + else if (asTypeId == TypeId.REAL) { // FIXME Fudge for body-less functions + js.append("return 0;\n"); + } + else if (asTypeId == TypeId.INTEGER) { // FIXME Fudge for body-less functions + js.append("return 0;\n"); + } + else if (asTypeId instanceof CollectionTypeId) { // FIXME Fudge for body-less functions + if (js.isUseNullAnnotations()) { + js.append("@SuppressWarnings(\"null\")"); + js.appendIsRequired(true); + js.append(" "); } - else { // FIXME Fudge for body-less functions - js.append("return \"\";\n"); + if (elementId != null) { + TypeDescriptor javaTypeDescriptor = context.getUnboxedDescriptor(elementId); + js.appendClassReference(javaTypeDescriptor); } + js.append(" emptyList = "); + js.appendClassReference(Collections.class); + js.append(".emptyList();\n"); + js.append("return emptyList;\n"); + } + else { // FIXME Fudge for body-less functions + js.append("return \"\";\n"); } + } js.popIndentation(); js.append("}\n"); return true; @@ -625,34 +626,34 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato if (cgBody != null) { js.appendCommentWithOCL(null, cgBody.getAst()); } -// if (js.isUseNullAnnotations()) { -// js.append("@SuppressWarnings(\"null\")\n"); // Accurate casts are too hard -// } + // if (js.isUseNullAnnotations()) { + // js.append("@SuppressWarnings(\"null\")\n"); // Accurate casts are too hard + // } js.append("public "); js.append(getFunctionName(cgFunction)); js.append("(/*Nullable*/ Object "); js.appendIsRequired(true); js.append(" [] boundValues) {\n"); js.pushIndentation(null); - js.append("this.self = ("); - js.appendClassReference(cgClass); - js.append(")boundValues[0];\n"); - int i = 1; - for (@NonNull CGParameter cgParameter : cgParameters) { - String valueName = getValueName(cgParameter); - js.append("this."); - js.append(valueName); - js.append(" = "); - js.appendClassCast(cgParameter); - js.append("boundValues[" + i++ + "];\n"); - } - doFunctionBody(cgFunction, instanceName); + js.append("this.self = ("); + js.appendClassReference(cgClass); + js.append(")boundValues[0];\n"); + int i = 1; + for (@NonNull CGParameter cgParameter : cgParameters) { + String valueName = getValueName(cgParameter); + js.append("this."); + js.append(valueName); + js.append(" = "); + js.appendClassCast(cgParameter); + js.append("boundValues[" + i++ + "];\n"); + } + doFunctionBody(cgFunction, instanceName); js.popIndentation(); js.append("}\n"); } protected void doFunctionConstructor(@NonNull CGFunction cgFunction, @NonNull CGShadowExp cgShadowExp, @NonNull String instanceName) { -// List<@NonNull CGParameter> cgParameters = ClassUtil.nullFree(cgFunction.getParameters()); + // List<@NonNull CGParameter> cgParameters = ClassUtil.nullFree(cgFunction.getParameters()); if (js.isUseNullAnnotations()) { js.append("@SuppressWarnings(\"null\")\n"); // Accurate casts are too hard } @@ -661,7 +662,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append("(/*Nullable*/ Object "); js.appendIsRequired(true); js.append(" [] boundValues) "); -/* int i = 0; + /* int i = 0; for (@NonNull CGParameter cgParameter : cgParameters) { String valueName = getValueName(cgParameter); js.append(valueName); @@ -695,20 +696,20 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append("(idResolver)\n"); js.append("{\n"); js.pushIndentation(null); - js.append("@Override\n"); - js.append("public "); - js.appendIsRequired(true); - js.append(" " + getFunctionName(cgFunction) + " newInstance("); - js.appendIsRequired(false); - js.append(" "); - js.appendClassReference(Object.class); - js.append(" "); - js.appendIsRequired(true); - js.append(" [] values) {\n"); - js.pushIndentation(null); - js.append("return new " + getFunctionName(cgFunction) + "(values);\n"); - js.popIndentation(); - js.append("}\n"); + js.append("@Override\n"); + js.append("public "); + js.appendIsRequired(true); + js.append(" " + getFunctionName(cgFunction) + " newInstance("); + js.appendIsRequired(false); + js.append(" "); + js.appendClassReference(Object.class); + js.append(" "); + js.appendIsRequired(true); + js.append(" [] values) {\n"); + js.pushIndentation(null); + js.append("return new " + getFunctionName(cgFunction) + "(values);\n"); + js.popIndentation(); + js.append("}\n"); js.popIndentation(); js.append("};\n\n"); } @@ -716,7 +717,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato } } -/* protected void doFunctionConstructorInitializers(@NonNull CGTransformation cgTransformation) { + /* protected void doFunctionConstructorInitializers(@NonNull CGTransformation cgTransformation) { String className = cgTransformation.getName(); for (@NonNull CGOperation cgOperation : ClassUtil.nullFree(cgTransformation.getOperations())) { if (cgOperation instanceof CGFunction) { @@ -734,10 +735,10 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append("public "); js.appendIsRequired(false); js.append(" Object"); -// js.appendTypeDeclaration(ClassUtil.nonNullState(cgFunction.getBody())); + // js.appendTypeDeclaration(ClassUtil.nonNullState(cgFunction.getBody())); js.append(" getResult() {\n"); js.pushIndentation(null); - js.append("return " + instanceName + ";\n"); + js.append("return " + instanceName + ";\n"); js.popIndentation(); js.append("}\n"); } @@ -753,15 +754,15 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.appendIsRequired(true); js.append(" [] thoseValues) {\n"); js.pushIndentation(null); - js.append("return this.self == thoseValues[0]"); - int index = 1; - for (@NonNull CGParameter cgParameter : ClassUtil.nullFree(cgFunction.getParameters())) { - js.append("\n && "); - js.append("idResolver.oclEquals(this."); // FIXME oclEquals / == - js.appendValueName(cgParameter); - js.append(", thoseValues[" + index++ + "])"); - } - js.append(";\n"); + js.append("return this.self == thoseValues[0]"); + int index = 1; + for (@NonNull CGParameter cgParameter : ClassUtil.nullFree(cgFunction.getParameters())) { + js.append("\n && "); + js.append("idResolver.oclEquals(this."); // FIXME oclEquals / == + js.appendValueName(cgParameter); + js.append(", thoseValues[" + index++ + "])"); + } + js.append(";\n"); js.popIndentation(); js.append("}\n"); } @@ -777,28 +778,28 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.appendIsRequired(true); js.append(" [] thoseValues) {\n"); js.pushIndentation(null); - js.append("return "); - int index = 0; - for (@NonNull CGShadowPart cgShadowPart : ClassUtil.nullFree(cgShadowExp.getParts())) { - if (index > 0) { - js.append("\n && "); - } - js.append("idResolver.oclEquals("); // FIXME oclEquals / == - js.append(instanceName); - js.append("."); - Property asProperty = ClassUtil.nonNullState(((ShadowPart)cgShadowPart.getAst()).getReferredProperty()); - EStructuralFeature eStructuralFeature = ClassUtil.nonNullState(getESObject(asProperty)); - String getAccessor; - if (eStructuralFeature == OCLstdlibPackage.Literals.OCL_ELEMENT__OCL_CONTAINER) { - getAccessor = "eContainer"; - } - else { - getAccessor = genModelHelper.getGetAccessor(eStructuralFeature); - } - js.append(getAccessor); - js.append("(), thoseValues[" + index++ + "])"); + js.append("return "); + int index = 0; + for (@NonNull CGShadowPart cgShadowPart : ClassUtil.nullFree(cgShadowExp.getParts())) { + if (index > 0) { + js.append("\n && "); } - js.append(";\n"); + js.append("idResolver.oclEquals("); // FIXME oclEquals / == + js.append(instanceName); + js.append("."); + Property asProperty = ClassUtil.nonNullState(((ShadowPart)cgShadowPart.getAst()).getReferredProperty()); + EStructuralFeature eStructuralFeature = ClassUtil.nonNullState(getESObject(asProperty)); + String getAccessor; + if (eStructuralFeature == OCLstdlibPackage.Literals.OCL_ELEMENT__OCL_CONTAINER) { + getAccessor = "eContainer"; + } + else { + getAccessor = genModelHelper.getGetAccessor(eStructuralFeature); + } + js.append(getAccessor); + js.append("(), thoseValues[" + index++ + "])"); + } + js.append(";\n"); js.popIndentation(); js.append("}\n"); } @@ -854,17 +855,17 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.appendIsRequired(true); js.append(" [] thoseValues) {\n"); js.pushIndentation(null); - js.append("return "); - int index = 0; - for (@NonNull CGParameter cgFreeVariable : cgFreeVariables) { - if (index > 0) { - js.append("\n && "); - } - js.append("idResolver.oclEquals("); - js.append(cgFreeVariable.getValueName()); - js.append(", thoseValues[" + index++ + "])"); - } - js.append(";\n"); + js.append("return "); + int index = 0; + for (@NonNull CGParameter cgFreeVariable : cgFreeVariables) { + if (index > 0) { + js.append("\n && "); + } + js.append("idResolver.oclEquals("); + js.append(cgFreeVariable.getValueName()); + js.append(", thoseValues[" + index++ + "])"); + } + js.append(";\n"); js.popIndentation(); js.append("}\n"); } @@ -873,35 +874,35 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato CGValuedElement cgBody = cgMapping.getBody(); js.append(" {\n"); js.pushIndentation(null); - if (cgBody.isInvalid()) { - js.append("return handleExecutionFailure(\"" + getMappingName(cgMapping) + "\", "); + if (cgBody.isInvalid()) { + js.append("return handleExecutionFailure(\"" + getMappingName(cgMapping) + "\", "); + js.appendValueName(cgBody); + js.append(");\n"); + } + else { + js.append("try {\n"); + js.pushIndentation(null); + String savedLocalPrefix = localPrefix; + try { + localPrefix = hasMappingClass ? cgMapping.getTransformation().getName() : localPrefix; + js.append("// predicates and unrealized variables\n"); + if (!cgBody.isInlined()) { + cgBody.accept(this); + } + js.append("return "); js.appendValueName(cgBody); - js.append(");\n"); + js.append(";\n"); } - else { - js.append("try {\n"); - js.pushIndentation(null); - String savedLocalPrefix = localPrefix; - try { - localPrefix = hasMappingClass ? cgMapping.getTransformation().getName() : localPrefix; - js.append("// predicates and unrealized variables\n"); - if (!cgBody.isInlined()) { - cgBody.accept(this); - } - js.append("return "); - js.appendValueName(cgBody); - js.append(";\n"); - } - finally { - localPrefix = savedLocalPrefix; - } - js.popIndentation(); - js.append("} catch (Throwable e) {\n"); - js.pushIndentation(null); - js.append("return handleExecutionFailure(\"" + getMappingName(cgMapping) + "\", e);\n"); - js.popIndentation(); - js.append("}\n"); + finally { + localPrefix = savedLocalPrefix; } + js.popIndentation(); + js.append("} catch (Throwable e) {\n"); + js.pushIndentation(null); + js.append("return handleExecutionFailure(\"" + getMappingName(cgMapping) + "\", e);\n"); + js.popIndentation(); + js.append("}\n"); + } js.popIndentation(); js.append("}\n"); } @@ -922,9 +923,9 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato protected void doMappingConstructor(@NonNull CGMapping cgMapping) { List<@NonNull CGGuardVariable> cgFreeVariables = ClassUtil.nullFree(cgMapping.getFreeVariables()); -// if (js.isUseNullAnnotations()) { -// js.append("@SuppressWarnings(\"null\")\n"); // Accurate casts are too hard -// } + // if (js.isUseNullAnnotations()) { + // js.append("@SuppressWarnings(\"null\")\n"); // Accurate casts are too hard + // } js.append("public "); js.append(getMappingName(cgMapping)); js.append("("); @@ -938,7 +939,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato String valueName = getValueName(cgFreeVariable); js.append(valueName); js.append(" = "); -// js.appendClassCast(cgFreeVariable); + // js.appendClassCast(cgFreeVariable); if (cgFreeVariable instanceof CGConnectionVariable) { js.append("("); js.appendClassReference(null, cgFreeVariable); @@ -966,27 +967,27 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append("(idResolver)\n"); js.append("{\n"); js.pushIndentation(null); - js.append("@Override\n"); - js.append("public "); - js.appendIsRequired(true); - js.append(" " + getMappingName(cgMapping) + " newInstance("); - js.appendIsRequired(true); - js.append(" "); - js.appendClassReference(Object.class); - js.append(" "); - js.appendIsRequired(true); - js.append(" [] values) {\n"); - js.pushIndentation(null); - js.append("return new " + getMappingName(cgMapping) + "(values);\n"); - js.popIndentation(); - js.append("}\n"); + js.append("@Override\n"); + js.append("public "); + js.appendIsRequired(true); + js.append(" " + getMappingName(cgMapping) + " newInstance("); + js.appendIsRequired(true); + js.append(" "); + js.appendClassReference(Object.class); + js.append(" "); + js.appendIsRequired(true); + js.append(" [] values) {\n"); + js.pushIndentation(null); + js.append("return new " + getMappingName(cgMapping) + "(values);\n"); + js.popIndentation(); + js.append("}\n"); js.popIndentation(); js.append("};\n\n"); } } } -/* protected void doMappingConstructorInitializers(@NonNull CGTransformation cgTransformation) { + /* protected void doMappingConstructorInitializers(@NonNull CGTransformation cgTransformation) { String className = cgTransformation.getName(); for (@NonNull CGMapping cgMapping : ClassUtil.nullFree(cgTransformation.getMappings())) { if (useClass(cgMapping) && (cgMapping.getFreeVariables().size() > 0)) { @@ -1007,7 +1008,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato for (Map.Entry<@NonNull Property, @NonNull Integer> entry : opposites.entrySet()) { Property property = entry.getKey(); String name = getGlobalContext().addOppositeProperty(property); - + key2property.put(name, property); } List<String> sortedKeys = new ArrayList<String>(key2property.keySet()); @@ -1027,13 +1028,13 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.appendClassReference(null, HashMap.class, false, middleTypeDescriptor, outerTypeDescriptor); js.append("();\n"); } - } - + } + protected @Nullable String doOppositePropertyIds(@NonNull QVTiTransformationAnalysis transformationAnalysis) { return null; // This code is no longer used, and since it is not used it generates undefined references // It appears to have 'worked' only because a duplicate incomplete TransformationAnalysis was in use. -/* Map<Property, Integer> opposites = transformationAnalysis.getSourceCaches(); + /* Map<Property, Integer> opposites = transformationAnalysis.getSourceCaches(); if (opposites.size() <= 0) { return null; } @@ -1074,12 +1075,12 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.popIndentation(); js.append("};\n"); return oppositeIndex2propertyIdName; */ - } + } protected void doRun(@NonNull CGTransformation cgTransformation) { CGMapping cgRootMapping = NameUtil.getNameable(cgTransformation.getMappings(), QVTimperativeUtil.ROOT_MAPPING_NAME); if (cgRootMapping == null) { - throw new IllegalStateException("Transformation " + cgTransformation.getName() + " has no root mapping"); + throw new IllegalStateException("Transformation " + cgTransformation.getName() + " has no root mapping"); } js.append("@Override\n"); js.append("public boolean run() {\n"); @@ -1087,7 +1088,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append("return "); js.append(getMappingName(cgRootMapping)); js.append("() && invocationManager.flush();\n"); - js.popIndentation(); + js.popIndentation(); js.append("}\n"); } @@ -1211,10 +1212,10 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato return false; } final String iteratorName = getSymbolName(null, "iterator"); -// CollectionTypeId abstractCollectionTypeId = (CollectionTypeId)initValue.getASTypeId(); -// assert abstractCollectionTypeId != null; -// TypeId abstractElementTypeId = abstractCollectionTypeId.getElementTypeId(); -// BoxedDescriptor abstractBoxedDescriptor = context.getBoxedDescriptor(abstractElementTypeId); + // CollectionTypeId abstractCollectionTypeId = (CollectionTypeId)initValue.getASTypeId(); + // assert abstractCollectionTypeId != null; + // TypeId abstractElementTypeId = abstractCollectionTypeId.getElementTypeId(); + // BoxedDescriptor abstractBoxedDescriptor = context.getBoxedDescriptor(abstractElementTypeId); CollectionTypeId concreteCollectionTypeId = (CollectionTypeId)cgConnectionAssignment.getConnectionVariable().getASTypeId(); assert concreteCollectionTypeId != null; TypeId concreteElementTypeId = concreteCollectionTypeId.getElementTypeId(); @@ -1244,24 +1245,24 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.appendValueName(initValue); } js.append(") {\n"); + js.pushIndentation(null); + if (concreteBoxedDescriptor != abstractBoxedDescriptor) { + js.append("if ("); + js.append(iteratorName); + js.append(" instanceof "); + js.appendClassReference(concreteBoxedDescriptor); + js.append(") {\n"); js.pushIndentation(null); - if (concreteBoxedDescriptor != abstractBoxedDescriptor) { - js.append("if ("); - js.append(iteratorName); - js.append(" instanceof "); - js.appendClassReference(concreteBoxedDescriptor); - js.append(") {\n"); - js.pushIndentation(null); - } - js.appendReferenceTo(cgConnectionAssignment.getConnectionVariable()); - js.append(".add("); - js.append(iteratorName); - js.append(");\n"); - if (concreteBoxedDescriptor != abstractBoxedDescriptor) { - js.popIndentation(); - js.append("}\n"); - } + } + js.appendReferenceTo(cgConnectionAssignment.getConnectionVariable()); + js.append(".add("); + js.append(iteratorName); + js.append(");\n"); + if (concreteBoxedDescriptor != abstractBoxedDescriptor) { js.popIndentation(); + js.append("}\n"); + } + js.popIndentation(); js.append("}\n"); } return true; @@ -1274,16 +1275,16 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato @Override public @NonNull Boolean visitCGEcoreContainerAssignment(@NonNull CGEcoreContainerAssignment cgPropertyAssignment) { -// Property referredProperty = cgPropertyAssignment.getReferredProperty(); -// Property pivotProperty = cgPropertyCallExp.getReferredProperty(); -// CGTypeId cgTypeId = analyzer.getTypeId(pivotProperty.getOwningType().getTypeId()); -// JavaTypeDescriptor requiredTypeDescriptor = context.getJavaTypeDescriptor(cgTypeId, false); + // Property referredProperty = cgPropertyAssignment.getReferredProperty(); + // Property pivotProperty = cgPropertyCallExp.getReferredProperty(); + // CGTypeId cgTypeId = analyzer.getTypeId(pivotProperty.getOwningType().getTypeId()); + // JavaTypeDescriptor requiredTypeDescriptor = context.getJavaTypeDescriptor(cgTypeId, false); EStructuralFeature eStructuralFeature = ClassUtil.nonNullModel(cgPropertyAssignment.getEStructuralFeature()); CGValuedElement cgSlot = getExpression(cgPropertyAssignment.getSlotValue()); CGValuedElement cgInit = getExpression(cgPropertyAssignment.getInitValue()); -// Class<?> requiredJavaClass = requiredTypeDescriptor.getJavaClass(); -// Method leastDerivedMethod = requiredJavaClass != null ? getLeastDerivedMethod(requiredJavaClass, getAccessor) : null; -// Class<?> unboxedSourceClass = leastDerivedMethod != null ? leastDerivedMethod.getDeclaringClass() : requiredJavaClass; + // Class<?> requiredJavaClass = requiredTypeDescriptor.getJavaClass(); + // Method leastDerivedMethod = requiredJavaClass != null ? getLeastDerivedMethod(requiredJavaClass, getAccessor) : null; + // Class<?> unboxedSourceClass = leastDerivedMethod != null ? leastDerivedMethod.getDeclaringClass() : requiredJavaClass; // if (!js.appendLocalStatements(cgSlot)) { return false; @@ -1317,16 +1318,16 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato @Override public @NonNull Boolean visitCGEcorePropertyAssignment(@NonNull CGEcorePropertyAssignment cgPropertyAssignment) { -// Property referredProperty = cgPropertyAssignment.getReferredProperty(); -// Property pivotProperty = cgPropertyCallExp.getReferredProperty(); -// CGTypeId cgTypeId = analyzer.getTypeId(pivotProperty.getOwningType().getTypeId()); -// JavaTypeDescriptor requiredTypeDescriptor = context.getJavaTypeDescriptor(cgTypeId, false); + // Property referredProperty = cgPropertyAssignment.getReferredProperty(); + // Property pivotProperty = cgPropertyCallExp.getReferredProperty(); + // CGTypeId cgTypeId = analyzer.getTypeId(pivotProperty.getOwningType().getTypeId()); + // JavaTypeDescriptor requiredTypeDescriptor = context.getJavaTypeDescriptor(cgTypeId, false); EStructuralFeature eStructuralFeature = ClassUtil.nonNullModel(cgPropertyAssignment.getEStructuralFeature()); CGValuedElement cgSlot = getExpression(cgPropertyAssignment.getSlotValue()); CGValuedElement cgInit = getExpression(cgPropertyAssignment.getInitValue()); -// Class<?> requiredJavaClass = requiredTypeDescriptor.getJavaClass(); -// Method leastDerivedMethod = requiredJavaClass != null ? getLeastDerivedMethod(requiredJavaClass, getAccessor) : null; -// Class<?> unboxedSourceClass = leastDerivedMethod != null ? leastDerivedMethod.getDeclaringClass() : requiredJavaClass; + // Class<?> requiredJavaClass = requiredTypeDescriptor.getJavaClass(); + // Method leastDerivedMethod = requiredJavaClass != null ? getLeastDerivedMethod(requiredJavaClass, getAccessor) : null; + // Class<?> unboxedSourceClass = leastDerivedMethod != null ? leastDerivedMethod.getDeclaringClass() : requiredJavaClass; // if (!js.appendLocalStatements(cgSlot)) { return false; @@ -1373,7 +1374,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato protected boolean doEcoreCreate(@NonNull CGValuedElement cgElement, @NonNull EClassifier eClassifier) { boolean doSetNonNull = false; - EPackage ePackage = eClassifier.getEPackage(); + EPackage ePackage = eClassifier.getEPackage(); String createMethodName = "create" + eClassifier.getName(); String javaClass; if (ePackage != null) { @@ -1398,7 +1399,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.appendDeclaration(cgElement); js.append(" = "); js.appendClassReference(javaClass); -// js.appendReferenceTo(localContext.getExecutorType(cgRealizedVariable.getPivotTypeId())); + // js.appendReferenceTo(localContext.getExecutorType(cgRealizedVariable.getPivotTypeId())); js.append(".eINSTANCE."); js.append(createMethodName); js.append("();\n"); @@ -1411,7 +1412,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato JavaLocalContext<?> localContext2 = globalContext.getLocalContext(cgFunction); if (localContext2 != null) { localContext = localContext2; -// localContext. + // localContext. try { List<CGParameter> cgParameters = cgFunction.getParameters(); // @@ -1420,7 +1421,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato if (cgShadowExp != null) { JavaLocalContext<?> functionContext = ClassUtil.nonNullState(globalContext.getLocalContext(cgFunction)); String instanceName = functionContext.getNameManagerContext().getSymbolName(cgFunction.getBody(), "instance"); -// Type + // Type js.append("protected class "); js.append(getFunctionName(cgFunction)); js.append(" extends "); @@ -1428,15 +1429,15 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append("\n"); js.append("{\n"); js.pushIndentation(null); - js.append("protected final "); - js.appendTypeDeclaration(cgFunction); - js.append(" " + instanceName + ";\n"); - js.append("\n"); - doFunctionConstructor(cgFunction, cgShadowExp, instanceName); - js.append("\n"); - doFunctionGetInstance(cgFunction, instanceName); - js.append("\n"); - doFunctionIsEqual(cgShadowExp, instanceName); + js.append("protected final "); + js.appendTypeDeclaration(cgFunction); + js.append(" " + instanceName + ";\n"); + js.append("\n"); + doFunctionConstructor(cgFunction, cgShadowExp, instanceName); + js.append("\n"); + doFunctionGetInstance(cgFunction, instanceName); + js.append("\n"); + doFunctionIsEqual(cgShadowExp, instanceName); js.popIndentation(); js.append("}\n"); } @@ -1451,29 +1452,37 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append("\n"); js.append("{\n"); js.pushIndentation(null); - js.append("protected final "); - js.appendIsRequired(true); + js.append("protected final "); + js.appendIsRequired(true); + js.append(" "); + js.appendClassReference(cgClass); + js.append(" self;\n"); + for (@NonNull CGParameter cgParameter : ClassUtil.nullFree(cgFunction.getParameters())) { + js.append("protected "); + // js.appendDeclaration(cgParameter); + // js.appendTypeDeclaration(cgParameter); + boolean isPrimitive = js.isPrimitive(cgParameter); + boolean isRequired = !isPrimitive && !cgParameter.isAssertedNonNull() && cgParameter.isNonNull() && !(cgParameter instanceof CGUnboxExp)/*|| cgElement.isRequired()*/; // FIXME Ugh! + js.appendIsCaught(cgParameter.isNonInvalid(), cgParameter.isCaught()); js.append(" "); - js.appendClassReference(cgClass); - js.append(" self;\n"); - for (@NonNull CGParameter cgParameter : ClassUtil.nullFree(cgFunction.getParameters())) { - js.append("protected "); - js.appendDeclaration(cgParameter); - js.append(";\n"); - } - // CGValuedElement body = getExpression(cgFunction.getBody()); - //ElementId elementId = cgFunction.getTypeId().getElementId(); - - js.append("protected final "); - CGValuedElement cgBody = cgFunction.getBody(); - js.appendTypeDeclaration(cgBody != null ? cgBody : cgFunction); - js.append(" " + instanceName + ";\n"); - js.append("\n"); - doFunctionConstructor(cgFunction, instanceName); - js.append("\n"); - doFunctionGetInstance(cgFunction, instanceName); - js.append("\n"); - doFunctionIsEqual(cgFunction, instanceName); + js.appendClassReference(isPrimitive ? null : isRequired ? true : null, cgParameter); + js.append(" "); + js.appendValueName(cgParameter); + js.append(";\n"); + } + // CGValuedElement body = getExpression(cgFunction.getBody()); + //ElementId elementId = cgFunction.getTypeId().getElementId(); + + js.append("protected final "); + CGValuedElement cgBody = cgFunction.getBody(); + js.appendTypeDeclaration(cgBody != null ? cgBody : cgFunction); + js.append(" " + instanceName + ";\n"); + js.append("\n"); + doFunctionConstructor(cgFunction, instanceName); + js.append("\n"); + doFunctionGetInstance(cgFunction, instanceName); + js.append("\n"); + doFunctionIsEqual(cgFunction, instanceName); js.popIndentation(); js.append("}\n"); } @@ -1481,8 +1490,8 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato // js.append("protected "); js.appendIsRequired(cgFunction.isRequired()); - // js.append(" "); - // js.appendIsCaught(!cgOperation.isInvalid(), cgOperation.isInvalid()); + // js.append(" "); + // js.appendIsCaught(!cgOperation.isInvalid(), cgOperation.isInvalid()); js.append(" "); ElementId elementId = cgFunction.getTypeId().getElementId(); if (elementId != null) { @@ -1556,7 +1565,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato CGValuedElement cgArgument = cgArguments.get(i); CGValuedElement argument = getExpression(cgArgument); Parameter pParameter = pParameters.get(i); -// CGTypeId cgParameterTypeId = analyzer.getTypeId(pParameter.getTypeId()); + // CGTypeId cgParameterTypeId = analyzer.getTypeId(pParameter.getTypeId()); TypeDescriptor parameterTypeDescriptor = context.getUnboxedDescriptor(pParameter.getTypeId()); js.appendReferenceTo(parameterTypeDescriptor, argument); needComma = true; @@ -1566,7 +1575,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append(")"); JavaLocalContext<?> functionContext = ClassUtil.nonNullState(globalContext.getLocalContext(cgFunction)); String instanceName = functionContext.getNameManagerContext().getSymbolName(cgFunction.getBody(), "instance"); -// js.append(".getInstance()"); + // js.append(".getInstance()"); js.append("."); js.append(instanceName); } @@ -1601,18 +1610,18 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append("\n"); js.append("{\n"); js.pushIndentation(null); - for (@NonNull CGGuardVariable cgFreeVariable : cgFreeVariables) { - js.append("protected "); - doMappingConnectionVariable(cgFreeVariable); - js.append(";\n"); - } - js.append("\n"); - doMappingConstructor(cgMapping); - js.append("\n"); - js.append("public boolean execute() "); - doMappingBody(cgMapping, true); - js.append("\n"); - doIsEqual(cgFreeVariables); + for (@NonNull CGGuardVariable cgFreeVariable : cgFreeVariables) { + js.append("protected "); + doMappingConnectionVariable(cgFreeVariable); + js.append(";\n"); + } + js.append("\n"); + doMappingConstructor(cgMapping); + js.append("\n"); + js.append("public boolean execute() "); + doMappingBody(cgMapping, true); + js.append("\n"); + doIsEqual(cgFreeVariables); js.popIndentation(); js.append("}\n"); } @@ -1627,7 +1636,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato isFirst = false; } js.append(") "); - + doMappingBody(cgMapping, false); } @@ -1638,7 +1647,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato } return true; } - + @Override public @NonNull Boolean visitCGMappingCall(@NonNull CGMappingCall cgMappingCall) { MappingCall pMappingCall = (MappingCall) cgMappingCall.getAst(); @@ -1732,7 +1741,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato @Override public @NonNull Boolean visitCGMappingExp(@NonNull CGMappingExp cgMappingExp) { -// assert cgMappingExp.getPredicates().isEmpty(); // Get rewritten during JavaPre pass + // assert cgMappingExp.getPredicates().isEmpty(); // Get rewritten during JavaPre pass List<@NonNull CGAccumulator> cgAccumulators = ClassUtil.nullFree(cgMappingExp.getOwnedAccumulators()); if (cgAccumulators.size() > 0) { js.append("// connection variables\n"); @@ -1772,7 +1781,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append(".class, "); js.appendValueName(cgInit); js.append(")"); - // js.appendReferenceTo(cgAccumulator.getInit()); + // js.appendReferenceTo(cgAccumulator.getInit()); js.append(") {\n"); js.pushIndentation(null); js.appendReferenceTo(cgAccumulator); @@ -1781,9 +1790,9 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append(");\n"); js.popIndentation(); js.append("}\n"); - // js.appendClassReference(cgAccumulator); - // _m_join_m_PackageCS_m_0_0 = (SetValue.Accumulator)ValueUtil.createCollectionAccumulatorValue(SET_CLSSid_OclElement); - // cgAccumulator.accept(this); + // js.appendClassReference(cgAccumulator); + // _m_join_m_PackageCS_m_0_0 = (SetValue.Accumulator)ValueUtil.createCollectionAccumulatorValue(SET_CLSSid_OclElement); + // cgAccumulator.accept(this); } } } @@ -1851,7 +1860,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato js.append(" != null) {\n"); js.pushIndentation(null); } - cgMappingLoop.getBody().accept(this); + cgMappingLoop.getBody().accept(this); if (!iterator.isNonNull()) { js.popIndentation(); js.append("}\n"); @@ -2024,7 +2033,7 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato List<CGOperation> cgOperations = cgTransformation.getOperations(); doMappingConstructorConstants(cgMappings); doFunctionConstructorConstants(ClassUtil.nullFree(cgOperations)); -// js.append("\n"); + // js.append("\n"); doConstructor(cgTransformation, oppositeIndex2propertyIdName, allInstancesNames); js.append("\n"); if (isIncremental) { diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvti/HeadSplitter.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvti/HeadSplitter.java index 5f6024b39..ddb9f40fd 100644 --- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvti/HeadSplitter.java +++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvti/HeadSplitter.java @@ -40,7 +40,7 @@ public class HeadSplitter { protected final @NonNull Set<@NonNull Node> intersectionNodes; protected final @NonNull Set<@NonNull Node> headNodes = new HashSet<@NonNull Node>(); -// protected final @NonNull Map<@NonNull Node, @NonNull Set<@NonNull Node>> headNode2reachableNodes; + // protected final @NonNull Map<@NonNull Node, @NonNull Set<@NonNull Node>> headNode2reachableNodes; Map<@NonNull Node, List<@NonNull Edge>> head2interHeadEdges = new HashMap<@NonNull Node, List<@NonNull Edge>>(); Map<@NonNull Node, List<@NonNull Node>> head2interHeadNodes = new HashMap<@NonNull Node, List<@NonNull Node>>(); @@ -52,13 +52,13 @@ public class HeadSplitter boolean wasAdded = headNodes.add(headNode); assert wasAdded; } - + public void analyze() { for (@NonNull Node headNode : headNodes) { analyze(headNode); } } - + public void analyze(@NonNull Node headNode) { List<@NonNull Edge> interHeadEdges = null; List<@NonNull Node> interHeadNodes = null; @@ -131,10 +131,10 @@ public class HeadSplitter head2interHeadNodes.put(headNode, interHeadNodes); } } - - + + public void debug(@NonNull StringBuilder s) { - s.append("\n boundary:"); + s.append("\n boundary:"); for (@NonNull Node headNode : headNodes) { s.append(" \"" + headNode.getName() + "\""); } @@ -160,7 +160,7 @@ public class HeadSplitter if (opposite != null) { s.append("\n opposite: " + (opposite.isIsImplicit() ? "implicit" : "explicit") + " " + opposite.getName() + " : " + opposite.getType()); } - + } } } @@ -180,7 +180,7 @@ public class HeadSplitter derivableHeadNodes2edges.put(headNode, interHeadEdges); } } - } + } // // Compute the deriveable head nodes that do not depend on other deriveable heads. // @@ -196,37 +196,37 @@ public class HeadSplitter return removableHeadNodes; } } - + public static boolean containsNone(@NonNull Iterable<@NonNull Node> firstNodes, @NonNull Iterable<@NonNull Node> secondNodes) { for (@NonNull Node firstNode : firstNodes) { for (@NonNull Node secondNode : secondNodes) { if (firstNode == secondNode) { return false; } - } - } + } + } return true; } - + protected final @NonNull Region region; - + /** * Map from each head node to all the nodes reachable from the head by to-one navigation. */ private final @NonNull Map<@NonNull Node, Set<@NonNull Node>> head2reachables = new HashMap<@NonNull Node, Set<@NonNull Node>>(); - + /** * Map from each head node to all the nodes reachable from the head by to-one navigation. */ private final @NonNull Set<@NonNull Node> allReachables = new HashSet<@NonNull Node>(); - + /** * Map from each reachable node to all the head nodes from which it is reachable by to-one navigation. */ private final @NonNull Map<@NonNull Node, List<@NonNull Node>> reachable2heads = new HashMap<@NonNull Node, List<@NonNull Node>>(); private final @NonNull Map<@NonNull Set<@NonNull Node>, @NonNull Boundary> intersection2boundary = new HashMap<@NonNull Set<@NonNull Node>, @NonNull Boundary>();; - + public HeadSplitter(@NonNull Region region) { this.region = region; List<@NonNull Node> headNodes = region.getHeadNodes(); @@ -330,7 +330,7 @@ public class HeadSplitter } } } - } + } } private @NonNull Collection<@NonNull Node> removeBoundary() { @@ -341,7 +341,7 @@ public class HeadSplitter resolvedHeadNodes2edges.put(entry.getKey(), entry.getValue()); } } - } + } if (SPLITTING.isActive()) { StringBuilder s = new StringBuilder(); for (Map.Entry<@NonNull Node, @NonNull List<@NonNull Edge>> entry : resolvedHeadNodes2edges.entrySet()) { @@ -349,7 +349,7 @@ public class HeadSplitter for (@NonNull Edge edge : entry.getValue()) { s.append("\n\t via " + edge); } - } + } SPLITTING.println(region + s.toString()); } return resolvedHeadNodes2edges.keySet(); @@ -372,20 +372,20 @@ public class HeadSplitter } private @NonNull Collection<@NonNull Node> split(@NonNull List<@NonNull Node> headNodes) { -// head2reachables.clear(); + // head2reachables.clear(); intersection2boundary.clear(); for (@NonNull Node headNode : headNodes) { createBoundary(headNode); - } -// pruneBoundaries(); + } + // pruneBoundaries(); for (@NonNull Boundary boundary : intersection2boundary.values()) { boundary.analyze(); - } + } if (SPLITTING.isActive()) { StringBuilder s = new StringBuilder(); for (@NonNull Boundary boundary : intersection2boundary.values()) { boundary.debug(s); - } + } SPLITTING.println(region + s.toString()); } return removeBoundary(); diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvti/QVTs2QVTiVisitor.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvti/QVTs2QVTiVisitor.java index 1206f25bf..d4b24c82f 100644 --- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvti/QVTs2QVTiVisitor.java +++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvti/QVTs2QVTiVisitor.java @@ -59,7 +59,7 @@ import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperativeUtil; public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Element> { public static final @NonNull TracingOption POLLED_PROPERTIES = new TracingOption(CompilerConstants.PLUGIN_ID, "qvts2qvti/polledProperties"); - + protected final @NonNull Transformation qvtpTransformation; protected final @NonNull SymbolNameReservation symbolNameReservation; @@ -72,10 +72,10 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele private @Nullable Set<@NonNull String> reservedNames = null; private @NonNull Map<@NonNull Operation, @NonNull Operation> qvtpOperation2qvtiOperation = new HashMap<@NonNull Operation, @NonNull Operation>(); private final @NonNull Region2Depth region2depth = new Region2Depth(); - + private final @NonNull Set<@NonNull Transformation> otherTransformations = new HashSet<@NonNull Transformation>(); // Workaround Bug 481658 private final @NonNull Map<@NonNull String, @NonNull Operation> name2operation = new HashMap<@NonNull String, @NonNull Operation>(); // Workaround Bug 481658 - + public QVTs2QVTiVisitor(@NonNull EnvironmentFactory environmentFactory, @NonNull Transformation qvtpTransformation, @NonNull SymbolNameReservation symbolNameReservation) { super(environmentFactory); this.qvtpTransformation = qvtpTransformation; @@ -84,7 +84,7 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele assert transformationName != null; qvtiTransformation = QVTimperativeUtil.createTransformation(transformationName); createTypedModels(); -// analyzeConnections(); + // analyzeConnections(); } private void accumulateOperations(@NonNull Transformation transformation) { @@ -100,7 +100,7 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele } } -/* private void analyzeConnection(@NonNull Connection connection) { + /* private void analyzeConnection(@NonNull Connection connection) { assert connection.isPassed(); Region commonRegion = null; for (Node source : connection.getSources()) { @@ -121,7 +121,7 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele } connections.add(connection); } - + private void analyzeConnections() { for (Region region : regionOrdering.getRegionOrdering()) { if (region.isConnectionRegion()) { @@ -166,11 +166,11 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele } return iOperation; } - + public void createRegion2Mapping(@NonNull Region region) { AbstractRegion2Mapping region2mapping = region2region2mapping.get(region); assert region2mapping == null : "Re-AbstractRegion2Mapping for " + region; -// assert !region.isConnectionRegion(); + // assert !region.isConnectionRegion(); if (region.isCyclicScheduledRegion()) { region2mapping = new CyclicScheduledRegion2Mapping(this, (CyclicScheduledRegion)region); } @@ -185,11 +185,11 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele region2region2mapping.put(region, region2mapping); qvtiTransformation.getRule().add(region2mapping.getMapping()); region.accept(this); -// for (@SuppressWarnings("null")@NonNull Region childRegion : region.getCalledRegions()) { -// if (region2region2mapping.get(childRegion) == null) { -// createRegion2Mapping(childRegion); -// } -// } + // for (@SuppressWarnings("null")@NonNull Region childRegion : region.getCalledRegions()) { + // if (region2region2mapping.get(childRegion) == null) { + // createRegion2Mapping(childRegion); + // } + // } } protected void createTypedModels() { @@ -230,10 +230,10 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele } } } - -// public @NonNull ChainNode getChain(@NonNull Region region) { -// return chainGraph.getChain(region); -// } + + // public @NonNull ChainNode getChain(@NonNull Region region) { + // return chainGraph.getChain(region); + // } public @NonNull EnvironmentFactory getEnvironmentFactory() { return environmentFactory; @@ -260,7 +260,7 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele OperationId oclAnyEqualsId = operation1.getOperationId(); return environmentFactory.getIdResolver().getOperation(oclAnyEqualsId); } - + public @Nullable TypedModel getQVTiTypedModel(@Nullable TypedModel qvtpTypedModel) { TypedModel qvtiTypedModel = qvtpTypedModel2qvtiTypedModel.get(qvtpTypedModel); return qvtiTypedModel != null ? qvtiTypedModel : qvtpTypedModel; @@ -269,7 +269,7 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele public @NonNull Region2Depth getRegion2Depth() { return region2depth; } - + public @NonNull AbstractRegion2Mapping getRegion2Mapping(@NonNull Region region) { AbstractRegion2Mapping region2mapping = region2region2mapping.get(region); assert region2mapping != null : "No AbstractRegion2Mapping for " + region; @@ -306,23 +306,23 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele return symbolNameReservation.reserveSymbolName(symbolNameBuilder, object); } -// private @NonNull Node selectHeadNode(@NonNull List<Node> headNodes) { -// return headNodes.get(0); // FIXME best -// } + // private @NonNull Node selectHeadNode(@NonNull List<Node> headNodes) { + // return headNodes.get(0); // FIXME best + // } @Override public @Nullable Element visiting(@NonNull Visitable visitable) { throw new UnsupportedOperationException(getClass().getSimpleName() + ": " + visitable.getClass().getSimpleName()); } - + @Override public @Nullable Element visitCyclicScheduledRegion(@NonNull CyclicScheduledRegion cyclicScheduledRegion) { List<@NonNull Region> callableRegions = new ArrayList<@NonNull Region>(); for (@NonNull Region region : cyclicScheduledRegion.getRegions()) { if (region.isOperationRegion()) {} -// else if (region.isConnectionRegion()) { -// callableRegions.add(region); -// } + // else if (region.isConnectionRegion()) { + // callableRegions.add(region); + // } else { callableRegions.add(region); } @@ -330,15 +330,15 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele List<@NonNull Region> sortedRegions = AbstractRegion.EarliestRegionComparator.sort(callableRegions); for (@NonNull Region region : sortedRegions) { -// if (!region.isConnectionRegion()) { - createRegion2Mapping(region); -// } + // if (!region.isConnectionRegion()) { + createRegion2Mapping(region); + // } } for (@NonNull Region region : sortedRegions) { -// if (!region.isConnectionRegion()) { - AbstractRegion2Mapping region2Mapping = getRegion2Mapping(region); - region2Mapping.createStatements(); -// } + // if (!region.isConnectionRegion()) { + AbstractRegion2Mapping region2Mapping = getRegion2Mapping(region); + region2Mapping.createStatements(); + // } } AbstractRegion2Mapping region2mapping = getRegion2Mapping(cyclicScheduledRegion); return region2mapping.getMapping(); @@ -350,34 +350,34 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele Mapping mapping = region2mapping.getMapping(); return mapping; } - + @Override public @Nullable Element visitOperationRegion(@NonNull OperationRegion operationRegion) { return visiting(operationRegion); } - + @Override public @Nullable Element visitRootCompositionRegion(@NonNull RootCompositionRegion rootCompositionRegion) { AbstractRegion2Mapping region2mapping = getRegion2Mapping(rootCompositionRegion); Mapping mapping = region2mapping.getMapping(); -// for (@SuppressWarnings("null")@NonNull List<Node> headNodes : rootContainmentRegion.getHeadNodeGroups()) { -// Node headNode = selectHeadNode(headNodes); -// Variable headVariable = region2mapping.getGuardVariable(headNode); -// getGuardPattern(mapping).getVariable().add(guardVariable); -// } + // for (@SuppressWarnings("null")@NonNull List<Node> headNodes : rootContainmentRegion.getHeadNodeGroups()) { + // Node headNode = selectHeadNode(headNodes); + // Variable headVariable = region2mapping.getGuardVariable(headNode); + // getGuardPattern(mapping).getVariable().add(guardVariable); + // } return mapping; } - + @Override public @Nullable Element visitRootScheduledRegion(@NonNull RootScheduledRegion rootScheduledRegion) { -// String name = rootRegion.getName(); + // String name = rootRegion.getName(); // List<@NonNull Region> callableRegions = new ArrayList<@NonNull Region>(); for (@NonNull Region region : rootScheduledRegion.getRegions()) { if (region.isOperationRegion()) {} -// else if (region.isConnectionRegion()) { -// callableRegions.add(region); -// } + // else if (region.isConnectionRegion()) { + // callableRegions.add(region); + // } else { callableRegions.add(region); } @@ -385,18 +385,18 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele List<@NonNull Region> sortedRegions = AbstractRegion.EarliestRegionComparator.sort(callableRegions); for (@NonNull Region region : sortedRegions) { -// if (!region.isConnectionRegion()) { - createRegion2Mapping(region); -// } + // if (!region.isConnectionRegion()) { + createRegion2Mapping(region); + // } } -// Region rootRegion = regionOrdering.getRootRegion(); -// chainGraph = new ChainGraph(region2depth, rootRegion, regionOrdering.getSchedulableOrdering()); -// @SuppressWarnings("null")@NonNull URI baseURI = qvtpTransformation.eResource().getURI(); -// chainGraph.writeChainDOTfile(baseURI, "c"); -// chainGraph.writeChainGraphMLfile(baseURI, "c"); + // Region rootRegion = regionOrdering.getRootRegion(); + // chainGraph = new ChainGraph(region2depth, rootRegion, regionOrdering.getSchedulableOrdering()); + // @SuppressWarnings("null")@NonNull URI baseURI = qvtpTransformation.eResource().getURI(); + // chainGraph.writeChainDOTfile(baseURI, "c"); + // chainGraph.writeChainGraphMLfile(baseURI, "c"); // -/* Map<TypedModel, Map<Property, List<NavigationEdge>>> typedModel2property2realizedEdges = new HashMap<TypedModel, Map<Property, List<NavigationEdge>>>(); + /* Map<TypedModel, Map<Property, List<NavigationEdge>>> typedModel2property2realizedEdges = new HashMap<TypedModel, Map<Property, List<NavigationEdge>>>(); for (@SuppressWarnings("null")@NonNull Region region : sortedRegions) { AbstractRegion2Mapping region2Mapping = getRegion2Mapping(region); region2Mapping.computeRealizations(typedModel2property2realizedEdges); @@ -420,13 +420,13 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele region2Mapping.checkAndEnforceRealizations(typedModel2property2realizedEdges); } */ for (@NonNull Region region : sortedRegions) { -// if (!region.isConnectionRegion()) { - AbstractRegion2Mapping region2Mapping = getRegion2Mapping(region); - region2Mapping.createStatements(); -// } + // if (!region.isConnectionRegion()) { + AbstractRegion2Mapping region2Mapping = getRegion2Mapping(region); + region2Mapping.createStatements(); + // } } ECollections.sort(qvtiTransformation.getRule(), NameUtil.NameableComparator.INSTANCE); -/* org.eclipse.ocl.pivot.Package rootPackage = PivotUtil.createPackage("", "yy", "zz", null); + /* org.eclipse.ocl.pivot.Package rootPackage = PivotUtil.createPackage("", "yy", "zz", null); rootPackage.getOwnedClasses().add(qvtiTransformation); Model model = PivotUtil.createModel(ImperativeModel.class, QVTimperativePackage.Literals.IMPERATIVE_MODEL, null); model.getOwnedPackages().add(rootPackage); @@ -445,7 +445,7 @@ public class QVTs2QVTiVisitor extends QVTimperativeHelper implements Visitor<Ele } */ return qvtiTransformation; } - + @Override public @Nullable Element visitSimpleMappingRegion(@NonNull SimpleMappingRegion simpleMappingRegion) { AbstractRegion2Mapping region2mapping = getRegion2Mapping(simpleMappingRegion); diff --git a/plugins/org.eclipse.qvtd.cs2as.build/src/org/eclipse/qvtd/cs2as/build/mwe/GenerateCGedQVTiTransformation.java b/plugins/org.eclipse.qvtd.cs2as.build/src/org/eclipse/qvtd/cs2as/build/mwe/GenerateCGedQVTiTransformation.java index 5760d2f62..99e84440d 100644 --- a/plugins/org.eclipse.qvtd.cs2as.build/src/org/eclipse/qvtd/cs2as/build/mwe/GenerateCGedQVTiTransformation.java +++ b/plugins/org.eclipse.qvtd.cs2as.build/src/org/eclipse/qvtd/cs2as/build/mwe/GenerateCGedQVTiTransformation.java @@ -44,6 +44,7 @@ public class GenerateCGedQVTiTransformation extends AbstractWorkflowComponent protected String traceabilityPropName = "ast"; protected Map<?, ?> savingOptions; + @Override public void checkConfiguration(final Issues issues) { if (!isDefined(oclFileURI)) { issues.addError(this, "OCL document URI not specified."); diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CGLookupCallExpImpl.java b/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CGLookupCallExpImpl.java index b1aa5d0fc..fabd086ee 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CGLookupCallExpImpl.java +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CGLookupCallExpImpl.java @@ -61,6 +61,7 @@ public class CGLookupCallExpImpl extends CGOperationCallExpImpl implements CGLoo * {@inheritDoc} * @generated */ + @Override public EClassifier getEcoreClassifier() { return null; } @@ -80,6 +81,7 @@ public class CGLookupCallExpImpl extends CGOperationCallExpImpl implements CGLoo * {@inheritDoc} * @generated */ + @Override public boolean isEcore() { return false; } @@ -88,6 +90,7 @@ public class CGLookupCallExpImpl extends CGOperationCallExpImpl implements CGLoo * {@inheritDoc} * @generated */ + @Override public boolean isGlobal() { return false; } diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CS2ASCGFactoryImpl.java b/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CS2ASCGFactoryImpl.java index 66d27f2f0..9b1d9fa35 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CS2ASCGFactoryImpl.java +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CS2ASCGFactoryImpl.java @@ -76,6 +76,7 @@ public class CS2ASCGFactoryImpl extends EFactoryImpl implements CS2ASCGFactory { * <!-- end-user-doc --> * @generated */ + @Override public CGLookupCallExp createCGLookupCallExp() { CGLookupCallExpImpl cgLookupCallExp = new CGLookupCallExpImpl(); return cgLookupCallExp; @@ -86,6 +87,7 @@ public class CS2ASCGFactoryImpl extends EFactoryImpl implements CS2ASCGFactory { * <!-- end-user-doc --> * @generated */ + @Override public CS2ASCGPackage getCS2ASCGPackage() { return (CS2ASCGPackage)getEPackage(); } diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CS2ASCGPackageImpl.java b/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CS2ASCGPackageImpl.java index 117f64737..83d4f9a24 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CS2ASCGPackageImpl.java +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/emf-gen/org/eclipse/qvtd/cs2as/compiler/cgmodel/impl/CS2ASCGPackageImpl.java @@ -104,6 +104,7 @@ public class CS2ASCGPackageImpl extends EPackageImpl implements CS2ASCGPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getCGLookupCallExp() { return cgLookupCallExpEClass; } @@ -113,6 +114,7 @@ public class CS2ASCGPackageImpl extends EPackageImpl implements CS2ASCGPackage { * <!-- end-user-doc --> * @generated */ + @Override public CS2ASCGFactory getCS2ASCGFactory() { return (CS2ASCGFactory)getEFactoryInstance(); } diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/CS2ASJavaCompilerParameters.java b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/CS2ASJavaCompilerParameters.java index 305605589..c656613f1 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/CS2ASJavaCompilerParameters.java +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/CS2ASJavaCompilerParameters.java @@ -15,36 +15,33 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNull; public interface CS2ASJavaCompilerParameters extends OCL2JavaTxCompilerParams { - - + + /** * @return the fully qualified name of the lookup resolver class */ - @NonNull - public String getLookupSolverClassName(); - - + public @NonNull String getLookupSolverClassName(); + + /** * @return the fully qualified name of the lookup result class */ - @NonNull - public String getLookupResultClassName(); + public @NonNull String getLookupResultClassName(); /** * @return the path in which the CGed transformation will be saved */ - @NonNull - public String getSavePath(); + + public @NonNull String getSavePath(); /** * @return the java package name in which the CGed transformation will be created */ - @NonNull - public String getPackageName(); + public @NonNull String getPackageName(); /** * @return the map of Java package renames to replicate the localization of the run-time packages. - */ + */ public @NonNull Map<@NonNull String, @NonNull String> getPackageRenames(); /** diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/OCL2QVTiCGTxCompiler.java b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/OCL2QVTiCGTxCompiler.java index 2cd1bb5eb..395c8d0f3 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/OCL2QVTiCGTxCompiler.java +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/OCL2QVTiCGTxCompiler.java @@ -43,26 +43,27 @@ public class OCL2QVTiCGTxCompiler implements OCL2JavaTxCompiler<CS2ASJavaCompile private @Nullable Log log = null; private boolean debug = false; - + @Override public Class<? extends Transformer> compileTransformation(@Nullable ResourceSet rSet, @NonNull CS2ASJavaCompilerParameters params, @NonNull URI oclDocURI, URI... extendedOCLDocURIs) throws Exception { return this.compileTransformation(rSet, params, "ast", oclDocURI); } - - public Class<? extends Transformer> compileTransformation(@Nullable ResourceSet rSet, @NonNull CS2ASJavaCompilerParameters params, @NonNull String tracePropertyName, @NonNull URI oclDocURI, URI... extendedOCLDocURIs) + + @Override + public Class<? extends Transformer> compileTransformation(@Nullable ResourceSet rSet, @NonNull CS2ASJavaCompilerParameters params, @NonNull String tracePropertyName, @NonNull URI oclDocURI, URI... extendedOCLDocURIs) throws Exception { - + QVTimperative qvt = QVTimperative.newInstance(BasicProjectManager.CLASS_PATH, rSet); try { Transformation qvtiTransf = executeOCL2QVTi_CompilerChain(qvt, tracePropertyName, oclDocURI, extendedOCLDocURIs); CS2ASJavaCompilerImpl compiler = createCompiler(); compiler.setLog(log); - return compiler.compileTransformation(qvt, qvtiTransf, (CS2ASJavaCompilerParameters) params); + return compiler.compileTransformation(qvt, qvtiTransf, params); } finally { qvt.dispose(); } } - + protected CS2ASJavaCompilerImpl createCompiler() { return new CS2ASJavaCompilerImpl(); } @@ -75,29 +76,30 @@ public class OCL2QVTiCGTxCompiler implements OCL2JavaTxCompiler<CS2ASJavaCompile // Default options OCL2QVTiCompilerChain.setOption(options, OCL2QVTiCompilerChain.DEFAULT_STEP, OCL2QVTiCompilerChain.SAVE_OPTIONS_KEY, XMIUtil.createSaveOptions()); // FIXME parametrize save options ? OCL2QVTiCompilerChain.setOption(options, OCL2QVTiCompilerChain.DEFAULT_STEP, CompilerChain.DEBUG_KEY, debug); - + OCL2QVTiCompilerChain compilerChain = new OCL2QVTiCompilerChain(qvt, options, oclDocURI, extendedOCLDocURIs); - if (log != null) { + Log log2 = log; + if (log2 != null) { compilerChain.addListener(new CompilerChain.Listener() { - + @Override public void compiled(@NonNull String step, @Nullable Object object) { if (object instanceof Resource) { - log.info(step + " step completed => " + ((Resource)object).getURI()); + log2.info(step + " step completed => " + ((Resource)object).getURI()); } else { - log.info(step + " step completed => " + object); + log2.info(step + " step completed => " + object); } } }); } - return compilerChain.compile(); + return compilerChain.compile(); } public void setLog(@Nullable Log log) { this.log = log; } - + public void setDebug(boolean debug) { this.debug = debug; } diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/OCL2QVTiTransformationTechnology.java b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/OCL2QVTiTransformationTechnology.java index 20b6c2596..feb219ad1 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/OCL2QVTiTransformationTechnology.java +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/OCL2QVTiTransformationTechnology.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -19,6 +19,7 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; +import org.eclipse.ocl.pivot.utilities.ClassUtil; import org.eclipse.qvtd.cs2as.compiler.internal.CS2ASJavaCompilerParametersImpl; import org.eclipse.qvtd.runtime.evaluation.Transformer; import org.eclipse.qvtd.runtime.invocation.AbstractTransformationTechnology; @@ -26,33 +27,33 @@ import org.eclipse.qvtd.runtime.invocation.AbstractTransformationTechnology; public class OCL2QVTiTransformationTechnology extends AbstractTransformationTechnology { public static final @NonNull OCL2QVTiTransformationTechnology INSTANCE = new OCL2QVTiTransformationTechnology("org.eclipse.qvtd.ocl2qvti"); - + protected @Nullable Log log = null; - + private OCL2QVTiTransformationTechnology(@NonNull String name) { super(name); -// Scheduler.DEBUG_GRAPHS.setState(true); + // Scheduler.DEBUG_GRAPHS.setState(true); } @Override - public @NonNull Map<@NonNull String, Object> execute(@NonNull ResourceSet resourceSet, @NonNull Map<String, Object> modelMap, + public @NonNull Map<@NonNull String, Object> execute(@NonNull ResourceSet resourceSet, @NonNull Map<@NonNull String, Object> modelMap, @NonNull Map<@NonNull String, Object> parametersMap) throws TransformationException { Object logObject = parametersMap.get("log"); if (logObject instanceof Log) { log = (Log)logObject; } - String lookupSolverClassName = (String) parametersMap.get("lookupSolverClassName"); - String lookupResultItfName = (String) parametersMap.get("lookupResultItfName"); - String javaFolder = (String) parametersMap.get("javaFolder"); - String javaPackage = (String) parametersMap.get("javaPackage"); + String lookupSolverClassName = (String) ClassUtil.nonNullState(parametersMap.get("lookupSolverClassName")); + String lookupResultItfName = (String) ClassUtil.nonNullState(parametersMap.get("lookupResultItfName")); + String javaFolder = (String) ClassUtil.nonNullState(parametersMap.get("javaFolder")); + String javaPackage = (String) ClassUtil.nonNullState(parametersMap.get("javaPackage")); Boolean debug = (Boolean) parametersMap.get("debug"); // String oclFileURI = (String) parametersMap.get("oclFileURI"); @SuppressWarnings("unchecked") Map<String, String> packageRenames = (Map<String, String>) parametersMap.get("packageRenames"); @SuppressWarnings("unchecked") - List<String> extendedOclFileURIs = (List<String>) parametersMap.get("extendedOclFileURIs"); - String traceabilityPropName = (String) parametersMap.get("traceabilityPropName"); + List<String> extendedOclFileURIs = (List<String>) ClassUtil.nonNullState(parametersMap.get("extendedOclFileURIs")); + String traceabilityPropName = (String) ClassUtil.nonNullState(parametersMap.get("traceabilityPropName")); // URI oclDocURI = URI.createURI(oclFileURI); URI[] extendedOclDocURIs = new URI[extendedOclFileURIs.size()]; @@ -72,14 +73,14 @@ public class OCL2QVTiTransformationTechnology extends AbstractTransformationTech try { OCL2QVTiCGTxCompiler ocl2qvTiCGTxCompiler = new OCL2QVTiCGTxCompiler(); ocl2qvTiCGTxCompiler.setLog(log); - ocl2qvTiCGTxCompiler.setDebug(debug); + ocl2qvTiCGTxCompiler.setDebug(debug == Boolean.TRUE); Class<? extends Transformer> transformationClass = ocl2qvTiCGTxCompiler.compileTransformation(resourceSet, cgParams, traceabilityPropName, oclDocURI, extendedOclDocURIs); if (log != null) { log.info("Created " + transformationClass); } return new HashMap<@NonNull String, Object>(); } catch (Exception e) { - throw new TransformationException(null, e, "Error while executing " + OCL2QVTiCGTxCompiler.class.getName()); + throw new TransformationException(parametersMap, e, "Error while executing " + OCL2QVTiCGTxCompiler.class.getName()); } finally { log = null; } diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/CS2ASJavaCompilerImpl.java b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/CS2ASJavaCompilerImpl.java index ae3318cfd..69ffc5f78 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/CS2ASJavaCompilerImpl.java +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/CS2ASJavaCompilerImpl.java @@ -76,7 +76,7 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { protected static class CS2ASJavaCodeGenerator extends QVTiCodeGenerator { private @NonNull CS2ASJavaCompilerParameters params; - + protected CS2ASJavaCodeGenerator(@NonNull QVTiEnvironmentFactory environmentFactory, @NonNull Transformation transformation, @NonNull CS2ASJavaCompilerParameters params) { super(environmentFactory, transformation); @@ -87,45 +87,45 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { protected @NonNull QVTiCG2JavaVisitor createCG2JavaVisitor(@NonNull CGPackage cgPackage, @Nullable List<CGValuedElement> sortedGlobals) { return new CS2ASCG2JavaVisitor(this, cgPackage, sortedGlobals); } - + @Override protected @NonNull QVTiAS2CGVisitor createAS2CGVisitor(@NonNull QVTiAnalyzer analyzer, @NonNull QVTiGlobalContext gContext) { return new CS2ASAS2CGVisitor(analyzer, gContext); } - + @Override public @NonNull AnalysisVisitor createAnalysisVisitor() { return new CS2ASAnalysisVisitor(cgAnalyzer); } - + @Override public @NonNull BoxingAnalyzer createBoxingAnalyzer() { - + return new CS2ASBoxingAnalyser(cgAnalyzer); } - + @Override public @NonNull FieldingAnalyzer createFieldingAnalyzer() { return new CS2ASFieldingAnalyser(cgAnalyzer); } - + @Override public @NonNull CG2JavaPreVisitor createCG2JavaPreVisitor() { return new CS2ASCG2JavaPreVisitor(getGlobalContext()); } - + @Override public @NonNull ReferencesVisitor createReferencesVisitor() { return CS2ASReferencesVisitor.INSTANCE; } - + @Override public @NonNull DependencyVisitor createDependencyVisitor() { return new CS2ASDependencyVisitor(cgAnalyzer, getGlobalContext(), - getGlobalPlace()); + getGlobalPlace()); } - + @Override public @NonNull CGModelResourceFactory getCGResourceFactory() { return CS2ASCGModelResourceFactory.INSTANCE; @@ -139,7 +139,7 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { protected static class CS2ASCG2JavaVisitor extends QVTiCG2JavaVisitor implements CS2ASCGModelVisitor<Boolean> { private static final String LOOKUP_SOLVER_FIELD_NAME = "lookupSolver"; - + protected CS2ASCG2JavaVisitor(@NonNull QVTiCodeGenerator codeGenerator, @NonNull CGPackage cgPackage, @Nullable List<CGValuedElement> sortedGlobals) { super(codeGenerator, cgPackage, sortedGlobals); } @@ -159,10 +159,11 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { return; } } -// CGUtil.createCGParameter(name, typeId) + // CGUtil.createCGParameter(name, typeId) super.appendGuardFailure(cgGuardExp); } + @Override protected @NonNull Class<? extends AbstractTransformer> getAbstractTransformationExecutorClass() { return AbstractCS2ASTransformer.class; } @@ -171,14 +172,14 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { @Nullable public Boolean visitCGLookupCallExp(CGLookupCallExp cgCall) { CS2ASJavaCompilerParameters params = ((CS2ASJavaCodeGenerator)getCodeGenerator()).getCGParameters(); - + CGValuedElement cgSource = cgCall.getSource(); // FIXME to skip env() call. Remove env() call TypeDescriptor typeDescriptor = context.getTypeDescriptor(cgCall); if (!js.appendLocalStatements(cgSource)) { return false; } - - + + List<CGValuedElement> cgArguments = cgCall.getArguments(); for (@NonNull CGValuedElement cgArgument : cgArguments) { CGValuedElement argument = getExpression(cgArgument); @@ -186,8 +187,8 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { return false; } } - - + + String resultClassName = params.getLookupResultClassName(); String resultSymbol = getSymbolName(resultClassName + cgCall.hashCode(), "_lookupResult"); @@ -196,8 +197,8 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { js.appendClassReference(context.getUnboxedDescriptor(ClassUtil.nonNullState(cgCall.getTypeId().getElementId()))); js.append(">"); js.append(" "); - js.append(resultSymbol); - js.append(" = "); + js.append(resultSymbol); + js.append(" = "); js.append(LOOKUP_SOLVER_FIELD_NAME); js.append("."); js.append(cgCall.getName()); @@ -217,7 +218,7 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { js.appendReferenceTo(parameterTypeDescriptor, argument); } js.append(");\n"); - + js.appendClassReference(typeDescriptor); js.append(" "); js.appendReferenceTo(cgCall); @@ -231,29 +232,29 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { // TODO what about ambiguous error report ? js.append("} else {\n"); js.pushIndentation(null); - + CGValuedElement lookupArg = cgArguments.get(0); // FIXMe improve handleLookupError CGValuedElement initialSource = initialSourceCG(lookupArg); js.append("handleLookupError("); - js.appendReferenceTo(initialSource); + js.appendReferenceTo(initialSource); js.append(","); js.appendReferenceTo(lookupArg); js.append(");\n"); - + js.popIndentation(); js.append("};\n"); return true; } - - + + @Override - protected void doMappingConstructorConstants(List<CGMapping> cgMappings) { + protected void doMappingConstructorConstants(List<@NonNull CGMapping> cgMappings) { super.doMappingConstructorConstants(cgMappings); - + CS2ASJavaCompilerParameters params = ((CS2ASJavaCodeGenerator)getCodeGenerator()).getCGParameters(); String lookupSolver = params.getLookupSolverClassName(); - + if (lookupSolver != null && !"".equals(lookupSolver)) { js.append("private final "); js.appendClassReference(lookupSolver); @@ -263,7 +264,7 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { js.appendClassReference(lookupSolver); js.append("("); js.append(JavaConstants.EXECUTOR_NAME); - js.append(");\n"); + js.append(");\n"); } } @@ -277,7 +278,7 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { if (cgVarInit == null) { return cgValue; } else { - return cgVarInit == cgValue ? cgVarInit : initialSourceCG(cgVarInit); + return cgVarInit == cgValue ? cgVarInit : initialSourceCG(cgVarInit); }*/ return cgValue; } else if (cgValue instanceof CGCallExp) { @@ -293,10 +294,10 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { public CS2ASAS2CGVisitor(QVTiAnalyzer analyzer, QVTiGlobalContext globalContext) { super(analyzer, globalContext); } - + @Override protected @NonNull CGValuedElement generateOperationCallExp(@Nullable CGValuedElement cgSource, @NonNull OperationCallExp asOperationCallExp) { - + Operation asOperation = asOperationCallExp.getReferredOperation(); if (isLookupOp(asOperation)) { CGLookupCallExp cgLookupCallExp = CS2ASCGFactory.eINSTANCE.createCGLookupCallExp(); @@ -312,9 +313,9 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { } return super.generateOperationCallExp(cgSource, asOperationCallExp); } - + protected boolean isLookupOp(Operation op) { - + String opName = op.getName(); if (opName != null && opName.startsWith("_lookup")) {// FIXME return true; @@ -322,9 +323,9 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { return false; } } - - protected static class CS2ASAnalysisVisitor extends QVTiAnalysisVisitor - implements CS2ASCGModelVisitor<Object> { + + protected static class CS2ASAnalysisVisitor extends QVTiAnalysisVisitor + implements CS2ASCGModelVisitor<Object> { public CS2ASAnalysisVisitor(QVTiAnalyzer analyzer) { super(analyzer); @@ -336,10 +337,10 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { return visitCGOperationCallExp(object); } } - + protected static class CS2ASBoxingAnalyser extends QVTiBoxingAnalyzer - implements CS2ASCGModelVisitor<Object> { - + implements CS2ASCGModelVisitor<Object> { + public CS2ASBoxingAnalyser(QVTiAnalyzer analyzer) { super(analyzer); } @@ -347,21 +348,21 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { @Override @Nullable public Object visitCGLookupCallExp(CGLookupCallExp object) { - super.visitCGOperationCallExp(object); - CGValuedElement cgSource = object.getSource(); - rewriteAsGuarded(cgSource, isSafe(object), "source for '" + object.getReferredOperation() + "'"); - rewriteAsUnboxed(cgSource); - List<CGValuedElement> cgArguments = object.getArguments(); - int iMax = cgArguments.size(); - for (int i = 0; i < iMax; i++) { // Avoid CME from rewrite - rewriteAsUnboxed(cgArguments.get(i)); - } - return null; + super.visitCGOperationCallExp(object); + CGValuedElement cgSource = object.getSource(); + rewriteAsGuarded(cgSource, isSafe(object), "source for '" + object.getReferredOperation() + "'"); + rewriteAsUnboxed(cgSource); + List<CGValuedElement> cgArguments = object.getArguments(); + int iMax = cgArguments.size(); + for (int i = 0; i < iMax; i++) { // Avoid CME from rewrite + rewriteAsUnboxed(cgArguments.get(i)); + } + return null; } } - + protected static class CS2ASFieldingAnalyser extends QVTiFieldingAnalyzer { - + protected static class CS2ASAnalysisVisitor extends QVTiFieldingAnalyzer.QVTiAnalysisVisitor implements CS2ASCGModelVisitor<Set<CGVariable>> { public CS2ASAnalysisVisitor(QVTiFieldingAnalyzer context) { @@ -374,7 +375,7 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { return visitCGOperationCallExp(object); } } - + protected static class CS2ASRewriteVisitor extends QVTiFieldingAnalyzer.QVTiRewriteVisitor implements CS2ASCGModelVisitor<Boolean> { public CS2ASRewriteVisitor(@NonNull QVTiAnalyzer context, @NonNull Set<CGVariable> caughtVariable) { @@ -387,28 +388,28 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { return visitCGOperationCallExp(object); } } - - - + + + public CS2ASFieldingAnalyser(QVTiAnalyzer analyzer) { super(analyzer); } - + @Override protected @NonNull AnalysisVisitor createAnalysisVisitor() { return new CS2ASAnalysisVisitor(this); } - + @Override protected @NonNull RewriteVisitor createRewriteVisitor(@NonNull Set<CGVariable> caughtVariables) { return new CS2ASRewriteVisitor((QVTiAnalyzer)analyzer, caughtVariables); } } - + protected static class CS2ASCG2JavaPreVisitor extends QVTiCG2JavaPreVisitor - implements CS2ASCGModelVisitor<Object> { - + implements CS2ASCGModelVisitor<Object> { + public CS2ASCG2JavaPreVisitor(QVTiGlobalContext globalContext) { super(globalContext); } @@ -419,25 +420,25 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { return visitCGOperationCallExp(object); } } - + protected static class CS2ASReferencesVisitor extends QVTiReferencesVisitor - implements CS2ASCGModelVisitor<@NonNull List<@Nullable Object>> { - + implements CS2ASCGModelVisitor<@NonNull List<@Nullable Object>> { + protected static CS2ASReferencesVisitor INSTANCE = new CS2ASReferencesVisitor(new Object()); - + public CS2ASReferencesVisitor(@Nullable Object context) { super(context); } - + @Override public @NonNull List<@Nullable Object> visitCGLookupCallExp(@NonNull CGLookupCallExp object) { return visitCGOperationCallExp(object); } } - + protected static class CS2ASDependencyVisitor extends QVTiDependencyVisitor - implements CS2ASCGModelVisitor<Object> { - + implements CS2ASCGModelVisitor<Object> { + public CS2ASDependencyVisitor(QVTiAnalyzer analyzer, QVTiGlobalContext globalContext, GlobalPlace globalPlace) { super(analyzer, globalContext, globalPlace); } @@ -450,23 +451,23 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { } private @Nullable Log log = null; - + // Copied from QVTiCompilerTest protected Class<? extends CS2ASTransformer> compileTransformation(@NonNull File explicitClassPath, @NonNull QVTiCodeGenerator cg) throws Exception { String qualifiedClassName = cg.getQualifiedName(); String javaCodeSource = cg.generateClassFile(); - OCL2JavaFileObject.saveClass(explicitClassPath.toString(), qualifiedClassName, javaCodeSource); + OCL2JavaFileObject.saveClass(explicitClassPath.toString(), qualifiedClassName, javaCodeSource); @SuppressWarnings("unchecked") Class<? extends CS2ASTransformer> txClass = (Class<? extends CS2ASTransformer>) OCL2JavaFileObject.loadExplicitClass(explicitClassPath, qualifiedClassName); return txClass; } - - + + // Copied from QVTiCompilerTest @Override public @NonNull Class<? extends CS2ASTransformer> compileTransformation(@NonNull QVTimperative qvt, @NonNull Transformation transformation, @NonNull CS2ASJavaCompilerParameters params) throws Exception { - + QVTiCodeGenerator cg = new CS2ASJavaCodeGenerator(qvt.getEnvironmentFactory(), transformation, params) { @Override @@ -478,7 +479,7 @@ public class CS2ASJavaCompilerImpl implements CS2ASJavaCompiler { classFileContent = classFileContent.replace(fromPackage, toPackage); } return classFileContent; - } + } }; QVTiCodeGenOptions options = cg.getOptions(); options.setUseNullAnnotations(true); diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/CS2ASJavaCompilerParametersImpl.java b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/CS2ASJavaCompilerParametersImpl.java index f3ef86c81..005f23c4e 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/CS2ASJavaCompilerParametersImpl.java +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/CS2ASJavaCompilerParametersImpl.java @@ -14,21 +14,20 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; import org.eclipse.qvtd.cs2as.compiler.CS2ASJavaCompilerParameters; public class CS2ASJavaCompilerParametersImpl implements CS2ASJavaCompilerParameters { private @NonNull String lookupSolverName; - private @Nullable String savePath; + private @NonNull String savePath; private @NonNull String packagePrefix; private @NonNull String lookupResultName; - private @NonNull String namedElementClassName; + // private @NonNull String namedElementClassName; private boolean isIncremental = false; private @NonNull Map<@NonNull String, @NonNull String> packageRenameMap = new HashMap<@NonNull String, @NonNull String>(); - + public CS2ASJavaCompilerParametersImpl(@NonNull String lookupSolverClassName, - @Nullable String lookupResultClassName, - @Nullable String savePath, @NonNull String packagePrefix) { + @NonNull String lookupResultClassName, + @NonNull String savePath, @NonNull String packagePrefix) { this.lookupSolverName = lookupSolverClassName; this.savePath = savePath; this.packagePrefix = packagePrefix; @@ -41,34 +40,35 @@ public class CS2ASJavaCompilerParametersImpl implements CS2ASJavaCompilerParamet public void addPackageRename(@NonNull String fromPackage, @NonNull String toPackage) { packageRenameMap.put(fromPackage, toPackage); } - + /** * @return the fully qualified name of the lookup resolver class */ - @NonNull - public String getLookupSolverClassName() { + @Override + public @NonNull String getLookupSolverClassName() { return lookupSolverName; } - + /** * @return the fully qualified name of the lookup result class */ - @Nullable - public String getLookupResultClassName() { - return lookupResultName; + @Override + public @NonNull String getLookupResultClassName() { + return lookupResultName; } /** * @return the path in which the CGed transformation will be saved */ - @NonNull - public String getSavePath() { + @Override + public @NonNull String getSavePath() { return savePath; } /** * @return the java package name in which the CGed transformation will be created */ + @Override @NonNull public String getPackageName() { return packagePrefix; diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTiCompilerChain.java b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTiCompilerChain.java index 6104f2da4..d6ffa81d5 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTiCompilerChain.java +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTiCompilerChain.java @@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.ocl.pivot.Element; +import org.eclipse.ocl.pivot.utilities.ClassUtil; import org.eclipse.qvtd.compiler.AbstractCompilerChain; import org.eclipse.qvtd.compiler.AbstractCompilerStep; import org.eclipse.qvtd.compiler.CompilerChain; @@ -33,28 +34,28 @@ public class OCL2QVTiCompilerChain extends AbstractCompilerChain { public static class OCL2QVTpCompilerStep extends AbstractCompilerStep // FIXME split into multiple steps { private @NonNull URI oclASUri; - private @NonNull List<URI> extendedASUris = new ArrayList<URI>(); - private @Nullable String traceabilityPropName; + private @NonNull List<URI> extendedASUris = new ArrayList<URI>(); + private @NonNull String traceabilityPropName; public OCL2QVTpCompilerStep(@NonNull CompilerChain compilerChain, @NonNull QVTimperative qvti, - @Nullable Map<@NonNull String, @Nullable Map<@NonNull Key<Object>, @Nullable Object>> options, + @Nullable Map<@NonNull String, @Nullable Map<@NonNull Key<Object>, @Nullable Object>> options, @NonNull URI oclDocURI, URI... extendedDocURIs) { super(compilerChain, QVTP_STEP); this.traceabilityPropName = getTraceabilityPropertyName(); - this.oclASUri = qvti.parse(oclDocURI).getURI(); + this.oclASUri = ClassUtil.nonNullState(qvti.parse(oclDocURI)).getURI(); for (URI oclDocUri : extendedDocURIs) { - this.extendedASUris.add(qvti.parse(oclDocUri).getURI()); // We add the AS URI + this.extendedASUris.add(ClassUtil.nonNullState(qvti.parse(oclDocUri)).getURI()); // We add the AS URI } - } - + } + public @NonNull Resource ocl2qvtp(@NonNull URI oclURI) throws IOException { OCL2QVTp ocl2qvtp = new OCL2QVTp(environmentFactory, traceabilityPropName); Resource pResource = ocl2qvtp.run(environmentFactory.getMetamodelManager().getASResourceSet(), oclURI); saveResource(pResource, QVTP_STEP); return pResource; } - - protected Resource execute() throws IOException { + + protected Resource execute() throws IOException { Resource pModel = ocl2qvtp(oclASUri); if (!extendedASUris.isEmpty()) { List<Resource> qvtpModels = new ArrayList<Resource>(); @@ -69,29 +70,29 @@ public class OCL2QVTiCompilerChain extends AbstractCompilerChain { } return pModel; } - + private @NonNull String getTraceabilityPropertyName() { String tracePropName = compilerChain.getOption(QVTP_STEP, TRACE_PROPERTY_NAME_KEY); return tracePropName == null ? DEFAULT_TRACE_PROPERTY_NAME : tracePropName; } } - public @NonNull static final String DEFAULT_TRACE_PROPERTY_NAME = "ast"; + public @NonNull static final String DEFAULT_TRACE_PROPERTY_NAME = "ast"; public @NonNull static final Key<String> TRACE_PROPERTY_NAME_KEY = new Key<String>("ocl2qvtp.tracePropName"); public final @NonNull OCL2QVTpCompilerStep ocl2qvtpCompilerStep; - + /** * To provide a different traceabilityPropName different to the default {@link OCL2QVTiCompilerChain#DEFAULT_TRACE_PROPERTY_NAME "ast"} one, * it must be passed as an option using the {@link #TRACE_PROPERTY_NAME_KEY TRACE_PROPERTY_NAME_KEY} and the {@link CompilerChain#QVTP_STEP QVTP_STEP} - * + * * @param qvti mandatory {@link QVTimperative} instance * @param options optional options * @param oclDocURI the mandatory main OCL document URI to compile * @param extendedDocURIs optional OCL document URIs that the main one extends */ - public OCL2QVTiCompilerChain(@NonNull QVTimperative qvti, @Nullable Map<@NonNull String, @Nullable Map<@NonNull Key<Object>, @Nullable Object>> options, - @NonNull URI oclDocURI, URI... extendedDocURIs) { + public OCL2QVTiCompilerChain(@NonNull QVTimperative qvti, @Nullable Map<@NonNull String, @Nullable Map<@NonNull Key<Object>, @Nullable Object>> options, + @NonNull URI oclDocURI, URI... extendedDocURIs) { super(qvti.getEnvironmentFactory(), oclDocURI, options); this.ocl2qvtpCompilerStep = new OCL2QVTpCompilerStep(this, qvti, options, oclDocURI, extendedDocURIs); } @@ -100,7 +101,7 @@ public class OCL2QVTiCompilerChain extends AbstractCompilerChain { public @NonNull Transformation compile(@NonNull String enforcedOutputName) throws IOException { return qvtp2qvti(ocl2qvtpCompilerStep.execute()); } - + public @NonNull Transformation compile() throws IOException { return compile(""); } diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/QVTpModelsMerger.java b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/QVTpModelsMerger.java index cb98015d3..5ea448a12 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/QVTpModelsMerger.java +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/QVTpModelsMerger.java @@ -39,6 +39,7 @@ import org.eclipse.ocl.pivot.Type; import org.eclipse.ocl.pivot.TypeExp; import org.eclipse.ocl.pivot.Variable; import org.eclipse.ocl.pivot.VariableExp; +import org.eclipse.ocl.pivot.utilities.ClassUtil; import org.eclipse.ocl.pivot.utilities.EnvironmentFactory; import org.eclipse.ocl.pivot.utilities.FeatureFilter; import org.eclipse.qvtd.pivot.qvtbase.Domain; @@ -53,32 +54,32 @@ import org.eclipse.qvtd.pivot.qvtcore.Mapping; public class QVTpModelsMerger { - + /** * <p> * Utility to merge the QVTp models result of the OCL2QVTp transformation on different CS2AS descriptions. * </p> - * + * * <ul> * The merge utility will simply consist of: * <li> Merging all the qvtp {@link Mapping mappings} in one qvtp {@link Transformation transformation} </li> * <li> Merging all the {@link Import imports} in the containing qvtp {@link CoreModel model}, taking care of import duplications </li> * </ul> - * + * * @param extendedQVTpModels a list of the QVTp models to merge - * @return a clone of the first QVTp model of the provided list, having merged the remaining QVTp models of that list + * @return a clone of the first QVTp model of the provided list, having merged the remaining QVTp models of that list */ public static void merge(EnvironmentFactory envF, Resource targetQVTpModel, List<Resource> extendedQVTpModels) { - + CoreModel qvtpModel = getCoreModel(targetQVTpModel); Map<Class, List<Mapping>> inputType2RefiningMapping = getRefiningMappingInputTypes(qvtpModel); for (Resource extendedQVTpModel : extendedQVTpModels) { doMerge(envF, qvtpModel, getCoreModel(extendedQVTpModel), inputType2RefiningMapping); } } - + private static Map<Class, List<Mapping>> getRefiningMappingInputTypes(CoreModel qvtpModel) { - + Map<Class, List<Mapping>> result = new HashMap<Class, List<Mapping>>(); Package _package = qvtpModel.getOwnedPackages().get(0); Transformation tx = (Transformation) _package.getOwnedClasses().get(0); @@ -101,7 +102,7 @@ public class QVTpModelsMerger { * @param refMapInputTypes a list of the types involved in the mappings of the extending QVTp model */ private static void doMerge(EnvironmentFactory envF, CoreModel resultQVTpModel, CoreModel mergedQVTpModel, Map<Class, List<Mapping>> inputType2RefiningMapping) { - + // Imports Set<Namespace> alreadyImportedNamespaces = new HashSet<Namespace>(); Set<Import> importsToRemove = new HashSet<Import>(); @@ -119,15 +120,15 @@ public class QVTpModelsMerger { resultQVTpModel.getOwnedImports().add(EcoreUtil.copy(_import)); } } - + for (Import _import : importsToRemove) { resultQVTpModel.getOwnedImports().remove(_import); } - - + + Transformation resultTransformation = getTransformation(resultQVTpModel); Transformation mergedTransformation = getTransformation(mergedQVTpModel); - + // TypedModels Map<String, List<Package>> tmName2oldUsedPackages = new HashMap<String, List<Package>>(); for (TypedModel typedModel : mergedTransformation.getModelParameter()) { @@ -138,7 +139,7 @@ public class QVTpModelsMerger { typedModel.getUsedPackage().addAll(tmName2oldUsedPackages.get(typedModel.getName())); tmName2newTypedModel.put(typedModel.getName(), typedModel); } - + // Mapping rules EList<Rule> resultRules = resultTransformation.getRule(); for (Rule rule : mergedTransformation.getRule()) { @@ -146,23 +147,23 @@ public class QVTpModelsMerger { refactorMapping(envF, baseRule, inputType2RefiningMapping, tmName2newTypedModel); resultRules.add(baseRule); } - + } - + private static boolean doesNamespaceCorrespondToMergedQVTpModel(CoreModel mergedQVTpModel, Namespace ns) { - - if (ns instanceof Model && isAnOCLModel(ns)) { + + if (ns instanceof Model && isAnOCLModel(ns)) { URI qvtpModelURI = URI.createURI(mergedQVTpModel.getExternalURI()); assert assertCorrectQVTpModelFileExtenion(qvtpModelURI); URI importedNSURI = URI.createURI(((Model) ns).getExternalURI()); String fileName1 = qvtpModelURI.trimFragment().trimFileExtension().trimFileExtension().lastSegment(); // xxx.qvtp.qvias String fileName2 = importedNSURI.trimFragment().trimFileExtension().trimFileExtension(). lastSegment(); // xxx.ocl or xxx.ocl.oclas - return fileName1.equals(fileName2); + return ClassUtil.nonNullState(fileName1).equals(fileName2); } return false; } - + private static boolean isAnOCLModel(Namespace ns) { URI nsURI = URI.createURI(((Model) ns).getExternalURI()); @@ -179,21 +180,21 @@ public class QVTpModelsMerger { } private static Transformation getTransformation(CoreModel iModel) { - - - for (org.eclipse.ocl.pivot.Package aPackage : iModel.getOwnedPackages()) { - for (org.eclipse.ocl.pivot.Class aClass : aPackage.getOwnedClasses()) { - if (aClass instanceof Transformation) { - return (Transformation) aClass; - } - } - } - + + + for (org.eclipse.ocl.pivot.Package aPackage : iModel.getOwnedPackages()) { + for (org.eclipse.ocl.pivot.Class aClass : aPackage.getOwnedClasses()) { + if (aClass instanceof Transformation) { + return (Transformation) aClass; + } + } + } + throw new IllegalStateException(MessageFormat.format("The QVTd model '{0}' does not have a Transformation element.", iModel.getExternalURI())); } - + private static CoreModel getCoreModel(Resource qvtpResource) { - + for (EObject eContent : qvtpResource.getContents()) { if (eContent instanceof CoreModel) { return (CoreModel) eContent; @@ -201,22 +202,22 @@ public class QVTpModelsMerger { } throw new IllegalStateException(MessageFormat.format("The QVTd model '{0}' does not have an CoreModel element.", qvtpResource.getURI())); } - + private static boolean assertCorrectQVTpModelFileExtenion(URI qvtpModelURI ) { - + assert qvtpModelURI.fileExtension().equals("qvtcas"); assert qvtpModelURI.trimFileExtension().fileExtension().equals("qvtp"); return true; } - + private static void refactorMapping (EnvironmentFactory envF, Mapping mappingToRefactor, Map<Class, List<Mapping>> inputType2extendingMapping, Map<String, TypedModel> tmName2newTypedModel) { - + // TypedModel refactor for (Domain domain : mappingToRefactor.getDomain()) { domain.setTypedModel(tmName2newTypedModel.get(domain.getTypedModel().getName())); } - + Variable inputVar = getInputVariable(mappingToRefactor); Type refinedType = inputVar.getType(); for (Entry<Class, List<Mapping>> mEntry : inputType2extendingMapping.entrySet()) { @@ -228,13 +229,13 @@ public class QVTpModelsMerger { // We check the mapping name, to ensure it's the correct refining mapping String refinedMappingName = mappingToRefactor.getName(); String refiningMappingName = refiningMapping.getName(); - if (refinedMappingName.startsWith("c")){ // if it's a creation mapping + if (refinedMappingName.startsWith("c")){ // if it's a creation mapping if (refiningMappingName.startsWith("c")) { doMappingRefactoring(envF, mappingToRefactor, refiningMapping, inputVar, refiningType); - } + } } else if (refinedMappingName.startsWith("u")) { if (refiningMappingName.startsWith("u")) { - String refinedUMappingFeature = refinedMappingName.split("u.*_")[1]; + String refinedUMappingFeature = refinedMappingName.split("u.*_")[1]; String refiningUMappingFeature = refiningMappingName.split("u.*_")[1]; if (refinedUMappingFeature.equals(refiningUMappingFeature)) { doMappingRefactoring(envF, mappingToRefactor, refiningMapping, inputVar, refiningType); @@ -242,15 +243,15 @@ public class QVTpModelsMerger { } } else { //This point should never be reached given the mapping naming convention introduced in OCL2QVTp. - throw new IllegalStateException("This point should never be reached given the mapping naming convention introduced in OCL2QVTp."); + throw new IllegalStateException("This point should never be reached given the mapping naming convention introduced in OCL2QVTp."); } } } } } - + private static void doMappingRefactoring(EnvironmentFactory envF, Mapping mappingToRefactor, Mapping refiningMapping, Variable inputVar, Class refiningType) { - + // We add the guard Predicate predicate = QVTbaseFactory.eINSTANCE.createPredicate(); predicate.setConditionExpression(createOclIsKindOfOperationCall(envF, inputVar, refiningType)); @@ -258,63 +259,63 @@ public class QVTpModelsMerger { // And set the refinement refiningMapping.setOverrides(mappingToRefactor); } - - private static Variable getInputVariable(Mapping mapping) { + + private static Variable getInputVariable(Mapping mapping) { // In OCL2QVTp the first one is always the input domain with a unique input variable CoreDomain inputDomain = (CoreDomain) mapping.getDomain().get(0); return inputDomain.getGuardPattern().getVariable().get(0); } private static void computeAllSuperClasses(Class aClass, List<Class> allSuperClasses) { - + for (Class superClass : aClass.getSuperClasses()) { if (!allSuperClasses.contains(superClass)) { allSuperClasses.add(superClass); - computeAllSuperClasses(superClass, allSuperClasses); + computeAllSuperClasses(superClass, allSuperClasses); } } } - + private static OCLExpression createOclIsKindOfOperationCall(EnvironmentFactory envF, Variable inputVar, Class refiningType) { - + // oclIsKindOf OperationCallExp OperationCallExp opCallExp = PivotFactory.eINSTANCE.createOperationCallExp(); CompletePackage cPackage = envF.getCompleteModel().getCompletePackage(envF.getStandardLibrary().getPackage()); CompleteClass cClass = cPackage.getCompleteClass(envF.getStandardLibrary().getOclAnyType()); - Operation oclIsKindOfOp = cClass.getOperations(FeatureFilter.SELECT_NON_STATIC, "oclIsKindOf").iterator().next(); - + Operation oclIsKindOfOp = cClass.getOperations(FeatureFilter.SELECT_NON_STATIC, "oclIsKindOf").iterator().next(); + opCallExp.setReferredOperation(oclIsKindOfOp); opCallExp.setName(oclIsKindOfOp.getName()); opCallExp.setType(oclIsKindOfOp.getType()); - + // We set the source - + VariableExp source = PivotFactory.eINSTANCE.createVariableExp(); source.setReferredVariable(inputVar); source.setName(inputVar.getName()); source.setType(inputVar.getType()); opCallExp.setOwnedSource(source); - + // We set the argument TypeExp arg = PivotFactory.eINSTANCE.createTypeExp(); arg.setType(envF.getStandardLibrary().getClassType()); arg.setReferredType(refiningType); opCallExp.getOwnedArguments().add(arg); - + return createNotOperation(envF, opCallExp); } - + private static OperationCallExp createNotOperation(EnvironmentFactory envF, OCLExpression expToNegate) { - + // not OperationCallExp OperationCallExp opCallExp = PivotFactory.eINSTANCE.createOperationCallExp(); CompletePackage cPackage = envF.getCompleteModel().getPrimitiveCompletePackage(); CompleteClass cClass = cPackage.getCompleteClass(envF.getStandardLibrary().getBooleanType()); - Operation oclIsKindOfOp = cClass.getOperations(FeatureFilter.SELECT_NON_STATIC, "not").iterator().next(); - + Operation oclIsKindOfOp = cClass.getOperations(FeatureFilter.SELECT_NON_STATIC, "not").iterator().next(); + opCallExp.setReferredOperation(oclIsKindOfOp); opCallExp.setName(oclIsKindOfOp.getName()); opCallExp.setType(oclIsKindOfOp.getType()); - + // we set the source opCallExp.setOwnedSource(expToNegate); return opCallExp; diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java index 5e7044a9d..ad78e76ee 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java @@ -63,6 +63,7 @@ public class QVTdDebugUIPlugin extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; @@ -72,6 +73,7 @@ public class QVTdDebugUIPlugin extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; if (imageDescriptorRegistry != null) { diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiRetargettableActionAdapterFactory.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiRetargettableActionAdapterFactory.java index ba4cd1390..983c034d7 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiRetargettableActionAdapterFactory.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiRetargettableActionAdapterFactory.java @@ -42,6 +42,7 @@ public class QVTiRetargettableActionAdapterFactory implements IAdapterFactory return null; } + @Override @SuppressWarnings({ "rawtypes", "unchecked" }) public Class[] getAdapterList() { return new Class[] { QVTiToggleBreakpointAdapter.class, QVTiRunToLineAdapter.class }; diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiRunToLineAdapter.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiRunToLineAdapter.java index 726c636fd..2c3fdb6fc 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiRunToLineAdapter.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiRunToLineAdapter.java @@ -19,6 +19,7 @@ import org.eclipse.ui.IWorkbenchPart; public class QVTiRunToLineAdapter extends VMRunToLineAdapter { + @Override public boolean canRunToLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) { return (part instanceof QVTimperativeEditor) && super.canRunToLine(part, selection, target); } diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiToggleBreakpointAdapter.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiToggleBreakpointAdapter.java index 8dc47afa1..7ec92b3d6 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiToggleBreakpointAdapter.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/actions/QVTiToggleBreakpointAdapter.java @@ -19,10 +19,12 @@ import org.eclipse.ui.IWorkbenchPart; public class QVTiToggleBreakpointAdapter extends VMToggleBreakpointAdapter { + @Override public boolean canToggleLineBreakpoints(IWorkbenchPart part, ISelection selection) { return part instanceof QVTimperativeEditor; } + @Override public void toggleLineBreakpoints(final IWorkbenchPart part, ISelection selection) throws CoreException { if (part instanceof QVTimperativeEditor) { super.toggleLineBreakpoints(part, selection);; diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/AbstractMainTab.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/AbstractMainTab.java index 162602f50..a72f1cf44 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/AbstractMainTab.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/AbstractMainTab.java @@ -48,6 +48,7 @@ public abstract class AbstractMainTab extends AbstractLaunchConfigurationTab super.dispose(); } + @Override public @NonNull String getName() { return "Main"; } @@ -82,6 +83,7 @@ public abstract class AbstractMainTab extends AbstractLaunchConfigurationTab } } + @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { IWorkbench workbench = PlatformUI.getWorkbench(); if (workbench != null) { diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/CompileStepRow.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/CompileStepRow.java index a7808fe48..fbb3d2311 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/CompileStepRow.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/CompileStepRow.java @@ -31,6 +31,7 @@ public class CompileStepRow extends ParameterRow // state.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_GREEN)); } + @Override protected void createDerivedButtons() { state = new Label(this, SWT.NONE); state.setText(" Stale "); diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/DirectionalMainTab.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/DirectionalMainTab.java index 097e4ee97..651d73cb1 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/DirectionalMainTab.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/DirectionalMainTab.java @@ -47,6 +47,7 @@ public abstract class DirectionalMainTab extends MainTab implements QVTcLaunchCo protected Combo directionCombo; protected Button viewCheckButton; + @Override protected void createDirectionGroup(Group txGroup) { directionGroup = new Composite(txGroup, SWT.NONE); GridLayout gl_directionGroup = new GridLayout(5, false); 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 6df68ccc2..9413c6ff7 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 @@ -118,6 +118,7 @@ public abstract class MainTab extends AbstractMainTab implements QVTiLaunchConst this.javaURI = javaURI; } + @Override public void compiled(@NonNull String step, @Nullable Object object) { Display.getDefault().asyncExec(new Runnable() { @@ -499,6 +500,7 @@ public abstract class MainTab extends AbstractMainTab implements QVTiLaunchConst protected abstract @NonNull CompilerChain createCompilerChain(@NonNull QVTiEnvironmentFactory environmentFactory, @NonNull URI txURI); + @Override @SuppressWarnings("null") public void createControl(Composite parent) { // System.out.println("createControl-start"); @@ -804,6 +806,7 @@ public abstract class MainTab extends AbstractMainTab implements QVTiLaunchConst return URI.createURI(txName, true).resolve(getProjectURI()); } + @Override public void initializeFrom(ILaunchConfiguration configuration) { // System.out.println("initializeFrom"); assert !initializing; @@ -886,6 +889,7 @@ public abstract class MainTab extends AbstractMainTab implements QVTiLaunchConst return interpretedCheckButton.getSelection(); } + @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { // System.out.println("performApply"); configuration.setAttribute(PROJECT_KEY, getProjectName()); @@ -1006,6 +1010,7 @@ public abstract class MainTab extends AbstractMainTab implements QVTiLaunchConst } } + @Override protected void setDefaults(@NonNull ILaunchConfigurationWorkingCopy configuration, @NonNull IFile iFile) { // System.out.println("setDefaults"); String projectName = iFile.getProject().getName(); diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTcLaunchConfigurationTabGroup.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTcLaunchConfigurationTabGroup.java index 3e8b2aa56..b794d5e52 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTcLaunchConfigurationTabGroup.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTcLaunchConfigurationTabGroup.java @@ -20,6 +20,7 @@ import org.eclipse.debug.ui.ILaunchConfigurationTab; public class QVTcLaunchConfigurationTabGroup extends LaunchConfigurationTabGroup { + @Override public void createTabs(ILaunchConfigurationDialog dialog, String mode) { List<ILaunchConfigurationTab> tabList = new ArrayList<ILaunchConfigurationTab>(); tabList.add(new QVTcMainTab()); diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiLaunchConfigurationTabGroup.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiLaunchConfigurationTabGroup.java index fe4206304..4d7661ea0 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiLaunchConfigurationTabGroup.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiLaunchConfigurationTabGroup.java @@ -20,6 +20,7 @@ import org.eclipse.debug.ui.ILaunchConfigurationTab; public class QVTiLaunchConfigurationTabGroup extends LaunchConfigurationTabGroup { + @Override public void createTabs(ILaunchConfigurationDialog dialog, String mode) { List<ILaunchConfigurationTab> tabList = new ArrayList<ILaunchConfigurationTab>(); tabList.add(new QVTiMainTab()); diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiMainTab.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiMainTab.java index 1e25717d8..51b6d6580 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiMainTab.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiMainTab.java @@ -48,6 +48,7 @@ public class QVTiMainTab extends MainTab implements QVTiLaunchConstants return new QVTiCompilerChain(environmentFactory, txURI, null); } + @Override protected void createDirectionGroup(Group txGroup) {} @Override diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTrLaunchConfigurationTabGroup.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTrLaunchConfigurationTabGroup.java index 48e08fd08..374ba7c69 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTrLaunchConfigurationTabGroup.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTrLaunchConfigurationTabGroup.java @@ -20,6 +20,7 @@ import org.eclipse.debug.ui.ILaunchConfigurationTab; public class QVTrLaunchConfigurationTabGroup extends LaunchConfigurationTabGroup { + @Override public void createTabs(ILaunchConfigurationDialog dialog, String mode) { List<ILaunchConfigurationTab> tabList = new ArrayList<ILaunchConfigurationTab>(); tabList.add(new QVTrMainTab()); diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/pages/QVTiDebugModelPresentation.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/pages/QVTiDebugModelPresentation.java index 407b4498b..92da360f8 100644 --- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/pages/QVTiDebugModelPresentation.java +++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/pages/QVTiDebugModelPresentation.java @@ -30,7 +30,8 @@ import org.eclipse.ui.IEditorInput; public class QVTiDebugModelPresentation extends VMDebugModelPresentation { - public Image getImage(Object element) { // FIXME Inherit most of this + @Override + public Image getImage(Object element) { // FIXME Inherit most of this if (element instanceof VMDebugTarget) { return QVTiDebugImages.getImage(QVTiDebugImages.TRANSFORMATION); } @@ -125,6 +126,7 @@ public class QVTiDebugModelPresentation extends VMDebugModelPresentation return null; } */ + @Override public String getEditorId(IEditorInput input, Object element) { if (element instanceof IFile || element instanceof ILineBreakpoint) { return QVTimperativeEditor.EDITOR_ID; diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/QVTiDebugPlugin.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/QVTiDebugPlugin.java index 48a5ce0c6..60b5201b4 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/QVTiDebugPlugin.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/QVTiDebugPlugin.java @@ -36,11 +36,13 @@ public class QVTiDebugPlugin extends Plugin return new Status(IStatus.ERROR, PLUGIN_ID, 0, message, e); } + @Override public void start(BundleContext bundleContext) throws Exception { super.start(bundleContext); plugin = this; } + @Override public void stop(BundleContext bundleContext) throws Exception { plugin = null; super.stop(bundleContext); diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiDebugCore.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiDebugCore.java index 2b42fd8b8..bb272f3b9 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiDebugCore.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiDebugCore.java @@ -46,39 +46,48 @@ public class QVTiDebugCore extends VMDebugCore private QVTiDebugCore() {} + @Override public @NonNull String getBreakpointMarkerId() { return BREAKPOINT_MARKER_ID; } + @Override public @NonNull String getDebuggerActiveProperty() { return DEBUGGER_ACTIVE_PROPERTY; } + @Override public @NonNull List<QVTiLineBreakpoint> getLineBreakpoints() { return getOCLBreakpoints(QVTiLineBreakpoint.class); } + @Override public @NonNull EssentialOCLLocationInFileProvider getLocationInFileProvider() { return locationInFileProvider; } - public @Nullable ILog getLog() { + @Override + public @Nullable ILog getLog() { QVTiDebugPlugin debugPlugin = QVTiDebugPlugin.getDefault(); return debugPlugin != null ? debugPlugin.getLog() : null; } + @Override public @NonNull String getModelId() { return MODEL_ID; } + @Override public @NonNull String getPluginId() { return PLUGIN_ID; } + @Override public @NonNull Trace getTrace() { return TRACE; } + @Override public @NonNull String getVMThreadName() { return "QVTi VM"; } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiDebugTarget.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiDebugTarget.java index 241969c03..40bc5eb3c 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiDebugTarget.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiDebugTarget.java @@ -21,10 +21,12 @@ public class QVTiDebugTarget extends VMDebugTarget super(process, vm); } + @Override public @NonNull QVTiDebugCore getDebugCore() { return QVTiDebugCore.INSTANCE; } + @Override public @NonNull String getModelIdentifier() { return getDebugCore().getModelId(); } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiEvaluationContext.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiEvaluationContext.java index ada20b1c0..3f8e396b4 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiEvaluationContext.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiEvaluationContext.java @@ -35,6 +35,7 @@ public class QVTiEvaluationContext extends EvaluationContext this.outputURIs = outputURIs; } + @Override public @NonNull URI getDebuggableURI() { return transformationURI; } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiLineBreakpoint.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiLineBreakpoint.java index 146bbc31a..8060e45ed 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiLineBreakpoint.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiLineBreakpoint.java @@ -48,6 +48,7 @@ public class QVTiLineBreakpoint extends VMLineBreakpoint super(sourceURI, lineNumber, isRunToLine); } + @Override protected @NonNull QVTiDebugCore getDebugCore() { return QVTiDebugCore.INSTANCE; } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiVirtualProcess.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiVirtualProcess.java index d65e7bb15..069ecd31b 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiVirtualProcess.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/core/QVTiVirtualProcess.java @@ -25,6 +25,7 @@ public class QVTiVirtualProcess extends VMVirtualProcess super(launch, vm); } + @Override public @NonNull String getLabel() { String transformationURI = null; ILaunchConfiguration configuration = fLaunch.getLaunchConfiguration(); diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationEnvironment.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationEnvironment.java index 4e8472371..0a9b055f7 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationEnvironment.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationEnvironment.java @@ -22,11 +22,18 @@ import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiEvaluationEnvironment public interface QVTiVMEvaluationEnvironment extends QVTiEvaluationEnvironment, VMEvaluationEnvironment { @NonNull QVTiVMEvaluationEnvironment createClonedEvaluationEnvironment(); + @Override @NonNull Element getCurrentIP(); + @Override @NonNull UnitLocation getCurrentLocation(); + @Override @Nullable QVTiVMEvaluationEnvironment getVMParentEvaluationEnvironment(); + @Override @NonNull QVTiVMRootEvaluationEnvironment getVMRootEvaluationEnvironment(); + @Override void processDeferredTasks(); + @Override @NonNull Element setCurrentIP(@NonNull Element element); + @Override void throwVMException(@NonNull VMRuntimeException qvtInterruptedExecutionException); } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationStepper.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationStepper.java index f4d5acb9d..09e0abdc6 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationStepper.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationStepper.java @@ -27,14 +27,17 @@ public class QVTiVMEvaluationStepper extends AbstractVMEvaluationStepper super(evaluationVisitor, vmContext, QVTiStepperVisitor.INSTANCE); } + @Override protected @NonNull VMStackFrameData @NonNull [] createStackFrame() { return QVTiVMVirtualMachine.createStackFrame(getLocationStack()); } - protected void log(IStatus status) { + @Override + protected void log(IStatus status) { QVTiDebugCore.INSTANCE.log(status); } + @Override protected void trace(String option, String message) { QVTiDebugCore.TRACE.trace(option, message); } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationVisitor.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationVisitor.java index e5f4c4d87..4b2659163 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationVisitor.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMEvaluationVisitor.java @@ -81,10 +81,12 @@ public class QVTiVMEvaluationVisitor extends AbstractMergedQVTimperativeVisitor< return context.getDiagnosticSeverity(severityPreference, resultValue); } + @Override public @NonNull QVTiEnvironmentFactory getEnvironmentFactory() { return (QVTiEnvironmentFactory) context.getEnvironmentFactory(); } + @Override public @NonNull EvaluationEnvironment getEvaluationEnvironment() { return context.getEvaluationEnvironment(); } @@ -129,6 +131,7 @@ public class QVTiVMEvaluationVisitor extends AbstractMergedQVTimperativeVisitor< return context.getModelManager(); } + @Override public @Nullable Monitor getMonitor() { return context.getMonitor(); } @@ -183,6 +186,7 @@ public class QVTiVMEvaluationVisitor extends AbstractMergedQVTimperativeVisitor< return (VMEvaluationEnvironment) context.getEvaluationEnvironment(); } + @Override public @NonNull VMEvaluationStepper getVMEvaluationStepper() { return vmEvaluationStepper; } @@ -204,6 +208,7 @@ public class QVTiVMEvaluationVisitor extends AbstractMergedQVTimperativeVisitor< context.setLogger(logger); } + @Override public void setMonitor(@Nullable Monitor monitor) { context.setMonitor(monitor); } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMExecutor.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMExecutor.java index cc37d08e9..bcabcb830 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMExecutor.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMExecutor.java @@ -56,6 +56,7 @@ public class QVTiVMExecutor extends BasicQVTiExecutor implements VMExecutor return new QVTiVMRootEvaluationEnvironment(this, (Transformation)executableObject, ++envId); } + @Override protected Boolean executeInternal() { QVTiVMEvaluationVisitor visitor = (QVTiVMEvaluationVisitor) getEvaluationVisitor(); VMEvaluationStepper vmStepper = visitor.getVMEvaluationStepper(); diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMNestedEvaluationEnvironment.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMNestedEvaluationEnvironment.java index da0c476f6..fe87c037e 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMNestedEvaluationEnvironment.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMNestedEvaluationEnvironment.java @@ -61,6 +61,7 @@ public class QVTiVMNestedEvaluationEnvironment extends QVTiNestedEvaluationEnvir return myCurrentIP; } + @Override public @NonNull UnitLocation getCurrentLocation() { // if (myCurrentIP == null) { // return null; @@ -72,10 +73,12 @@ public class QVTiVMNestedEvaluationEnvironment extends QVTiNestedEvaluationEnvir // } } + @Override public @NonNull VMDebugCore getDebugCore() { return getVMRootEvaluationEnvironment().getDebugCore(); } + @Override public @NonNull Transformation getDebuggableElement() { return getVMRootEvaluationEnvironment().getDebuggableElement(); } @@ -120,14 +123,17 @@ public class QVTiVMNestedEvaluationEnvironment extends QVTiNestedEvaluationEnvir return stepperStack; } + @Override public boolean isDeferredExecution() { return getVMRootEvaluationEnvironment().isDeferredExecution(); } - public void processDeferredTasks() { + @Override + public void processDeferredTasks() { getVMRootEvaluationEnvironment().processDeferredTasks(); } + @Override public @NonNull Element setCurrentIP(@NonNull Element element) { Element prevValue = myCurrentIP; myCurrentIP = element; @@ -139,6 +145,7 @@ public class QVTiVMNestedEvaluationEnvironment extends QVTiNestedEvaluationEnvir this.myOperation = operation; } + @Override public void throwVMException(@NonNull VMRuntimeException exception) throws VMRuntimeException { try { getVMRootEvaluationEnvironment().saveThrownException(exception); diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMRootEvaluationEnvironment.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMRootEvaluationEnvironment.java index cd14066a3..772a39153 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMRootEvaluationEnvironment.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/evaluator/QVTiVMRootEvaluationEnvironment.java @@ -77,6 +77,7 @@ public class QVTiVMRootEvaluationEnvironment extends QVTiRootEvaluationEnvironme return myCurrentIP; } + @Override public @NonNull UnitLocation getCurrentLocation() { // if (myCurrentIP == null) { // return null; @@ -88,6 +89,7 @@ public class QVTiVMRootEvaluationEnvironment extends QVTiRootEvaluationEnvironme // } } + @Override public @NonNull QVTiDebugCore getDebugCore() { return QVTiDebugCore.INSTANCE; } @@ -169,6 +171,7 @@ public class QVTiVMRootEvaluationEnvironment extends QVTiRootEvaluationEnvironme // myException = exception; } + @Override public @NonNull Element setCurrentIP(@NonNull Element element) { Element prevValue = myCurrentIP; myCurrentIP = element; @@ -179,6 +182,7 @@ public class QVTiVMRootEvaluationEnvironment extends QVTiRootEvaluationEnvironme saveThrownException(exception); } + @Override public void throwVMException(@NonNull VMRuntimeException exception) throws VMRuntimeException { try { saveThrownException(exception); diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTcLaunchConfigurationDelegate.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTcLaunchConfigurationDelegate.java index 4dbf2997d..dfdf18b6c 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTcLaunchConfigurationDelegate.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTcLaunchConfigurationDelegate.java @@ -88,14 +88,17 @@ public class QVTcLaunchConfigurationDelegate extends QVTiLaunchConfigurationDele return super.buildForLaunch(configuration, mode, monitor); // FIXME override with the progress monitor } + @Override protected @NonNull QVTiExecutor createExecutor(@NonNull QVTiEnvironmentFactory envFactory, @NonNull Transformation transformation) { return new BasicQVTcExecutor(envFactory, transformation); } + @Override protected @NonNull QVTiDebugCore getDebugCore() { return QVTiDebugCore.INSTANCE; // FIXME QVTcDebugCore with back-traceability } + @Override protected @NonNull URI getTransformationURI(final ILaunchConfiguration configuration) throws CoreException { Map<String, String> intermediatesMap = configuration.getAttribute(INTERMEDIATES_KEY, EMPTY_MAP); String qvtiName = intermediatesMap.get(CompilerChain.QVTI_STEP); diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiDebuggableRunnerFactory.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiDebuggableRunnerFactory.java index 7cad367ed..c1304353a 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiDebuggableRunnerFactory.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiDebuggableRunnerFactory.java @@ -37,6 +37,7 @@ public class QVTiDebuggableRunnerFactory extends DebuggableRunnerFactory super(packageRegistry, modelURIs, traceFileURI); } + @Override public @NonNull DebuggableRunner createRunner(@NonNull EvaluationContext evaluationContext) throws DiagnosticException { QVTiEvaluationContext qvtiEvaluationContext = (QVTiEvaluationContext)evaluationContext; @SuppressWarnings("unused") BasicDiagnostic diagnostic = createDiagnostic("Transformation runner problems"); @@ -78,6 +79,7 @@ public class QVTiDebuggableRunnerFactory extends DebuggableRunnerFactory return runner; } + @Override protected @NonNull String getPluginId() { return QVTiDebugPlugin.PLUGIN_ID; } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiInternalDebuggableExecutor.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiInternalDebuggableExecutor.java index 19f3c7c91..988f53e1d 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiInternalDebuggableExecutor.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiInternalDebuggableExecutor.java @@ -35,6 +35,7 @@ public class QVTiInternalDebuggableExecutor extends InternalDebuggableExecutor this.evaluationContext = evaluationContext; } + @Override protected @NonNull QVTiVMExecutor createVMExecutor() throws IOException { QVTiVMExecutor vmExecutor = new QVTiVMExecutor(vmContext, evaluationContext.getTransformationURI()); for (Map.Entry<String, URI> inEntry : evaluationContext.getInputURIs().entrySet()) { diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiLaunchConfigurationDelegate.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiLaunchConfigurationDelegate.java index 6453cb21b..0296d3d3c 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiLaunchConfigurationDelegate.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiLaunchConfigurationDelegate.java @@ -64,6 +64,7 @@ public class QVTiLaunchConfigurationDelegate extends LaunchConfigurationDelegate } // FIXME - do refactoring of this area + @Override public void launch(final ILaunchConfiguration configuration, String mode, final ILaunch launch, IProgressMonitor monitor) throws CoreException { try { @@ -78,7 +79,8 @@ public class QVTiLaunchConfigurationDelegate extends LaunchConfigurationDelegate ShallowProcess.IRunnable r = new ShallowProcess.IRunnable() { - public void run() throws Exception { + @Override + public void run() throws Exception { QVTiEnvironmentFactory environmentFactory = new QVTiEnvironmentFactory(BasicProjectManager.createDefaultProjectManager(), null); if (traceEvaluation) { environmentFactory.setEvaluationTracingEnabled(true); @@ -150,7 +152,8 @@ public class QVTiLaunchConfigurationDelegate extends LaunchConfigurationDelegate process.setStreamsProxy(streamsProxy); Thread processThread = new Thread(new Runnable() { - public void run() { + @Override + public void run() { try { process.run(); } catch (Exception e) { diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiVMLaunchConfigurationDelegate.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiVMLaunchConfigurationDelegate.java index 2209545ec..80570b08e 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiVMLaunchConfigurationDelegate.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTiVMLaunchConfigurationDelegate.java @@ -39,15 +39,18 @@ public class QVTiVMLaunchConfigurationDelegate extends VMLaunchConfigurationDele { public static final IStatus MODIFIED_SOURCE_STATUS = QVTiDebugCore.INSTANCE.createError("", 300, null); //$NON-NLS-1$ + @Override protected @NonNull QVTiDebugTarget createDebugTarget(@NonNull IVMVirtualMachineShell vm, @NonNull VMVirtualProcess process) { return new QVTiDebugTarget(process, vm); } + @Override protected @NonNull DebuggableRunnerFactory createDebuggableRunnerFactory(EPackage.@NonNull Registry packageRegistry, @NonNull List<String> modelURIs, @Nullable String traceURI) { return new QVTiDebuggableRunnerFactory(packageRegistry, modelURIs, null); } + @Override protected @NonNull QVTiEvaluationContext createEvaluationContext(@NonNull ILaunchConfiguration configuration) throws CoreException { String projectName = configuration.getAttribute(PROJECT_KEY, ""); String txName = configuration.getAttribute(TX_KEY, ""); @@ -65,10 +68,12 @@ public class QVTiVMLaunchConfigurationDelegate extends VMLaunchConfigurationDele return new QVTiEvaluationContext(txURI, inURIMap, outURIMap); } + @Override protected @NonNull QVTiVMVirtualMachine createVirtualMachine(@NonNull QVTiEvaluationContext evaluationContext, @NonNull DebuggableRunner runner) { return new QVTiVMVirtualMachine(runner, evaluationContext); } + @Override protected @NonNull QVTiVirtualProcess createVirtualProcess(@NonNull ILaunch launch, @NonNull IVMVirtualMachineShell vm) { return new QVTiVirtualProcess(launch, vm); } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTrLaunchConfigurationDelegate.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTrLaunchConfigurationDelegate.java index b22cb8883..43290bf53 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTrLaunchConfigurationDelegate.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTrLaunchConfigurationDelegate.java @@ -90,14 +90,17 @@ public class QVTrLaunchConfigurationDelegate extends QVTiLaunchConfigurationDele return super.buildForLaunch(configuration, mode, monitor); // FIXME override with the progress monitor } + @Override protected @NonNull QVTiExecutor createExecutor(@NonNull QVTiEnvironmentFactory envFactory, @NonNull Transformation transformation) { return new BasicQVTrExecutor(envFactory, transformation); } + @Override protected @NonNull QVTiDebugCore getDebugCore() { return QVTiDebugCore.INSTANCE; // FIXME QVTrDebugCore with back-traceability } + @Override protected @NonNull URI getTransformationURI(final ILaunchConfiguration configuration) throws CoreException { Map<String, String> intermediatesMap = configuration.getAttribute(INTERMEDIATES_KEY, EMPTY_MAP); String qvtiName = intermediatesMap.get(CompilerChain.QVTI_STEP); diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/srclookup/QVTiSourcePathComputer.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/srclookup/QVTiSourcePathComputer.java index a1b220877..e37dbf30f 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/srclookup/QVTiSourcePathComputer.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/srclookup/QVTiSourcePathComputer.java @@ -22,10 +22,12 @@ public class QVTiSourcePathComputer extends VMSourcePathComputer { public static final @NonNull String ID = "org.eclipse.qvtd.debug.srclookup.QVTiSourcePathComputer"; //$NON-NLS-1$ + @Override public @NonNull String getId() { return ID; } + @Override protected URI getModuleFile(@NonNull ILaunchConfiguration configuration) throws CoreException { // String moduleFileName = configuration.getAttribute(LaunchConstants.MODULE, ""); //$NON-NLS-1$ String projectName = configuration.getAttribute(QVTiLaunchConstants.PROJECT_KEY, (String)null); diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTbaseStepperVisitor.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTbaseStepperVisitor.java index 87074a27e..927a1f0b0 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTbaseStepperVisitor.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTbaseStepperVisitor.java @@ -36,38 +36,47 @@ public abstract class AbstractQVTbaseStepperVisitor super(context); } + @Override public @Nullable IStepper visitBaseModel(org.eclipse.qvtd.pivot.qvtbase.@NonNull BaseModel object) { return visitModel(object); } + @Override public @Nullable IStepper visitDomain(org.eclipse.qvtd.pivot.qvtbase.@NonNull Domain object) { return visitNamedElement(object); } + @Override public @Nullable IStepper visitFunction(org.eclipse.qvtd.pivot.qvtbase.@NonNull Function object) { return visitOperation(object); } + @Override public @Nullable IStepper visitFunctionParameter(org.eclipse.qvtd.pivot.qvtbase.@NonNull FunctionParameter object) { return visitParameter(object); } + @Override public @Nullable IStepper visitPattern(org.eclipse.qvtd.pivot.qvtbase.@NonNull Pattern object) { return visitElement(object); } + @Override public @Nullable IStepper visitPredicate(org.eclipse.qvtd.pivot.qvtbase.@NonNull Predicate object) { return visitElement(object); } + @Override public @Nullable IStepper visitRule(org.eclipse.qvtd.pivot.qvtbase.@NonNull Rule object) { return visitNamedElement(object); } + @Override public @Nullable IStepper visitTransformation(org.eclipse.qvtd.pivot.qvtbase.@NonNull Transformation object) { return visitClass(object); } + @Override public @Nullable IStepper visitTypedModel(org.eclipse.qvtd.pivot.qvtbase.@NonNull TypedModel object) { return visitNamedElement(object); } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTcoreBaseStepperVisitor.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTcoreBaseStepperVisitor.java index 281739397..db1098d6c 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTcoreBaseStepperVisitor.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/AbstractQVTcoreBaseStepperVisitor.java @@ -35,46 +35,57 @@ public abstract class AbstractQVTcoreBaseStepperVisitor super(context); } + @Override public @Nullable IStepper visitAssignment(org.eclipse.qvtd.pivot.qvtcorebase.@NonNull Assignment object) { return visitElement(object); } + @Override public @Nullable IStepper visitBottomPattern(org.eclipse.qvtd.pivot.qvtcorebase.@NonNull BottomPattern object) { return visitCorePattern(object); } + @Override public @Nullable IStepper visitCoreDomain(org.eclipse.qvtd.pivot.qvtcorebase.@NonNull CoreDomain object) { return visitDomain(object); } + @Override public @Nullable IStepper visitCorePattern(org.eclipse.qvtd.pivot.qvtcorebase.@NonNull CorePattern object) { return visitPattern(object); } + @Override public @Nullable IStepper visitEnforcementOperation(org.eclipse.qvtd.pivot.qvtcorebase.@NonNull EnforcementOperation object) { return visitElement(object); } + @Override public @Nullable IStepper visitGuardPattern(org.eclipse.qvtd.pivot.qvtcorebase.@NonNull GuardPattern object) { return visitCorePattern(object); } + @Override public @Nullable IStepper visitNavigationAssignment(org.eclipse.qvtd.pivot.qvtcorebase.@NonNull NavigationAssignment object) { return visitAssignment(object); } + @Override public @Nullable IStepper visitOppositePropertyAssignment(org.eclipse.qvtd.pivot.qvtcorebase.@NonNull OppositePropertyAssignment object) { return visitNavigationAssignment(object); } + @Override public @Nullable IStepper visitPropertyAssignment(org.eclipse.qvtd.pivot.qvtcorebase.@NonNull PropertyAssignment object) { return visitNavigationAssignment(object); } + @Override public @Nullable IStepper visitRealizedVariable(org.eclipse.qvtd.pivot.qvtcorebase.@NonNull RealizedVariable object) { return visitVariable(object); } + @Override public @Nullable IStepper visitVariableAssignment(org.eclipse.qvtd.pivot.qvtcorebase.@NonNull VariableAssignment object) { return visitAssignment(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 5a4f98cc4..62a0e19c8 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 @@ -35,22 +35,27 @@ public abstract class AbstractQVTimperativeStepperVisitor super(context); } + @Override public @Nullable IStepper visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) { return visitBaseModel(object); } + @Override public @Nullable IStepper visitMapping(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Mapping object) { return visitRule(object); } + @Override public @Nullable IStepper visitMappingCall(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCall object) { return visitOCLExpression(object); } + @Override public @Nullable IStepper visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) { return visitElement(object); } + @Override public @Nullable IStepper visitVariablePredicate(org.eclipse.qvtd.pivot.qvtimperative.@NonNull VariablePredicate object) { return visitPredicate(object); } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/QVTiStepperVisitor.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/QVTiStepperVisitor.java index cab88f1c9..9c1d29291 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/QVTiStepperVisitor.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/stepper/QVTiStepperVisitor.java @@ -53,10 +53,12 @@ public class QVTiStepperVisitor extends AbstractQVTimperativeStepperVisitor return NonStepper.INSTANCE; } + @Override public @Nullable IStepper visitConnectionAssignment(@NonNull ConnectionAssignment object) { return visitAssignment(object); } + @Override public @Nullable IStepper visitConnectionStatement(@NonNull ConnectionStatement object) { return visitMappingStatement(object); } @@ -106,6 +108,7 @@ public class QVTiStepperVisitor extends AbstractQVTimperativeStepperVisitor return PreStepper.INSTANCE; } + @Override public @Nullable IStepper visitMappingSequence(@NonNull MappingSequence object) { return NonStepper.INSTANCE; } diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/vm/QVTiVMVirtualMachine.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/vm/QVTiVMVirtualMachine.java index 2e78f2e91..220e517b1 100644 --- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/vm/QVTiVMVirtualMachine.java +++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/vm/QVTiVMVirtualMachine.java @@ -145,6 +145,7 @@ public class QVTiVMVirtualMachine extends VMVirtualMachine return varsArray; } + @Override public VMStackFrameData createStackFrame(@NonNull UnitLocation location) { return createStackFrame(location, true); } diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/Schedule.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/Schedule.java index 346aaf6bc..9b3e87c2b 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/Schedule.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/Schedule.java @@ -76,6 +76,7 @@ public interface Schedule extends ScheduleElement { * @generated */ // Generated from org.eclipse.ocl.examples.build/templates/model/Class/insert.javajetinc + @Override public <R> R accept(@NonNull ScheduleVisitor<R> visitor); } // Schedule diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/AbstractActionImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/AbstractActionImpl.java index 05b4a6fcd..be6f9bf03 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/AbstractActionImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/AbstractActionImpl.java @@ -168,6 +168,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public EList<AbstractDatum> getProductions() { if (productions == null) { productions = new EObjectWithInverseResolvingEList.ManyInverse<AbstractDatum>(AbstractDatum.class, this, SchedulePackage.ABSTRACT_ACTION__PRODUCTIONS, SchedulePackage.ABSTRACT_DATUM__PRODUCED_BY); @@ -180,6 +181,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public EList<AbstractDatum> getRequisites() { if (requisites == null) { requisites = new EObjectWithInverseResolvingEList.ManyInverse<AbstractDatum>(AbstractDatum.class, this, SchedulePackage.ABSTRACT_ACTION__REQUISITES, SchedulePackage.ABSTRACT_DATUM__REQUIRED_BY); @@ -192,6 +194,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public EList<ParameterDerivation> getParameterDerivations() { if (parameterDerivations == null) { parameterDerivations = new EObjectContainmentWithInverseEList<ParameterDerivation>(ParameterDerivation.class, this, SchedulePackage.ABSTRACT_ACTION__PARAMETER_DERIVATIONS, SchedulePackage.PARAMETER_DERIVATION__TARGET); @@ -204,6 +207,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public int getOrder() { return order; } @@ -213,6 +217,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public void setOrder(int newOrder) { int oldOrder = order; order = newOrder; @@ -225,6 +230,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public AbstractAction getParent() { if (parent != null && parent.eIsProxy()) { InternalEObject oldParent = (InternalEObject)parent; @@ -266,6 +272,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public void setParent(AbstractAction newParent) { if (newParent != parent) { NotificationChain msgs = null; @@ -285,6 +292,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public EList<AbstractAction> getChildren() { if (children == null) { children = new EObjectWithInverseResolvingEList<AbstractAction>(AbstractAction.class, this, SchedulePackage.ABSTRACT_ACTION__CHILDREN, SchedulePackage.ABSTRACT_ACTION__PARENT); @@ -297,6 +305,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public EList<DataParameter> getParameters() { if (parameters == null) { parameters = new EObjectContainmentEList<DataParameter>(DataParameter.class, this, SchedulePackage.ABSTRACT_ACTION__PARAMETERS); @@ -309,6 +318,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public EList<DataParameter> getResults() { if (results == null) { results = new EObjectContainmentEList<DataParameter>(DataParameter.class, this, SchedulePackage.ABSTRACT_ACTION__RESULTS); @@ -321,6 +331,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public Schedule getSchedule() { if (eContainerFeatureID() != SchedulePackage.ABSTRACT_ACTION__SCHEDULE) return null; return (Schedule)eInternalContainer(); @@ -341,6 +352,7 @@ public abstract class AbstractActionImpl extends ScheduleElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public void setSchedule(Schedule newSchedule) { if (newSchedule != eInternalContainer() || (eContainerFeatureID() != SchedulePackage.ABSTRACT_ACTION__SCHEDULE && newSchedule != null)) { if (EcoreUtil.isAncestor(this, newSchedule)) diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/AbstractDatumImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/AbstractDatumImpl.java index 35f79d852..3daabb98e 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/AbstractDatumImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/AbstractDatumImpl.java @@ -146,6 +146,7 @@ public abstract class AbstractDatumImpl extends ScheduleElementImpl implements A * <!-- end-user-doc --> * @generated */ + @Override public EList<AbstractDatum> getSuper() { if (super_ == null) { super_ = new EObjectWithInverseResolvingEList.ManyInverse<AbstractDatum>(AbstractDatum.class, this, SchedulePackage.ABSTRACT_DATUM__SUPER, SchedulePackage.ABSTRACT_DATUM__SUB); @@ -158,6 +159,7 @@ public abstract class AbstractDatumImpl extends ScheduleElementImpl implements A * <!-- end-user-doc --> * @generated */ + @Override public EList<AbstractDatum> getSub() { if (sub == null) { sub = new EObjectWithInverseResolvingEList.ManyInverse<AbstractDatum>(AbstractDatum.class, this, SchedulePackage.ABSTRACT_DATUM__SUB, SchedulePackage.ABSTRACT_DATUM__SUPER); @@ -181,6 +183,7 @@ public abstract class AbstractDatumImpl extends ScheduleElementImpl implements A } return domain; } + @Override public CoreDomain getDomain() { // FIXME Eliminate domain altogether CoreDomain domainGen = getDomainGen(); TypedModel typedModel2 = getTypedModel(); @@ -213,6 +216,7 @@ public abstract class AbstractDatumImpl extends ScheduleElementImpl implements A if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, SchedulePackage.ABSTRACT_DATUM__DOMAIN, oldDomain, domain)); } + @Override public void setDomain(CoreDomain newDomain) { setDomainGen(newDomain); setTypedModel(newDomain != null ? newDomain.getTypedModel() : null); @@ -223,6 +227,7 @@ public abstract class AbstractDatumImpl extends ScheduleElementImpl implements A * <!-- end-user-doc --> * @generated */ + @Override public TypedModel getTypedModel() { if (typedModel != null && typedModel.eIsProxy()) { InternalEObject oldTypedModel = (InternalEObject)typedModel; @@ -249,6 +254,7 @@ public abstract class AbstractDatumImpl extends ScheduleElementImpl implements A * <!-- end-user-doc --> * @generated */ + @Override public void setTypedModel(TypedModel newTypedModel) { TypedModel oldTypedModel = typedModel; typedModel = newTypedModel; @@ -261,6 +267,7 @@ public abstract class AbstractDatumImpl extends ScheduleElementImpl implements A * <!-- end-user-doc --> * @generated */ + @Override public EList<AbstractAction> getProducedBy() { if (producedBy == null) { producedBy = new EObjectWithInverseResolvingEList.ManyInverse<AbstractAction>(AbstractAction.class, this, SchedulePackage.ABSTRACT_DATUM__PRODUCED_BY, SchedulePackage.ABSTRACT_ACTION__PRODUCTIONS); @@ -273,6 +280,7 @@ public abstract class AbstractDatumImpl extends ScheduleElementImpl implements A * <!-- end-user-doc --> * @generated */ + @Override public EList<AbstractAction> getRequiredBy() { if (requiredBy == null) { requiredBy = new EObjectWithInverseResolvingEList.ManyInverse<AbstractAction>(AbstractAction.class, this, SchedulePackage.ABSTRACT_DATUM__REQUIRED_BY, SchedulePackage.ABSTRACT_ACTION__REQUISITES); @@ -285,6 +293,7 @@ public abstract class AbstractDatumImpl extends ScheduleElementImpl implements A * <!-- end-user-doc --> * @generated */ + @Override public Schedule getSchedule() { if (eContainerFeatureID() != SchedulePackage.ABSTRACT_DATUM__SCHEDULE) return null; return (Schedule)eInternalContainer(); @@ -305,6 +314,7 @@ public abstract class AbstractDatumImpl extends ScheduleElementImpl implements A * <!-- end-user-doc --> * @generated */ + @Override public void setSchedule(Schedule newSchedule) { if (newSchedule != eInternalContainer() || (eContainerFeatureID() != SchedulePackage.ABSTRACT_DATUM__SCHEDULE && newSchedule != null)) { if (EcoreUtil.isAncestor(this, newSchedule)) @@ -326,6 +336,7 @@ public abstract class AbstractDatumImpl extends ScheduleElementImpl implements A * <!-- end-user-doc --> * @generated */ + @Override public EList<DataParameter> getDataParameter() { if (dataParameter == null) { dataParameter = new EObjectWithInverseResolvingEList<DataParameter>(DataParameter.class, this, SchedulePackage.ABSTRACT_DATUM__DATA_PARAMETER, SchedulePackage.DATA_PARAMETER__DATUM); diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ClassDatumImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ClassDatumImpl.java index 8e644dc8a..5fa47b41a 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ClassDatumImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ClassDatumImpl.java @@ -87,6 +87,7 @@ public class ClassDatumImpl extends AbstractDatumImpl implements ClassDatum { * <!-- end-user-doc --> * @generated */ + @Override public org.eclipse.ocl.pivot.Class getType() { if (type != null && type.eIsProxy()) { InternalEObject oldType = (InternalEObject)type; @@ -113,6 +114,7 @@ public class ClassDatumImpl extends AbstractDatumImpl implements ClassDatum { * <!-- end-user-doc --> * @generated */ + @Override public void setType(org.eclipse.ocl.pivot.Class newType) { org.eclipse.ocl.pivot.Class oldType = type; type = newType; @@ -125,6 +127,7 @@ public class ClassDatumImpl extends AbstractDatumImpl implements ClassDatum { * <!-- end-user-doc --> * @generated */ + @Override public EList<PropertyDatum> getPropertyDatums() { if (propertyDatums == null) { propertyDatums = new EObjectContainmentWithInverseEList<PropertyDatum>(PropertyDatum.class, this, SchedulePackage.CLASS_DATUM__PROPERTY_DATUMS, SchedulePackage.PROPERTY_DATUM__CLASS_DATUM); diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/DataParameterImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/DataParameterImpl.java index f79ff7a48..47c500b04 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/DataParameterImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/DataParameterImpl.java @@ -95,6 +95,7 @@ public class DataParameterImpl extends ScheduleElementImpl implements DataParame * <!-- end-user-doc --> * @generated */ + @Override public Variable getVariable() { if (variable != null && variable.eIsProxy()) { InternalEObject oldVariable = (InternalEObject)variable; @@ -121,6 +122,7 @@ public class DataParameterImpl extends ScheduleElementImpl implements DataParame * <!-- end-user-doc --> * @generated */ + @Override public void setVariable(Variable newVariable) { Variable oldVariable = variable; variable = newVariable; @@ -133,6 +135,7 @@ public class DataParameterImpl extends ScheduleElementImpl implements DataParame * <!-- end-user-doc --> * @generated */ + @Override public SecondaryParameter getSecondaryParameter() { if (secondaryParameter != null && secondaryParameter.eIsProxy()) { InternalEObject oldSecondaryParameter = (InternalEObject)secondaryParameter; @@ -174,6 +177,7 @@ public class DataParameterImpl extends ScheduleElementImpl implements DataParame * <!-- end-user-doc --> * @generated */ + @Override public void setSecondaryParameter(SecondaryParameter newSecondaryParameter) { if (newSecondaryParameter != secondaryParameter) { NotificationChain msgs = null; @@ -193,6 +197,7 @@ public class DataParameterImpl extends ScheduleElementImpl implements DataParame * <!-- end-user-doc --> * @generated */ + @Override public AbstractDatum getDatum() { if (datum != null && datum.eIsProxy()) { InternalEObject oldDatum = (InternalEObject)datum; @@ -234,6 +239,7 @@ public class DataParameterImpl extends ScheduleElementImpl implements DataParame * <!-- end-user-doc --> * @generated */ + @Override public void setDatum(AbstractDatum newDatum) { if (newDatum != datum) { NotificationChain msgs = null; diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/MappingActionImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/MappingActionImpl.java index 1f2fc0614..c421d5615 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/MappingActionImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/MappingActionImpl.java @@ -70,6 +70,7 @@ public class MappingActionImpl extends AbstractActionImpl implements MappingActi * <!-- end-user-doc --> * @generated */ + @Override public AbstractMapping getMapping() { if (mapping != null && mapping.eIsProxy()) { InternalEObject oldMapping = (InternalEObject)mapping; @@ -96,6 +97,7 @@ public class MappingActionImpl extends AbstractActionImpl implements MappingActi * <!-- end-user-doc --> * @generated */ + @Override public void setMapping(AbstractMapping newMapping) { AbstractMapping oldMapping = mapping; mapping = newMapping; diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ParameterDerivationImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ParameterDerivationImpl.java index 99b8af104..23822c086 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ParameterDerivationImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ParameterDerivationImpl.java @@ -86,6 +86,7 @@ public class ParameterDerivationImpl extends ScheduleElementImpl implements Para * <!-- end-user-doc --> * @generated */ + @Override public AbstractAction getTarget() { if (eContainerFeatureID() != SchedulePackage.PARAMETER_DERIVATION__TARGET) return null; return (AbstractAction)eInternalContainer(); @@ -106,6 +107,7 @@ public class ParameterDerivationImpl extends ScheduleElementImpl implements Para * <!-- end-user-doc --> * @generated */ + @Override public void setTarget(AbstractAction newTarget) { if (newTarget != eInternalContainer() || (eContainerFeatureID() != SchedulePackage.PARAMETER_DERIVATION__TARGET && newTarget != null)) { if (EcoreUtil.isAncestor(this, newTarget)) @@ -127,6 +129,7 @@ public class ParameterDerivationImpl extends ScheduleElementImpl implements Para * <!-- end-user-doc --> * @generated */ + @Override public DataParameter getPrimaryParameter() { if (primaryParameter != null && primaryParameter.eIsProxy()) { InternalEObject oldPrimaryParameter = (InternalEObject)primaryParameter; @@ -153,6 +156,7 @@ public class ParameterDerivationImpl extends ScheduleElementImpl implements Para * <!-- end-user-doc --> * @generated */ + @Override public void setPrimaryParameter(DataParameter newPrimaryParameter) { DataParameter oldPrimaryParameter = primaryParameter; primaryParameter = newPrimaryParameter; @@ -165,6 +169,7 @@ public class ParameterDerivationImpl extends ScheduleElementImpl implements Para * <!-- end-user-doc --> * @generated */ + @Override public SecondaryParameter getSecondaryParameter() { return secondaryParameter; } @@ -189,6 +194,7 @@ public class ParameterDerivationImpl extends ScheduleElementImpl implements Para * <!-- end-user-doc --> * @generated */ + @Override public void setSecondaryParameter(SecondaryParameter newSecondaryParameter) { if (newSecondaryParameter != secondaryParameter) { NotificationChain msgs = null; diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/PropertyDatumImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/PropertyDatumImpl.java index aef84a3b4..6bf86e0ad 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/PropertyDatumImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/PropertyDatumImpl.java @@ -85,6 +85,7 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu * <!-- end-user-doc --> * @generated */ + @Override public Property getProperty() { if (property != null && property.eIsProxy()) { InternalEObject oldProperty = (InternalEObject)property; @@ -111,6 +112,7 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu * <!-- end-user-doc --> * @generated */ + @Override public void setProperty(Property newProperty) { Property oldProperty = property; property = newProperty; @@ -123,6 +125,7 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu * <!-- end-user-doc --> * @generated */ + @Override public ClassDatum getClassDatum() { if (eContainerFeatureID() != SchedulePackage.PROPERTY_DATUM__CLASS_DATUM) return null; return (ClassDatum)eInternalContainer(); @@ -143,6 +146,7 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu * <!-- end-user-doc --> * @generated */ + @Override public void setClassDatum(ClassDatum newClassDatum) { if (newClassDatum != eInternalContainer() || (eContainerFeatureID() != SchedulePackage.PROPERTY_DATUM__CLASS_DATUM && newClassDatum != null)) { if (EcoreUtil.isAncestor(this, newClassDatum)) @@ -164,6 +168,7 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu * <!-- end-user-doc --> * @generated */ + @Override public PropertyDatum getOpposite() { if (opposite != null && opposite.eIsProxy()) { InternalEObject oldOpposite = (InternalEObject)opposite; @@ -190,6 +195,7 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu * <!-- end-user-doc --> * @generated */ + @Override public void setOpposite(PropertyDatum newOpposite) { PropertyDatum oldOpposite = opposite; opposite = newOpposite; diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleElementImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleElementImpl.java index 3d6a627df..9ac8551a7 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleElementImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleElementImpl.java @@ -53,6 +53,7 @@ public abstract class ScheduleElementImpl extends MinimalEObjectImpl.Container i * {@inheritDoc} * @generated */ + @Override public <R> R accept(@NonNull ScheduleVisitor<R> visitor) { return visitor.visitScheduleElement(this); } diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleFactoryImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleFactoryImpl.java index 938ba014a..2e8920cfc 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleFactoryImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleFactoryImpl.java @@ -83,6 +83,7 @@ public class ScheduleFactoryImpl extends EFactoryImpl implements ScheduleFactory * <!-- end-user-doc --> * @generated */ + @Override public @NonNull ClassDatum createClassDatum() { ClassDatumImpl classDatum = new ClassDatumImpl(); return classDatum; @@ -93,6 +94,7 @@ public class ScheduleFactoryImpl extends EFactoryImpl implements ScheduleFactory * <!-- end-user-doc --> * @generated */ + @Override public @NonNull DataParameter createDataParameter() { DataParameterImpl dataParameter = new DataParameterImpl(); return dataParameter; @@ -103,6 +105,7 @@ public class ScheduleFactoryImpl extends EFactoryImpl implements ScheduleFactory * <!-- end-user-doc --> * @generated */ + @Override public @NonNull InputAction createInputAction() { InputActionImpl inputAction = new InputActionImpl(); return inputAction; @@ -113,6 +116,7 @@ public class ScheduleFactoryImpl extends EFactoryImpl implements ScheduleFactory * <!-- end-user-doc --> * @generated */ + @Override public @NonNull MappingAction createMappingAction() { MappingActionImpl mappingAction = new MappingActionImpl(); return mappingAction; @@ -123,6 +127,7 @@ public class ScheduleFactoryImpl extends EFactoryImpl implements ScheduleFactory * <!-- end-user-doc --> * @generated */ + @Override public @NonNull OutputAction createOutputAction() { OutputActionImpl outputAction = new OutputActionImpl(); return outputAction; @@ -133,6 +138,7 @@ public class ScheduleFactoryImpl extends EFactoryImpl implements ScheduleFactory * <!-- end-user-doc --> * @generated */ + @Override public @NonNull ParameterDerivation createParameterDerivation() { ParameterDerivationImpl parameterDerivation = new ParameterDerivationImpl(); return parameterDerivation; @@ -143,6 +149,7 @@ public class ScheduleFactoryImpl extends EFactoryImpl implements ScheduleFactory * <!-- end-user-doc --> * @generated */ + @Override public @NonNull PropertyDatum createPropertyDatum() { PropertyDatumImpl propertyDatum = new PropertyDatumImpl(); return propertyDatum; @@ -153,6 +160,7 @@ public class ScheduleFactoryImpl extends EFactoryImpl implements ScheduleFactory * <!-- end-user-doc --> * @generated */ + @Override public @NonNull Schedule createSchedule() { ScheduleImpl schedule = new ScheduleImpl(); return schedule; @@ -163,6 +171,7 @@ public class ScheduleFactoryImpl extends EFactoryImpl implements ScheduleFactory * <!-- end-user-doc --> * @generated */ + @Override public @NonNull SecondaryParameter createSecondaryParameter() { SecondaryParameterImpl secondaryParameter = new SecondaryParameterImpl(); return secondaryParameter; @@ -173,6 +182,7 @@ public class ScheduleFactoryImpl extends EFactoryImpl implements ScheduleFactory * <!-- end-user-doc --> * @generated */ + @Override public SchedulePackage getSchedulePackage() { return (SchedulePackage)getEPackage(); } diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleImpl.java index b6ceb0110..9e21d437e 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/ScheduleImpl.java @@ -86,6 +86,7 @@ public class ScheduleImpl extends ScheduleElementImpl implements Schedule { * <!-- end-user-doc --> * @generated */ + @Override public EList<AbstractDatum> getDatums() { if (datums == null) { datums = new EObjectContainmentWithInverseEList<AbstractDatum>(AbstractDatum.class, this, SchedulePackage.SCHEDULE__DATUMS, SchedulePackage.ABSTRACT_DATUM__SCHEDULE); @@ -98,6 +99,7 @@ public class ScheduleImpl extends ScheduleElementImpl implements Schedule { * <!-- end-user-doc --> * @generated */ + @Override public EList<AbstractAction> getActions() { if (actions == null) { actions = new EObjectContainmentWithInverseEList<AbstractAction>(AbstractAction.class, this, SchedulePackage.SCHEDULE__ACTIONS, SchedulePackage.ABSTRACT_ACTION__SCHEDULE); @@ -213,6 +215,7 @@ public class ScheduleImpl extends ScheduleElementImpl implements Schedule { * {@inheritDoc} * @generated */ + @Override public <R> R accept(@NonNull ScheduleVisitor<R> visitor) { return visitor.visitSchedule(this); } diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/SchedulePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/SchedulePackageImpl.java index ce639c0c9..dd44a34d7 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/SchedulePackageImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/SchedulePackageImpl.java @@ -197,6 +197,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getAbstractDatum() { return abstractDatumEClass; } @@ -206,6 +207,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractDatum_Super() { return (EReference)abstractDatumEClass.getEStructuralFeatures().get(0); } @@ -215,6 +217,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractDatum_Sub() { return (EReference)abstractDatumEClass.getEStructuralFeatures().get(1); } @@ -224,6 +227,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractDatum_Domain() { return (EReference)abstractDatumEClass.getEStructuralFeatures().get(2); } @@ -233,6 +237,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractDatum_TypedModel() { return (EReference)abstractDatumEClass.getEStructuralFeatures().get(7); } @@ -242,6 +247,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractDatum_ProducedBy() { return (EReference)abstractDatumEClass.getEStructuralFeatures().get(3); } @@ -251,6 +257,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractDatum_RequiredBy() { return (EReference)abstractDatumEClass.getEStructuralFeatures().get(4); } @@ -260,6 +267,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractDatum_Schedule() { return (EReference)abstractDatumEClass.getEStructuralFeatures().get(5); } @@ -269,6 +277,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractDatum_DataParameter() { return (EReference)abstractDatumEClass.getEStructuralFeatures().get(6); } @@ -278,6 +287,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getAbstractAction() { return abstractActionEClass; } @@ -287,6 +297,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractAction_Productions() { return (EReference)abstractActionEClass.getEStructuralFeatures().get(0); } @@ -296,6 +307,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractAction_Requisites() { return (EReference)abstractActionEClass.getEStructuralFeatures().get(1); } @@ -305,6 +317,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractAction_ParameterDerivations() { return (EReference)abstractActionEClass.getEStructuralFeatures().get(2); } @@ -314,6 +327,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getAbstractAction_Order() { return (EAttribute)abstractActionEClass.getEStructuralFeatures().get(3); } @@ -323,6 +337,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractAction_Parent() { return (EReference)abstractActionEClass.getEStructuralFeatures().get(4); } @@ -332,6 +347,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractAction_Children() { return (EReference)abstractActionEClass.getEStructuralFeatures().get(5); } @@ -341,6 +357,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractAction_Parameters() { return (EReference)abstractActionEClass.getEStructuralFeatures().get(6); } @@ -350,6 +367,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractAction_Results() { return (EReference)abstractActionEClass.getEStructuralFeatures().get(7); } @@ -359,6 +377,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getAbstractAction_Schedule() { return (EReference)abstractActionEClass.getEStructuralFeatures().get(8); } @@ -368,6 +387,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getClassDatum() { return classDatumEClass; } @@ -377,6 +397,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassDatum_Type() { return (EReference)classDatumEClass.getEStructuralFeatures().get(0); } @@ -386,6 +407,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassDatum_PropertyDatums() { return (EReference)classDatumEClass.getEStructuralFeatures().get(1); } @@ -395,6 +417,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getDataParameter() { return dataParameterEClass; } @@ -404,6 +427,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getDataParameter_Variable() { return (EReference)dataParameterEClass.getEStructuralFeatures().get(0); } @@ -413,6 +437,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getDataParameter_SecondaryParameter() { return (EReference)dataParameterEClass.getEStructuralFeatures().get(1); } @@ -422,6 +447,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getDataParameter_Datum() { return (EReference)dataParameterEClass.getEStructuralFeatures().get(2); } @@ -431,6 +457,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getInputAction() { return inputActionEClass; } @@ -440,6 +467,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getMappingAction() { return mappingActionEClass; } @@ -449,6 +477,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getMappingAction_Mapping() { return (EReference)mappingActionEClass.getEStructuralFeatures().get(0); } @@ -458,6 +487,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getOutputAction() { return outputActionEClass; } @@ -467,6 +497,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getParameterDerivation() { return parameterDerivationEClass; } @@ -476,6 +507,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getParameterDerivation_Target() { return (EReference)parameterDerivationEClass.getEStructuralFeatures().get(0); } @@ -485,6 +517,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getParameterDerivation_PrimaryParameter() { return (EReference)parameterDerivationEClass.getEStructuralFeatures().get(1); } @@ -494,6 +527,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getParameterDerivation_SecondaryParameter() { return (EReference)parameterDerivationEClass.getEStructuralFeatures().get(2); } @@ -503,6 +537,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getPropertyDatum() { return propertyDatumEClass; } @@ -512,6 +547,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getPropertyDatum_Property() { return (EReference)propertyDatumEClass.getEStructuralFeatures().get(0); } @@ -521,6 +557,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getPropertyDatum_ClassDatum() { return (EReference)propertyDatumEClass.getEStructuralFeatures().get(1); } @@ -530,6 +567,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getPropertyDatum_Opposite() { return (EReference)propertyDatumEClass.getEStructuralFeatures().get(2); } @@ -539,6 +577,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getSchedule() { return scheduleEClass; } @@ -548,6 +587,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getSchedule_Datums() { return (EReference)scheduleEClass.getEStructuralFeatures().get(0); } @@ -557,6 +597,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getSchedule_Actions() { return (EReference)scheduleEClass.getEStructuralFeatures().get(1); } @@ -566,6 +607,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getScheduleElement() { return scheduleElementEClass; } @@ -575,6 +617,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getSecondaryParameter() { return secondaryParameterEClass; } @@ -584,6 +627,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getSecondaryParameter_IsLoop() { return (EAttribute)secondaryParameterEClass.getEStructuralFeatures().get(0); } @@ -593,6 +637,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getSecondaryParameter_DataParameter() { return (EReference)secondaryParameterEClass.getEStructuralFeatures().get(1); } @@ -602,6 +647,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getSecondaryParameter_DerivationProperty() { return (EReference)secondaryParameterEClass.getEStructuralFeatures().get(2); } @@ -611,6 +657,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getSecondaryParameter_Derivation() { return (EReference)secondaryParameterEClass.getEStructuralFeatures().get(3); } @@ -620,6 +667,7 @@ public class SchedulePackageImpl extends EPackageImpl implements SchedulePackage * <!-- end-user-doc --> * @generated */ + @Override public ScheduleFactory getScheduleFactory() { return (ScheduleFactory)getEFactoryInstance(); } diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/SecondaryParameterImpl.java b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/SecondaryParameterImpl.java index 97c9a9be8..4ac385ddc 100644 --- a/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/SecondaryParameterImpl.java +++ b/plugins/org.eclipse.qvtd.pivot.schedule/emf-gen/org/eclipse/qvtd/pivot/schedule/impl/SecondaryParameterImpl.java @@ -107,6 +107,7 @@ public class SecondaryParameterImpl extends ScheduleElementImpl implements Secon * <!-- end-user-doc --> * @generated */ + @Override public boolean isIsLoop() { return isLoop; } @@ -116,6 +117,7 @@ public class SecondaryParameterImpl extends ScheduleElementImpl implements Secon * <!-- end-user-doc --> * @generated */ + @Override public void setIsLoop(boolean newIsLoop) { boolean oldIsLoop = isLoop; isLoop = newIsLoop; @@ -128,6 +130,7 @@ public class SecondaryParameterImpl extends ScheduleElementImpl implements Secon * <!-- end-user-doc --> * @generated */ + @Override public DataParameter getDataParameter() { if (dataParameter != null && dataParameter.eIsProxy()) { InternalEObject oldDataParameter = (InternalEObject)dataParameter; @@ -169,6 +172,7 @@ public class SecondaryParameterImpl extends ScheduleElementImpl implements Secon * <!-- end-user-doc --> * @generated */ + @Override public void setDataParameter(DataParameter newDataParameter) { if (newDataParameter != dataParameter) { NotificationChain msgs = null; @@ -188,6 +192,7 @@ public class SecondaryParameterImpl extends ScheduleElementImpl implements Secon * <!-- end-user-doc --> * @generated */ + @Override public Property getDerivationProperty() { if (derivationProperty != null && derivationProperty.eIsProxy()) { InternalEObject oldDerivationProperty = (InternalEObject)derivationProperty; @@ -214,6 +219,7 @@ public class SecondaryParameterImpl extends ScheduleElementImpl implements Secon * <!-- end-user-doc --> * @generated */ + @Override public void setDerivationProperty(Property newDerivationProperty) { Property oldDerivationProperty = derivationProperty; derivationProperty = newDerivationProperty; @@ -226,6 +232,7 @@ public class SecondaryParameterImpl extends ScheduleElementImpl implements Secon * <!-- end-user-doc --> * @generated */ + @Override public ParameterDerivation getDerivation() { if (eContainerFeatureID() != SchedulePackage.SECONDARY_PARAMETER__DERIVATION) return null; return (ParameterDerivation)eInternalContainer(); @@ -246,6 +253,7 @@ public class SecondaryParameterImpl extends ScheduleElementImpl implements Secon * <!-- end-user-doc --> * @generated */ + @Override public void setDerivation(ParameterDerivation newDerivation) { if (newDerivation != eInternalContainer() || (eContainerFeatureID() != SchedulePackage.SECONDARY_PARAMETER__DERIVATION && newDerivation != null)) { if (EcoreUtil.isAncestor(this, newDerivation)) diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGTypedElementModelSpec.java b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGTypedElementModelSpec.java index 8a8d66c60..de41a4dd3 100644 --- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGTypedElementModelSpec.java +++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGTypedElementModelSpec.java @@ -26,7 +26,8 @@ public class QVTdCGTypedElementModelSpec extends CGTypedElementModelSpec /** * The algorithm options for getASTypeId() */ - public static final @NonNull Ati ATI_BOOL = new Ati() { public @NonNull String generate() { + public static final @NonNull Ati ATI_BOOL = new Ati() { @Override + public @NonNull String generate() { return "return " + classRef(TypeId.class) + ".BOOLEAN;"; }}; diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGValuedElementModelSpec.java b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGValuedElementModelSpec.java index f21885731..0db36a73d 100644 --- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGValuedElementModelSpec.java +++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGValuedElementModelSpec.java @@ -43,7 +43,8 @@ import org.eclipse.qvtd.codegen.utilities.QVTiEquivalenceUtil; */ public class QVTdCGValuedElementModelSpec extends CGValuedElementModelSpec { - public static final @NonNull Ctl CTL_MEXP = new Ctl() { public @NonNull String generate(@NonNull CGValuedElementModelSpec cgModelSpec, @NonNull GenModel genModel) { + public static final @NonNull Ctl CTL_MEXP = new Ctl() { @Override + public @NonNull String generate(@NonNull CGValuedElementModelSpec cgModelSpec, @NonNull GenModel genModel) { return "return " + classRef(MappingExpPlaces.class) + ".createMappingExpPlaces(element2place, this);"; }}; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamiliesFactoryImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamiliesFactoryImpl.java index 8d291c674..c743932f4 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamiliesFactoryImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamiliesFactoryImpl.java @@ -78,6 +78,7 @@ public class FamiliesFactoryImpl extends EFactoryImpl implements FamiliesFactory * <!-- end-user-doc --> * @generated */ + @Override public Family createFamily() { FamilyImpl family = new FamilyImpl(); return family; @@ -88,6 +89,7 @@ public class FamiliesFactoryImpl extends EFactoryImpl implements FamiliesFactory * <!-- end-user-doc --> * @generated */ + @Override public Member createMember() { MemberImpl member = new MemberImpl(); return member; @@ -98,6 +100,7 @@ public class FamiliesFactoryImpl extends EFactoryImpl implements FamiliesFactory * <!-- end-user-doc --> * @generated */ + @Override public FamiliesPackage getFamiliesPackage() { return (FamiliesPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamiliesPackageImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamiliesPackageImpl.java index 26f73b6aa..869b4fe8b 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamiliesPackageImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamiliesPackageImpl.java @@ -128,6 +128,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getFamily() { return familyEClass; } @@ -137,6 +138,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getFamily_LastName() { return (EAttribute)familyEClass.getEStructuralFeatures().get(0); } @@ -146,6 +148,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getFamily_Father() { return (EReference)familyEClass.getEStructuralFeatures().get(1); } @@ -155,6 +158,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getFamily_Mother() { return (EReference)familyEClass.getEStructuralFeatures().get(2); } @@ -164,6 +168,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getFamily_Sons() { return (EReference)familyEClass.getEStructuralFeatures().get(3); } @@ -173,6 +178,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getFamily_Daughters() { return (EReference)familyEClass.getEStructuralFeatures().get(4); } @@ -182,6 +188,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getMember() { return memberEClass; } @@ -191,6 +198,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getMember_FirstName() { return (EAttribute)memberEClass.getEStructuralFeatures().get(0); } @@ -200,6 +208,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getMember_FamilyFather() { return (EReference)memberEClass.getEStructuralFeatures().get(1); } @@ -209,6 +218,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getMember_FamilyMother() { return (EReference)memberEClass.getEStructuralFeatures().get(2); } @@ -218,6 +228,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getMember_FamilySon() { return (EReference)memberEClass.getEStructuralFeatures().get(3); } @@ -227,6 +238,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getMember_FamilyDaughter() { return (EReference)memberEClass.getEStructuralFeatures().get(4); } @@ -236,6 +248,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public FamiliesFactory getFamiliesFactory() { return (FamiliesFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamilyImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamilyImpl.java index d2e610c89..724b5f1a8 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamilyImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/FamilyImpl.java @@ -134,6 +134,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public String getLastName() { return lastName; } @@ -143,6 +144,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public void setLastName(String newLastName) { String oldLastName = lastName; lastName = newLastName; @@ -155,6 +157,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public Member getFather() { return father; } @@ -179,6 +182,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public void setFather(Member newFather) { if (newFather != father) { NotificationChain msgs = null; @@ -198,6 +202,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public Member getMother() { return mother; } @@ -222,6 +227,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public void setMother(Member newMother) { if (newMother != mother) { NotificationChain msgs = null; @@ -241,6 +247,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public EList<Member> getSons() { if (sons == null) { sons = new EObjectContainmentWithInverseEList<Member>(Member.class, this, FamiliesPackage.FAMILY__SONS, FamiliesPackage.MEMBER__FAMILY_SON); @@ -253,6 +260,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public EList<Member> getDaughters() { if (daughters == null) { daughters = new EObjectContainmentWithInverseEList<Member>(Member.class, this, FamiliesPackage.FAMILY__DAUGHTERS, FamiliesPackage.MEMBER__FAMILY_DAUGHTER); diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/MemberImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/MemberImpl.java index 033994207..681a3f0ec 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/MemberImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families/impl/MemberImpl.java @@ -89,6 +89,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public String getFirstName() { return firstName; } @@ -98,6 +99,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public void setFirstName(String newFirstName) { String oldFirstName = firstName; firstName = newFirstName; @@ -110,6 +112,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public Family getFamilyFather() { if (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_FATHER) return null; return (Family)eInternalContainer(); @@ -130,6 +133,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public void setFamilyFather(Family newFamilyFather) { if (newFamilyFather != eInternalContainer() || (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_FATHER && newFamilyFather != null)) { if (EcoreUtil.isAncestor(this, newFamilyFather)) @@ -151,6 +155,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public Family getFamilyMother() { if (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_MOTHER) return null; return (Family)eInternalContainer(); @@ -171,6 +176,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public void setFamilyMother(Family newFamilyMother) { if (newFamilyMother != eInternalContainer() || (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_MOTHER && newFamilyMother != null)) { if (EcoreUtil.isAncestor(this, newFamilyMother)) @@ -192,6 +198,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public Family getFamilySon() { if (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_SON) return null; return (Family)eInternalContainer(); @@ -212,6 +219,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public void setFamilySon(Family newFamilySon) { if (newFamilySon != eInternalContainer() || (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_SON && newFamilySon != null)) { if (EcoreUtil.isAncestor(this, newFamilySon)) @@ -233,6 +241,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public Family getFamilyDaughter() { if (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_DAUGHTER) return null; return (Family)eInternalContainer(); @@ -253,6 +262,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public void setFamilyDaughter(Family newFamilyDaughter) { if (newFamilyDaughter != eInternalContainer() || (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_DAUGHTER && newFamilyDaughter != null)) { if (EcoreUtil.isAncestor(this, newFamilyDaughter)) diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/Families2PersonsFactoryImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/Families2PersonsFactoryImpl.java index b090e7a00..0146ebfe9 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/Families2PersonsFactoryImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/Families2PersonsFactoryImpl.java @@ -78,6 +78,7 @@ public class Families2PersonsFactoryImpl extends EFactoryImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public Member2Male createMember2Male() { Member2MaleImpl member2Male = new Member2MaleImpl(); return member2Male; @@ -88,6 +89,7 @@ public class Families2PersonsFactoryImpl extends EFactoryImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public Member2Female createMember2Female() { Member2FemaleImpl member2Female = new Member2FemaleImpl(); return member2Female; @@ -98,6 +100,7 @@ public class Families2PersonsFactoryImpl extends EFactoryImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public Families2PersonsPackage getFamilies2PersonsPackage() { return (Families2PersonsPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java index 1e6286a40..8577acc0d 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java @@ -136,6 +136,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EClass getMemberToPerson() { return memberToPersonEClass; } @@ -145,6 +146,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EReference getMemberToPerson_Member() { return (EReference)memberToPersonEClass.getEStructuralFeatures().get(0); } @@ -154,6 +156,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EReference getMemberToPerson_Person() { return (EReference)memberToPersonEClass.getEStructuralFeatures().get(1); } @@ -163,6 +166,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getMemberToPerson_FirstName() { return (EAttribute)memberToPersonEClass.getEStructuralFeatures().get(2); } @@ -172,6 +176,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getMemberToPerson_FamilyName() { return (EAttribute)memberToPersonEClass.getEStructuralFeatures().get(3); } @@ -181,6 +186,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EClass getMember2Male() { return member2MaleEClass; } @@ -190,6 +196,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EClass getMember2Female() { return member2FemaleEClass; } @@ -199,6 +206,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public Families2PersonsFactory getFamilies2PersonsFactory() { return (Families2PersonsFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/MemberToPersonImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/MemberToPersonImpl.java index be5b909b2..bcfeb8f27 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/MemberToPersonImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Families2Persons/impl/MemberToPersonImpl.java @@ -128,6 +128,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public Member getMember() { if (member != null && member.eIsProxy()) { InternalEObject oldMember = (InternalEObject)member; @@ -154,6 +155,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public void setMember(Member newMember) { Member oldMember = member; member = newMember; @@ -166,6 +168,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public Person getPerson() { if (person != null && person.eIsProxy()) { InternalEObject oldPerson = (InternalEObject)person; @@ -192,6 +195,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public void setPerson(Person newPerson) { Person oldPerson = person; person = newPerson; @@ -204,6 +208,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public String getFirstName() { return firstName; } @@ -213,6 +218,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public void setFirstName(String newFirstName) { String oldFirstName = firstName; firstName = newFirstName; @@ -225,6 +231,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public String getFamilyName() { return familyName; } @@ -234,6 +241,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public void setFamilyName(String newFamilyName) { String oldFamilyName = familyName; familyName = newFamilyName; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonImpl.java index 0e878f5eb..1b4b0ea4e 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonImpl.java @@ -80,6 +80,7 @@ public abstract class PersonImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public String getFullName() { return fullName; } @@ -89,6 +90,7 @@ public abstract class PersonImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setFullName(String newFullName) { String oldFullName = fullName; fullName = newFullName; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonsFactoryImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonsFactoryImpl.java index 34a3fff92..e6b1588f4 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonsFactoryImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonsFactoryImpl.java @@ -78,6 +78,7 @@ public class PersonsFactoryImpl extends EFactoryImpl implements PersonsFactory { * <!-- end-user-doc --> * @generated */ + @Override public Male createMale() { MaleImpl male = new MaleImpl(); return male; @@ -88,6 +89,7 @@ public class PersonsFactoryImpl extends EFactoryImpl implements PersonsFactory { * <!-- end-user-doc --> * @generated */ + @Override public Female createFemale() { FemaleImpl female = new FemaleImpl(); return female; @@ -98,6 +100,7 @@ public class PersonsFactoryImpl extends EFactoryImpl implements PersonsFactory { * <!-- end-user-doc --> * @generated */ + @Override public PersonsPackage getPersonsPackage() { return (PersonsPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonsPackageImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonsPackageImpl.java index 3a7823300..1d2f42a8e 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonsPackageImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/families2persons/Persons/impl/PersonsPackageImpl.java @@ -135,6 +135,7 @@ public class PersonsPackageImpl extends EPackageImpl implements PersonsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPerson() { return personEClass; } @@ -144,6 +145,7 @@ public class PersonsPackageImpl extends EPackageImpl implements PersonsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getPerson_FullName() { return (EAttribute)personEClass.getEStructuralFeatures().get(0); } @@ -153,6 +155,7 @@ public class PersonsPackageImpl extends EPackageImpl implements PersonsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getMale() { return maleEClass; } @@ -162,6 +165,7 @@ public class PersonsPackageImpl extends EPackageImpl implements PersonsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getFemale() { return femaleEClass; } @@ -171,6 +175,7 @@ public class PersonsPackageImpl extends EPackageImpl implements PersonsPackage { * <!-- end-user-doc --> * @generated */ + @Override public PersonsFactory getPersonsFactory() { return (PersonsFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSNodeImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSNodeImpl.java index 98ab2a780..624d54070 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSNodeImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSNodeImpl.java @@ -123,6 +123,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public HLSNode getParent() { if (eContainerFeatureID() != HLSTreePackage.HLS_NODE__PARENT) return null; return (HLSNode)eInternalContainer(); @@ -143,6 +144,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public void setParent(HLSNode newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != HLSTreePackage.HLS_NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) @@ -164,6 +166,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public EList<HLSNode> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<HLSNode>(HLSNode.class, this, HLSTreePackage.HLS_NODE__CHILDREN, HLSTreePackage.HLS_NODE__PARENT); @@ -176,6 +179,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public String getHls() { return hls; } @@ -185,6 +189,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public void setHls(String newHls) { String oldHls = hls; hls = newHls; @@ -197,6 +202,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -206,6 +212,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSTreeFactoryImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSTreeFactoryImpl.java index 104f45303..0ccee7279 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSTreeFactoryImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSTreeFactoryImpl.java @@ -108,6 +108,7 @@ public class HLSTreeFactoryImpl extends EFactoryImpl implements HLSTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HLSNode createHLSNode() { HLSNodeImpl hlsNode = new HLSNodeImpl(); return hlsNode; @@ -136,6 +137,7 @@ public class HLSTreeFactoryImpl extends EFactoryImpl implements HLSTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HLSTreePackage getHLSTreePackage() { return (HLSTreePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSTreePackageImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSTreePackageImpl.java index 1cc26d8a9..16c4e0d0b 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSTreePackageImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hls/HLSTree/impl/HLSTreePackageImpl.java @@ -128,6 +128,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getHLSNode() { return hlsNodeEClass; } @@ -137,6 +138,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHLSNode_Parent() { return (EReference)hlsNodeEClass.getEStructuralFeatures().get(0); } @@ -146,6 +148,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHLSNode_Children() { return (EReference)hlsNodeEClass.getEStructuralFeatures().get(1); } @@ -155,6 +158,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHLSNode_Hls() { return (EAttribute)hlsNodeEClass.getEStructuralFeatures().get(2); } @@ -164,6 +168,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHLSNode_Name() { return (EAttribute)hlsNodeEClass.getEStructuralFeatures().get(3); } @@ -173,6 +178,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EDataType getHLS() { return hlsEDataType; } @@ -182,6 +188,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public HLSTreeFactory getHLSTreeFactory() { return (HLSTreeFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVNodeImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVNodeImpl.java index 657fc56a4..989e93df8 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVNodeImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVNodeImpl.java @@ -123,6 +123,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public HSVNode getParent() { if (eContainerFeatureID() != HSVTreePackage.HSV_NODE__PARENT) return null; return (HSVNode)eInternalContainer(); @@ -143,6 +144,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public void setParent(HSVNode newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != HSVTreePackage.HSV_NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) @@ -164,6 +166,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public EList<HSVNode> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<HSVNode>(HSVNode.class, this, HSVTreePackage.HSV_NODE__CHILDREN, HSVTreePackage.HSV_NODE__PARENT); @@ -176,6 +179,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public String getHsv() { return hsv; } @@ -185,6 +189,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public void setHsv(String newHsv) { String oldHsv = hsv; hsv = newHsv; @@ -197,6 +202,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -206,6 +212,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVTreeFactoryImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVTreeFactoryImpl.java index 932ef269d..f4002ed3b 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVTreeFactoryImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVTreeFactoryImpl.java @@ -108,6 +108,7 @@ public class HSVTreeFactoryImpl extends EFactoryImpl implements HSVTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HSVNode createHSVNode() { HSVNodeImpl hsvNode = new HSVNodeImpl(); return hsvNode; @@ -136,6 +137,7 @@ public class HSVTreeFactoryImpl extends EFactoryImpl implements HSVTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HSVTreePackage getHSVTreePackage() { return (HSVTreePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVTreePackageImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVTreePackageImpl.java index f1e841c3e..5f3142a88 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVTreePackageImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/hsv/HSVTree/impl/HSVTreePackageImpl.java @@ -128,6 +128,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getHSVNode() { return hsvNodeEClass; } @@ -137,6 +138,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode_Parent() { return (EReference)hsvNodeEClass.getEStructuralFeatures().get(0); } @@ -146,6 +148,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode_Children() { return (EReference)hsvNodeEClass.getEStructuralFeatures().get(1); } @@ -155,6 +158,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode_Hsv() { return (EAttribute)hsvNodeEClass.getEStructuralFeatures().get(2); } @@ -164,6 +168,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode_Name() { return (EAttribute)hsvNodeEClass.getEStructuralFeatures().get(3); } @@ -173,6 +178,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EDataType getHSV() { return hsvEDataType; } @@ -182,6 +188,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public HSVTreeFactory getHSVTreeFactory() { return (HSVTreeFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSV2HLSFactoryImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSV2HLSFactoryImpl.java index 9e1385f29..669c54c1d 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSV2HLSFactoryImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSV2HLSFactoryImpl.java @@ -108,6 +108,7 @@ public class HSV2HLSFactoryImpl extends EFactoryImpl implements HSV2HLSFactory { * <!-- end-user-doc --> * @generated */ + @Override public HSVNode2HLSNode createHSVNode2HLSNode() { HSVNode2HLSNodeImpl hsvNode2HLSNode = new HSVNode2HLSNodeImpl(); return hsvNode2HLSNode; @@ -136,6 +137,7 @@ public class HSV2HLSFactoryImpl extends EFactoryImpl implements HSV2HLSFactory { * <!-- end-user-doc --> * @generated */ + @Override public HSV2HLSPackage getHSV2HLSPackage() { return (HSV2HLSPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSV2HLSPackageImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSV2HLSPackageImpl.java index c1dba82e0..59c25f1a4 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSV2HLSPackageImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSV2HLSPackageImpl.java @@ -128,6 +128,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getHSVNode2HLSNode() { return hsvNode2HLSNodeEClass; } @@ -137,6 +138,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Parent() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(0); } @@ -146,6 +148,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Children() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(1); } @@ -155,6 +158,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Hsv() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(2); } @@ -164,6 +168,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Hls() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(3); } @@ -173,6 +178,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode2HLSNode_Rgb() { return (EAttribute)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(4); } @@ -182,6 +188,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode2HLSNode_Name() { return (EAttribute)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(5); } @@ -191,6 +198,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EDataType getRGB() { return rgbEDataType; } @@ -200,6 +208,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public HSV2HLSFactory getHSV2HLSFactory() { return (HSV2HLSFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSVNode2HLSNodeImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSVNode2HLSNodeImpl.java index 8867570aa..4ab4503ef 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSVNode2HLSNodeImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/test/middle/HSV2HLS/impl/HSVNode2HLSNodeImpl.java @@ -149,6 +149,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public HSVNode2HLSNode getParent() { if (eContainerFeatureID() != HSV2HLSPackage.HSV_NODE2_HLS_NODE__PARENT) return null; return (HSVNode2HLSNode)eInternalContainer(); @@ -169,6 +170,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setParent(HSVNode2HLSNode newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != HSV2HLSPackage.HSV_NODE2_HLS_NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) @@ -190,6 +192,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public EList<HSVNode2HLSNode> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<HSVNode2HLSNode>(HSVNode2HLSNode.class, this, HSV2HLSPackage.HSV_NODE2_HLS_NODE__CHILDREN, HSV2HLSPackage.HSV_NODE2_HLS_NODE__PARENT); @@ -202,6 +205,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public HSVNode getHsv() { if (hsv != null && hsv.eIsProxy()) { InternalEObject oldHsv = (InternalEObject)hsv; @@ -228,6 +232,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setHsv(HSVNode newHsv) { HSVNode oldHsv = hsv; hsv = newHsv; @@ -240,6 +245,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public HLSNode getHls() { if (hls != null && hls.eIsProxy()) { InternalEObject oldHls = (InternalEObject)hls; @@ -266,6 +272,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setHls(HLSNode newHls) { HLSNode oldHls = hls; hls = newHls; @@ -278,6 +285,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public String getRgb() { return rgb; } @@ -287,6 +295,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setRgb(String newRgb) { String oldRgb = rgb; rgb = newRgb; @@ -299,6 +308,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -308,6 +318,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/EdgeImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/EdgeImpl.java index d728f84ea..c00473493 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/EdgeImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/EdgeImpl.java @@ -83,6 +83,7 @@ public class EdgeImpl extends ElementImpl implements Edge { * <!-- end-user-doc --> * @generated */ + @Override public Node getTarget() { if (target != null && target.eIsProxy()) { InternalEObject oldTarget = (InternalEObject)target; @@ -124,6 +125,7 @@ public class EdgeImpl extends ElementImpl implements Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setTarget(Node newTarget) { if (newTarget != target) { NotificationChain msgs = null; @@ -143,6 +145,7 @@ public class EdgeImpl extends ElementImpl implements Edge { * <!-- end-user-doc --> * @generated */ + @Override public Node getSource() { if (source != null && source.eIsProxy()) { InternalEObject oldSource = (InternalEObject)source; @@ -184,6 +187,7 @@ public class EdgeImpl extends ElementImpl implements Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setSource(Node newSource) { if (newSource != source) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/ElementImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/ElementImpl.java index 6e10e8f2a..1b8e9a29e 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/ElementImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/ElementImpl.java @@ -65,6 +65,7 @@ public abstract class ElementImpl extends MinimalEObjectImpl.Container implement * <!-- end-user-doc --> * @generated */ + @Override public Graph getGraph() { if (eContainerFeatureID() != SimplegraphPackage.ELEMENT__GRAPH) return null; return (Graph)eInternalContainer(); @@ -85,6 +86,7 @@ public abstract class ElementImpl extends MinimalEObjectImpl.Container implement * <!-- end-user-doc --> * @generated */ + @Override public void setGraph(Graph newGraph) { if (newGraph != eInternalContainer() || (eContainerFeatureID() != SimplegraphPackage.ELEMENT__GRAPH && newGraph != null)) { if (EcoreUtil.isAncestor(this, newGraph)) diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/GraphImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/GraphImpl.java index 6aa4b95bb..e542de540 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/GraphImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/GraphImpl.java @@ -101,6 +101,7 @@ public class GraphImpl extends MinimalEObjectImpl.Container implements Graph { * <!-- end-user-doc --> * @generated */ + @Override public EList<Element> getElement() { if (element == null) { element = new EObjectContainmentWithInverseEList<Element>(Element.class, this, SimplegraphPackage.GRAPH__ELEMENT, SimplegraphPackage.ELEMENT__GRAPH); @@ -113,6 +114,7 @@ public class GraphImpl extends MinimalEObjectImpl.Container implements Graph { * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -122,6 +124,7 @@ public class GraphImpl extends MinimalEObjectImpl.Container implements Graph { * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/NodeImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/NodeImpl.java index ef2aa03ba..5ac348be0 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/NodeImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/NodeImpl.java @@ -111,6 +111,7 @@ public class NodeImpl extends ElementImpl implements Node { * <!-- end-user-doc --> * @generated */ + @Override public EList<Edge> getIncoming() { if (incoming == null) { incoming = new EObjectWithInverseResolvingEList<Edge>(Edge.class, this, SimplegraphPackage.NODE__INCOMING, SimplegraphPackage.EDGE__TARGET); @@ -123,6 +124,7 @@ public class NodeImpl extends ElementImpl implements Node { * <!-- end-user-doc --> * @generated */ + @Override public EList<Edge> getOutgoing() { if (outgoing == null) { outgoing = new EObjectWithInverseResolvingEList<Edge>(Edge.class, this, SimplegraphPackage.NODE__OUTGOING, SimplegraphPackage.EDGE__SOURCE); @@ -135,6 +137,7 @@ public class NodeImpl extends ElementImpl implements Node { * <!-- end-user-doc --> * @generated */ + @Override public String getLabel() { return label; } @@ -144,6 +147,7 @@ public class NodeImpl extends ElementImpl implements Node { * <!-- end-user-doc --> * @generated */ + @Override public void setLabel(String newLabel) { String oldLabel = label; label = newLabel; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/SimplegraphFactoryImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/SimplegraphFactoryImpl.java index 3e86f9145..7c9261a0f 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/SimplegraphFactoryImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/SimplegraphFactoryImpl.java @@ -79,6 +79,7 @@ public class SimplegraphFactoryImpl extends EFactoryImpl implements SimplegraphF * <!-- end-user-doc --> * @generated */ + @Override public Node createNode() { NodeImpl node = new NodeImpl(); return node; @@ -89,6 +90,7 @@ public class SimplegraphFactoryImpl extends EFactoryImpl implements SimplegraphF * <!-- end-user-doc --> * @generated */ + @Override public Edge createEdge() { EdgeImpl edge = new EdgeImpl(); return edge; @@ -99,6 +101,7 @@ public class SimplegraphFactoryImpl extends EFactoryImpl implements SimplegraphF * <!-- end-user-doc --> * @generated */ + @Override public Graph createGraph() { GraphImpl graph = new GraphImpl(); return graph; @@ -109,6 +112,7 @@ public class SimplegraphFactoryImpl extends EFactoryImpl implements SimplegraphF * <!-- end-user-doc --> * @generated */ + @Override public SimplegraphPackage getSimplegraphPackage() { return (SimplegraphPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/SimplegraphPackageImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/SimplegraphPackageImpl.java index 969c86967..7c134f9d6 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/SimplegraphPackageImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph/impl/SimplegraphPackageImpl.java @@ -137,6 +137,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EClass getNode() { return nodeEClass; } @@ -146,6 +147,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode_Incoming() { return (EReference)nodeEClass.getEStructuralFeatures().get(0); } @@ -155,6 +157,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode_Outgoing() { return (EReference)nodeEClass.getEStructuralFeatures().get(1); } @@ -164,6 +167,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNode_Label() { return (EAttribute)nodeEClass.getEStructuralFeatures().get(2); } @@ -173,6 +177,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EClass getEdge() { return edgeEClass; } @@ -182,6 +187,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge_Target() { return (EReference)edgeEClass.getEStructuralFeatures().get(0); } @@ -191,6 +197,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge_Source() { return (EReference)edgeEClass.getEStructuralFeatures().get(1); } @@ -200,6 +207,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EClass getElement() { return elementEClass; } @@ -209,6 +217,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getElement_Graph() { return (EReference)elementEClass.getEStructuralFeatures().get(0); } @@ -218,6 +227,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EClass getGraph() { return graphEClass; } @@ -227,6 +237,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getGraph_Element() { return (EReference)graphEClass.getEStructuralFeatures().get(0); } @@ -236,6 +247,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getGraph_Name() { return (EAttribute)graphEClass.getEStructuralFeatures().get(1); } @@ -245,6 +257,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public SimplegraphFactory getSimplegraphFactory() { return (SimplegraphFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Edge2EdgeImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Edge2EdgeImpl.java index 65cf1cd77..05ddc07c1 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Edge2EdgeImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Edge2EdgeImpl.java @@ -106,6 +106,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public Edge getEdge1() { if (edge1 != null && edge1.eIsProxy()) { InternalEObject oldEdge1 = (InternalEObject)edge1; @@ -132,6 +133,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setEdge1(Edge newEdge1) { Edge oldEdge1 = edge1; edge1 = newEdge1; @@ -144,6 +146,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public Edge getEdge2() { if (edge2 != null && edge2.eIsProxy()) { InternalEObject oldEdge2 = (InternalEObject)edge2; @@ -170,6 +173,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setEdge2(Edge newEdge2) { Edge oldEdge2 = edge2; edge2 = newEdge2; @@ -182,6 +186,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public Node2Node getTarget() { if (target != null && target.eIsProxy()) { InternalEObject oldTarget = (InternalEObject)target; @@ -208,6 +213,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setTarget(Node2Node newTarget) { Node2Node oldTarget = target; target = newTarget; @@ -220,6 +226,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public Node2Node getSource() { if (source != null && source.eIsProxy()) { InternalEObject oldSource = (InternalEObject)source; @@ -246,6 +253,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setSource(Node2Node newSource) { Node2Node oldSource = source; source = newSource; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Element2ElementImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Element2ElementImpl.java index c3aa5469e..00e10b9f0 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Element2ElementImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Element2ElementImpl.java @@ -65,6 +65,7 @@ public abstract class Element2ElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public Graph2Graph getOwner() { if (eContainerFeatureID() != Simplegraph2graphPackage.ELEMENT2_ELEMENT__OWNER) return null; return (Graph2Graph)eInternalContainer(); @@ -85,6 +86,7 @@ public abstract class Element2ElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(Graph2Graph newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != Simplegraph2graphPackage.ELEMENT2_ELEMENT__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Graph2GraphImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Graph2GraphImpl.java index 64bf088ec..817b35ae7 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Graph2GraphImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Graph2GraphImpl.java @@ -125,6 +125,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public Graph getGraph1() { if (graph1 != null && graph1.eIsProxy()) { InternalEObject oldGraph1 = (InternalEObject)graph1; @@ -151,6 +152,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public void setGraph1(Graph newGraph1) { Graph oldGraph1 = graph1; graph1 = newGraph1; @@ -163,6 +165,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public Graph getGraph2() { if (graph2 != null && graph2.eIsProxy()) { InternalEObject oldGraph2 = (InternalEObject)graph2; @@ -189,6 +192,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public void setGraph2(Graph newGraph2) { Graph oldGraph2 = graph2; graph2 = newGraph2; @@ -201,6 +205,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public EList<Element2Element> getElement2Element() { if (element2Element == null) { element2Element = new EObjectContainmentWithInverseEList<Element2Element>(Element2Element.class, this, Simplegraph2graphPackage.GRAPH2_GRAPH__ELEMENT2_ELEMENT, Simplegraph2graphPackage.ELEMENT2_ELEMENT__OWNER); @@ -213,6 +218,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -222,6 +228,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Node2NodeImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Node2NodeImpl.java index 8be1df460..1ccb10cb0 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Node2NodeImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Node2NodeImpl.java @@ -104,6 +104,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public Node getNode1() { if (node1 != null && node1.eIsProxy()) { InternalEObject oldNode1 = (InternalEObject)node1; @@ -130,6 +131,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public void setNode1(Node newNode1) { Node oldNode1 = node1; node1 = newNode1; @@ -142,6 +144,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public Node getNode2() { if (node2 != null && node2.eIsProxy()) { InternalEObject oldNode2 = (InternalEObject)node2; @@ -168,6 +171,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public void setNode2(Node newNode2) { Node oldNode2 = node2; node2 = newNode2; @@ -180,6 +184,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public String getLabel() { return label; } @@ -189,6 +194,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public void setLabel(String newLabel) { String oldLabel = label; label = newLabel; diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphFactoryImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphFactoryImpl.java index a3d978eb7..07a39d9e3 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphFactoryImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphFactoryImpl.java @@ -79,6 +79,7 @@ public class Simplegraph2graphFactoryImpl extends EFactoryImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public Graph2Graph createGraph2Graph() { Graph2GraphImpl graph2Graph = new Graph2GraphImpl(); return graph2Graph; @@ -89,6 +90,7 @@ public class Simplegraph2graphFactoryImpl extends EFactoryImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public Edge2Edge createEdge2Edge() { Edge2EdgeImpl edge2Edge = new Edge2EdgeImpl(); return edge2Edge; @@ -99,6 +101,7 @@ public class Simplegraph2graphFactoryImpl extends EFactoryImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public Node2Node createNode2Node() { Node2NodeImpl node2Node = new Node2NodeImpl(); return node2Node; @@ -109,6 +112,7 @@ public class Simplegraph2graphFactoryImpl extends EFactoryImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public Simplegraph2graphPackage getSimplegraph2graphPackage() { return (Simplegraph2graphPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java index ff959da54..f27461e9d 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java @@ -137,6 +137,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EClass getGraph2Graph() { return graph2GraphEClass; } @@ -146,6 +147,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getGraph2Graph_Graph1() { return (EReference)graph2GraphEClass.getEStructuralFeatures().get(0); } @@ -155,6 +157,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getGraph2Graph_Graph2() { return (EReference)graph2GraphEClass.getEStructuralFeatures().get(1); } @@ -164,6 +167,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getGraph2Graph_Element2Element() { return (EReference)graph2GraphEClass.getEStructuralFeatures().get(2); } @@ -173,6 +177,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getGraph2Graph_Name() { return (EAttribute)graph2GraphEClass.getEStructuralFeatures().get(3); } @@ -182,6 +187,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EClass getElement2Element() { return element2ElementEClass; } @@ -191,6 +197,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getElement2Element_Owner() { return (EReference)element2ElementEClass.getEStructuralFeatures().get(0); } @@ -200,6 +207,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EClass getEdge2Edge() { return edge2EdgeEClass; } @@ -209,6 +217,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge2Edge_Edge1() { return (EReference)edge2EdgeEClass.getEStructuralFeatures().get(0); } @@ -218,6 +227,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge2Edge_Edge2() { return (EReference)edge2EdgeEClass.getEStructuralFeatures().get(1); } @@ -227,6 +237,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge2Edge_Target() { return (EReference)edge2EdgeEClass.getEStructuralFeatures().get(2); } @@ -236,6 +247,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge2Edge_Source() { return (EReference)edge2EdgeEClass.getEStructuralFeatures().get(3); } @@ -245,6 +257,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EClass getNode2Node() { return node2NodeEClass; } @@ -254,6 +267,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode2Node_Node1() { return (EReference)node2NodeEClass.getEStructuralFeatures().get(0); } @@ -263,6 +277,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode2Node_Node2() { return (EReference)node2NodeEClass.getEStructuralFeatures().get(1); } @@ -272,6 +287,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNode2Node_Label() { return (EAttribute)node2NodeEClass.getEStructuralFeatures().get(2); } @@ -281,6 +297,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public Simplegraph2graphFactory getSimplegraph2graphFactory() { return (Simplegraph2graphFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/Families2Persons/Families2PersonsNormalizer.java b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/Families2Persons/Families2PersonsNormalizer.java index e8513188c..9fa780b25 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/Families2Persons/Families2PersonsNormalizer.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/Families2Persons/Families2PersonsNormalizer.java @@ -65,6 +65,7 @@ public class Families2PersonsNormalizer implements ModelNormalizer } } + @Override public @NonNull List<Normalizer> normalize(@NonNull Resource resource) { EObject eRoot = resource.getContents().get(0); EPackage ePackage = eRoot.eClass().getEPackage(); diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/QVTdMtcTests.java b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/QVTdMtcTests.java index 714560039..b18c155a2 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/QVTdMtcTests.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/QVTdMtcTests.java @@ -115,6 +115,7 @@ public class QVTdMtcTests extends LoadTestCase { /* (non-Javadoc) * @see org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase#setUp() */ + @Override @Before public void setUp() throws Exception { @@ -129,7 +130,8 @@ public class QVTdMtcTests extends LoadTestCase { /* (non-Javadoc) * @see org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase#tearDown() */ - @After + @Override + @After public void tearDown() throws Exception { super.tearDown(); } diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/UpperToLower/UpperToLowerNormalizer.java b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/UpperToLower/UpperToLowerNormalizer.java index 4e99df387..386e7641d 100644 --- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/UpperToLower/UpperToLowerNormalizer.java +++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/UpperToLower/UpperToLowerNormalizer.java @@ -133,6 +133,7 @@ public class UpperToLowerNormalizer implements ModelNormalizer } } + @Override public @NonNull List<Normalizer> normalize(@NonNull Resource resource) { EObject eRoot = resource.getContents().get(0); EPackage ePackage = eRoot.eClass().getEPackage(); diff --git a/tests/org.eclipse.qvtd.build.qvtrtoqvtc.tests/src/org/eclipse/qvtd/build/qvtrtoqvtc/tests/QvtrToQvtcTests.java b/tests/org.eclipse.qvtd.build.qvtrtoqvtc.tests/src/org/eclipse/qvtd/build/qvtrtoqvtc/tests/QvtrToQvtcTests.java index 13f70b2b9..7d818b921 100644 --- a/tests/org.eclipse.qvtd.build.qvtrtoqvtc.tests/src/org/eclipse/qvtd/build/qvtrtoqvtc/tests/QvtrToQvtcTests.java +++ b/tests/org.eclipse.qvtd.build.qvtrtoqvtc.tests/src/org/eclipse/qvtd/build/qvtrtoqvtc/tests/QvtrToQvtcTests.java @@ -25,6 +25,7 @@ public class QvtrToQvtcTests extends LoadTestCase { /* (non-Javadoc) * @see org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase#setUp() */ + @Override @Before public void setUp() throws Exception { // BaseLinkingService.DEBUG_RETRY.setState(true); @@ -37,7 +38,8 @@ public class QvtrToQvtcTests extends LoadTestCase { /* (non-Javadoc) * @see org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase#tearDown() */ - @After + @Override + @After public void tearDown() throws Exception { super.tearDown(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/ExecutionBenchmarks.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/ExecutionBenchmarks.java index 0b26a60d9..e9feb9bec 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/ExecutionBenchmarks.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/ExecutionBenchmarks.java @@ -70,6 +70,7 @@ public class ExecutionBenchmarks extends LoadTestCase { } } + @Override @Before public void setUp() throws Exception { super.setUp(); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java index 44b5e569b..dce7e9fb2 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java @@ -241,6 +241,7 @@ public class OCL2QVTiTestCases extends LoadTestCase { // } } + @Override @Before public void setUp() throws Exception { super.setUp(); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/PathElementCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/PathElementCSImpl.java index d1ecbd347..312567493 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/PathElementCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/PathElementCSImpl.java @@ -77,6 +77,7 @@ public class PathElementCSImpl extends SElementImpl implements PathElementCS { * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -86,6 +87,7 @@ public class PathElementCSImpl extends SElementImpl implements PathElementCS { * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/PathNameCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/PathNameCSImpl.java index 9c8e2c7df..671b66750 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/PathNameCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/PathNameCSImpl.java @@ -73,6 +73,7 @@ public class PathNameCSImpl extends SElementImpl implements PathNameCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<PathElementCS> getPath() { if (path == null) { path = new EObjectContainmentEList<PathElementCS>(PathElementCS.class, this, SourcePackage.PATH_NAME_CS__PATH); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SElementImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SElementImpl.java index 6ad6f0fd9..b523772a5 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SElementImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SElementImpl.java @@ -70,6 +70,7 @@ public class SElementImpl extends MinimalEObjectImpl.Container implements SEleme * <!-- end-user-doc --> * @generated */ + @Override public EObject getAst() { if (ast != null && ast.eIsProxy()) { InternalEObject oldAst = (InternalEObject)ast; @@ -96,6 +97,7 @@ public class SElementImpl extends MinimalEObjectImpl.Container implements SEleme * <!-- end-user-doc --> * @generated */ + @Override public void setAst(EObject newAst) { EObject oldAst = ast; ast = newAst; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SRootImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SRootImpl.java index b88aa3c0c..446153d73 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SRootImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SRootImpl.java @@ -73,6 +73,7 @@ public class SRootImpl extends SElementImpl implements SRoot { * <!-- end-user-doc --> * @generated */ + @Override public EList<X> getOwnedX() { if (ownedX == null) { ownedX = new EObjectContainmentEList<X>(X.class, this, SourcePackage.SROOT__OWNED_X); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourceFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourceFactoryImpl.java index 9153822ef..147be933e 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourceFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourceFactoryImpl.java @@ -91,6 +91,7 @@ public class SourceFactoryImpl extends EFactoryImpl implements SourceFactory { * <!-- end-user-doc --> * @generated */ + @Override public X createX() { XImpl x = new XImpl(); return x; @@ -101,6 +102,7 @@ public class SourceFactoryImpl extends EFactoryImpl implements SourceFactory { * <!-- end-user-doc --> * @generated */ + @Override public Y1 createY1() { Y1Impl y1 = new Y1Impl(); return y1; @@ -111,6 +113,7 @@ public class SourceFactoryImpl extends EFactoryImpl implements SourceFactory { * <!-- end-user-doc --> * @generated */ + @Override public Y2 createY2() { Y2Impl y2 = new Y2Impl(); return y2; @@ -121,6 +124,7 @@ public class SourceFactoryImpl extends EFactoryImpl implements SourceFactory { * <!-- end-user-doc --> * @generated */ + @Override public Z createZ() { ZImpl z = new ZImpl(); return z; @@ -131,6 +135,7 @@ public class SourceFactoryImpl extends EFactoryImpl implements SourceFactory { * <!-- end-user-doc --> * @generated */ + @Override public SRoot createSRoot() { SRootImpl sRoot = new SRootImpl(); return sRoot; @@ -141,6 +146,7 @@ public class SourceFactoryImpl extends EFactoryImpl implements SourceFactory { * <!-- end-user-doc --> * @generated */ + @Override public SElement createSElement() { SElementImpl sElement = new SElementImpl(); return sElement; @@ -151,6 +157,7 @@ public class SourceFactoryImpl extends EFactoryImpl implements SourceFactory { * <!-- end-user-doc --> * @generated */ + @Override public PathNameCS createPathNameCS() { PathNameCSImpl pathNameCS = new PathNameCSImpl(); return pathNameCS; @@ -161,6 +168,7 @@ public class SourceFactoryImpl extends EFactoryImpl implements SourceFactory { * <!-- end-user-doc --> * @generated */ + @Override public PathElementCS createPathElementCS() { PathElementCSImpl pathElementCS = new PathElementCSImpl(); return pathElementCS; @@ -171,6 +179,7 @@ public class SourceFactoryImpl extends EFactoryImpl implements SourceFactory { * <!-- end-user-doc --> * @generated */ + @Override public SourcePackage getSourcePackage() { return (SourcePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourcePackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourcePackageImpl.java index 9b1c391dd..39223cdba 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourcePackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourcePackageImpl.java @@ -162,6 +162,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getX() { return xEClass; } @@ -171,6 +172,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getX_OwnsY() { return (EReference)xEClass.getEStructuralFeatures().get(0); } @@ -180,6 +182,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getX_IsA1() { return (EAttribute)xEClass.getEStructuralFeatures().get(1); } @@ -189,6 +192,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getX_IsA2() { return (EAttribute)xEClass.getEStructuralFeatures().get(2); } @@ -198,6 +202,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getX_Name() { return (EAttribute)xEClass.getEStructuralFeatures().get(3); } @@ -207,6 +212,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getY() { return yEClass; } @@ -216,6 +222,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getY_OwnsZ() { return (EReference)yEClass.getEStructuralFeatures().get(0); } @@ -225,6 +232,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getY_Name() { return (EAttribute)yEClass.getEStructuralFeatures().get(1); } @@ -234,6 +242,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getY_ToX() { return (EReference)yEClass.getEStructuralFeatures().get(2); } @@ -243,6 +252,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getY1() { return y1EClass; } @@ -252,6 +262,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getY2() { return y2EClass; } @@ -261,6 +272,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getZ() { return zEClass; } @@ -270,6 +282,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getZ_ToY() { return (EReference)zEClass.getEStructuralFeatures().get(0); } @@ -279,6 +292,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getZ_Refers() { return (EReference)zEClass.getEStructuralFeatures().get(1); } @@ -288,6 +302,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getSRoot() { return sRootEClass; } @@ -297,6 +312,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getSRoot_OwnedX() { return (EReference)sRootEClass.getEStructuralFeatures().get(0); } @@ -306,6 +322,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getSElement() { return sElementEClass; } @@ -315,6 +332,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getSElement_Ast() { return (EReference)sElementEClass.getEStructuralFeatures().get(0); } @@ -324,6 +342,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPathNameCS() { return pathNameCSEClass; } @@ -333,6 +352,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPathNameCS_Path() { return (EReference)pathNameCSEClass.getEStructuralFeatures().get(0); } @@ -342,6 +362,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPathElementCS() { return pathElementCSEClass; } @@ -351,6 +372,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getPathElementCS_Name() { return (EAttribute)pathElementCSEClass.getEStructuralFeatures().get(0); } @@ -360,6 +382,7 @@ public class SourcePackageImpl extends EPackageImpl implements SourcePackage { * <!-- end-user-doc --> * @generated */ + @Override public SourceFactory getSourceFactory() { return (SourceFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/XImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/XImpl.java index 4dafc06b9..96c71f872 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/XImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/XImpl.java @@ -138,6 +138,7 @@ public class XImpl extends SElementImpl implements X { * <!-- end-user-doc --> * @generated */ + @Override public EList<Y> getOwnsY() { if (ownsY == null) { ownsY = new EObjectContainmentWithInverseEList<Y>(Y.class, this, SourcePackage.X__OWNS_Y, SourcePackage.Y__TO_X); @@ -150,6 +151,7 @@ public class XImpl extends SElementImpl implements X { * <!-- end-user-doc --> * @generated */ + @Override public boolean isIsA1() { return isA1; } @@ -159,6 +161,7 @@ public class XImpl extends SElementImpl implements X { * <!-- end-user-doc --> * @generated */ + @Override public void setIsA1(boolean newIsA1) { boolean oldIsA1 = isA1; isA1 = newIsA1; @@ -171,6 +174,7 @@ public class XImpl extends SElementImpl implements X { * <!-- end-user-doc --> * @generated */ + @Override public boolean isIsA2() { return isA2; } @@ -180,6 +184,7 @@ public class XImpl extends SElementImpl implements X { * <!-- end-user-doc --> * @generated */ + @Override public void setIsA2(boolean newIsA2) { boolean oldIsA2 = isA2; isA2 = newIsA2; @@ -192,6 +197,7 @@ public class XImpl extends SElementImpl implements X { * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -201,6 +207,7 @@ public class XImpl extends SElementImpl implements X { * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/YImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/YImpl.java index 63cf163bd..f0d2b49f0 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/YImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/YImpl.java @@ -94,6 +94,7 @@ public abstract class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public Z getOwnsZ() { return ownsZ; } @@ -118,6 +119,7 @@ public abstract class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public void setOwnsZ(Z newOwnsZ) { if (newOwnsZ != ownsZ) { NotificationChain msgs = null; @@ -137,6 +139,7 @@ public abstract class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -146,6 +149,7 @@ public abstract class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -158,6 +162,7 @@ public abstract class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public X getToX() { if (eContainerFeatureID() != SourcePackage.Y__TO_X) return null; return (X)eInternalContainer(); @@ -178,6 +183,7 @@ public abstract class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public void setToX(X newToX) { if (newToX != eInternalContainer() || (eContainerFeatureID() != SourcePackage.Y__TO_X && newToX != null)) { if (EcoreUtil.isAncestor(this, newToX)) diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/ZImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/ZImpl.java index 16af28209..625c4f20c 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/ZImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/ZImpl.java @@ -73,6 +73,7 @@ public class ZImpl extends SElementImpl implements Z { * <!-- end-user-doc --> * @generated */ + @Override public Y getToY() { if (eContainerFeatureID() != SourcePackage.Z__TO_Y) return null; return (Y)eInternalContainer(); @@ -93,6 +94,7 @@ public class ZImpl extends SElementImpl implements Z { * <!-- end-user-doc --> * @generated */ + @Override public void setToY(Y newToY) { if (newToY != eInternalContainer() || (eContainerFeatureID() != SourcePackage.Z__TO_Y && newToY != null)) { if (EcoreUtil.isAncestor(this, newToY)) @@ -114,6 +116,7 @@ public class ZImpl extends SElementImpl implements Z { * <!-- end-user-doc --> * @generated */ + @Override public PathNameCS getRefers() { return refers; } @@ -138,6 +141,7 @@ public class ZImpl extends SElementImpl implements Z { * <!-- end-user-doc --> * @generated */ + @Override public void setRefers(PathNameCS newRefers) { if (newRefers != refers) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/A1Impl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/A1Impl.java index d2feef9a9..95978cef1 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/A1Impl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/A1Impl.java @@ -74,6 +74,7 @@ public class A1Impl extends AImpl implements A1 { * <!-- end-user-doc --> * @generated */ + @Override public EList<B> getOwnsB() { if (ownsB == null) { ownsB = new EObjectContainmentWithInverseEList<B>(B.class, this, TargetPackage.A1__OWNS_B, TargetPackage.B__TO_A1); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/A2Impl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/A2Impl.java index bfaebe7f4..bf7a28565 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/A2Impl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/A2Impl.java @@ -74,6 +74,7 @@ public class A2Impl extends AImpl implements A2 { * <!-- end-user-doc --> * @generated */ + @Override public EList<C> getOwnsC() { if (ownsC == null) { ownsC = new EObjectContainmentWithInverseEList<C>(C.class, this, TargetPackage.A2__OWNS_C, TargetPackage.C__TO_A2); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/BImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/BImpl.java index 286777b61..185c8c7fd 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/BImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/BImpl.java @@ -74,6 +74,7 @@ public class BImpl extends NamespaceImpl implements B { * <!-- end-user-doc --> * @generated */ + @Override public A1 getToA1() { if (eContainerFeatureID() != TargetPackage.B__TO_A1) return null; return (A1)eInternalContainer(); @@ -94,6 +95,7 @@ public class BImpl extends NamespaceImpl implements B { * <!-- end-user-doc --> * @generated */ + @Override public void setToA1(A1 newToA1) { if (newToA1 != eInternalContainer() || (eContainerFeatureID() != TargetPackage.B__TO_A1 && newToA1 != null)) { if (EcoreUtil.isAncestor(this, newToA1)) @@ -115,6 +117,7 @@ public class BImpl extends NamespaceImpl implements B { * <!-- end-user-doc --> * @generated */ + @Override public D getOwnsD() { return ownsD; } @@ -139,6 +142,7 @@ public class BImpl extends NamespaceImpl implements B { * <!-- end-user-doc --> * @generated */ + @Override public void setOwnsD(D newOwnsD) { if (newOwnsD != ownsD) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/CImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/CImpl.java index 7fb0c9515..c0a916086 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/CImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/CImpl.java @@ -74,6 +74,7 @@ public class CImpl extends NamespaceImpl implements C { * <!-- end-user-doc --> * @generated */ + @Override public A2 getToA2() { if (eContainerFeatureID() != TargetPackage.C__TO_A2) return null; return (A2)eInternalContainer(); @@ -94,6 +95,7 @@ public class CImpl extends NamespaceImpl implements C { * <!-- end-user-doc --> * @generated */ + @Override public void setToA2(A2 newToA2) { if (newToA2 != eInternalContainer() || (eContainerFeatureID() != TargetPackage.C__TO_A2 && newToA2 != null)) { if (EcoreUtil.isAncestor(this, newToA2)) @@ -115,6 +117,7 @@ public class CImpl extends NamespaceImpl implements C { * <!-- end-user-doc --> * @generated */ + @Override public D getOwnsD() { return ownsD; } @@ -139,6 +142,7 @@ public class CImpl extends NamespaceImpl implements C { * <!-- end-user-doc --> * @generated */ + @Override public void setOwnsD(D newOwnsD) { if (newOwnsD != ownsD) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/DImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/DImpl.java index c13b4730a..cc6f49391 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/DImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/DImpl.java @@ -98,6 +98,7 @@ public class DImpl extends NamedElementImpl implements D { * <!-- end-user-doc --> * @generated */ + @Override public C getToC() { if (eContainerFeatureID() != TargetPackage.D__TO_C) return null; return (C)eInternalContainer(); @@ -118,6 +119,7 @@ public class DImpl extends NamedElementImpl implements D { * <!-- end-user-doc --> * @generated */ + @Override public void setToC(C newToC) { if (newToC != eInternalContainer() || (eContainerFeatureID() != TargetPackage.D__TO_C && newToC != null)) { if (EcoreUtil.isAncestor(this, newToC)) @@ -139,6 +141,7 @@ public class DImpl extends NamedElementImpl implements D { * <!-- end-user-doc --> * @generated */ + @Override public B getToB() { if (eContainerFeatureID() != TargetPackage.D__TO_B) return null; return (B)eInternalContainer(); @@ -159,6 +162,7 @@ public class DImpl extends NamedElementImpl implements D { * <!-- end-user-doc --> * @generated */ + @Override public void setToB(B newToB) { if (newToB != eInternalContainer() || (eContainerFeatureID() != TargetPackage.D__TO_B && newToB != null)) { if (EcoreUtil.isAncestor(this, newToB)) @@ -180,6 +184,7 @@ public class DImpl extends NamedElementImpl implements D { * <!-- end-user-doc --> * @generated */ + @Override public A getToA() { if (toA != null && toA.eIsProxy()) { InternalEObject oldToA = (InternalEObject)toA; @@ -206,6 +211,7 @@ public class DImpl extends NamedElementImpl implements D { * <!-- end-user-doc --> * @generated */ + @Override public void setToA(A newToA) { A oldToA = toA; toA = newToA; @@ -218,6 +224,7 @@ public class DImpl extends NamedElementImpl implements D { * <!-- end-user-doc --> * @generated */ + @Override public B getRefsB() { if (refsB != null && refsB.eIsProxy()) { InternalEObject oldRefsB = (InternalEObject)refsB; @@ -244,6 +251,7 @@ public class DImpl extends NamedElementImpl implements D { * <!-- end-user-doc --> * @generated */ + @Override public void setRefsB(B newRefsB) { B oldRefsB = refsB; refsB = newRefsB; @@ -256,6 +264,7 @@ public class DImpl extends NamedElementImpl implements D { * <!-- end-user-doc --> * @generated */ + @Override public C getRefsC() { if (refsC != null && refsC.eIsProxy()) { InternalEObject oldRefsC = (InternalEObject)refsC; @@ -282,6 +291,7 @@ public class DImpl extends NamedElementImpl implements D { * <!-- end-user-doc --> * @generated */ + @Override public void setRefsC(C newRefsC) { C oldRefsC = refsC; refsC = newRefsC; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/NamedElementImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/NamedElementImpl.java index 0d53fefed..21fcfbf46 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/NamedElementImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/NamedElementImpl.java @@ -79,6 +79,7 @@ public class NamedElementImpl extends MinimalEObjectImpl.Container implements Na * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -88,6 +89,7 @@ public class NamedElementImpl extends MinimalEObjectImpl.Container implements Na * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TRootImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TRootImpl.java index 6432ae478..c2bc4adea 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TRootImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TRootImpl.java @@ -75,6 +75,7 @@ public class TRootImpl extends MinimalEObjectImpl.Container implements TRoot { * <!-- end-user-doc --> * @generated */ + @Override public EList<A> getOwnedA() { if (ownedA == null) { ownedA = new EObjectContainmentEList<A>(A.class, this, TargetPackage.TROOT__OWNED_A); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetFactoryImpl.java index bf9e55d15..7cfa445c6 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetFactoryImpl.java @@ -93,6 +93,7 @@ public class TargetFactoryImpl extends EFactoryImpl implements TargetFactory { * <!-- end-user-doc --> * @generated */ + @Override public A1 createA1() { A1Impl a1 = new A1Impl(); return a1; @@ -103,6 +104,7 @@ public class TargetFactoryImpl extends EFactoryImpl implements TargetFactory { * <!-- end-user-doc --> * @generated */ + @Override public A2 createA2() { A2Impl a2 = new A2Impl(); return a2; @@ -113,6 +115,7 @@ public class TargetFactoryImpl extends EFactoryImpl implements TargetFactory { * <!-- end-user-doc --> * @generated */ + @Override public A3 createA3() { A3Impl a3 = new A3Impl(); return a3; @@ -123,6 +126,7 @@ public class TargetFactoryImpl extends EFactoryImpl implements TargetFactory { * <!-- end-user-doc --> * @generated */ + @Override public B createB() { BImpl b = new BImpl(); return b; @@ -133,6 +137,7 @@ public class TargetFactoryImpl extends EFactoryImpl implements TargetFactory { * <!-- end-user-doc --> * @generated */ + @Override public C createC() { CImpl c = new CImpl(); return c; @@ -143,6 +148,7 @@ public class TargetFactoryImpl extends EFactoryImpl implements TargetFactory { * <!-- end-user-doc --> * @generated */ + @Override public D createD() { DImpl d = new DImpl(); return d; @@ -153,6 +159,7 @@ public class TargetFactoryImpl extends EFactoryImpl implements TargetFactory { * <!-- end-user-doc --> * @generated */ + @Override public TRoot createTRoot() { TRootImpl tRoot = new TRootImpl(); return tRoot; @@ -163,6 +170,7 @@ public class TargetFactoryImpl extends EFactoryImpl implements TargetFactory { * <!-- end-user-doc --> * @generated */ + @Override public NamedElement createNamedElement() { NamedElementImpl namedElement = new NamedElementImpl(); return namedElement; @@ -173,6 +181,7 @@ public class TargetFactoryImpl extends EFactoryImpl implements TargetFactory { * <!-- end-user-doc --> * @generated */ + @Override public Namespace createNamespace() { NamespaceImpl namespace = new NamespaceImpl(); return namespace; @@ -183,6 +192,7 @@ public class TargetFactoryImpl extends EFactoryImpl implements TargetFactory { * <!-- end-user-doc --> * @generated */ + @Override public TargetPackage getTargetPackage() { return (TargetPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetPackageImpl.java index 4fab4c02a..e36020027 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetPackageImpl.java @@ -183,6 +183,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getA() { return aEClass; } @@ -192,6 +193,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getA1() { return a1EClass; } @@ -201,6 +203,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getA1_OwnsB() { return (EReference)a1EClass.getEStructuralFeatures().get(0); } @@ -210,6 +213,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getA2() { return a2EClass; } @@ -219,6 +223,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getA2_OwnsC() { return (EReference)a2EClass.getEStructuralFeatures().get(0); } @@ -228,6 +233,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getA3() { return a3EClass; } @@ -237,6 +243,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getB() { return bEClass; } @@ -246,6 +253,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getB_ToA1() { return (EReference)bEClass.getEStructuralFeatures().get(0); } @@ -255,6 +263,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getB_OwnsD() { return (EReference)bEClass.getEStructuralFeatures().get(1); } @@ -264,6 +273,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getC() { return cEClass; } @@ -273,6 +283,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getC_ToA2() { return (EReference)cEClass.getEStructuralFeatures().get(0); } @@ -282,6 +293,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getC_OwnsD() { return (EReference)cEClass.getEStructuralFeatures().get(1); } @@ -291,6 +303,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getD() { return dEClass; } @@ -300,6 +313,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getD_ToC() { return (EReference)dEClass.getEStructuralFeatures().get(0); } @@ -309,6 +323,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getD_ToB() { return (EReference)dEClass.getEStructuralFeatures().get(1); } @@ -318,6 +333,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getD_ToA() { return (EReference)dEClass.getEStructuralFeatures().get(2); } @@ -327,6 +343,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getD_RefsB() { return (EReference)dEClass.getEStructuralFeatures().get(3); } @@ -336,6 +353,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getD_RefsC() { return (EReference)dEClass.getEStructuralFeatures().get(4); } @@ -345,6 +363,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getTRoot() { return tRootEClass; } @@ -354,6 +373,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTRoot_OwnedA() { return (EReference)tRootEClass.getEStructuralFeatures().get(0); } @@ -363,6 +383,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNamedElement() { return namedElementEClass; } @@ -372,6 +393,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNamedElement_Name() { return (EAttribute)namedElementEClass.getEStructuralFeatures().get(0); } @@ -381,6 +403,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNamespace() { return namespaceEClass; } @@ -390,6 +413,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getVisitable() { return visitableEClass; } @@ -399,6 +423,7 @@ public class TargetPackageImpl extends EPackageImpl implements TargetPackage { * <!-- end-user-doc --> * @generated */ + @Override public TargetFactory getTargetFactory() { return (TargetFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentFactoryImpl.java index e0169eb7d..829d6fb6d 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentFactoryImpl.java @@ -77,6 +77,7 @@ public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentF * <!-- end-user-doc --> * @generated */ + @Override public LookupEnvironment createLookupEnvironment() { LookupEnvironmentImpl lookupEnvironment = new LookupEnvironmentImpl(); return lookupEnvironment; @@ -87,6 +88,7 @@ public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentF * <!-- end-user-doc --> * @generated */ + @Override public EnvironmentPackage getEnvironmentPackage() { return (EnvironmentPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentPackageImpl.java index 995a27e0f..db27d86d8 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentPackageImpl.java @@ -129,6 +129,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EClass getLookupEnvironment() { return lookupEnvironmentEClass; } @@ -138,6 +139,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EReference getLookupEnvironment_NamedElements() { return (EReference)lookupEnvironmentEClass.getEStructuralFeatures().get(0); } @@ -147,6 +149,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EReference getLookupEnvironment_ParentEnv() { return (EReference)lookupEnvironmentEClass.getEStructuralFeatures().get(1); } @@ -156,6 +159,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EOperation getLookupEnvironment__AddElements__Collection() { return lookupEnvironmentEClass.getEOperations().get(0); } @@ -165,6 +169,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EOperation getLookupEnvironment__AddElement__NamedElement() { return lookupEnvironmentEClass.getEOperations().get(1); } @@ -174,6 +179,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EClass getEnv4CG() { return env4CGEClass; } @@ -183,6 +189,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EOperation getEnv4CG__HasFinalResult() { return env4CGEClass.getEOperations().get(0); } @@ -192,6 +199,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EOperation getEnv4CG__GetExecutor() { return env4CGEClass.getEOperations().get(1); } @@ -201,6 +209,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EClass getExecutor() { return executorEClass; } @@ -210,6 +219,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EnvironmentFactory getEnvironmentFactory() { return (EnvironmentFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/LookupEnvironmentImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/LookupEnvironmentImpl.java index 128b3394a..cca43110e 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/LookupEnvironmentImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/LookupEnvironmentImpl.java @@ -95,6 +95,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public EList<NamedElement> getNamedElements() { if (namedElements == null) { namedElements = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, EnvironmentPackage.LOOKUP_ENVIRONMENT__NAMED_ELEMENTS); @@ -107,6 +108,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public LookupEnvironment getParentEnv() { if (parentEnv != null && parentEnv.eIsProxy()) { InternalEObject oldParentEnv = (InternalEObject)parentEnv; @@ -133,6 +135,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public void setParentEnv(LookupEnvironment newParentEnv) { LookupEnvironment oldParentEnv = parentEnv; parentEnv = newParentEnv; @@ -145,6 +148,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public <NE extends NamedElement> LookupEnvironment addElements(final Collection<NE> elements) { /** * @@ -176,6 +180,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public LookupEnvironment addElement(final NamedElement element) { /** * @@ -206,6 +211,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public boolean hasFinalResult() { throw new UnsupportedOperationException("LookupEnvironment::hasFinalResult() has been created for CG purposes. Don't call this method"); } @@ -215,6 +221,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public Executor getExecutor() { throw new UnsupportedOperationException("LookupEnvironment::getEvaluator() has been created for CG purposes. Don't call this method"); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/CallExpImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/CallExpImpl.java index 5cf186178..bffadbc35 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/CallExpImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/CallExpImpl.java @@ -72,6 +72,7 @@ public abstract class CallExpImpl extends TypedElementImpl implements CallExp { * <!-- end-user-doc --> * @generated */ + @Override public CallExp getOwnedCallExp() { return ownedCallExp; } @@ -96,6 +97,7 @@ public abstract class CallExpImpl extends TypedElementImpl implements CallExp { * <!-- end-user-doc --> * @generated */ + @Override public void setOwnedCallExp(CallExp newOwnedCallExp) { if (newOwnedCallExp != ownedCallExp) { NotificationChain msgs = null; @@ -115,6 +117,7 @@ public abstract class CallExpImpl extends TypedElementImpl implements CallExp { * <!-- end-user-doc --> * @generated */ + @Override public CallExp getOwningSource() { if (eContainerFeatureID() != ClassesPackage.CALL_EXP__OWNING_SOURCE) return null; return (CallExp)eInternalContainer(); @@ -135,6 +138,7 @@ public abstract class CallExpImpl extends TypedElementImpl implements CallExp { * <!-- end-user-doc --> * @generated */ + @Override public void setOwningSource(CallExp newOwningSource) { if (newOwningSource != eInternalContainer() || (eContainerFeatureID() != ClassesPackage.CALL_EXP__OWNING_SOURCE && newOwningSource != null)) { if (EcoreUtil.isAncestor(this, newOwningSource)) diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassImpl.java index a66b883c0..7dda11811 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassImpl.java @@ -96,6 +96,7 @@ public class ClassImpl extends NamedElementImpl implements example2.classes.Clas * <!-- end-user-doc --> * @generated */ + @Override public example2.classes.Class getSuperClass() { if (superClass != null && superClass.eIsProxy()) { InternalEObject oldSuperClass = (InternalEObject)superClass; @@ -122,6 +123,7 @@ public class ClassImpl extends NamedElementImpl implements example2.classes.Clas * <!-- end-user-doc --> * @generated */ + @Override public void setSuperClass(example2.classes.Class newSuperClass) { example2.classes.Class oldSuperClass = superClass; superClass = newSuperClass; @@ -134,6 +136,7 @@ public class ClassImpl extends NamedElementImpl implements example2.classes.Clas * <!-- end-user-doc --> * @generated */ + @Override public EList<Operation> getOwnedOperations() { if (ownedOperations == null) { ownedOperations = new EObjectContainmentEList<Operation>(Operation.class, this, ClassesPackage.CLASS__OWNED_OPERATIONS); @@ -146,6 +149,7 @@ public class ClassImpl extends NamedElementImpl implements example2.classes.Clas * <!-- end-user-doc --> * @generated */ + @Override public EList<Property> getOwnedProperties() { if (ownedProperties == null) { ownedProperties = new EObjectContainmentEList<Property>(Property.class, this, ClassesPackage.CLASS__OWNED_PROPERTIES); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassesFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassesFactoryImpl.java index 23ba81fd6..8df5af28d 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassesFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassesFactoryImpl.java @@ -91,6 +91,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public example2.classes.Package createPackage() { PackageImpl package_ = new PackageImpl(); return package_; @@ -101,6 +102,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public example2.classes.Class createClass() { ClassImpl class_ = new ClassImpl(); return class_; @@ -111,6 +113,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public Property createProperty() { PropertyImpl property = new PropertyImpl(); return property; @@ -121,6 +124,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public Operation createOperation() { OperationImpl operation = new OperationImpl(); return operation; @@ -131,6 +135,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public Parameter createParameter() { ParameterImpl parameter = new ParameterImpl(); return parameter; @@ -141,6 +146,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public PropertyCallExp createPropertyCallExp() { PropertyCallExpImpl propertyCallExp = new PropertyCallExpImpl(); return propertyCallExp; @@ -151,6 +157,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public OperationCallExp createOperationCallExp() { OperationCallExpImpl operationCallExp = new OperationCallExpImpl(); return operationCallExp; @@ -161,6 +168,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public Argument createArgument() { ArgumentImpl argument = new ArgumentImpl(); return argument; @@ -171,6 +179,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public Root createRoot() { RootImpl root = new RootImpl(); return root; @@ -181,6 +190,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public ClassesPackage getClassesPackage() { return (ClassesPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassesPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassesPackageImpl.java index f931a268e..59a471923 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassesPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/ClassesPackageImpl.java @@ -220,6 +220,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getElement() { return elementEClass; } @@ -229,6 +230,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNamedElement() { return namedElementEClass; } @@ -238,6 +240,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNamedElement_Name() { return (EAttribute)namedElementEClass.getEStructuralFeatures().get(0); } @@ -247,6 +250,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNamespace() { return namespaceEClass; } @@ -256,6 +260,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getTypedElement() { return typedElementEClass; } @@ -265,6 +270,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTypedElement_Type() { return (EReference)typedElementEClass.getEStructuralFeatures().get(0); } @@ -274,6 +280,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getCallExp() { return callExpEClass; } @@ -283,6 +290,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getCallExp_OwnedCallExp() { return (EReference)callExpEClass.getEStructuralFeatures().get(0); } @@ -292,6 +300,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getCallExp_OwningSource() { return (EReference)callExpEClass.getEStructuralFeatures().get(1); } @@ -301,6 +310,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackage() { return packageEClass; } @@ -310,6 +320,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackage_OwnedClasses() { return (EReference)packageEClass.getEStructuralFeatures().get(0); } @@ -319,6 +330,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackage_OwnedPackages() { return (EReference)packageEClass.getEStructuralFeatures().get(1); } @@ -328,6 +340,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getClass_() { return classEClass; } @@ -337,6 +350,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_SuperClass() { return (EReference)classEClass.getEStructuralFeatures().get(0); } @@ -346,6 +360,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_OwnedOperations() { return (EReference)classEClass.getEStructuralFeatures().get(1); } @@ -355,6 +370,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_OwnedProperties() { return (EReference)classEClass.getEStructuralFeatures().get(2); } @@ -364,6 +380,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getProperty() { return propertyEClass; } @@ -373,6 +390,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getOperation() { return operationEClass; } @@ -382,6 +400,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getOperation_OwnedParameters() { return (EReference)operationEClass.getEStructuralFeatures().get(0); } @@ -391,6 +410,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getOperation_OwnedExpressions() { return (EReference)operationEClass.getEStructuralFeatures().get(1); } @@ -400,6 +420,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getParameter() { return parameterEClass; } @@ -409,6 +430,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPropertyCallExp() { return propertyCallExpEClass; } @@ -418,6 +440,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPropertyCallExp_ReferredProperty() { return (EReference)propertyCallExpEClass.getEStructuralFeatures().get(0); } @@ -427,6 +450,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getOperationCallExp() { return operationCallExpEClass; } @@ -436,6 +460,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getOperationCallExp_OwnedArguments() { return (EReference)operationCallExpEClass.getEStructuralFeatures().get(0); } @@ -445,6 +470,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getOperationCallExp_ReferredOperation() { return (EReference)operationCallExpEClass.getEStructuralFeatures().get(1); } @@ -454,6 +480,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getArgument() { return argumentEClass; } @@ -463,6 +490,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getRoot() { return rootEClass; } @@ -472,6 +500,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getRoot_OwnedPackages() { return (EReference)rootEClass.getEStructuralFeatures().get(0); } @@ -481,6 +510,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getVisitable() { return visitableEClass; } @@ -490,6 +520,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public ClassesFactory getClassesFactory() { return (ClassesFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/NamedElementImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/NamedElementImpl.java index 1e63e586e..31c0d3f15 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/NamedElementImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/NamedElementImpl.java @@ -77,6 +77,7 @@ public abstract class NamedElementImpl extends ElementImpl implements NamedEleme * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -86,6 +87,7 @@ public abstract class NamedElementImpl extends ElementImpl implements NamedEleme * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/OperationCallExpImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/OperationCallExpImpl.java index b384e3893..39cd58eae 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/OperationCallExpImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/OperationCallExpImpl.java @@ -94,6 +94,7 @@ public class OperationCallExpImpl extends CallExpImpl implements OperationCallEx * <!-- end-user-doc --> * @generated */ + @Override public EList<Argument> getOwnedArguments() { if (ownedArguments == null) { ownedArguments = new EObjectContainmentEList<Argument>(Argument.class, this, ClassesPackage.OPERATION_CALL_EXP__OWNED_ARGUMENTS); @@ -106,6 +107,7 @@ public class OperationCallExpImpl extends CallExpImpl implements OperationCallEx * <!-- end-user-doc --> * @generated */ + @Override public Operation getReferredOperation() { if (referredOperation != null && referredOperation.eIsProxy()) { InternalEObject oldReferredOperation = (InternalEObject)referredOperation; @@ -132,6 +134,7 @@ public class OperationCallExpImpl extends CallExpImpl implements OperationCallEx * <!-- end-user-doc --> * @generated */ + @Override public void setReferredOperation(Operation newReferredOperation) { Operation oldReferredOperation = referredOperation; referredOperation = newReferredOperation; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/OperationImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/OperationImpl.java index 692169e86..717d5481e 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/OperationImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/OperationImpl.java @@ -107,6 +107,7 @@ public class OperationImpl extends NamedElementImpl implements Operation { * <!-- end-user-doc --> * @generated */ + @Override public example2.classes.Class getType() { if (type != null && type.eIsProxy()) { InternalEObject oldType = (InternalEObject)type; @@ -133,6 +134,7 @@ public class OperationImpl extends NamedElementImpl implements Operation { * <!-- end-user-doc --> * @generated */ + @Override public void setType(example2.classes.Class newType) { example2.classes.Class oldType = type; type = newType; @@ -145,6 +147,7 @@ public class OperationImpl extends NamedElementImpl implements Operation { * <!-- end-user-doc --> * @generated */ + @Override public EList<Parameter> getOwnedParameters() { if (ownedParameters == null) { ownedParameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, ClassesPackage.OPERATION__OWNED_PARAMETERS); @@ -157,6 +160,7 @@ public class OperationImpl extends NamedElementImpl implements Operation { * <!-- end-user-doc --> * @generated */ + @Override public EList<CallExp> getOwnedExpressions() { if (ownedExpressions == null) { ownedExpressions = new EObjectContainmentEList<CallExp>(CallExp.class, this, ClassesPackage.OPERATION__OWNED_EXPRESSIONS); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PackageImpl.java index 680f0e823..c75fa37eb 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PackageImpl.java @@ -83,6 +83,7 @@ public class PackageImpl extends NamedElementImpl implements example2.classes.Pa * <!-- end-user-doc --> * @generated */ + @Override public EList<example2.classes.Class> getOwnedClasses() { if (ownedClasses == null) { ownedClasses = new EObjectContainmentEList<example2.classes.Class>(example2.classes.Class.class, this, ClassesPackage.PACKAGE__OWNED_CLASSES); @@ -95,6 +96,7 @@ public class PackageImpl extends NamedElementImpl implements example2.classes.Pa * <!-- end-user-doc --> * @generated */ + @Override public EList<example2.classes.Package> getOwnedPackages() { if (ownedPackages == null) { ownedPackages = new EObjectContainmentEList<example2.classes.Package>(example2.classes.Package.class, this, ClassesPackage.PACKAGE__OWNED_PACKAGES); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PropertyCallExpImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PropertyCallExpImpl.java index fcfb97411..fe5f53dbd 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PropertyCallExpImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PropertyCallExpImpl.java @@ -73,6 +73,7 @@ public class PropertyCallExpImpl extends CallExpImpl implements PropertyCallExp * <!-- end-user-doc --> * @generated */ + @Override public Property getReferredProperty() { if (referredProperty != null && referredProperty.eIsProxy()) { InternalEObject oldReferredProperty = (InternalEObject)referredProperty; @@ -99,6 +100,7 @@ public class PropertyCallExpImpl extends CallExpImpl implements PropertyCallExp * <!-- end-user-doc --> * @generated */ + @Override public void setReferredProperty(Property newReferredProperty) { Property oldReferredProperty = referredProperty; referredProperty = newReferredProperty; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PropertyImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PropertyImpl.java index f68a15f25..f1bfc91ef 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PropertyImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/PropertyImpl.java @@ -75,6 +75,7 @@ public class PropertyImpl extends NamedElementImpl implements Property { * <!-- end-user-doc --> * @generated */ + @Override public example2.classes.Class getType() { if (type != null && type.eIsProxy()) { InternalEObject oldType = (InternalEObject)type; @@ -101,6 +102,7 @@ public class PropertyImpl extends NamedElementImpl implements Property { * <!-- end-user-doc --> * @generated */ + @Override public void setType(example2.classes.Class newType) { example2.classes.Class oldType = type; type = newType; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/RootImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/RootImpl.java index e4c010e32..a3eb1cfc1 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/RootImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/RootImpl.java @@ -73,6 +73,7 @@ public class RootImpl extends ElementImpl implements Root { * <!-- end-user-doc --> * @generated */ + @Override public EList<example2.classes.Package> getOwnedPackages() { if (ownedPackages == null) { ownedPackages = new EObjectContainmentEList<example2.classes.Package>(example2.classes.Package.class, this, ClassesPackage.ROOT__OWNED_PACKAGES); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/TypedElementImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/TypedElementImpl.java index a36800e9d..ac5e4a1f9 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/TypedElementImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/impl/TypedElementImpl.java @@ -70,6 +70,7 @@ public abstract class TypedElementImpl extends ElementImpl implements TypedEleme * <!-- end-user-doc --> * @generated */ + @Override public example2.classes.Class getType() { if (type != null && type.eIsProxy()) { InternalEObject oldType = (InternalEObject)type; @@ -96,6 +97,7 @@ public abstract class TypedElementImpl extends ElementImpl implements TypedEleme * <!-- end-user-doc --> * @generated */ + @Override public void setType(example2.classes.Class newType) { example2.classes.Class oldType = type; type = newType; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentFactoryImpl.java index d5817f78d..6dc2b4a82 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentFactoryImpl.java @@ -77,6 +77,7 @@ public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentF * <!-- end-user-doc --> * @generated */ + @Override public LookupEnvironment createLookupEnvironment() { LookupEnvironmentImpl lookupEnvironment = new LookupEnvironmentImpl(); return lookupEnvironment; @@ -87,6 +88,7 @@ public class EnvironmentFactoryImpl extends EFactoryImpl implements EnvironmentF * <!-- end-user-doc --> * @generated */ + @Override public EnvironmentPackage getEnvironmentPackage() { return (EnvironmentPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentPackageImpl.java index f0d7fbd55..9e255694e 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentPackageImpl.java @@ -129,6 +129,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EClass getLookupEnvironment() { return lookupEnvironmentEClass; } @@ -138,6 +139,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EReference getLookupEnvironment_NamedElements() { return (EReference)lookupEnvironmentEClass.getEStructuralFeatures().get(0); } @@ -147,6 +149,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EReference getLookupEnvironment_ParentEnv() { return (EReference)lookupEnvironmentEClass.getEStructuralFeatures().get(1); } @@ -156,6 +159,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EOperation getLookupEnvironment__AddElements__Collection() { return lookupEnvironmentEClass.getEOperations().get(0); } @@ -165,6 +169,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EOperation getLookupEnvironment__AddElement__NamedElement() { return lookupEnvironmentEClass.getEOperations().get(1); } @@ -174,6 +179,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EClass getEnv4CG() { return env4CGEClass; } @@ -183,6 +189,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EOperation getEnv4CG__HasFinalResult() { return env4CGEClass.getEOperations().get(0); } @@ -192,6 +199,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EOperation getEnv4CG__GetExecutor() { return env4CGEClass.getEOperations().get(1); } @@ -201,6 +209,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EClass getExecutor() { return executorEClass; } @@ -210,6 +219,7 @@ public class EnvironmentPackageImpl extends EPackageImpl implements EnvironmentP * <!-- end-user-doc --> * @generated */ + @Override public EnvironmentFactory getEnvironmentFactory() { return (EnvironmentFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/LookupEnvironmentImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/LookupEnvironmentImpl.java index e5f88e325..1e20237eb 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/LookupEnvironmentImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/LookupEnvironmentImpl.java @@ -95,6 +95,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public EList<NamedElement> getNamedElements() { if (namedElements == null) { namedElements = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, EnvironmentPackage.LOOKUP_ENVIRONMENT__NAMED_ELEMENTS); @@ -107,6 +108,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public LookupEnvironment getParentEnv() { if (parentEnv != null && parentEnv.eIsProxy()) { InternalEObject oldParentEnv = (InternalEObject)parentEnv; @@ -133,6 +135,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public void setParentEnv(LookupEnvironment newParentEnv) { LookupEnvironment oldParentEnv = parentEnv; parentEnv = newParentEnv; @@ -145,6 +148,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public <NE extends NamedElement> LookupEnvironment addElements(final Collection<NE> elements) { /** * @@ -176,6 +180,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public LookupEnvironment addElement(final NamedElement element) { /** * @@ -206,6 +211,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public boolean hasFinalResult() { throw new UnsupportedOperationException("LookupEnvironment::hasFinalResult() has been created for CG purposes. Don't call this method"); } @@ -215,6 +221,7 @@ public class LookupEnvironmentImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public Executor getExecutor() { throw new UnsupportedOperationException("LookupEnvironment::getEvaluator() has been created for CG purposes. Don't call this method"); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/util/OperationFilter.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/util/OperationFilter.java index bd80eca3f..d1538f3fb 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/util/OperationFilter.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/util/OperationFilter.java @@ -63,7 +63,8 @@ public class OperationFilter * * _'null' : Boolean[?] */ - public /*@NonInvalid*/ Boolean _matches(final /*@NonInvalid*/ example2.classes.@org.eclipse.jdt.annotation.NonNull Operation element) { + @Override + public /*@NonInvalid*/ Boolean _matches(final /*@NonInvalid*/ example2.classes.@org.eclipse.jdt.annotation.NonNull Operation element) { /*@Caught*/ @NonNull Object CAUGHT_args; try { final /*@Thrown*/ List<Argument> args = (List<Argument>)this.args; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassCSImpl.java index 60dbfa3a3..b0faddbec 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassCSImpl.java @@ -97,6 +97,7 @@ public class ClassCSImpl extends NamedElementCSImpl implements ClassCS { * <!-- end-user-doc --> * @generated */ + @Override public PathNameCS getExtends() { return extends_; } @@ -121,6 +122,7 @@ public class ClassCSImpl extends NamedElementCSImpl implements ClassCS { * <!-- end-user-doc --> * @generated */ + @Override public void setExtends(PathNameCS newExtends) { if (newExtends != extends_) { NotificationChain msgs = null; @@ -140,6 +142,7 @@ public class ClassCSImpl extends NamedElementCSImpl implements ClassCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<PropertyCS> getProperties() { if (properties == null) { properties = new EObjectContainmentEList<PropertyCS>(PropertyCS.class, this, ClassescsPackage.CLASS_CS__PROPERTIES); @@ -152,6 +155,7 @@ public class ClassCSImpl extends NamedElementCSImpl implements ClassCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<OperationCS> getOperations() { if (operations == null) { operations = new EObjectContainmentEList<OperationCS>(OperationCS.class, this, ClassescsPackage.CLASS_CS__OPERATIONS); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassescsFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassescsFactoryImpl.java index 3b192f1f3..2d66a0a8d 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassescsFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassescsFactoryImpl.java @@ -91,6 +91,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public PackageCS createPackageCS() { PackageCSImpl packageCS = new PackageCSImpl(); return packageCS; @@ -101,6 +102,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public ClassCS createClassCS() { ClassCSImpl classCS = new ClassCSImpl(); return classCS; @@ -111,6 +113,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public PathNameCS createPathNameCS() { PathNameCSImpl pathNameCS = new PathNameCSImpl(); return pathNameCS; @@ -121,6 +124,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public PathElementCS createPathElementCS() { PathElementCSImpl pathElementCS = new PathElementCSImpl(); return pathElementCS; @@ -131,6 +135,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public RootCS createRootCS() { RootCSImpl rootCS = new RootCSImpl(); return rootCS; @@ -141,6 +146,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public PropertyCS createPropertyCS() { PropertyCSImpl propertyCS = new PropertyCSImpl(); return propertyCS; @@ -151,6 +157,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public OperationCS createOperationCS() { OperationCSImpl operationCS = new OperationCSImpl(); return operationCS; @@ -161,6 +168,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public NameExpCS createNameExpCS() { NameExpCSImpl nameExpCS = new NameExpCSImpl(); return nameExpCS; @@ -171,6 +179,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public RoundedBracketClause createRoundedBracketClause() { RoundedBracketClauseImpl roundedBracketClause = new RoundedBracketClauseImpl(); return roundedBracketClause; @@ -181,6 +190,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public ArgumentCS createArgumentCS() { ArgumentCSImpl argumentCS = new ArgumentCSImpl(); return argumentCS; @@ -191,6 +201,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public ClassescsPackage getClassescsPackage() { return (ClassescsPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassescsPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassescsPackageImpl.java index b3f977786..278186f86 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassescsPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ClassescsPackageImpl.java @@ -191,6 +191,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getElementCS() { return elementCSEClass; } @@ -200,6 +201,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getElementCS_Ast() { return (EReference)elementCSEClass.getEStructuralFeatures().get(0); } @@ -209,6 +211,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getNamedElementCS() { return namedElementCSEClass; } @@ -218,6 +221,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNamedElementCS_Name() { return (EAttribute)namedElementCSEClass.getEStructuralFeatures().get(0); } @@ -227,6 +231,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackageCS() { return packageCSEClass; } @@ -236,6 +241,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageCS_OwnedClasses() { return (EReference)packageCSEClass.getEStructuralFeatures().get(0); } @@ -245,6 +251,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageCS_OwnedPackages() { return (EReference)packageCSEClass.getEStructuralFeatures().get(1); } @@ -254,6 +261,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getClassCS() { return classCSEClass; } @@ -263,6 +271,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassCS_Extends() { return (EReference)classCSEClass.getEStructuralFeatures().get(0); } @@ -272,6 +281,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassCS_Properties() { return (EReference)classCSEClass.getEStructuralFeatures().get(1); } @@ -281,6 +291,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassCS_Operations() { return (EReference)classCSEClass.getEStructuralFeatures().get(2); } @@ -290,6 +301,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPathNameCS() { return pathNameCSEClass; } @@ -299,6 +311,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPathNameCS_Path() { return (EReference)pathNameCSEClass.getEStructuralFeatures().get(0); } @@ -308,6 +321,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPathElementCS() { return pathElementCSEClass; } @@ -317,6 +331,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getRootCS() { return rootCSEClass; } @@ -326,6 +341,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getRootCS_OwnedPackages() { return (EReference)rootCSEClass.getEStructuralFeatures().get(0); } @@ -335,6 +351,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPropertyCS() { return propertyCSEClass; } @@ -344,6 +361,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPropertyCS_TypeRef() { return (EReference)propertyCSEClass.getEStructuralFeatures().get(0); } @@ -353,6 +371,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getOperationCS() { return operationCSEClass; } @@ -362,6 +381,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getOperationCS_Params() { return (EAttribute)operationCSEClass.getEStructuralFeatures().get(0); } @@ -371,6 +391,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getOperationCS_BodyExps() { return (EReference)operationCSEClass.getEStructuralFeatures().get(1); } @@ -380,6 +401,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getOperationCS_ResultRef() { return (EReference)operationCSEClass.getEStructuralFeatures().get(2); } @@ -389,6 +411,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getNameExpCS() { return nameExpCSEClass; } @@ -398,6 +421,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getNameExpCS_Name() { return (EReference)nameExpCSEClass.getEStructuralFeatures().get(0); } @@ -407,6 +431,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getNameExpCS_RoundedBrackets() { return (EReference)nameExpCSEClass.getEStructuralFeatures().get(1); } @@ -416,6 +441,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getNameExpCS_OwnedNameExp() { return (EReference)nameExpCSEClass.getEStructuralFeatures().get(2); } @@ -425,6 +451,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getRoundedBracketClause() { return roundedBracketClauseEClass; } @@ -434,6 +461,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getRoundedBracketClause_Args() { return (EReference)roundedBracketClauseEClass.getEStructuralFeatures().get(0); } @@ -443,6 +471,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getArgumentCS() { return argumentCSEClass; } @@ -452,6 +481,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public ClassescsFactory getClassescsFactory() { return (ClassescsFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ElementCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ElementCSImpl.java index 51b37c6a4..c15e0e6c1 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ElementCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/ElementCSImpl.java @@ -70,6 +70,7 @@ public abstract class ElementCSImpl extends MinimalEObjectImpl.Container impleme * <!-- end-user-doc --> * @generated */ + @Override public EObject getAst() { if (ast != null && ast.eIsProxy()) { InternalEObject oldAst = (InternalEObject)ast; @@ -96,6 +97,7 @@ public abstract class ElementCSImpl extends MinimalEObjectImpl.Container impleme * <!-- end-user-doc --> * @generated */ + @Override public void setAst(EObject newAst) { EObject oldAst = ast; ast = newAst; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/NameExpCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/NameExpCSImpl.java index d511ed64e..1421451e6 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/NameExpCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/NameExpCSImpl.java @@ -95,6 +95,7 @@ public class NameExpCSImpl extends ElementCSImpl implements NameExpCS { * <!-- end-user-doc --> * @generated */ + @Override public PathNameCS getName() { return name; } @@ -119,6 +120,7 @@ public class NameExpCSImpl extends ElementCSImpl implements NameExpCS { * <!-- end-user-doc --> * @generated */ + @Override public void setName(PathNameCS newName) { if (newName != name) { NotificationChain msgs = null; @@ -138,6 +140,7 @@ public class NameExpCSImpl extends ElementCSImpl implements NameExpCS { * <!-- end-user-doc --> * @generated */ + @Override public RoundedBracketClause getRoundedBrackets() { return roundedBrackets; } @@ -162,6 +165,7 @@ public class NameExpCSImpl extends ElementCSImpl implements NameExpCS { * <!-- end-user-doc --> * @generated */ + @Override public void setRoundedBrackets(RoundedBracketClause newRoundedBrackets) { if (newRoundedBrackets != roundedBrackets) { NotificationChain msgs = null; @@ -181,6 +185,7 @@ public class NameExpCSImpl extends ElementCSImpl implements NameExpCS { * <!-- end-user-doc --> * @generated */ + @Override public NameExpCS getOwnedNameExp() { return ownedNameExp; } @@ -205,6 +210,7 @@ public class NameExpCSImpl extends ElementCSImpl implements NameExpCS { * <!-- end-user-doc --> * @generated */ + @Override public void setOwnedNameExp(NameExpCS newOwnedNameExp) { if (newOwnedNameExp != ownedNameExp) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/NamedElementCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/NamedElementCSImpl.java index ec57aa097..7ee4f116e 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/NamedElementCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/NamedElementCSImpl.java @@ -77,6 +77,7 @@ public abstract class NamedElementCSImpl extends ElementCSImpl implements NamedE * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -86,6 +87,7 @@ public abstract class NamedElementCSImpl extends ElementCSImpl implements NamedE * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/OperationCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/OperationCSImpl.java index abeedc113..2958b78d8 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/OperationCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/OperationCSImpl.java @@ -99,6 +99,7 @@ public class OperationCSImpl extends NamedElementCSImpl implements OperationCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<String> getParams() { if (params == null) { params = new EDataTypeUniqueEList<String>(String.class, this, ClassescsPackage.OPERATION_CS__PARAMS); @@ -111,6 +112,7 @@ public class OperationCSImpl extends NamedElementCSImpl implements OperationCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<NameExpCS> getBodyExps() { if (bodyExps == null) { bodyExps = new EObjectContainmentEList<NameExpCS>(NameExpCS.class, this, ClassescsPackage.OPERATION_CS__BODY_EXPS); @@ -123,6 +125,7 @@ public class OperationCSImpl extends NamedElementCSImpl implements OperationCS { * <!-- end-user-doc --> * @generated */ + @Override public PathNameCS getResultRef() { return resultRef; } @@ -147,6 +150,7 @@ public class OperationCSImpl extends NamedElementCSImpl implements OperationCS { * <!-- end-user-doc --> * @generated */ + @Override public void setResultRef(PathNameCS newResultRef) { if (newResultRef != resultRef) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PackageCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PackageCSImpl.java index 8c29abb72..934526b42 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PackageCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PackageCSImpl.java @@ -84,6 +84,7 @@ public class PackageCSImpl extends NamedElementCSImpl implements PackageCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<ClassCS> getOwnedClasses() { if (ownedClasses == null) { ownedClasses = new EObjectContainmentEList<ClassCS>(ClassCS.class, this, ClassescsPackage.PACKAGE_CS__OWNED_CLASSES); @@ -96,6 +97,7 @@ public class PackageCSImpl extends NamedElementCSImpl implements PackageCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<PackageCS> getOwnedPackages() { if (ownedPackages == null) { ownedPackages = new EObjectContainmentEList<PackageCS>(PackageCS.class, this, ClassescsPackage.PACKAGE_CS__OWNED_PACKAGES); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PathNameCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PathNameCSImpl.java index 2ace7d316..69ef2ed5d 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PathNameCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PathNameCSImpl.java @@ -73,6 +73,7 @@ public class PathNameCSImpl extends ElementCSImpl implements PathNameCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<PathElementCS> getPath() { if (path == null) { path = new EObjectContainmentEList<PathElementCS>(PathElementCS.class, this, ClassescsPackage.PATH_NAME_CS__PATH); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PropertyCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PropertyCSImpl.java index 642b85cff..ba1157bc9 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PropertyCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/PropertyCSImpl.java @@ -70,6 +70,7 @@ public class PropertyCSImpl extends NamedElementCSImpl implements PropertyCS { * <!-- end-user-doc --> * @generated */ + @Override public PathNameCS getTypeRef() { return typeRef; } @@ -94,6 +95,7 @@ public class PropertyCSImpl extends NamedElementCSImpl implements PropertyCS { * <!-- end-user-doc --> * @generated */ + @Override public void setTypeRef(PathNameCS newTypeRef) { if (newTypeRef != typeRef) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/RootCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/RootCSImpl.java index bc23e1ab5..cb2fde098 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/RootCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/RootCSImpl.java @@ -73,6 +73,7 @@ public class RootCSImpl extends ElementCSImpl implements RootCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<PackageCS> getOwnedPackages() { if (ownedPackages == null) { ownedPackages = new EObjectContainmentEList<PackageCS>(PackageCS.class, this, ClassescsPackage.ROOT_CS__OWNED_PACKAGES); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/RoundedBracketClauseImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/RoundedBracketClauseImpl.java index 29cbf715c..1c5174a60 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/RoundedBracketClauseImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescs/impl/RoundedBracketClauseImpl.java @@ -75,6 +75,7 @@ public class RoundedBracketClauseImpl extends ElementCSImpl implements RoundedBr * <!-- end-user-doc --> * @generated */ + @Override public EList<ArgumentCS> getArgs() { if (args == null) { args = new EObjectContainmentEList<ArgumentCS>(ArgumentCS.class, this, ClassescsPackage.ROUNDED_BRACKET_CLAUSE__ARGS); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassCS2ClassImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassCS2ClassImpl.java index 73f09d348..e4b52cef5 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassCS2ClassImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassCS2ClassImpl.java @@ -81,6 +81,7 @@ public class ClassCS2ClassImpl extends MinimalEObjectImpl.Container implements C * <!-- end-user-doc --> * @generated */ + @Override public ClassCS getClassCS() { if (classCS != null && classCS.eIsProxy()) { InternalEObject oldClassCS = (InternalEObject)classCS; @@ -107,6 +108,7 @@ public class ClassCS2ClassImpl extends MinimalEObjectImpl.Container implements C * <!-- end-user-doc --> * @generated */ + @Override public void setClassCS(ClassCS newClassCS) { ClassCS oldClassCS = classCS; classCS = newClassCS; @@ -119,6 +121,7 @@ public class ClassCS2ClassImpl extends MinimalEObjectImpl.Container implements C * <!-- end-user-doc --> * @generated */ + @Override public example2.classes.Class getClass_() { if (class_ != null && class_.eIsProxy()) { InternalEObject oldClass = (InternalEObject)class_; @@ -145,6 +148,7 @@ public class ClassCS2ClassImpl extends MinimalEObjectImpl.Container implements C * <!-- end-user-doc --> * @generated */ + @Override public void setClass(example2.classes.Class newClass) { example2.classes.Class oldClass = class_; class_ = newClass; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesFactoryImpl.java index a7d8f4041..4ec9341ec 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesFactoryImpl.java @@ -81,6 +81,7 @@ public class ClassescstracesFactoryImpl extends EFactoryImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public PackageCS2Package createPackageCS2Package() { PackageCS2PackageImpl packageCS2Package = new PackageCS2PackageImpl(); return packageCS2Package; @@ -91,6 +92,7 @@ public class ClassescstracesFactoryImpl extends EFactoryImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public ClassCS2Class createClassCS2Class() { ClassCS2ClassImpl classCS2Class = new ClassCS2ClassImpl(); return classCS2Class; @@ -101,6 +103,7 @@ public class ClassescstracesFactoryImpl extends EFactoryImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public RootCS2Root createRootCS2Root() { RootCS2RootImpl rootCS2Root = new RootCS2RootImpl(); return rootCS2Root; @@ -111,6 +114,7 @@ public class ClassescstracesFactoryImpl extends EFactoryImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public ClassescstracesPackage getClassescstracesPackage() { return (ClassescstracesPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesPackageImpl.java index ef89554d5..63cb53599 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesPackageImpl.java @@ -124,6 +124,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackageCS2Package() { return packageCS2PackageEClass; } @@ -133,6 +134,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageCS2Package_PackageCS() { return (EReference)packageCS2PackageEClass.getEStructuralFeatures().get(0); } @@ -142,6 +144,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageCS2Package_Package() { return (EReference)packageCS2PackageEClass.getEStructuralFeatures().get(1); } @@ -151,6 +154,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EClass getClassCS2Class() { return classCS2ClassEClass; } @@ -160,6 +164,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassCS2Class_ClassCS() { return (EReference)classCS2ClassEClass.getEStructuralFeatures().get(0); } @@ -169,6 +174,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassCS2Class_Class() { return (EReference)classCS2ClassEClass.getEStructuralFeatures().get(1); } @@ -178,6 +184,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EClass getRootCS2Root() { return rootCS2RootEClass; } @@ -187,6 +194,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getRootCS2Root_RootCS() { return (EReference)rootCS2RootEClass.getEStructuralFeatures().get(0); } @@ -196,6 +204,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getRootCS2Root_Root() { return (EReference)rootCS2RootEClass.getEStructuralFeatures().get(1); } @@ -205,6 +214,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public ClassescstracesFactory getClassescstracesFactory() { return (ClassescstracesFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/PackageCS2PackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/PackageCS2PackageImpl.java index 3f225d45f..750b280bc 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/PackageCS2PackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/PackageCS2PackageImpl.java @@ -81,6 +81,7 @@ public class PackageCS2PackageImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public PackageCS getPackageCS() { if (packageCS != null && packageCS.eIsProxy()) { InternalEObject oldPackageCS = (InternalEObject)packageCS; @@ -107,6 +108,7 @@ public class PackageCS2PackageImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public void setPackageCS(PackageCS newPackageCS) { PackageCS oldPackageCS = packageCS; packageCS = newPackageCS; @@ -119,6 +121,7 @@ public class PackageCS2PackageImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public example2.classes.Package getPackage() { if (package_ != null && package_.eIsProxy()) { InternalEObject oldPackage = (InternalEObject)package_; @@ -145,6 +148,7 @@ public class PackageCS2PackageImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public void setPackage(example2.classes.Package newPackage) { example2.classes.Package oldPackage = package_; package_ = newPackage; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/RootCS2RootImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/RootCS2RootImpl.java index cb6754da3..29f69b7b8 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/RootCS2RootImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/RootCS2RootImpl.java @@ -82,6 +82,7 @@ public class RootCS2RootImpl extends MinimalEObjectImpl.Container implements Roo * <!-- end-user-doc --> * @generated */ + @Override public RootCS getRootCS() { if (rootCS != null && rootCS.eIsProxy()) { InternalEObject oldRootCS = (InternalEObject)rootCS; @@ -108,6 +109,7 @@ public class RootCS2RootImpl extends MinimalEObjectImpl.Container implements Roo * <!-- end-user-doc --> * @generated */ + @Override public void setRootCS(RootCS newRootCS) { RootCS oldRootCS = rootCS; rootCS = newRootCS; @@ -120,6 +122,7 @@ public class RootCS2RootImpl extends MinimalEObjectImpl.Container implements Roo * <!-- end-user-doc --> * @generated */ + @Override public Root getRoot() { if (root != null && root.eIsProxy()) { InternalEObject oldRoot = (InternalEObject)root; @@ -146,6 +149,7 @@ public class RootCS2RootImpl extends MinimalEObjectImpl.Container implements Roo * <!-- end-user-doc --> * @generated */ + @Override public void setRoot(Root newRoot) { Root oldRoot = root; root = newRoot; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/KiamaasFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/KiamaasFactoryImpl.java index ed069ebc2..28e0ac151 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/KiamaasFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/KiamaasFactoryImpl.java @@ -79,6 +79,7 @@ public class KiamaasFactoryImpl extends EFactoryImpl implements KiamaasFactory { * <!-- end-user-doc --> * @generated */ + @Override public Top createTop() { TopImpl top = new TopImpl(); return top; @@ -89,6 +90,7 @@ public class KiamaasFactoryImpl extends EFactoryImpl implements KiamaasFactory { * <!-- end-user-doc --> * @generated */ + @Override public Plus createPlus() { PlusImpl plus = new PlusImpl(); return plus; @@ -99,6 +101,7 @@ public class KiamaasFactoryImpl extends EFactoryImpl implements KiamaasFactory { * <!-- end-user-doc --> * @generated */ + @Override public Num createNum() { NumImpl num = new NumImpl(); return num; @@ -109,6 +112,7 @@ public class KiamaasFactoryImpl extends EFactoryImpl implements KiamaasFactory { * <!-- end-user-doc --> * @generated */ + @Override public KiamaasPackage getKiamaasPackage() { return (KiamaasPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/KiamaasPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/KiamaasPackageImpl.java index f1e12758a..98b2f85bb 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/KiamaasPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/KiamaasPackageImpl.java @@ -128,6 +128,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getTop() { return topEClass; } @@ -137,6 +138,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTop_Node() { return (EReference)topEClass.getEStructuralFeatures().get(0); } @@ -146,6 +148,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNode() { return nodeEClass; } @@ -155,6 +158,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNode_Height() { return (EAttribute)nodeEClass.getEStructuralFeatures().get(0); } @@ -164,6 +168,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNode_Depth() { return (EAttribute)nodeEClass.getEStructuralFeatures().get(1); } @@ -173,6 +178,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPlus() { return plusEClass; } @@ -182,6 +188,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPlus_Left() { return (EReference)plusEClass.getEStructuralFeatures().get(0); } @@ -191,6 +198,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPlus_Right() { return (EReference)plusEClass.getEStructuralFeatures().get(1); } @@ -200,6 +208,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNum() { return numEClass; } @@ -209,6 +218,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNum_Value() { return (EAttribute)numEClass.getEStructuralFeatures().get(0); } @@ -218,6 +228,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public KiamaasFactory getKiamaasFactory() { return (KiamaasFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/NodeImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/NodeImpl.java index a20cf80e9..48230b1e8 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/NodeImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/NodeImpl.java @@ -101,6 +101,7 @@ public abstract class NodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public Integer getHeight() { return height; } @@ -110,6 +111,7 @@ public abstract class NodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public void setHeight(Integer newHeight) { Integer oldHeight = height; height = newHeight; @@ -122,6 +124,7 @@ public abstract class NodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public Integer getDepth() { return depth; } @@ -131,6 +134,7 @@ public abstract class NodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public void setDepth(Integer newDepth) { Integer oldDepth = depth; depth = newDepth; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/NumImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/NumImpl.java index 91031fa5a..ef1c94f2f 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/NumImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/NumImpl.java @@ -79,6 +79,7 @@ public class NumImpl extends NodeImpl implements Num { * <!-- end-user-doc --> * @generated */ + @Override public int getValue() { return value; } @@ -88,6 +89,7 @@ public class NumImpl extends NodeImpl implements Num { * <!-- end-user-doc --> * @generated */ + @Override public void setValue(int newValue) { int oldValue = value; value = newValue; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/PlusImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/PlusImpl.java index 2c61cc4a5..424f95d6c 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/PlusImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/PlusImpl.java @@ -83,6 +83,7 @@ public class PlusImpl extends NodeImpl implements Plus { * <!-- end-user-doc --> * @generated */ + @Override public Node getLeft() { return left; } @@ -107,6 +108,7 @@ public class PlusImpl extends NodeImpl implements Plus { * <!-- end-user-doc --> * @generated */ + @Override public void setLeft(Node newLeft) { if (newLeft != left) { NotificationChain msgs = null; @@ -126,6 +128,7 @@ public class PlusImpl extends NodeImpl implements Plus { * <!-- end-user-doc --> * @generated */ + @Override public Node getRight() { return right; } @@ -150,6 +153,7 @@ public class PlusImpl extends NodeImpl implements Plus { * <!-- end-user-doc --> * @generated */ + @Override public void setRight(Node newRight) { if (newRight != right) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/TopImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/TopImpl.java index 82b7f278f..81daa238e 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/TopImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamaas/impl/TopImpl.java @@ -73,6 +73,7 @@ public class TopImpl extends MinimalEObjectImpl.Container implements Top { * <!-- end-user-doc --> * @generated */ + @Override public Node getNode() { return node; } @@ -97,6 +98,7 @@ public class TopImpl extends MinimalEObjectImpl.Container implements Top { * <!-- end-user-doc --> * @generated */ + @Override public void setNode(Node newNode) { if (newNode != node) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/BaseCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/BaseCSImpl.java index 79b286f0e..bb94c3719 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/BaseCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/BaseCSImpl.java @@ -72,6 +72,7 @@ public abstract class BaseCSImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public EObject getAst() { if (ast != null && ast.eIsProxy()) { InternalEObject oldAst = (InternalEObject)ast; @@ -98,6 +99,7 @@ public abstract class BaseCSImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setAst(EObject newAst) { EObject oldAst = ast; ast = newAst; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/KiamacsFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/KiamacsFactoryImpl.java index 44edf5f12..20ac1745c 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/KiamacsFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/KiamacsFactoryImpl.java @@ -79,6 +79,7 @@ public class KiamacsFactoryImpl extends EFactoryImpl implements KiamacsFactory { * <!-- end-user-doc --> * @generated */ + @Override public TopCS createTopCS() { TopCSImpl topCS = new TopCSImpl(); return topCS; @@ -89,6 +90,7 @@ public class KiamacsFactoryImpl extends EFactoryImpl implements KiamacsFactory { * <!-- end-user-doc --> * @generated */ + @Override public PlusCS createPlusCS() { PlusCSImpl plusCS = new PlusCSImpl(); return plusCS; @@ -99,6 +101,7 @@ public class KiamacsFactoryImpl extends EFactoryImpl implements KiamacsFactory { * <!-- end-user-doc --> * @generated */ + @Override public NumCS createNumCS() { NumCSImpl numCS = new NumCSImpl(); return numCS; @@ -109,6 +112,7 @@ public class KiamacsFactoryImpl extends EFactoryImpl implements KiamacsFactory { * <!-- end-user-doc --> * @generated */ + @Override public KiamacsPackage getKiamacsPackage() { return (KiamacsPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/KiamacsPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/KiamacsPackageImpl.java index f2e0acf44..cc1bf44cc 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/KiamacsPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/KiamacsPackageImpl.java @@ -136,6 +136,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getTopCS() { return topCSEClass; } @@ -145,6 +146,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTopCS_Node() { return (EReference)topCSEClass.getEStructuralFeatures().get(0); } @@ -154,6 +156,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNodeCS() { return nodeCSEClass; } @@ -163,6 +166,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPlusCS() { return plusCSEClass; } @@ -172,6 +176,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPlusCS_Left() { return (EReference)plusCSEClass.getEStructuralFeatures().get(0); } @@ -181,6 +186,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPlusCS_Right() { return (EReference)plusCSEClass.getEStructuralFeatures().get(1); } @@ -190,6 +196,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNumCS() { return numCSEClass; } @@ -199,6 +206,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNumCS_Value() { return (EAttribute)numCSEClass.getEStructuralFeatures().get(0); } @@ -208,6 +216,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getBaseCS() { return baseCSEClass; } @@ -217,6 +226,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getBaseCS_Ast() { return (EReference)baseCSEClass.getEStructuralFeatures().get(0); } @@ -226,6 +236,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public KiamacsFactory getKiamacsFactory() { return (KiamacsFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/NumCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/NumCSImpl.java index 473713aec..d98d3afed 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/NumCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/NumCSImpl.java @@ -79,6 +79,7 @@ public class NumCSImpl extends NodeCSImpl implements NumCS { * <!-- end-user-doc --> * @generated */ + @Override public int getValue() { return value; } @@ -88,6 +89,7 @@ public class NumCSImpl extends NodeCSImpl implements NumCS { * <!-- end-user-doc --> * @generated */ + @Override public void setValue(int newValue) { int oldValue = value; value = newValue; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/PlusCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/PlusCSImpl.java index 984e3f21f..0a550498b 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/PlusCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/PlusCSImpl.java @@ -83,6 +83,7 @@ public class PlusCSImpl extends NodeCSImpl implements PlusCS { * <!-- end-user-doc --> * @generated */ + @Override public NodeCS getLeft() { return left; } @@ -107,6 +108,7 @@ public class PlusCSImpl extends NodeCSImpl implements PlusCS { * <!-- end-user-doc --> * @generated */ + @Override public void setLeft(NodeCS newLeft) { if (newLeft != left) { NotificationChain msgs = null; @@ -126,6 +128,7 @@ public class PlusCSImpl extends NodeCSImpl implements PlusCS { * <!-- end-user-doc --> * @generated */ + @Override public NodeCS getRight() { return right; } @@ -150,6 +153,7 @@ public class PlusCSImpl extends NodeCSImpl implements PlusCS { * <!-- end-user-doc --> * @generated */ + @Override public void setRight(NodeCS newRight) { if (newRight != right) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/TopCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/TopCSImpl.java index 14afc9ad1..9386d8708 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/TopCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example3/kiamacs/impl/TopCSImpl.java @@ -72,6 +72,7 @@ public class TopCSImpl extends BaseCSImpl implements TopCS { * <!-- end-user-doc --> * @generated */ + @Override public NodeCS getNode() { return node; } @@ -96,6 +97,7 @@ public class TopCSImpl extends BaseCSImpl implements TopCS { * <!-- end-user-doc --> * @generated */ + @Override public void setNode(NodeCS newNode) { if (newNode != node) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/CompositeImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/CompositeImpl.java index 09ef987b1..97a3b7414 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/CompositeImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/CompositeImpl.java @@ -72,6 +72,7 @@ public class CompositeImpl extends NodeImpl implements Composite { * <!-- end-user-doc --> * @generated */ + @Override public Node getChild() { return child; } @@ -96,6 +97,7 @@ public class CompositeImpl extends NodeImpl implements Composite { * <!-- end-user-doc --> * @generated */ + @Override public void setChild(Node newChild) { if (newChild != child) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/KiamaasFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/KiamaasFactoryImpl.java index 0da1a6b83..30fd77e10 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/KiamaasFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/KiamaasFactoryImpl.java @@ -79,6 +79,7 @@ public class KiamaasFactoryImpl extends EFactoryImpl implements KiamaasFactory { * <!-- end-user-doc --> * @generated */ + @Override public Top createTop() { TopImpl top = new TopImpl(); return top; @@ -89,6 +90,7 @@ public class KiamaasFactoryImpl extends EFactoryImpl implements KiamaasFactory { * <!-- end-user-doc --> * @generated */ + @Override public Composite createComposite() { CompositeImpl composite = new CompositeImpl(); return composite; @@ -99,6 +101,7 @@ public class KiamaasFactoryImpl extends EFactoryImpl implements KiamaasFactory { * <!-- end-user-doc --> * @generated */ + @Override public Leaf createLeaf() { LeafImpl leaf = new LeafImpl(); return leaf; @@ -109,6 +112,7 @@ public class KiamaasFactoryImpl extends EFactoryImpl implements KiamaasFactory { * <!-- end-user-doc --> * @generated */ + @Override public KiamaasPackage getKiamaasPackage() { return (KiamaasPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/KiamaasPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/KiamaasPackageImpl.java index 9868ec6ca..ed214a03f 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/KiamaasPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/KiamaasPackageImpl.java @@ -128,6 +128,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getTop() { return topEClass; } @@ -137,6 +138,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTop_Node() { return (EReference)topEClass.getEStructuralFeatures().get(0); } @@ -146,6 +148,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNode() { return nodeEClass; } @@ -155,6 +158,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNode_Height() { return (EAttribute)nodeEClass.getEStructuralFeatures().get(0); } @@ -164,6 +168,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNode_Depth() { return (EAttribute)nodeEClass.getEStructuralFeatures().get(1); } @@ -173,6 +178,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getComposite() { return compositeEClass; } @@ -182,6 +188,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getComposite_Child() { return (EReference)compositeEClass.getEStructuralFeatures().get(0); } @@ -191,6 +198,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getLeaf() { return leafEClass; } @@ -200,6 +208,7 @@ public class KiamaasPackageImpl extends EPackageImpl implements KiamaasPackage { * <!-- end-user-doc --> * @generated */ + @Override public KiamaasFactory getKiamaasFactory() { return (KiamaasFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/NodeImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/NodeImpl.java index 54175a518..bebd49bdc 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/NodeImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/NodeImpl.java @@ -101,6 +101,7 @@ public abstract class NodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public Integer getHeight() { return height; } @@ -110,6 +111,7 @@ public abstract class NodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public void setHeight(Integer newHeight) { Integer oldHeight = height; height = newHeight; @@ -122,6 +124,7 @@ public abstract class NodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public Integer getDepth() { return depth; } @@ -131,6 +134,7 @@ public abstract class NodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public void setDepth(Integer newDepth) { Integer oldDepth = depth; depth = newDepth; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/TopImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/TopImpl.java index 616a7d47b..b9c065872 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/TopImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamaas/impl/TopImpl.java @@ -73,6 +73,7 @@ public class TopImpl extends MinimalEObjectImpl.Container implements Top { * <!-- end-user-doc --> * @generated */ + @Override public Node getNode() { return node; } @@ -97,6 +98,7 @@ public class TopImpl extends MinimalEObjectImpl.Container implements Top { * <!-- end-user-doc --> * @generated */ + @Override public void setNode(Node newNode) { if (newNode != node) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/BaseCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/BaseCSImpl.java index 8da2fd5bd..3cf855c7d 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/BaseCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/BaseCSImpl.java @@ -72,6 +72,7 @@ public abstract class BaseCSImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public EObject getAst() { if (ast != null && ast.eIsProxy()) { InternalEObject oldAst = (InternalEObject)ast; @@ -98,6 +99,7 @@ public abstract class BaseCSImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setAst(EObject newAst) { EObject oldAst = ast; ast = newAst; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/CompositeCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/CompositeCSImpl.java index 0feffed64..3cbeb955b 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/CompositeCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/CompositeCSImpl.java @@ -72,6 +72,7 @@ public class CompositeCSImpl extends NodeCSImpl implements CompositeCS { * <!-- end-user-doc --> * @generated */ + @Override public NodeCS getChild() { return child; } @@ -96,6 +97,7 @@ public class CompositeCSImpl extends NodeCSImpl implements CompositeCS { * <!-- end-user-doc --> * @generated */ + @Override public void setChild(NodeCS newChild) { if (newChild != child) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/KiamacsFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/KiamacsFactoryImpl.java index fcece0b0f..eb401e44f 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/KiamacsFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/KiamacsFactoryImpl.java @@ -79,6 +79,7 @@ public class KiamacsFactoryImpl extends EFactoryImpl implements KiamacsFactory { * <!-- end-user-doc --> * @generated */ + @Override public TopCS createTopCS() { TopCSImpl topCS = new TopCSImpl(); return topCS; @@ -89,6 +90,7 @@ public class KiamacsFactoryImpl extends EFactoryImpl implements KiamacsFactory { * <!-- end-user-doc --> * @generated */ + @Override public CompositeCS createCompositeCS() { CompositeCSImpl compositeCS = new CompositeCSImpl(); return compositeCS; @@ -99,6 +101,7 @@ public class KiamacsFactoryImpl extends EFactoryImpl implements KiamacsFactory { * <!-- end-user-doc --> * @generated */ + @Override public LeafCS createLeafCS() { LeafCSImpl leafCS = new LeafCSImpl(); return leafCS; @@ -109,6 +112,7 @@ public class KiamacsFactoryImpl extends EFactoryImpl implements KiamacsFactory { * <!-- end-user-doc --> * @generated */ + @Override public KiamacsPackage getKiamacsPackage() { return (KiamacsPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/KiamacsPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/KiamacsPackageImpl.java index 37105f478..8f2799eb5 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/KiamacsPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/KiamacsPackageImpl.java @@ -135,6 +135,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getTopCS() { return topCSEClass; } @@ -144,6 +145,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTopCS_Node() { return (EReference)topCSEClass.getEStructuralFeatures().get(0); } @@ -153,6 +155,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNodeCS() { return nodeCSEClass; } @@ -162,6 +165,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getCompositeCS() { return compositeCSEClass; } @@ -171,6 +175,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getCompositeCS_Child() { return (EReference)compositeCSEClass.getEStructuralFeatures().get(0); } @@ -180,6 +185,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getLeafCS() { return leafCSEClass; } @@ -189,6 +195,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getBaseCS() { return baseCSEClass; } @@ -198,6 +205,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getBaseCS_Ast() { return (EReference)baseCSEClass.getEStructuralFeatures().get(0); } @@ -207,6 +215,7 @@ public class KiamacsPackageImpl extends EPackageImpl implements KiamacsPackage { * <!-- end-user-doc --> * @generated */ + @Override public KiamacsFactory getKiamacsFactory() { return (KiamacsFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/TopCSImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/TopCSImpl.java index 681ff99d0..a5afa8276 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/TopCSImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example4/kiamacs/impl/TopCSImpl.java @@ -72,6 +72,7 @@ public class TopCSImpl extends BaseCSImpl implements TopCS { * <!-- end-user-doc --> * @generated */ + @Override public NodeCS getNode() { return node; } @@ -96,6 +97,7 @@ public class TopCSImpl extends BaseCSImpl implements TopCS { * <!-- end-user-doc --> * @generated */ + @Override public void setNode(NodeCS newNode) { if (newNode != node) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SElementImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SElementImpl.java index f1d2a4614..86a32a520 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SElementImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SElementImpl.java @@ -72,6 +72,7 @@ public class SElementImpl extends MinimalEObjectImpl.Container implements SEleme * <!-- end-user-doc --> * @generated */ + @Override public EObject getAst() { if (ast != null && ast.eIsProxy()) { InternalEObject oldAst = (InternalEObject)ast; @@ -98,6 +99,7 @@ public class SElementImpl extends MinimalEObjectImpl.Container implements SEleme * <!-- end-user-doc --> * @generated */ + @Override public void setAst(EObject newAst) { EObject oldAst = ast; ast = newAst; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SRootImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SRootImpl.java index 681878b6c..83fc7196d 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SRootImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SRootImpl.java @@ -76,6 +76,7 @@ public class SRootImpl extends SElementImpl implements SRoot { * <!-- end-user-doc --> * @generated */ + @Override public EList<X> getOwnedX() { if (ownedX == null) { ownedX = new EObjectContainmentEList<X>(X.class, this, SbasePackage.SROOT__OWNED_X); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SbaseFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SbaseFactoryImpl.java index 38470bb62..7098fb236 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SbaseFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SbaseFactoryImpl.java @@ -81,6 +81,7 @@ public class SbaseFactoryImpl extends EFactoryImpl implements SbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public X createX() { XImpl x = new XImpl(); return x; @@ -91,6 +92,7 @@ public class SbaseFactoryImpl extends EFactoryImpl implements SbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public Y createY() { YImpl y = new YImpl(); return y; @@ -101,6 +103,7 @@ public class SbaseFactoryImpl extends EFactoryImpl implements SbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public Z createZ() { ZImpl z = new ZImpl(); return z; @@ -111,6 +114,7 @@ public class SbaseFactoryImpl extends EFactoryImpl implements SbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public SRoot createSRoot() { SRootImpl sRoot = new SRootImpl(); return sRoot; @@ -121,6 +125,7 @@ public class SbaseFactoryImpl extends EFactoryImpl implements SbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public SElement createSElement() { SElementImpl sElement = new SElementImpl(); return sElement; @@ -131,6 +136,7 @@ public class SbaseFactoryImpl extends EFactoryImpl implements SbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public SbasePackage getSbasePackage() { return (SbasePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SbasePackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SbasePackageImpl.java index e62f67b0c..b23f61d77 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SbasePackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/SbasePackageImpl.java @@ -133,6 +133,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getX() { return xEClass; } @@ -142,6 +143,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getX_OwnsY() { return (EReference)xEClass.getEStructuralFeatures().get(0); } @@ -151,6 +153,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getX_Name() { return (EAttribute)xEClass.getEStructuralFeatures().get(1); } @@ -160,6 +163,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getY() { return yEClass; } @@ -169,6 +173,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getY_OwnsZ() { return (EReference)yEClass.getEStructuralFeatures().get(0); } @@ -178,6 +183,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getY_Name() { return (EAttribute)yEClass.getEStructuralFeatures().get(1); } @@ -187,6 +193,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getY_ToX() { return (EReference)yEClass.getEStructuralFeatures().get(2); } @@ -196,6 +203,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getZ() { return zEClass; } @@ -205,6 +213,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getZ_ToY() { return (EReference)zEClass.getEStructuralFeatures().get(0); } @@ -214,6 +223,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getSRoot() { return sRootEClass; } @@ -223,6 +233,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getSRoot_OwnedX() { return (EReference)sRootEClass.getEStructuralFeatures().get(0); } @@ -232,6 +243,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getSElement() { return sElementEClass; } @@ -241,6 +253,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getSElement_Ast() { return (EReference)sElementEClass.getEStructuralFeatures().get(0); } @@ -250,6 +263,7 @@ public class SbasePackageImpl extends EPackageImpl implements SbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public SbaseFactory getSbaseFactory() { return (SbaseFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/XImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/XImpl.java index 7cb85f3e7..7cc2b5964 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/XImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/XImpl.java @@ -100,6 +100,7 @@ public class XImpl extends SElementImpl implements X { * <!-- end-user-doc --> * @generated */ + @Override public EList<Y> getOwnsY() { if (ownsY == null) { ownsY = new EObjectContainmentWithInverseEList<Y>(Y.class, this, SbasePackage.X__OWNS_Y, SbasePackage.Y__TO_X); @@ -112,6 +113,7 @@ public class XImpl extends SElementImpl implements X { * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -121,6 +123,7 @@ public class XImpl extends SElementImpl implements X { * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/YImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/YImpl.java index fb39c13bd..4fea2a08a 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/YImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/YImpl.java @@ -97,6 +97,7 @@ public class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public Z getOwnsZ() { return ownsZ; } @@ -121,6 +122,7 @@ public class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public void setOwnsZ(Z newOwnsZ) { if (newOwnsZ != ownsZ) { NotificationChain msgs = null; @@ -140,6 +142,7 @@ public class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -149,6 +152,7 @@ public class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -161,6 +165,7 @@ public class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public X getToX() { if (eContainerFeatureID() != SbasePackage.Y__TO_X) return null; return (X)eInternalContainer(); @@ -181,6 +186,7 @@ public class YImpl extends SElementImpl implements Y { * <!-- end-user-doc --> * @generated */ + @Override public void setToX(X newToX) { if (newToX != eInternalContainer() || (eContainerFeatureID() != SbasePackage.Y__TO_X && newToX != null)) { if (EcoreUtil.isAncestor(this, newToX)) diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/ZImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/ZImpl.java index 419894f24..6c44f3765 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/ZImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sbase/impl/ZImpl.java @@ -64,6 +64,7 @@ public class ZImpl extends SElementImpl implements Z { * <!-- end-user-doc --> * @generated */ + @Override public Y getToY() { if (eContainerFeatureID() != SbasePackage.Z__TO_Y) return null; return (Y)eInternalContainer(); @@ -84,6 +85,7 @@ public class ZImpl extends SElementImpl implements Z { * <!-- end-user-doc --> * @generated */ + @Override public void setToY(Y newToY) { if (newToY != eInternalContainer() || (eContainerFeatureID() != SbasePackage.Z__TO_Y && newToY != null)) { if (EcoreUtil.isAncestor(this, newToY)) diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/SderivedFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/SderivedFactoryImpl.java index 262d70c10..80bd20757 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/SderivedFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/SderivedFactoryImpl.java @@ -79,6 +79,7 @@ public class SderivedFactoryImpl extends EFactoryImpl implements SderivedFactory * <!-- end-user-doc --> * @generated */ + @Override public X2 createX2() { X2Impl x2 = new X2Impl(); return x2; @@ -89,6 +90,7 @@ public class SderivedFactoryImpl extends EFactoryImpl implements SderivedFactory * <!-- end-user-doc --> * @generated */ + @Override public Y2 createY2() { Y2Impl y2 = new Y2Impl(); return y2; @@ -99,6 +101,7 @@ public class SderivedFactoryImpl extends EFactoryImpl implements SderivedFactory * <!-- end-user-doc --> * @generated */ + @Override public W createW() { WImpl w = new WImpl(); return w; @@ -109,6 +112,7 @@ public class SderivedFactoryImpl extends EFactoryImpl implements SderivedFactory * <!-- end-user-doc --> * @generated */ + @Override public SderivedPackage getSderivedPackage() { return (SderivedPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/SderivedPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/SderivedPackageImpl.java index e1e2ab73a..87027a4e0 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/SderivedPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/SderivedPackageImpl.java @@ -122,6 +122,7 @@ public class SderivedPackageImpl extends EPackageImpl implements SderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getX2() { return x2EClass; } @@ -131,6 +132,7 @@ public class SderivedPackageImpl extends EPackageImpl implements SderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getX2_OwnsW() { return (EReference)x2EClass.getEStructuralFeatures().get(0); } @@ -140,6 +142,7 @@ public class SderivedPackageImpl extends EPackageImpl implements SderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getY2() { return y2EClass; } @@ -149,6 +152,7 @@ public class SderivedPackageImpl extends EPackageImpl implements SderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getY2_Name2() { return (EAttribute)y2EClass.getEStructuralFeatures().get(0); } @@ -158,6 +162,7 @@ public class SderivedPackageImpl extends EPackageImpl implements SderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getW() { return wEClass; } @@ -167,6 +172,7 @@ public class SderivedPackageImpl extends EPackageImpl implements SderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public SderivedFactory getSderivedFactory() { return (SderivedFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/X2Impl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/X2Impl.java index 90ae960b3..c0df7bb37 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/X2Impl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/X2Impl.java @@ -78,6 +78,7 @@ public class X2Impl extends XImpl implements X2 { * <!-- end-user-doc --> * @generated */ + @Override public EList<W> getOwnsW() { if (ownsW == null) { ownsW = new EObjectContainmentEList<W>(W.class, this, SderivedPackage.X2__OWNS_W); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/Y2Impl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/Y2Impl.java index 0a81033f4..e950cd9cc 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/Y2Impl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/sderived/impl/Y2Impl.java @@ -81,6 +81,7 @@ public class Y2Impl extends YImpl implements Y2 { * <!-- end-user-doc --> * @generated */ + @Override public String getName2() { return name2; } @@ -90,6 +91,7 @@ public class Y2Impl extends YImpl implements Y2 { * <!-- end-user-doc --> * @generated */ + @Override public void setName2(String newName2) { String oldName2 = name2; name2 = newName2; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/AImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/AImpl.java index 1120d430d..88e177293 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/AImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/AImpl.java @@ -76,6 +76,7 @@ public class AImpl extends NamedElementImpl implements A { * <!-- end-user-doc --> * @generated */ + @Override public EList<B> getOwnsB() { if (ownsB == null) { ownsB = new EObjectContainmentEList<B>(B.class, this, TbasePackage.A__OWNS_B); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/BImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/BImpl.java index 1f1e975f8..5ae2adaf8 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/BImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/BImpl.java @@ -72,6 +72,7 @@ public class BImpl extends NamedElementImpl implements B { * <!-- end-user-doc --> * @generated */ + @Override public C getOwnsC() { return ownsC; } @@ -96,6 +97,7 @@ public class BImpl extends NamedElementImpl implements B { * <!-- end-user-doc --> * @generated */ + @Override public void setOwnsC(C newOwnsC) { if (newOwnsC != ownsC) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/NamedElementImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/NamedElementImpl.java index 0c3ca55a1..05b45d719 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/NamedElementImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/NamedElementImpl.java @@ -80,6 +80,7 @@ public class NamedElementImpl extends MinimalEObjectImpl.Container implements Na * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -89,6 +90,7 @@ public class NamedElementImpl extends MinimalEObjectImpl.Container implements Na * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TRootImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TRootImpl.java index aa4f3e4e4..7c91a44a6 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TRootImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TRootImpl.java @@ -78,6 +78,7 @@ public class TRootImpl extends MinimalEObjectImpl.Container implements TRoot { * <!-- end-user-doc --> * @generated */ + @Override public EList<A> getOwnedA() { if (ownedA == null) { ownedA = new EObjectContainmentEList<A>(A.class, this, TbasePackage.TROOT__OWNED_A); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TbaseFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TbaseFactoryImpl.java index cbafba2a2..1c8e96d7f 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TbaseFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TbaseFactoryImpl.java @@ -81,6 +81,7 @@ public class TbaseFactoryImpl extends EFactoryImpl implements TbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public A createA() { AImpl a = new AImpl(); return a; @@ -91,6 +92,7 @@ public class TbaseFactoryImpl extends EFactoryImpl implements TbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public B createB() { BImpl b = new BImpl(); return b; @@ -101,6 +103,7 @@ public class TbaseFactoryImpl extends EFactoryImpl implements TbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public C createC() { CImpl c = new CImpl(); return c; @@ -111,6 +114,7 @@ public class TbaseFactoryImpl extends EFactoryImpl implements TbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public TRoot createTRoot() { TRootImpl tRoot = new TRootImpl(); return tRoot; @@ -121,6 +125,7 @@ public class TbaseFactoryImpl extends EFactoryImpl implements TbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public NamedElement createNamedElement() { NamedElementImpl namedElement = new NamedElementImpl(); return namedElement; @@ -131,6 +136,7 @@ public class TbaseFactoryImpl extends EFactoryImpl implements TbaseFactory { * <!-- end-user-doc --> * @generated */ + @Override public TbasePackage getTbasePackage() { return (TbasePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TbasePackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TbasePackageImpl.java index 38e1ca778..0a71a928e 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TbasePackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tbase/impl/TbasePackageImpl.java @@ -133,6 +133,7 @@ public class TbasePackageImpl extends EPackageImpl implements TbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getA() { return aEClass; } @@ -142,6 +143,7 @@ public class TbasePackageImpl extends EPackageImpl implements TbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getA_OwnsB() { return (EReference)aEClass.getEStructuralFeatures().get(0); } @@ -151,6 +153,7 @@ public class TbasePackageImpl extends EPackageImpl implements TbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getB() { return bEClass; } @@ -160,6 +163,7 @@ public class TbasePackageImpl extends EPackageImpl implements TbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getB_OwnsC() { return (EReference)bEClass.getEStructuralFeatures().get(0); } @@ -169,6 +173,7 @@ public class TbasePackageImpl extends EPackageImpl implements TbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getC() { return cEClass; } @@ -178,6 +183,7 @@ public class TbasePackageImpl extends EPackageImpl implements TbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getTRoot() { return tRootEClass; } @@ -187,6 +193,7 @@ public class TbasePackageImpl extends EPackageImpl implements TbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTRoot_OwnedA() { return (EReference)tRootEClass.getEStructuralFeatures().get(0); } @@ -196,6 +203,7 @@ public class TbasePackageImpl extends EPackageImpl implements TbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNamedElement() { return namedElementEClass; } @@ -205,6 +213,7 @@ public class TbasePackageImpl extends EPackageImpl implements TbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNamedElement_Name() { return (EAttribute)namedElementEClass.getEStructuralFeatures().get(0); } @@ -214,6 +223,7 @@ public class TbasePackageImpl extends EPackageImpl implements TbasePackage { * <!-- end-user-doc --> * @generated */ + @Override public TbaseFactory getTbaseFactory() { return (TbaseFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/A2Impl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/A2Impl.java index dd5f23417..22529f637 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/A2Impl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/A2Impl.java @@ -78,6 +78,7 @@ public class A2Impl extends AImpl implements A2 { * <!-- end-user-doc --> * @generated */ + @Override public EList<D> getOwnsD() { if (ownsD == null) { ownsD = new EObjectContainmentEList<D>(D.class, this, TderivedPackage.A2__OWNS_D); diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/B2Impl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/B2Impl.java index 44065c828..b0976c6da 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/B2Impl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/B2Impl.java @@ -81,6 +81,7 @@ public class B2Impl extends BImpl implements B2 { * <!-- end-user-doc --> * @generated */ + @Override public String getAnotherName() { return anotherName; } @@ -90,6 +91,7 @@ public class B2Impl extends BImpl implements B2 { * <!-- end-user-doc --> * @generated */ + @Override public void setAnotherName(String newAnotherName) { String oldAnotherName = anotherName; anotherName = newAnotherName; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/TderivedFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/TderivedFactoryImpl.java index 7af63b8ba..18033f287 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/TderivedFactoryImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/TderivedFactoryImpl.java @@ -79,6 +79,7 @@ public class TderivedFactoryImpl extends EFactoryImpl implements TderivedFactory * <!-- end-user-doc --> * @generated */ + @Override public A2 createA2() { A2Impl a2 = new A2Impl(); return a2; @@ -89,6 +90,7 @@ public class TderivedFactoryImpl extends EFactoryImpl implements TderivedFactory * <!-- end-user-doc --> * @generated */ + @Override public B2 createB2() { B2Impl b2 = new B2Impl(); return b2; @@ -99,6 +101,7 @@ public class TderivedFactoryImpl extends EFactoryImpl implements TderivedFactory * <!-- end-user-doc --> * @generated */ + @Override public D createD() { DImpl d = new DImpl(); return d; @@ -109,6 +112,7 @@ public class TderivedFactoryImpl extends EFactoryImpl implements TderivedFactory * <!-- end-user-doc --> * @generated */ + @Override public TderivedPackage getTderivedPackage() { return (TderivedPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/TderivedPackageImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/TderivedPackageImpl.java index 5e780efe9..03146fde9 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/TderivedPackageImpl.java +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example5/tderived/impl/TderivedPackageImpl.java @@ -122,6 +122,7 @@ public class TderivedPackageImpl extends EPackageImpl implements TderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getA2() { return a2EClass; } @@ -131,6 +132,7 @@ public class TderivedPackageImpl extends EPackageImpl implements TderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getA2_OwnsD() { return (EReference)a2EClass.getEStructuralFeatures().get(0); } @@ -140,6 +142,7 @@ public class TderivedPackageImpl extends EPackageImpl implements TderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getB2() { return b2EClass; } @@ -149,6 +152,7 @@ public class TderivedPackageImpl extends EPackageImpl implements TderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getB2_AnotherName() { return (EAttribute)b2EClass.getEStructuralFeatures().get(0); } @@ -158,6 +162,7 @@ public class TderivedPackageImpl extends EPackageImpl implements TderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getD() { return dEClass; } @@ -167,6 +172,7 @@ public class TderivedPackageImpl extends EPackageImpl implements TderivedPackage * <!-- end-user-doc --> * @generated */ + @Override public TderivedFactory getTderivedFactory() { return (TderivedFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/PivotTestCase.java b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/PivotTestCase.java index 5bbde223f..498e82491 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/PivotTestCase.java +++ b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/PivotTestCase.java @@ -37,6 +37,7 @@ import org.eclipse.ocl.pivot.internal.ecore.as2es.AS2Ecore; import org.eclipse.ocl.pivot.internal.resource.ProjectMap; import org.eclipse.ocl.pivot.internal.resource.StandaloneProjectMap; import org.eclipse.ocl.pivot.internal.utilities.EnvironmentFactoryInternal; +import org.eclipse.ocl.pivot.utilities.ClassUtil; import org.eclipse.ocl.pivot.utilities.LabelUtil; import org.eclipse.ocl.pivot.utilities.OCL; import org.eclipse.ocl.pivot.utilities.PivotUtil; @@ -87,10 +88,10 @@ public class PivotTestCase extends TestCase if (unresolvedProxies.size() > 0) { StringBuilder s = new StringBuilder(); s.append(unresolvedProxies.size()); - s.append(" unresolved proxies in '" + resource.getURI() + "' "); + s.append(" unresolved proxies in '" + resource.getURI() + "' "); s.append(message); for (Map.Entry<EObject, Collection<Setting>> unresolvedProxy : unresolvedProxies.entrySet()) { - s.append("\n"); + s.append("\n"); BasicEObjectImpl key = (BasicEObjectImpl) unresolvedProxy.getKey(); s.append(key.eProxyURI()); for (Setting setting : unresolvedProxy.getValue()) { @@ -171,7 +172,7 @@ public class PivotTestCase extends TestCase } StringBuilder s2 = null; for (String key : expected.keySet()) { - Integer count = expected.get(key); + Integer count = ClassUtil.nonNullState(expected.get(key)); while (count-- > 0) { if (s2 == null) { s2 = new StringBuilder(); @@ -211,10 +212,10 @@ public class PivotTestCase extends TestCase throw new Error("Failed to parse or evaluate \"" + expression + "\"", e); } else { - throw new Error("Failure for \"" + expression + "\"", e); + throw new Error("Failure for \"" + expression + "\"", e); } } - + public static Resource getEcoreFromCS(@NonNull OCL ocl, String testDocument, URI ecoreURI) throws IOException { InputStream inputStream = new ByteArrayInputStream(testDocument.getBytes()); URI xtextURI = URI.createURI("test.oclinecore"); @@ -235,16 +236,16 @@ public class PivotTestCase extends TestCase } return projectMap2; } - + public URI getTestModelURI(String localFileName) { - String urlString = getProjectMap().getLocation(PLUGIN_ID).toString(); + String urlString = ClassUtil.nonNullState(getProjectMap().getLocation(PLUGIN_ID)).toString(); TestCase.assertNotNull(urlString); return URI.createURI(urlString + "/" + localFileName); } -// public static void resetProjectMap() { -// projectMap = null; -// } + // public static void resetProjectMap() { + // projectMap = null; + // } public static Resource savePivotAsEcore(@NonNull OCL ocl, Resource pivotResource, URI ecoreURI, boolean validateSaved) throws IOException { return savePivotAsEcore(ocl, pivotResource, ecoreURI, null, validateSaved); @@ -278,13 +279,13 @@ public class PivotTestCase extends TestCase } resourceSet.eAdapters().clear(); } - + protected static boolean noDebug = false; - + public static void debugPrintln(String string) { if (!noDebug) { System.out.println(string); - } + } } @Override diff --git a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/QVTbaseLibraryTests.java b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/QVTbaseLibraryTests.java index 31dcb670d..ff53da6df 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/QVTbaseLibraryTests.java +++ b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/QVTbaseLibraryTests.java @@ -89,7 +89,7 @@ public class QVTbaseLibraryTests extends XtextTestCase assertNoResourceErrors("Load failed", asResource); assertNoUnresolvedProxies("File Model", asResource); assertNoValidationErrors("File Model", asResource); -// PivotAliasCreator.refreshPackageAliases(javaResource); + // PivotAliasCreator.refreshPackageAliases(javaResource); assertNoResourceErrors("Java Model", javaResource); assertNoUnresolvedProxies("Java Model", javaResource); assertNoValidationErrors("Java Model", javaResource); @@ -100,14 +100,14 @@ public class QVTbaseLibraryTests extends XtextTestCase // Check similar content // Map<String,Element> fileMoniker2asMap = computeMoniker2ASMap(Collections.singletonList(asResource)); -// for (String moniker : fileMoniker2asMap.keySet()) { -// System.out.println("File : " + moniker); -// } + // for (String moniker : fileMoniker2asMap.keySet()) { + // System.out.println("File : " + moniker); + // } Map<String,Element> javaMoniker2asMap = computeMoniker2ASMap(Collections.singletonList(javaResource)); -// for (String moniker : javaMoniker2asMap.keySet()) { -// System.out.println("Java : " + moniker); -// } -// assertEquals(fileMoniker2asMap.size(), javaMoniker2asMap.size()); + // for (String moniker : javaMoniker2asMap.keySet()) { + // System.out.println("Java : " + moniker); + // } + // assertEquals(fileMoniker2asMap.size(), javaMoniker2asMap.size()); for (String moniker : fileMoniker2asMap.keySet()) { Element fileElement = fileMoniker2asMap.get(moniker); Element javaElement = javaMoniker2asMap.get(moniker); @@ -124,7 +124,9 @@ public class QVTbaseLibraryTests extends XtextTestCase } } assertNotNull("Missing java element for '" + moniker + "'", javaElement); -// @SuppressWarnings("null") // Can be null and we'll have an NPE as the test failure. + assert fileElement != null; + assert javaElement != null; + // @SuppressWarnings("null") // Can be null and we'll have an NPE as the test failure. Class<? extends Element> javaElementClass = javaElement.getClass(); assertEquals(fileElement.getClass(), javaElementClass); if (fileElement instanceof TypedElement) { @@ -180,11 +182,11 @@ public class QVTbaseLibraryTests extends XtextTestCase protected void tearDown() throws Exception { super.tearDown(); } - + /** * Checks that the local QVTbase-1.3.oclstdlib is the same as the pre-compiled * Java implementation. - * + * * FIXME check the library/model version instead. */ public void testQVTbaseLibrary() throws Exception { @@ -200,6 +202,7 @@ public class QVTbaseLibraryTests extends XtextTestCase ocl.getEnvironmentFactory().adapt(xtextResource); xtextResource.load(null); CS2AS cs2as = xtextResource.findCS2AS(); + assert cs2as != null; assertNoResourceErrors("Load failed", xtextResource); Resource fileResource = cs2as.getASResource(); assertNoResourceErrors("File Model", fileResource); @@ -209,7 +212,7 @@ public class QVTbaseLibraryTests extends XtextTestCase // Load 'QVTbaseLibrary.oclstdlib' as pre-code-generated Java. // Resource javaResource = QVTbaseLibrary.getDefault(); -// PivotAliasCreator.refreshPackageAliases(javaResource); + // PivotAliasCreator.refreshPackageAliases(javaResource); assertNoResourceErrors("Java Model", javaResource); assertNoUnresolvedProxies("Java Model", javaResource); assertNoValidationErrors("Java Model", javaResource); @@ -217,14 +220,14 @@ public class QVTbaseLibraryTests extends XtextTestCase // Check similar content // Map<String,Element> fileMoniker2asMap = computeMoniker2ASMap(Collections.singletonList(fileResource)); -// for (String moniker : fileMoniker2asMap.keySet()) { -// System.out.println("File : " + moniker); -// } + // for (String moniker : fileMoniker2asMap.keySet()) { + // System.out.println("File : " + moniker); + // } Map<String,Element> javaMoniker2asMap = computeMoniker2ASMap(Collections.singletonList(javaResource)); -// for (String moniker : javaMoniker2asMap.keySet()) { -// System.out.println("Java : " + moniker); -// } -// assertEquals(fileMoniker2asMap.size(), javaMoniker2asMap.size()); + // for (String moniker : javaMoniker2asMap.keySet()) { + // System.out.println("Java : " + moniker); + // } + // assertEquals(fileMoniker2asMap.size(), javaMoniker2asMap.size()); for (String moniker : fileMoniker2asMap.keySet()) { Element fileElement = fileMoniker2asMap.get(moniker); Element javaElement = javaMoniker2asMap.get(moniker); @@ -241,7 +244,9 @@ public class QVTbaseLibraryTests extends XtextTestCase } } assertNotNull("Missing java element for '" + moniker + "'", javaElement); -// @SuppressWarnings("null") // Can be null and we'll have an NPE as the test failure. + assert fileElement != null; + assert javaElement != null; + // @SuppressWarnings("null") // Can be null and we'll have an NPE as the test failure. Class<? extends Element> javaElementClass = javaElement.getClass(); assertEquals(fileElement.getClass(), javaElementClass); if (fileElement instanceof TypedElement) { @@ -286,7 +291,7 @@ public class QVTbaseLibraryTests extends XtextTestCase } ocl.dispose(); } - + /** * Checks that the QVTbase-1.3 AS model is the same as the pre-compiled * Java implementation. @@ -304,7 +309,7 @@ public class QVTbaseLibraryTests extends XtextTestCase @SuppressWarnings("unused")Resource asResource = doLoadAS(ocl.getMetamodelManager().getASResourceSet(), libraryURI, javaResource, false); // FIXME Contents are far from identical ocl.dispose(); } - + /** * Checks that the QVTbase AS model is the same as the pre-compiled Java implementation. */ diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamiliesFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamiliesFactoryImpl.java index e3e615721..730ecd0b0 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamiliesFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamiliesFactoryImpl.java @@ -76,6 +76,7 @@ public class FamiliesFactoryImpl extends EFactoryImpl implements FamiliesFactory * <!-- end-user-doc --> * @generated */ + @Override public Family createFamily() { FamilyImpl family = new FamilyImpl(); return family; @@ -86,6 +87,7 @@ public class FamiliesFactoryImpl extends EFactoryImpl implements FamiliesFactory * <!-- end-user-doc --> * @generated */ + @Override public Member createMember() { MemberImpl member = new MemberImpl(); return member; @@ -96,6 +98,7 @@ public class FamiliesFactoryImpl extends EFactoryImpl implements FamiliesFactory * <!-- end-user-doc --> * @generated */ + @Override public FamiliesPackage getFamiliesPackage() { return (FamiliesPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamiliesPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamiliesPackageImpl.java index 0e1d15768..c5bb1e0e1 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamiliesPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamiliesPackageImpl.java @@ -126,6 +126,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getFamily() { return familyEClass; } @@ -135,6 +136,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getFamily_LastName() { return (EAttribute)familyEClass.getEStructuralFeatures().get(0); } @@ -144,6 +146,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getFamily_Father() { return (EReference)familyEClass.getEStructuralFeatures().get(1); } @@ -153,6 +156,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getFamily_Mother() { return (EReference)familyEClass.getEStructuralFeatures().get(2); } @@ -162,6 +166,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getFamily_Sons() { return (EReference)familyEClass.getEStructuralFeatures().get(3); } @@ -171,6 +176,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getFamily_Daughters() { return (EReference)familyEClass.getEStructuralFeatures().get(4); } @@ -180,6 +186,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getMember() { return memberEClass; } @@ -189,6 +196,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getMember_FirstName() { return (EAttribute)memberEClass.getEStructuralFeatures().get(0); } @@ -198,6 +206,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getMember_FamilyFather() { return (EReference)memberEClass.getEStructuralFeatures().get(1); } @@ -207,6 +216,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getMember_FamilyMother() { return (EReference)memberEClass.getEStructuralFeatures().get(2); } @@ -216,6 +226,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getMember_FamilySon() { return (EReference)memberEClass.getEStructuralFeatures().get(3); } @@ -225,6 +236,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getMember_FamilyDaughter() { return (EReference)memberEClass.getEStructuralFeatures().get(4); } @@ -234,6 +246,7 @@ public class FamiliesPackageImpl extends EPackageImpl implements FamiliesPackage * <!-- end-user-doc --> * @generated */ + @Override public FamiliesFactory getFamiliesFactory() { return (FamiliesFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamilyImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamilyImpl.java index e9e476faa..9548dd32d 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamilyImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/FamilyImpl.java @@ -4,7 +4,7 @@ * 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 */ @@ -132,6 +132,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public String getLastName() { return lastName; } @@ -141,6 +142,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public void setLastName(String newLastName) { String oldLastName = lastName; lastName = newLastName; @@ -153,6 +155,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public Member getFather() { return father; } @@ -177,6 +180,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public void setFather(Member newFather) { if (newFather != father) { NotificationChain msgs = null; @@ -196,6 +200,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public Member getMother() { return mother; } @@ -220,6 +225,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public void setMother(Member newMother) { if (newMother != mother) { NotificationChain msgs = null; @@ -239,6 +245,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public EList<Member> getSons() { if (sons == null) { sons = new EObjectContainmentWithInverseEList<Member>(Member.class, this, FamiliesPackage.FAMILY__SONS, FamiliesPackage.MEMBER__FAMILY_SON); @@ -251,6 +258,7 @@ public class FamilyImpl extends MinimalEObjectImpl.Container implements Family { * <!-- end-user-doc --> * @generated */ + @Override public EList<Member> getDaughters() { if (daughters == null) { daughters = new EObjectContainmentWithInverseEList<Member>(Member.class, this, FamiliesPackage.FAMILY__DAUGHTERS, FamiliesPackage.MEMBER__FAMILY_DAUGHTER); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/MemberImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/MemberImpl.java index 02b12418f..3645b2852 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/MemberImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families/impl/MemberImpl.java @@ -87,6 +87,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public String getFirstName() { return firstName; } @@ -96,6 +97,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public void setFirstName(String newFirstName) { String oldFirstName = firstName; firstName = newFirstName; @@ -108,6 +110,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public Family getFamilyFather() { if (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_FATHER) return null; return (Family)eInternalContainer(); @@ -128,6 +131,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public void setFamilyFather(Family newFamilyFather) { if (newFamilyFather != eInternalContainer() || (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_FATHER && newFamilyFather != null)) { if (EcoreUtil.isAncestor(this, newFamilyFather)) @@ -149,6 +153,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public Family getFamilyMother() { if (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_MOTHER) return null; return (Family)eInternalContainer(); @@ -169,6 +174,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public void setFamilyMother(Family newFamilyMother) { if (newFamilyMother != eInternalContainer() || (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_MOTHER && newFamilyMother != null)) { if (EcoreUtil.isAncestor(this, newFamilyMother)) @@ -190,6 +196,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public Family getFamilySon() { if (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_SON) return null; return (Family)eInternalContainer(); @@ -210,6 +217,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public void setFamilySon(Family newFamilySon) { if (newFamilySon != eInternalContainer() || (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_SON && newFamilySon != null)) { if (EcoreUtil.isAncestor(this, newFamilySon)) @@ -231,6 +239,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public Family getFamilyDaughter() { if (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_DAUGHTER) return null; return (Family)eInternalContainer(); @@ -251,6 +260,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { * <!-- end-user-doc --> * @generated */ + @Override public void setFamilyDaughter(Family newFamilyDaughter) { if (newFamilyDaughter != eInternalContainer() || (eContainerFeatureID() != FamiliesPackage.MEMBER__FAMILY_DAUGHTER && newFamilyDaughter != null)) { if (EcoreUtil.isAncestor(this, newFamilyDaughter)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsFactoryImpl.java index 448258f7c..994ffec7a 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsFactoryImpl.java @@ -76,6 +76,7 @@ public class Families2PersonsFactoryImpl extends EFactoryImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public Member2Male createMember2Male() { Member2MaleImpl member2Male = new Member2MaleImpl(); return member2Male; @@ -86,6 +87,7 @@ public class Families2PersonsFactoryImpl extends EFactoryImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public Member2Female createMember2Female() { Member2FemaleImpl member2Female = new Member2FemaleImpl(); return member2Female; @@ -96,6 +98,7 @@ public class Families2PersonsFactoryImpl extends EFactoryImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public Families2PersonsPackage getFamilies2PersonsPackage() { return (Families2PersonsPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java index 43ed398e2..cb7f54584 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java @@ -134,6 +134,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EClass getMemberToPerson() { return memberToPersonEClass; } @@ -143,6 +144,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EReference getMemberToPerson_Member() { return (EReference)memberToPersonEClass.getEStructuralFeatures().get(0); } @@ -152,6 +154,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EReference getMemberToPerson_Person() { return (EReference)memberToPersonEClass.getEStructuralFeatures().get(1); } @@ -161,6 +164,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getMemberToPerson_FirstName() { return (EAttribute)memberToPersonEClass.getEStructuralFeatures().get(2); } @@ -170,6 +174,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getMemberToPerson_FamilyName() { return (EAttribute)memberToPersonEClass.getEStructuralFeatures().get(3); } @@ -179,6 +184,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EClass getMember2Male() { return member2MaleEClass; } @@ -188,6 +194,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public EClass getMember2Female() { return member2FemaleEClass; } @@ -197,6 +204,7 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie * <!-- end-user-doc --> * @generated */ + @Override public Families2PersonsFactory getFamilies2PersonsFactory() { return (Families2PersonsFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/MemberToPersonImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/MemberToPersonImpl.java index d14369984..3a40d4d96 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/MemberToPersonImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/MemberToPersonImpl.java @@ -126,6 +126,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public Member getMember() { if (member != null && member.eIsProxy()) { InternalEObject oldMember = (InternalEObject)member; @@ -152,6 +153,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public void setMember(Member newMember) { Member oldMember = member; member = newMember; @@ -164,6 +166,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public Person getPerson() { if (person != null && person.eIsProxy()) { InternalEObject oldPerson = (InternalEObject)person; @@ -190,6 +193,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public void setPerson(Person newPerson) { Person oldPerson = person; person = newPerson; @@ -202,6 +206,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public String getFirstName() { return firstName; } @@ -211,6 +216,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public void setFirstName(String newFirstName) { String oldFirstName = firstName; firstName = newFirstName; @@ -223,6 +229,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public String getFamilyName() { return familyName; } @@ -232,6 +239,7 @@ public abstract class MemberToPersonImpl extends MinimalEObjectImpl.Container im * <!-- end-user-doc --> * @generated */ + @Override public void setFamilyName(String newFamilyName) { String oldFamilyName = familyName; familyName = newFamilyName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonImpl.java index d6d50eab4..47df2d74b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonImpl.java @@ -78,6 +78,7 @@ public abstract class PersonImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public String getFullName() { return fullName; } @@ -87,6 +88,7 @@ public abstract class PersonImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setFullName(String newFullName) { String oldFullName = fullName; fullName = newFullName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonsFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonsFactoryImpl.java index d90f3cfc2..1d47fe2e2 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonsFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonsFactoryImpl.java @@ -76,6 +76,7 @@ public class PersonsFactoryImpl extends EFactoryImpl implements PersonsFactory { * <!-- end-user-doc --> * @generated */ + @Override public Male createMale() { MaleImpl male = new MaleImpl(); return male; @@ -86,6 +87,7 @@ public class PersonsFactoryImpl extends EFactoryImpl implements PersonsFactory { * <!-- end-user-doc --> * @generated */ + @Override public Female createFemale() { FemaleImpl female = new FemaleImpl(); return female; @@ -96,6 +98,7 @@ public class PersonsFactoryImpl extends EFactoryImpl implements PersonsFactory { * <!-- end-user-doc --> * @generated */ + @Override public PersonsPackage getPersonsPackage() { return (PersonsPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonsPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonsPackageImpl.java index 3c853d0ab..c29937258 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonsPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Persons/impl/PersonsPackageImpl.java @@ -133,6 +133,7 @@ public class PersonsPackageImpl extends EPackageImpl implements PersonsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPerson() { return personEClass; } @@ -142,6 +143,7 @@ public class PersonsPackageImpl extends EPackageImpl implements PersonsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getPerson_FullName() { return (EAttribute)personEClass.getEStructuralFeatures().get(0); } @@ -151,6 +153,7 @@ public class PersonsPackageImpl extends EPackageImpl implements PersonsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getMale() { return maleEClass; } @@ -160,6 +163,7 @@ public class PersonsPackageImpl extends EPackageImpl implements PersonsPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getFemale() { return femaleEClass; } @@ -169,6 +173,7 @@ public class PersonsPackageImpl extends EPackageImpl implements PersonsPackage { * <!-- end-user-doc --> * @generated */ + @Override public PersonsFactory getPersonsFactory() { return (PersonsFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSNodeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSNodeImpl.java index b85823363..087364400 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSNodeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSNodeImpl.java @@ -121,6 +121,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public HLSNode getParent() { if (eContainerFeatureID() != HLSTreePackage.HLS_NODE__PARENT) return null; return (HLSNode)eInternalContainer(); @@ -141,6 +142,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public void setParent(HLSNode newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != HLSTreePackage.HLS_NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) @@ -162,6 +164,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public EList<HLSNode> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<HLSNode>(HLSNode.class, this, HLSTreePackage.HLS_NODE__CHILDREN, HLSTreePackage.HLS_NODE__PARENT); @@ -174,6 +177,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public String getHls() { return hls; } @@ -183,6 +187,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public void setHls(String newHls) { String oldHls = hls; hls = newHls; @@ -195,6 +200,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -204,6 +210,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSTreeFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSTreeFactoryImpl.java index 89e04b758..c500f11b1 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSTreeFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSTreeFactoryImpl.java @@ -106,6 +106,7 @@ public class HLSTreeFactoryImpl extends EFactoryImpl implements HLSTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HLSNode createHLSNode() { HLSNodeImpl hlsNode = new HLSNodeImpl(); return hlsNode; @@ -134,6 +135,7 @@ public class HLSTreeFactoryImpl extends EFactoryImpl implements HLSTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HLSTreePackage getHLSTreePackage() { return (HLSTreePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSTreePackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSTreePackageImpl.java index 70f6d0ae8..e78f08340 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSTreePackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HLSTree/impl/HLSTreePackageImpl.java @@ -126,6 +126,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getHLSNode() { return hlsNodeEClass; } @@ -135,6 +136,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHLSNode_Parent() { return (EReference)hlsNodeEClass.getEStructuralFeatures().get(0); } @@ -144,6 +146,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHLSNode_Children() { return (EReference)hlsNodeEClass.getEStructuralFeatures().get(1); } @@ -153,6 +156,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHLSNode_Hls() { return (EAttribute)hlsNodeEClass.getEStructuralFeatures().get(2); } @@ -162,6 +166,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHLSNode_Name() { return (EAttribute)hlsNodeEClass.getEStructuralFeatures().get(3); } @@ -171,6 +176,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EDataType getHLS() { return hlsEDataType; } @@ -180,6 +186,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public HLSTreeFactory getHLSTreeFactory() { return (HLSTreeFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSFactoryImpl.java index c7c10c9dd..0e64e25c7 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSFactoryImpl.java @@ -106,6 +106,7 @@ public class HSV2HLSFactoryImpl extends EFactoryImpl implements HSV2HLSFactory { * <!-- end-user-doc --> * @generated */ + @Override public HSVNode2HLSNode createHSVNode2HLSNode() { HSVNode2HLSNodeImpl hsvNode2HLSNode = new HSVNode2HLSNodeImpl(); return hsvNode2HLSNode; @@ -134,6 +135,7 @@ public class HSV2HLSFactoryImpl extends EFactoryImpl implements HSV2HLSFactory { * <!-- end-user-doc --> * @generated */ + @Override public HSV2HLSPackage getHSV2HLSPackage() { return (HSV2HLSPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSPackageImpl.java index bfc632c22..146285332 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSPackageImpl.java @@ -126,6 +126,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getHSVNode2HLSNode() { return hsvNode2HLSNodeEClass; } @@ -135,6 +136,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Parent() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(0); } @@ -144,6 +146,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Children() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(1); } @@ -153,6 +156,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Hsv() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(2); } @@ -162,6 +166,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Hls() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(3); } @@ -171,6 +176,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode2HLSNode_Rgb() { return (EAttribute)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(4); } @@ -180,6 +186,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode2HLSNode_Name() { return (EAttribute)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(5); } @@ -189,6 +196,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EDataType getRGB() { return rgbEDataType; } @@ -198,6 +206,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public HSV2HLSFactory getHSV2HLSFactory() { return (HSV2HLSFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSVNode2HLSNodeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSVNode2HLSNodeImpl.java index a86cb4016..26654dbd1 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSVNode2HLSNodeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSVNode2HLSNodeImpl.java @@ -147,6 +147,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public HSVNode2HLSNode getParent() { if (eContainerFeatureID() != HSV2HLSPackage.HSV_NODE2_HLS_NODE__PARENT) return null; return (HSVNode2HLSNode)eInternalContainer(); @@ -167,6 +168,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setParent(HSVNode2HLSNode newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != HSV2HLSPackage.HSV_NODE2_HLS_NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) @@ -188,6 +190,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public EList<HSVNode2HLSNode> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<HSVNode2HLSNode>(HSVNode2HLSNode.class, this, HSV2HLSPackage.HSV_NODE2_HLS_NODE__CHILDREN, HSV2HLSPackage.HSV_NODE2_HLS_NODE__PARENT); @@ -200,6 +203,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public HSVNode getHsv() { if (hsv != null && hsv.eIsProxy()) { InternalEObject oldHsv = (InternalEObject)hsv; @@ -226,6 +230,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setHsv(HSVNode newHsv) { HSVNode oldHsv = hsv; hsv = newHsv; @@ -238,6 +243,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public HLSNode getHls() { if (hls != null && hls.eIsProxy()) { InternalEObject oldHls = (InternalEObject)hls; @@ -264,6 +270,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setHls(HLSNode newHls) { HLSNode oldHls = hls; hls = newHls; @@ -276,6 +283,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public String getRgb() { return rgb; } @@ -285,6 +293,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setRgb(String newRgb) { String oldRgb = rgb; rgb = newRgb; @@ -297,6 +306,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -306,6 +316,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVNodeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVNodeImpl.java index 764205436..23e0b571d 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVNodeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVNodeImpl.java @@ -121,6 +121,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public HSVNode getParent() { if (eContainerFeatureID() != HSVTreePackage.HSV_NODE__PARENT) return null; return (HSVNode)eInternalContainer(); @@ -141,6 +142,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public void setParent(HSVNode newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != HSVTreePackage.HSV_NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) @@ -162,6 +164,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public EList<HSVNode> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<HSVNode>(HSVNode.class, this, HSVTreePackage.HSV_NODE__CHILDREN, HSVTreePackage.HSV_NODE__PARENT); @@ -174,6 +177,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public String getHsv() { return hsv; } @@ -183,6 +187,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public void setHsv(String newHsv) { String oldHsv = hsv; hsv = newHsv; @@ -195,6 +200,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -204,6 +210,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVTreeFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVTreeFactoryImpl.java index f2b6f65e2..85485a013 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVTreeFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVTreeFactoryImpl.java @@ -106,6 +106,7 @@ public class HSVTreeFactoryImpl extends EFactoryImpl implements HSVTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HSVNode createHSVNode() { HSVNodeImpl hsvNode = new HSVNodeImpl(); return hsvNode; @@ -134,6 +135,7 @@ public class HSVTreeFactoryImpl extends EFactoryImpl implements HSVTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HSVTreePackage getHSVTreePackage() { return (HSVTreePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVTreePackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVTreePackageImpl.java index 2e0ec9455..e8e4ebc8b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVTreePackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSVTree/impl/HSVTreePackageImpl.java @@ -126,6 +126,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getHSVNode() { return hsvNodeEClass; } @@ -135,6 +136,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode_Parent() { return (EReference)hsvNodeEClass.getEStructuralFeatures().get(0); } @@ -144,6 +146,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode_Children() { return (EReference)hsvNodeEClass.getEStructuralFeatures().get(1); } @@ -153,6 +156,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode_Hsv() { return (EAttribute)hsvNodeEClass.getEStructuralFeatures().get(2); } @@ -162,6 +166,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode_Name() { return (EAttribute)hsvNodeEClass.getEStructuralFeatures().get(3); } @@ -171,6 +176,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EDataType getHSV() { return hsvEDataType; } @@ -180,6 +186,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public HSVTreeFactory getHSVTreeFactory() { return (HSVTreeFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/ColumnImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/ColumnImpl.java index 813d43902..f61a3f4ea 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/ColumnImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/ColumnImpl.java @@ -113,6 +113,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public String getType() { return type; } @@ -122,6 +123,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public void setType(String newType) { String oldType = type; type = newType; @@ -134,6 +136,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public Table getOwner() { if (eContainerFeatureID() != SimplerdbmsPackage.COLUMN__OWNER) return null; return (Table)eInternalContainer(); @@ -154,6 +157,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(Table newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != SimplerdbmsPackage.COLUMN__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -175,6 +179,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public EList<ForeignKey> getForeignKeys() { if (foreignKeys == null) { foreignKeys = new EObjectWithInverseResolvingEList.ManyInverse<ForeignKey>(ForeignKey.class, this, SimplerdbmsPackage.COLUMN__FOREIGN_KEYS, SimplerdbmsPackage.FOREIGN_KEY__COLUMNS); @@ -187,6 +192,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public EList<Key> getKeys() { if (keys == null) { keys = new EObjectWithInverseResolvingEList.ManyInverse<Key>(Key.class, this, SimplerdbmsPackage.COLUMN__KEYS, SimplerdbmsPackage.KEY__COLUMN); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/ForeignKeyImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/ForeignKeyImpl.java index 1dcf1009d..740b2d6e1 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/ForeignKeyImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/ForeignKeyImpl.java @@ -92,6 +92,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public Key getRefersTo() { if (refersTo != null && refersTo.eIsProxy()) { InternalEObject oldRefersTo = (InternalEObject)refersTo; @@ -118,6 +119,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public void setRefersTo(Key newRefersTo) { Key oldRefersTo = refersTo; refersTo = newRefersTo; @@ -130,6 +132,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public EList<Column> getColumns() { if (columns == null) { columns = new EObjectWithInverseResolvingEList.ManyInverse<Column>(Column.class, this, SimplerdbmsPackage.FOREIGN_KEY__COLUMNS, SimplerdbmsPackage.COLUMN__FOREIGN_KEYS); @@ -142,6 +145,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public Table getOwner() { if (eContainerFeatureID() != SimplerdbmsPackage.FOREIGN_KEY__OWNER) return null; return (Table)eInternalContainer(); @@ -162,6 +166,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(Table newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != SimplerdbmsPackage.FOREIGN_KEY__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/KeyImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/KeyImpl.java index 140361bd8..28fae8db1 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/KeyImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/KeyImpl.java @@ -80,6 +80,7 @@ public class KeyImpl extends RModelElementImpl implements Key { * <!-- end-user-doc --> * @generated */ + @Override public Table getOwner() { if (eContainerFeatureID() != SimplerdbmsPackage.KEY__OWNER) return null; return (Table)eInternalContainer(); @@ -100,6 +101,7 @@ public class KeyImpl extends RModelElementImpl implements Key { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(Table newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != SimplerdbmsPackage.KEY__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -121,6 +123,7 @@ public class KeyImpl extends RModelElementImpl implements Key { * <!-- end-user-doc --> * @generated */ + @Override public EList<Column> getColumn() { if (column == null) { column = new EObjectWithInverseResolvingEList.ManyInverse<Column>(Column.class, this, SimplerdbmsPackage.KEY__COLUMN, SimplerdbmsPackage.COLUMN__KEYS); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/RModelElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/RModelElementImpl.java index 7a5e2ecef..892182743 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/RModelElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/RModelElementImpl.java @@ -4,7 +4,7 @@ * 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 */ @@ -99,6 +99,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -108,6 +109,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -120,6 +122,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -129,6 +132,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SchemaImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SchemaImpl.java index 94fcd2f27..f2976c7b4 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SchemaImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SchemaImpl.java @@ -74,6 +74,7 @@ public class SchemaImpl extends RModelElementImpl implements Schema { * <!-- end-user-doc --> * @generated */ + @Override public EList<Table> getTables() { if (tables == null) { tables = new EObjectContainmentWithInverseEList<Table>(Table.class, this, SimplerdbmsPackage.SCHEMA__TABLES, SimplerdbmsPackage.TABLE__SCHEMA); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SimplerdbmsFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SimplerdbmsFactoryImpl.java index 848c7caea..9f73abbd8 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SimplerdbmsFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SimplerdbmsFactoryImpl.java @@ -110,6 +110,7 @@ public class SimplerdbmsFactoryImpl extends EFactoryImpl implements SimplerdbmsF * <!-- end-user-doc --> * @generated */ + @Override public Column createColumn() { ColumnImpl column = new ColumnImpl(); return column; @@ -120,6 +121,7 @@ public class SimplerdbmsFactoryImpl extends EFactoryImpl implements SimplerdbmsF * <!-- end-user-doc --> * @generated */ + @Override public ForeignKey createForeignKey() { ForeignKeyImpl foreignKey = new ForeignKeyImpl(); return foreignKey; @@ -130,6 +132,7 @@ public class SimplerdbmsFactoryImpl extends EFactoryImpl implements SimplerdbmsF * <!-- end-user-doc --> * @generated */ + @Override public Key createKey() { KeyImpl key = new KeyImpl(); return key; @@ -140,6 +143,7 @@ public class SimplerdbmsFactoryImpl extends EFactoryImpl implements SimplerdbmsF * <!-- end-user-doc --> * @generated */ + @Override public Schema createSchema() { SchemaImpl schema = new SchemaImpl(); return schema; @@ -150,6 +154,7 @@ public class SimplerdbmsFactoryImpl extends EFactoryImpl implements SimplerdbmsF * <!-- end-user-doc --> * @generated */ + @Override public Table createTable() { TableImpl table = new TableImpl(); return table; @@ -178,6 +183,7 @@ public class SimplerdbmsFactoryImpl extends EFactoryImpl implements SimplerdbmsF * <!-- end-user-doc --> * @generated */ + @Override public SimplerdbmsPackage getSimplerdbmsPackage() { return (SimplerdbmsPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SimplerdbmsPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SimplerdbmsPackageImpl.java index c43f5043b..1d51ac2a7 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SimplerdbmsPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/SimplerdbmsPackageImpl.java @@ -166,6 +166,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EClass getColumn() { return columnEClass; } @@ -175,6 +176,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getColumn_Type() { return (EAttribute)columnEClass.getEStructuralFeatures().get(0); } @@ -184,6 +186,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getColumn_Owner() { return (EReference)columnEClass.getEStructuralFeatures().get(1); } @@ -193,6 +196,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getColumn_ForeignKeys() { return (EReference)columnEClass.getEStructuralFeatures().get(2); } @@ -202,6 +206,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getColumn_Keys() { return (EReference)columnEClass.getEStructuralFeatures().get(3); } @@ -211,6 +216,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EClass getForeignKey() { return foreignKeyEClass; } @@ -220,6 +226,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getForeignKey_RefersTo() { return (EReference)foreignKeyEClass.getEStructuralFeatures().get(0); } @@ -229,6 +236,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getForeignKey_Columns() { return (EReference)foreignKeyEClass.getEStructuralFeatures().get(1); } @@ -238,6 +246,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getForeignKey_Owner() { return (EReference)foreignKeyEClass.getEStructuralFeatures().get(2); } @@ -247,6 +256,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EClass getKey() { return keyEClass; } @@ -256,6 +266,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getKey_Owner() { return (EReference)keyEClass.getEStructuralFeatures().get(0); } @@ -265,6 +276,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getKey_Column() { return (EReference)keyEClass.getEStructuralFeatures().get(1); } @@ -274,6 +286,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EClass getRModelElement() { return rModelElementEClass; } @@ -283,6 +296,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getRModelElement_Name() { return (EAttribute)rModelElementEClass.getEStructuralFeatures().get(0); } @@ -292,6 +306,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getRModelElement_Kind() { return (EAttribute)rModelElementEClass.getEStructuralFeatures().get(1); } @@ -301,6 +316,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EClass getSchema() { return schemaEClass; } @@ -310,6 +326,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getSchema_Tables() { return (EReference)schemaEClass.getEStructuralFeatures().get(0); } @@ -319,6 +336,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EClass getTable() { return tableEClass; } @@ -328,6 +346,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_Columns() { return (EReference)tableEClass.getEStructuralFeatures().get(0); } @@ -337,6 +356,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_Schema() { return (EReference)tableEClass.getEStructuralFeatures().get(1); } @@ -346,6 +366,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_Keys() { return (EReference)tableEClass.getEStructuralFeatures().get(2); } @@ -355,6 +376,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_ForeignKeys() { return (EReference)tableEClass.getEStructuralFeatures().get(3); } @@ -364,6 +386,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public EDataType getString() { return stringEDataType; } @@ -373,6 +396,7 @@ public class SimplerdbmsPackageImpl extends EPackageImpl implements SimplerdbmsP * <!-- end-user-doc --> * @generated */ + @Override public SimplerdbmsFactory getSimplerdbmsFactory() { return (SimplerdbmsFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/TableImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/TableImpl.java index dd993dd73..047899a6d 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/TableImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simplerdbms/impl/TableImpl.java @@ -104,6 +104,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public EList<Column> getColumns() { if (columns == null) { columns = new EObjectContainmentWithInverseEList<Column>(Column.class, this, SimplerdbmsPackage.TABLE__COLUMNS, SimplerdbmsPackage.COLUMN__OWNER); @@ -116,6 +117,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public Schema getSchema() { if (eContainerFeatureID() != SimplerdbmsPackage.TABLE__SCHEMA) return null; return (Schema)eInternalContainer(); @@ -136,6 +138,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public void setSchema(Schema newSchema) { if (newSchema != eInternalContainer() || (eContainerFeatureID() != SimplerdbmsPackage.TABLE__SCHEMA && newSchema != null)) { if (EcoreUtil.isAncestor(this, newSchema)) @@ -157,6 +160,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public EList<Key> getKeys() { if (keys == null) { keys = new EObjectContainmentWithInverseEList<Key>(Key.class, this, SimplerdbmsPackage.TABLE__KEYS, SimplerdbmsPackage.KEY__OWNER); @@ -169,6 +173,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public EList<ForeignKey> getForeignKeys() { if (foreignKeys == null) { foreignKeys = new EObjectContainmentWithInverseEList<ForeignKey>(ForeignKey.class, this, SimplerdbmsPackage.TABLE__FOREIGN_KEYS, SimplerdbmsPackage.FOREIGN_KEY__OWNER); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/AssociationImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/AssociationImpl.java index 20a0951e7..a3bc4b906 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/AssociationImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/AssociationImpl.java @@ -80,6 +80,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class getDestination() { if (destination != null && destination.eIsProxy()) { InternalEObject oldDestination = (InternalEObject)destination; @@ -121,6 +122,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public void setDestination(org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class newDestination) { if (newDestination != destination) { NotificationChain msgs = null; @@ -140,6 +142,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class getSource() { if (source != null && source.eIsProxy()) { InternalEObject oldSource = (InternalEObject)source; @@ -181,6 +184,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public void setSource(org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class newSource) { if (newSource != source) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/AttributeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/AttributeImpl.java index e00dd3d49..0b1d2b7b6 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/AttributeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/AttributeImpl.java @@ -73,6 +73,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class getOwner() { if (eContainerFeatureID() != SimpleumlPackage.ATTRIBUTE__OWNER) return null; return (org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class)eInternalContainer(); @@ -93,6 +94,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != SimpleumlPackage.ATTRIBUTE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -114,6 +116,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public Classifier getType() { if (type != null && type.eIsProxy()) { InternalEObject oldType = (InternalEObject)type; @@ -155,6 +158,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public void setType(Classifier newType) { if (newType != type) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/ClassImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/ClassImpl.java index 643b186d0..597bdb8f7 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/ClassImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/ClassImpl.java @@ -119,6 +119,7 @@ public class ClassImpl extends ClassifierImpl implements org.eclipse.qvtd.xtext. * <!-- end-user-doc --> * @generated */ + @Override public EList<Attribute> getAttributes() { if (attributes == null) { attributes = new EObjectContainmentWithInverseEList<Attribute>(Attribute.class, this, SimpleumlPackage.CLASS__ATTRIBUTES, SimpleumlPackage.ATTRIBUTE__OWNER); @@ -131,6 +132,7 @@ public class ClassImpl extends ClassifierImpl implements org.eclipse.qvtd.xtext. * <!-- end-user-doc --> * @generated */ + @Override public EList<Association> getForward() { if (forward == null) { forward = new EObjectWithInverseResolvingEList<Association>(Association.class, this, SimpleumlPackage.CLASS__FORWARD, SimpleumlPackage.ASSOCIATION__SOURCE); @@ -143,6 +145,7 @@ public class ClassImpl extends ClassifierImpl implements org.eclipse.qvtd.xtext. * <!-- end-user-doc --> * @generated */ + @Override public EList<org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class> getGeneral() { if (general == null) { general = new EObjectWithInverseResolvingEList.ManyInverse<org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class>(org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class.class, this, SimpleumlPackage.CLASS__GENERAL, SimpleumlPackage.CLASS__GENERAL_OPPOSITE); @@ -155,6 +158,7 @@ public class ClassImpl extends ClassifierImpl implements org.eclipse.qvtd.xtext. * <!-- end-user-doc --> * @generated */ + @Override public EList<org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class> getGeneralOpposite() { if (generalOpposite == null) { generalOpposite = new EObjectWithInverseResolvingEList.ManyInverse<org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class>(org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class.class, this, SimpleumlPackage.CLASS__GENERAL_OPPOSITE, SimpleumlPackage.CLASS__GENERAL); @@ -167,6 +171,7 @@ public class ClassImpl extends ClassifierImpl implements org.eclipse.qvtd.xtext. * <!-- end-user-doc --> * @generated */ + @Override public EList<Association> getReverse() { if (reverse == null) { reverse = new EObjectWithInverseResolvingEList<Association>(Association.class, this, SimpleumlPackage.CLASS__REVERSE, SimpleumlPackage.ASSOCIATION__DESTINATION); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/ClassifierImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/ClassifierImpl.java index c82e19e17..08fa156b9 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/ClassifierImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/ClassifierImpl.java @@ -74,6 +74,7 @@ public abstract class ClassifierImpl extends PackageElementImpl implements Class * <!-- end-user-doc --> * @generated */ + @Override public EList<Attribute> getTypeOpposite() { if (typeOpposite == null) { typeOpposite = new EObjectWithInverseResolvingEList<Attribute>(Attribute.class, this, SimpleumlPackage.CLASSIFIER__TYPE_OPPOSITE, SimpleumlPackage.ATTRIBUTE__TYPE); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/PackageElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/PackageElementImpl.java index 2bc5bd28a..040cda594 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/PackageElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/PackageElementImpl.java @@ -61,6 +61,7 @@ public abstract class PackageElementImpl extends UMLModelElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Package getNamespace() { if (eContainerFeatureID() != SimpleumlPackage.PACKAGE_ELEMENT__NAMESPACE) return null; return (org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Package)eInternalContainer(); @@ -81,6 +82,7 @@ public abstract class PackageElementImpl extends UMLModelElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public void setNamespace(org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Package newNamespace) { if (newNamespace != eInternalContainer() || (eContainerFeatureID() != SimpleumlPackage.PACKAGE_ELEMENT__NAMESPACE && newNamespace != null)) { if (EcoreUtil.isAncestor(this, newNamespace)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/PackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/PackageImpl.java index c5a8c24f2..5fea1b0c8 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/PackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/PackageImpl.java @@ -73,6 +73,7 @@ public class PackageImpl extends PackageElementImpl implements org.eclipse.qvtd. * <!-- end-user-doc --> * @generated */ + @Override public EList<PackageElement> getElements() { if (elements == null) { elements = new EObjectContainmentWithInverseEList<PackageElement>(PackageElement.class, this, SimpleumlPackage.PACKAGE__ELEMENTS, SimpleumlPackage.PACKAGE_ELEMENT__NAMESPACE); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/SimpleumlFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/SimpleumlFactoryImpl.java index bb9747b3a..a8679a513 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/SimpleumlFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/SimpleumlFactoryImpl.java @@ -83,6 +83,7 @@ public class SimpleumlFactoryImpl extends EFactoryImpl implements SimpleumlFacto * <!-- end-user-doc --> * @generated */ + @Override public Attribute createAttribute() { AttributeImpl attribute = new AttributeImpl(); return attribute; @@ -93,6 +94,7 @@ public class SimpleumlFactoryImpl extends EFactoryImpl implements SimpleumlFacto * <!-- end-user-doc --> * @generated */ + @Override public Association createAssociation() { AssociationImpl association = new AssociationImpl(); return association; @@ -103,6 +105,7 @@ public class SimpleumlFactoryImpl extends EFactoryImpl implements SimpleumlFacto * <!-- end-user-doc --> * @generated */ + @Override public org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class createClass() { ClassImpl class_ = new ClassImpl(); return class_; @@ -113,6 +116,7 @@ public class SimpleumlFactoryImpl extends EFactoryImpl implements SimpleumlFacto * <!-- end-user-doc --> * @generated */ + @Override public org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Package createPackage() { PackageImpl package_ = new PackageImpl(); return package_; @@ -123,6 +127,7 @@ public class SimpleumlFactoryImpl extends EFactoryImpl implements SimpleumlFacto * <!-- end-user-doc --> * @generated */ + @Override public PrimitiveDataType createPrimitiveDataType() { PrimitiveDataTypeImpl primitiveDataType = new PrimitiveDataTypeImpl(); return primitiveDataType; @@ -133,6 +138,7 @@ public class SimpleumlFactoryImpl extends EFactoryImpl implements SimpleumlFacto * <!-- end-user-doc --> * @generated */ + @Override public SimpleumlPackage getSimpleumlPackage() { return (SimpleumlPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/SimpleumlPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/SimpleumlPackageImpl.java index e52abf75a..da6e1b5ff 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/SimpleumlPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/SimpleumlPackageImpl.java @@ -172,6 +172,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getAttribute() { return attributeEClass; } @@ -181,6 +182,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAttribute_Owner() { return (EReference)attributeEClass.getEStructuralFeatures().get(0); } @@ -190,6 +192,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAttribute_Type() { return (EReference)attributeEClass.getEStructuralFeatures().get(1); } @@ -199,6 +202,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getAssociation() { return associationEClass; } @@ -208,6 +212,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociation_Destination() { return (EReference)associationEClass.getEStructuralFeatures().get(0); } @@ -217,6 +222,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociation_Source() { return (EReference)associationEClass.getEStructuralFeatures().get(1); } @@ -226,6 +232,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getClass_() { return classEClass; } @@ -235,6 +242,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_Attributes() { return (EReference)classEClass.getEStructuralFeatures().get(0); } @@ -244,6 +252,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_Forward() { return (EReference)classEClass.getEStructuralFeatures().get(1); } @@ -253,6 +262,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_General() { return (EReference)classEClass.getEStructuralFeatures().get(2); } @@ -262,6 +272,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_GeneralOpposite() { return (EReference)classEClass.getEStructuralFeatures().get(3); } @@ -271,6 +282,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_Reverse() { return (EReference)classEClass.getEStructuralFeatures().get(4); } @@ -280,6 +292,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getClassifier() { return classifierEClass; } @@ -289,6 +302,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassifier_TypeOpposite() { return (EReference)classifierEClass.getEStructuralFeatures().get(0); } @@ -298,6 +312,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackage() { return packageEClass; } @@ -307,6 +322,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackage_Elements() { return (EReference)packageEClass.getEStructuralFeatures().get(0); } @@ -316,6 +332,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackageElement() { return packageElementEClass; } @@ -325,6 +342,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageElement_Namespace() { return (EReference)packageElementEClass.getEStructuralFeatures().get(0); } @@ -334,6 +352,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPrimitiveDataType() { return primitiveDataTypeEClass; } @@ -343,6 +362,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getUMLModelElement() { return umlModelElementEClass; } @@ -352,6 +372,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getUMLModelElement_Kind() { return (EAttribute)umlModelElementEClass.getEStructuralFeatures().get(0); } @@ -361,6 +382,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getUMLModelElement_Name() { return (EAttribute)umlModelElementEClass.getEStructuralFeatures().get(1); } @@ -370,6 +392,7 @@ public class SimpleumlPackageImpl extends EPackageImpl implements SimpleumlPacka * <!-- end-user-doc --> * @generated */ + @Override public SimpleumlFactory getSimpleumlFactory() { return (SimpleumlFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/UMLModelElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/UMLModelElementImpl.java index 05780e846..880815c49 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/UMLModelElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml/impl/UMLModelElementImpl.java @@ -99,6 +99,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -108,6 +109,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; @@ -120,6 +122,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -129,6 +132,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/AssociationToForeignKeyImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/AssociationToForeignKeyImpl.java index d7fee065b..8aaccb899 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/AssociationToForeignKeyImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/AssociationToForeignKeyImpl.java @@ -4,7 +4,7 @@ * 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 */ @@ -121,6 +121,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -130,6 +131,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -142,6 +144,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public Association getAssociation() { if (association != null && association.eIsProxy()) { InternalEObject oldAssociation = (InternalEObject)association; @@ -168,6 +171,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setAssociation(Association newAssociation) { Association oldAssociation = association; association = newAssociation; @@ -180,6 +184,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public ForeignKey getForeignKey() { if (foreignKey != null && foreignKey.eIsProxy()) { InternalEObject oldForeignKey = (InternalEObject)foreignKey; @@ -206,6 +211,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setForeignKey(ForeignKey newForeignKey) { ForeignKey oldForeignKey = foreignKey; foreignKey = newForeignKey; @@ -218,6 +224,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public ClassToTable getOwner() { if (eContainerFeatureID() != Simpleuml2rdbmsPackage.ASSOCIATION_TO_FOREIGN_KEY__OWNER) return null; return (ClassToTable)eInternalContainer(); @@ -238,6 +245,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(ClassToTable newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != Simpleuml2rdbmsPackage.ASSOCIATION_TO_FOREIGN_KEY__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -259,6 +267,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public ClassToTable getReferenced() { if (referenced != null && referenced.eIsProxy()) { InternalEObject oldReferenced = (InternalEObject)referenced; @@ -285,6 +294,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setReferenced(ClassToTable newReferenced) { ClassToTable oldReferenced = referenced; referenced = newReferenced; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/AttributeToColumnImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/AttributeToColumnImpl.java index d60d1a899..770ff6149 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/AttributeToColumnImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/AttributeToColumnImpl.java @@ -83,6 +83,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public Column getColumn() { if (column != null && column.eIsProxy()) { InternalEObject oldColumn = (InternalEObject)column; @@ -109,6 +110,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public void setColumn(Column newColumn) { Column oldColumn = column; column = newColumn; @@ -121,6 +123,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public PrimitiveToName getType() { if (type != null && type.eIsProxy()) { InternalEObject oldType = (InternalEObject)type; @@ -147,6 +150,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public void setType(PrimitiveToName newType) { PrimitiveToName oldType = type; type = newType; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/ClassToTableImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/ClassToTableImpl.java index 55a81cd72..c867e043b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/ClassToTableImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/ClassToTableImpl.java @@ -4,7 +4,7 @@ * 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 */ @@ -151,6 +151,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public Column getColumn() { if (column != null && column.eIsProxy()) { InternalEObject oldColumn = (InternalEObject)column; @@ -177,6 +178,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setColumn(Column newColumn) { Column oldColumn = column; column = newColumn; @@ -189,6 +191,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -198,6 +201,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -210,6 +214,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public EList<AssociationToForeignKey> getAssociationsToForeignKeys() { if (associationsToForeignKeys == null) { associationsToForeignKeys = new EObjectContainmentWithInverseEList<AssociationToForeignKey>(AssociationToForeignKey.class, this, Simpleuml2rdbmsPackage.CLASS_TO_TABLE__ASSOCIATIONS_TO_FOREIGN_KEYS, Simpleuml2rdbmsPackage.ASSOCIATION_TO_FOREIGN_KEY__OWNER); @@ -222,6 +227,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public PackageToSchema getOwner() { if (eContainerFeatureID() != Simpleuml2rdbmsPackage.CLASS_TO_TABLE__OWNER) return null; return (PackageToSchema)eInternalContainer(); @@ -242,6 +248,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(PackageToSchema newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != Simpleuml2rdbmsPackage.CLASS_TO_TABLE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -263,6 +270,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public Key getPrimaryKey() { if (primaryKey != null && primaryKey.eIsProxy()) { InternalEObject oldPrimaryKey = (InternalEObject)primaryKey; @@ -289,6 +297,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setPrimaryKey(Key newPrimaryKey) { Key oldPrimaryKey = primaryKey; primaryKey = newPrimaryKey; @@ -301,6 +310,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public Table getTable() { if (table != null && table.eIsProxy()) { InternalEObject oldTable = (InternalEObject)table; @@ -327,6 +337,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setTable(Table newTable) { Table oldTable = table; table = newTable; @@ -339,6 +350,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class getUmlClass() { if (umlClass != null && umlClass.eIsProxy()) { InternalEObject oldUmlClass = (InternalEObject)umlClass; @@ -365,6 +377,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setUmlClass(org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class newUmlClass) { org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class oldUmlClass = umlClass; umlClass = newUmlClass; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/FromAttributeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/FromAttributeImpl.java index a5a84ee92..a2c5ca642 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/FromAttributeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/FromAttributeImpl.java @@ -4,7 +4,7 @@ * 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 */ @@ -113,6 +113,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -122,6 +123,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; @@ -134,6 +136,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public Attribute getAttribute() { if (attribute != null && attribute.eIsProxy()) { InternalEObject oldAttribute = (InternalEObject)attribute; @@ -160,6 +163,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public void setAttribute(Attribute newAttribute) { Attribute oldAttribute = attribute; attribute = newAttribute; @@ -172,6 +176,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public EList<AttributeToColumn> getLeafs() { if (leafs == null) { leafs = new EObjectResolvingEList<AttributeToColumn>(AttributeToColumn.class, this, Simpleuml2rdbmsPackage.FROM_ATTRIBUTE__LEAFS); @@ -184,6 +189,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public FromAttributeOwner getOwner() { if (eContainerFeatureID() != Simpleuml2rdbmsPackage.FROM_ATTRIBUTE__OWNER) return null; return (FromAttributeOwner)eInternalContainer(); @@ -204,6 +210,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(FromAttributeOwner newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != Simpleuml2rdbmsPackage.FROM_ATTRIBUTE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/FromAttributeOwnerImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/FromAttributeOwnerImpl.java index 9fb6ba82e..4c77910a8 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/FromAttributeOwnerImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/FromAttributeOwnerImpl.java @@ -76,6 +76,7 @@ public abstract class FromAttributeOwnerImpl extends MinimalEObjectImpl.Containe * <!-- end-user-doc --> * @generated */ + @Override public EList<FromAttribute> getFromAttributes() { if (fromAttributes == null) { fromAttributes = new EObjectContainmentWithInverseEList<FromAttribute>(FromAttribute.class, this, Simpleuml2rdbmsPackage.FROM_ATTRIBUTE_OWNER__FROM_ATTRIBUTES, Simpleuml2rdbmsPackage.FROM_ATTRIBUTE__OWNER); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/NonLeafAttributeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/NonLeafAttributeImpl.java index 07d01eff7..2f3d33308 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/NonLeafAttributeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/NonLeafAttributeImpl.java @@ -136,6 +136,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -145,6 +146,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -157,6 +159,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -166,6 +169,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; @@ -178,6 +182,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public Attribute getAttribute() { if (attribute != null && attribute.eIsProxy()) { InternalEObject oldAttribute = (InternalEObject)attribute; @@ -204,6 +209,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setAttribute(Attribute newAttribute) { Attribute oldAttribute = attribute; attribute = newAttribute; @@ -216,6 +222,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public EList<AttributeToColumn> getLeafs() { if (leafs == null) { leafs = new EObjectResolvingEList<AttributeToColumn>(AttributeToColumn.class, this, Simpleuml2rdbmsPackage.NON_LEAF_ATTRIBUTE__LEAFS); @@ -228,6 +235,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public FromAttributeOwner getOwner() { if (eContainerFeatureID() != Simpleuml2rdbmsPackage.NON_LEAF_ATTRIBUTE__OWNER) return null; return (FromAttributeOwner)eInternalContainer(); @@ -248,6 +256,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(FromAttributeOwner newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != Simpleuml2rdbmsPackage.NON_LEAF_ATTRIBUTE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/PackageToSchemaImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/PackageToSchemaImpl.java index 432610858..fa35611b7 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/PackageToSchemaImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/PackageToSchemaImpl.java @@ -113,6 +113,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public EList<ClassToTable> getClassesToTables() { if (classesToTables == null) { classesToTables = new EObjectContainmentWithInverseEList<ClassToTable>(ClassToTable.class, this, Simpleuml2rdbmsPackage.PACKAGE_TO_SCHEMA__CLASSES_TO_TABLES, Simpleuml2rdbmsPackage.CLASS_TO_TABLE__OWNER); @@ -125,6 +126,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public EList<PrimitiveToName> getPrimitivesToNames() { if (primitivesToNames == null) { primitivesToNames = new EObjectContainmentWithInverseEList<PrimitiveToName>(PrimitiveToName.class, this, Simpleuml2rdbmsPackage.PACKAGE_TO_SCHEMA__PRIMITIVES_TO_NAMES, Simpleuml2rdbmsPackage.PRIMITIVE_TO_NAME__OWNER); @@ -137,6 +139,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public Schema getSchema() { if (schema != null && schema.eIsProxy()) { InternalEObject oldSchema = (InternalEObject)schema; @@ -163,6 +166,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public void setSchema(Schema newSchema) { Schema oldSchema = schema; schema = newSchema; @@ -175,6 +179,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Package getUmlPackage() { if (umlPackage != null && umlPackage.eIsProxy()) { InternalEObject oldUmlPackage = (InternalEObject)umlPackage; @@ -201,6 +206,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public void setUmlPackage(org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Package newUmlPackage) { org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Package oldUmlPackage = umlPackage; umlPackage = newUmlPackage; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/PrimitiveToNameImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/PrimitiveToNameImpl.java index e1ff69c55..0268df7ef 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/PrimitiveToNameImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/PrimitiveToNameImpl.java @@ -96,6 +96,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public String getTypeName() { return typeName; } @@ -105,6 +106,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public void setTypeName(String newTypeName) { String oldTypeName = typeName; typeName = newTypeName; @@ -117,6 +119,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public PackageToSchema getOwner() { if (eContainerFeatureID() != Simpleuml2rdbmsPackage.PRIMITIVE_TO_NAME__OWNER) return null; return (PackageToSchema)eInternalContainer(); @@ -137,6 +140,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(PackageToSchema newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != Simpleuml2rdbmsPackage.PRIMITIVE_TO_NAME__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -158,6 +162,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public PrimitiveDataType getPrimitive() { if (primitive != null && primitive.eIsProxy()) { InternalEObject oldPrimitive = (InternalEObject)primitive; @@ -184,6 +189,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public void setPrimitive(PrimitiveDataType newPrimitive) { PrimitiveDataType oldPrimitive = primitive; primitive = newPrimitive; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsFactoryImpl.java index 0dbd44b2c..1915a613b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsFactoryImpl.java @@ -82,6 +82,7 @@ public class Simpleuml2rdbmsFactoryImpl extends EFactoryImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public AttributeToColumn createAttributeToColumn() { AttributeToColumnImpl attributeToColumn = new AttributeToColumnImpl(); return attributeToColumn; @@ -92,6 +93,7 @@ public class Simpleuml2rdbmsFactoryImpl extends EFactoryImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public AssociationToForeignKey createAssociationToForeignKey() { AssociationToForeignKeyImpl associationToForeignKey = new AssociationToForeignKeyImpl(); return associationToForeignKey; @@ -102,6 +104,7 @@ public class Simpleuml2rdbmsFactoryImpl extends EFactoryImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public BooleanToBoolean createBooleanToBoolean() { BooleanToBooleanImpl booleanToBoolean = new BooleanToBooleanImpl(); return booleanToBoolean; @@ -112,6 +115,7 @@ public class Simpleuml2rdbmsFactoryImpl extends EFactoryImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public ClassToTable createClassToTable() { ClassToTableImpl classToTable = new ClassToTableImpl(); return classToTable; @@ -122,6 +126,7 @@ public class Simpleuml2rdbmsFactoryImpl extends EFactoryImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public IntegerToNumber createIntegerToNumber() { IntegerToNumberImpl integerToNumber = new IntegerToNumberImpl(); return integerToNumber; @@ -132,6 +137,7 @@ public class Simpleuml2rdbmsFactoryImpl extends EFactoryImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public NonLeafAttribute createNonLeafAttribute() { NonLeafAttributeImpl nonLeafAttribute = new NonLeafAttributeImpl(); return nonLeafAttribute; @@ -142,6 +148,7 @@ public class Simpleuml2rdbmsFactoryImpl extends EFactoryImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public PackageToSchema createPackageToSchema() { PackageToSchemaImpl packageToSchema = new PackageToSchemaImpl(); return packageToSchema; @@ -152,6 +159,7 @@ public class Simpleuml2rdbmsFactoryImpl extends EFactoryImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public StringToVarchar createStringToVarchar() { StringToVarcharImpl stringToVarchar = new StringToVarcharImpl(); return stringToVarchar; @@ -162,6 +170,7 @@ public class Simpleuml2rdbmsFactoryImpl extends EFactoryImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public Simpleuml2rdbmsPackage getSimpleuml2rdbmsPackage() { return (Simpleuml2rdbmsPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsPackageImpl.java index 71f4ec91a..24e462d48 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsPackageImpl.java @@ -214,6 +214,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getAttributeToColumn() { return attributeToColumnEClass; } @@ -223,6 +224,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getAttributeToColumn_Type() { return (EReference)attributeToColumnEClass.getEStructuralFeatures().get(0); } @@ -232,6 +234,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getAssociationToForeignKey() { return associationToForeignKeyEClass; } @@ -241,6 +244,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_Association() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(0); } @@ -250,6 +254,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_ForeignKey() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(1); } @@ -259,6 +264,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_Owner() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(2); } @@ -268,6 +274,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_Referenced() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(3); } @@ -277,6 +284,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getBooleanToBoolean() { return booleanToBooleanEClass; } @@ -286,6 +294,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getClassToTable() { return classToTableEClass; } @@ -295,6 +304,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_AssociationsToForeignKeys() { return (EReference)classToTableEClass.getEStructuralFeatures().get(0); } @@ -304,6 +314,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_Owner() { return (EReference)classToTableEClass.getEStructuralFeatures().get(1); } @@ -313,6 +324,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_PrimaryKey() { return (EReference)classToTableEClass.getEStructuralFeatures().get(2); } @@ -322,6 +334,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_Table() { return (EReference)classToTableEClass.getEStructuralFeatures().get(3); } @@ -331,6 +344,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_UmlClass() { return (EReference)classToTableEClass.getEStructuralFeatures().get(4); } @@ -340,6 +354,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getFromAttribute() { return fromAttributeEClass; } @@ -349,6 +364,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getFromAttribute_Kind() { return (EAttribute)fromAttributeEClass.getEStructuralFeatures().get(0); } @@ -358,6 +374,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttribute_Attribute() { return (EReference)fromAttributeEClass.getEStructuralFeatures().get(1); } @@ -367,6 +384,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttribute_Leafs() { return (EReference)fromAttributeEClass.getEStructuralFeatures().get(2); } @@ -376,6 +394,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttribute_Owner() { return (EReference)fromAttributeEClass.getEStructuralFeatures().get(3); } @@ -385,6 +404,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getFromAttributeOwner() { return fromAttributeOwnerEClass; } @@ -394,6 +414,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttributeOwner_FromAttributes() { return (EReference)fromAttributeOwnerEClass.getEStructuralFeatures().get(0); } @@ -403,6 +424,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getIntegerToNumber() { return integerToNumberEClass; } @@ -412,6 +434,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getNonLeafAttribute() { return nonLeafAttributeEClass; } @@ -421,6 +444,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackageToSchema() { return packageToSchemaEClass; } @@ -430,6 +454,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_ClassesToTables() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(0); } @@ -439,6 +464,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_PrimitivesToNames() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(1); } @@ -448,6 +474,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_Schema() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(2); } @@ -457,6 +484,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_UmlPackage() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(3); } @@ -466,6 +494,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getPrimitiveToName() { return primitiveToNameEClass; } @@ -475,6 +504,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getPrimitiveToName_TypeName() { return (EAttribute)primitiveToNameEClass.getEStructuralFeatures().get(0); } @@ -484,6 +514,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getPrimitiveToName_Owner() { return (EReference)primitiveToNameEClass.getEStructuralFeatures().get(1); } @@ -493,6 +524,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getPrimitiveToName_Primitive() { return (EReference)primitiveToNameEClass.getEStructuralFeatures().get(2); } @@ -502,6 +534,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getStringToVarchar() { return stringToVarcharEClass; } @@ -511,6 +544,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getToColumn() { return toColumnEClass; } @@ -520,6 +554,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EReference getToColumn_Column() { return (EReference)toColumnEClass.getEStructuralFeatures().get(0); } @@ -529,6 +564,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EClass getUmlToRdbmsModelElement() { return umlToRdbmsModelElementEClass; } @@ -538,6 +574,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getUmlToRdbmsModelElement_Name() { return (EAttribute)umlToRdbmsModelElementEClass.getEStructuralFeatures().get(0); } @@ -547,6 +584,7 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum * <!-- end-user-doc --> * @generated */ + @Override public Simpleuml2rdbmsFactory getSimpleuml2rdbmsFactory() { return (Simpleuml2rdbmsFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/ToColumnImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/ToColumnImpl.java index f0918f31b..f075bf978 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/ToColumnImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/ToColumnImpl.java @@ -71,6 +71,7 @@ public abstract class ToColumnImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public Column getColumn() { if (column != null && column.eIsProxy()) { InternalEObject oldColumn = (InternalEObject)column; @@ -97,6 +98,7 @@ public abstract class ToColumnImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public void setColumn(Column newColumn) { Column oldColumn = column; column = newColumn; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/UmlToRdbmsModelElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/UmlToRdbmsModelElementImpl.java index c6fb35ac1..9ec853358 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/UmlToRdbmsModelElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/UmlToRdbmsModelElementImpl.java @@ -78,6 +78,7 @@ public abstract class UmlToRdbmsModelElementImpl extends MinimalEObjectImpl.Cont * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -87,6 +88,7 @@ public abstract class UmlToRdbmsModelElementImpl extends MinimalEObjectImpl.Cont * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/EdgeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/EdgeImpl.java index 2d46048fe..47f20f25e 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/EdgeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/EdgeImpl.java @@ -81,6 +81,7 @@ public class EdgeImpl extends ElementImpl implements Edge { * <!-- end-user-doc --> * @generated */ + @Override public Node getTarget() { if (target != null && target.eIsProxy()) { InternalEObject oldTarget = (InternalEObject)target; @@ -122,6 +123,7 @@ public class EdgeImpl extends ElementImpl implements Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setTarget(Node newTarget) { if (newTarget != target) { NotificationChain msgs = null; @@ -141,6 +143,7 @@ public class EdgeImpl extends ElementImpl implements Edge { * <!-- end-user-doc --> * @generated */ + @Override public Node getSource() { if (source != null && source.eIsProxy()) { InternalEObject oldSource = (InternalEObject)source; @@ -182,6 +185,7 @@ public class EdgeImpl extends ElementImpl implements Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setSource(Node newSource) { if (newSource != source) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/ElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/ElementImpl.java index 4eb12bba0..af64119f3 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/ElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/ElementImpl.java @@ -63,6 +63,7 @@ public abstract class ElementImpl extends MinimalEObjectImpl.Container implement * <!-- end-user-doc --> * @generated */ + @Override public Graph getGraph() { if (eContainerFeatureID() != SimplegraphPackage.ELEMENT__GRAPH) return null; return (Graph)eInternalContainer(); @@ -83,6 +84,7 @@ public abstract class ElementImpl extends MinimalEObjectImpl.Container implement * <!-- end-user-doc --> * @generated */ + @Override public void setGraph(Graph newGraph) { if (newGraph != eInternalContainer() || (eContainerFeatureID() != SimplegraphPackage.ELEMENT__GRAPH && newGraph != null)) { if (EcoreUtil.isAncestor(this, newGraph)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/GraphImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/GraphImpl.java index 748b46a27..27317b9db 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/GraphImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/GraphImpl.java @@ -99,6 +99,7 @@ public class GraphImpl extends MinimalEObjectImpl.Container implements Graph { * <!-- end-user-doc --> * @generated */ + @Override public EList<Element> getElement() { if (element == null) { element = new EObjectContainmentWithInverseEList<Element>(Element.class, this, SimplegraphPackage.GRAPH__ELEMENT, SimplegraphPackage.ELEMENT__GRAPH); @@ -111,6 +112,7 @@ public class GraphImpl extends MinimalEObjectImpl.Container implements Graph { * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -120,6 +122,7 @@ public class GraphImpl extends MinimalEObjectImpl.Container implements Graph { * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/NodeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/NodeImpl.java index b2cba325b..369ebb04d 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/NodeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/NodeImpl.java @@ -4,7 +4,7 @@ * 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 */ @@ -109,6 +109,7 @@ public class NodeImpl extends ElementImpl implements Node { * <!-- end-user-doc --> * @generated */ + @Override public EList<Edge> getIncoming() { if (incoming == null) { incoming = new EObjectWithInverseResolvingEList<Edge>(Edge.class, this, SimplegraphPackage.NODE__INCOMING, SimplegraphPackage.EDGE__TARGET); @@ -121,6 +122,7 @@ public class NodeImpl extends ElementImpl implements Node { * <!-- end-user-doc --> * @generated */ + @Override public EList<Edge> getOutgoing() { if (outgoing == null) { outgoing = new EObjectWithInverseResolvingEList<Edge>(Edge.class, this, SimplegraphPackage.NODE__OUTGOING, SimplegraphPackage.EDGE__SOURCE); @@ -133,6 +135,7 @@ public class NodeImpl extends ElementImpl implements Node { * <!-- end-user-doc --> * @generated */ + @Override public String getLabel() { return label; } @@ -142,6 +145,7 @@ public class NodeImpl extends ElementImpl implements Node { * <!-- end-user-doc --> * @generated */ + @Override public void setLabel(String newLabel) { String oldLabel = label; label = newLabel; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/SimplegraphFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/SimplegraphFactoryImpl.java index d782dbcf6..f56834d41 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/SimplegraphFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/SimplegraphFactoryImpl.java @@ -77,6 +77,7 @@ public class SimplegraphFactoryImpl extends EFactoryImpl implements SimplegraphF * <!-- end-user-doc --> * @generated */ + @Override public Node createNode() { NodeImpl node = new NodeImpl(); return node; @@ -87,6 +88,7 @@ public class SimplegraphFactoryImpl extends EFactoryImpl implements SimplegraphF * <!-- end-user-doc --> * @generated */ + @Override public Edge createEdge() { EdgeImpl edge = new EdgeImpl(); return edge; @@ -97,6 +99,7 @@ public class SimplegraphFactoryImpl extends EFactoryImpl implements SimplegraphF * <!-- end-user-doc --> * @generated */ + @Override public Graph createGraph() { GraphImpl graph = new GraphImpl(); return graph; @@ -107,6 +110,7 @@ public class SimplegraphFactoryImpl extends EFactoryImpl implements SimplegraphF * <!-- end-user-doc --> * @generated */ + @Override public SimplegraphPackage getSimplegraphPackage() { return (SimplegraphPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/SimplegraphPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/SimplegraphPackageImpl.java index a86b2e3e6..d2d167f98 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/SimplegraphPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph/impl/SimplegraphPackageImpl.java @@ -135,6 +135,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EClass getNode() { return nodeEClass; } @@ -144,6 +145,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode_Incoming() { return (EReference)nodeEClass.getEStructuralFeatures().get(0); } @@ -153,6 +155,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode_Outgoing() { return (EReference)nodeEClass.getEStructuralFeatures().get(1); } @@ -162,6 +165,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNode_Label() { return (EAttribute)nodeEClass.getEStructuralFeatures().get(2); } @@ -171,6 +175,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EClass getEdge() { return edgeEClass; } @@ -180,6 +185,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge_Target() { return (EReference)edgeEClass.getEStructuralFeatures().get(0); } @@ -189,6 +195,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge_Source() { return (EReference)edgeEClass.getEStructuralFeatures().get(1); } @@ -198,6 +205,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EClass getElement() { return elementEClass; } @@ -207,6 +215,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getElement_Graph() { return (EReference)elementEClass.getEStructuralFeatures().get(0); } @@ -216,6 +225,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EClass getGraph() { return graphEClass; } @@ -225,6 +235,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EReference getGraph_Element() { return (EReference)graphEClass.getEStructuralFeatures().get(0); } @@ -234,6 +245,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getGraph_Name() { return (EAttribute)graphEClass.getEStructuralFeatures().get(1); } @@ -243,6 +255,7 @@ public class SimplegraphPackageImpl extends EPackageImpl implements SimplegraphP * <!-- end-user-doc --> * @generated */ + @Override public SimplegraphFactory getSimplegraphFactory() { return (SimplegraphFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Edge2EdgeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Edge2EdgeImpl.java index eff460751..7185e7c4d 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Edge2EdgeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Edge2EdgeImpl.java @@ -104,6 +104,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public Edge getEdge1() { if (edge1 != null && edge1.eIsProxy()) { InternalEObject oldEdge1 = (InternalEObject)edge1; @@ -130,6 +131,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setEdge1(Edge newEdge1) { Edge oldEdge1 = edge1; edge1 = newEdge1; @@ -142,6 +144,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public Edge getEdge2() { if (edge2 != null && edge2.eIsProxy()) { InternalEObject oldEdge2 = (InternalEObject)edge2; @@ -168,6 +171,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setEdge2(Edge newEdge2) { Edge oldEdge2 = edge2; edge2 = newEdge2; @@ -180,6 +184,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public Node2Node getTarget() { if (target != null && target.eIsProxy()) { InternalEObject oldTarget = (InternalEObject)target; @@ -206,6 +211,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setTarget(Node2Node newTarget) { Node2Node oldTarget = target; target = newTarget; @@ -218,6 +224,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public Node2Node getSource() { if (source != null && source.eIsProxy()) { InternalEObject oldSource = (InternalEObject)source; @@ -244,6 +251,7 @@ public class Edge2EdgeImpl extends Element2ElementImpl implements Edge2Edge { * <!-- end-user-doc --> * @generated */ + @Override public void setSource(Node2Node newSource) { Node2Node oldSource = source; source = newSource; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Element2ElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Element2ElementImpl.java index e79a17c45..ccb171e36 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Element2ElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Element2ElementImpl.java @@ -63,6 +63,7 @@ public abstract class Element2ElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public Graph2Graph getOwner() { if (eContainerFeatureID() != Simplegraph2graphPackage.ELEMENT2_ELEMENT__OWNER) return null; return (Graph2Graph)eInternalContainer(); @@ -83,6 +84,7 @@ public abstract class Element2ElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(Graph2Graph newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != Simplegraph2graphPackage.ELEMENT2_ELEMENT__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Graph2GraphImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Graph2GraphImpl.java index 7b4716c3d..f86741dae 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Graph2GraphImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Graph2GraphImpl.java @@ -123,6 +123,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public Graph getGraph1() { if (graph1 != null && graph1.eIsProxy()) { InternalEObject oldGraph1 = (InternalEObject)graph1; @@ -149,6 +150,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public void setGraph1(Graph newGraph1) { Graph oldGraph1 = graph1; graph1 = newGraph1; @@ -161,6 +163,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public Graph getGraph2() { if (graph2 != null && graph2.eIsProxy()) { InternalEObject oldGraph2 = (InternalEObject)graph2; @@ -187,6 +190,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public void setGraph2(Graph newGraph2) { Graph oldGraph2 = graph2; graph2 = newGraph2; @@ -199,6 +203,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public EList<Element2Element> getElement2Element() { if (element2Element == null) { element2Element = new EObjectContainmentWithInverseEList<Element2Element>(Element2Element.class, this, Simplegraph2graphPackage.GRAPH2_GRAPH__ELEMENT2_ELEMENT, Simplegraph2graphPackage.ELEMENT2_ELEMENT__OWNER); @@ -211,6 +216,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -220,6 +226,7 @@ public class Graph2GraphImpl extends MinimalEObjectImpl.Container implements Gra * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Node2NodeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Node2NodeImpl.java index 607d30d93..f5129ab10 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Node2NodeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Node2NodeImpl.java @@ -4,7 +4,7 @@ * 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 */ @@ -102,6 +102,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public Node getNode1() { if (node1 != null && node1.eIsProxy()) { InternalEObject oldNode1 = (InternalEObject)node1; @@ -128,6 +129,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public void setNode1(Node newNode1) { Node oldNode1 = node1; node1 = newNode1; @@ -140,6 +142,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public Node getNode2() { if (node2 != null && node2.eIsProxy()) { InternalEObject oldNode2 = (InternalEObject)node2; @@ -166,6 +169,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public void setNode2(Node newNode2) { Node oldNode2 = node2; node2 = newNode2; @@ -178,6 +182,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public String getLabel() { return label; } @@ -187,6 +192,7 @@ public class Node2NodeImpl extends Element2ElementImpl implements Node2Node { * <!-- end-user-doc --> * @generated */ + @Override public void setLabel(String newLabel) { String oldLabel = label; label = newLabel; diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphFactoryImpl.java index 7c3bd6579..d3c721782 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphFactoryImpl.java @@ -77,6 +77,7 @@ public class Simplegraph2graphFactoryImpl extends EFactoryImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public Graph2Graph createGraph2Graph() { Graph2GraphImpl graph2Graph = new Graph2GraphImpl(); return graph2Graph; @@ -87,6 +88,7 @@ public class Simplegraph2graphFactoryImpl extends EFactoryImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public Edge2Edge createEdge2Edge() { Edge2EdgeImpl edge2Edge = new Edge2EdgeImpl(); return edge2Edge; @@ -97,6 +99,7 @@ public class Simplegraph2graphFactoryImpl extends EFactoryImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public Node2Node createNode2Node() { Node2NodeImpl node2Node = new Node2NodeImpl(); return node2Node; @@ -107,6 +110,7 @@ public class Simplegraph2graphFactoryImpl extends EFactoryImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public Simplegraph2graphPackage getSimplegraph2graphPackage() { return (Simplegraph2graphPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java index 088a32d53..6a5041090 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java @@ -135,6 +135,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EClass getGraph2Graph() { return graph2GraphEClass; } @@ -144,6 +145,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getGraph2Graph_Graph1() { return (EReference)graph2GraphEClass.getEStructuralFeatures().get(0); } @@ -153,6 +155,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getGraph2Graph_Graph2() { return (EReference)graph2GraphEClass.getEStructuralFeatures().get(1); } @@ -162,6 +165,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getGraph2Graph_Element2Element() { return (EReference)graph2GraphEClass.getEStructuralFeatures().get(2); } @@ -171,6 +175,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getGraph2Graph_Name() { return (EAttribute)graph2GraphEClass.getEStructuralFeatures().get(3); } @@ -180,6 +185,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EClass getElement2Element() { return element2ElementEClass; } @@ -189,6 +195,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getElement2Element_Owner() { return (EReference)element2ElementEClass.getEStructuralFeatures().get(0); } @@ -198,6 +205,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EClass getEdge2Edge() { return edge2EdgeEClass; } @@ -207,6 +215,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge2Edge_Edge1() { return (EReference)edge2EdgeEClass.getEStructuralFeatures().get(0); } @@ -216,6 +225,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge2Edge_Edge2() { return (EReference)edge2EdgeEClass.getEStructuralFeatures().get(1); } @@ -225,6 +235,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge2Edge_Target() { return (EReference)edge2EdgeEClass.getEStructuralFeatures().get(2); } @@ -234,6 +245,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getEdge2Edge_Source() { return (EReference)edge2EdgeEClass.getEStructuralFeatures().get(3); } @@ -243,6 +255,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EClass getNode2Node() { return node2NodeEClass; } @@ -252,6 +265,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode2Node_Node1() { return (EReference)node2NodeEClass.getEStructuralFeatures().get(0); } @@ -261,6 +275,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode2Node_Node2() { return (EReference)node2NodeEClass.getEStructuralFeatures().get(1); } @@ -270,6 +285,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNode2Node_Label() { return (EAttribute)node2NodeEClass.getEStructuralFeatures().get(2); } @@ -279,6 +295,7 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple * <!-- end-user-doc --> * @generated */ + @Override public Simplegraph2graphFactory getSimplegraph2graphFactory() { return (Simplegraph2graphFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java index 2b86290d5..a1f75cbb0 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java @@ -89,19 +89,22 @@ public class QVTcCompilerTests extends LoadTestCase private BasicQVTiExecutor interpretedExecutor = null; private QVTiTransformationExecutor generatedExecutor = null; private Set<@NonNull String> nsURIs = new HashSet<@NonNull String>(); - + public MyQVT(@NonNull String testFolderName, @NonNull EPackage... eInstances) { super(new QVTiEnvironmentFactory(getProjectMap(), null)); this.testFolderName = testFolderName; this.testFolderURI = TESTS_BASE_URI.appendSegment(testFolderName); - this.samplesBaseUri = testFolderURI.appendSegment("samples"); + this.samplesBaseUri = testFolderURI.appendSegment("samples"); // // Explicitly install the eInstances that would normally make it into the ProjectMap from extension point registrations. // Test models are not registered via extension point so we have to do this manually. // ResourceSetImpl resourceSet = (ResourceSetImpl) getResourceSet(); for (EPackage eInstance : eInstances) { - nsURIs.add(eInstance.getNsURI()); + String nsURI = eInstance.getNsURI(); + if (nsURI != null) { + nsURIs.add(nsURI); + } resourceSet.getURIResourceMap().put(testFolderURI.appendSegment(eInstance.getName()+".ecore"), eInstance.eResource()); } } @@ -116,7 +119,7 @@ public class QVTcCompilerTests extends LoadTestCase compilerChain = new QVTcCompilerChain(getEnvironmentFactory(), testFolderURI.appendSegment(testFileName), options); Class<? extends Transformer> txClass = compilerChain.build(outputName, genModelFiles); createGeneratedExecutor(txClass); - return txClass; + return txClass; } public @NonNull Transformation compileTransformation(@NonNull String testFileName, @NonNull String outputName) throws Exception { @@ -124,7 +127,7 @@ public class QVTcCompilerTests extends LoadTestCase QVTcCompilerChain.setOption(options, CompilerChain.DEFAULT_STEP, CompilerChain.DEBUG_KEY, true); QVTcCompilerChain.setOption(options, CompilerChain.DEFAULT_STEP, CompilerChain.SAVE_OPTIONS_KEY, TestsXMLUtil.defaultSavingOptions); compilerChain = new QVTcCompilerChain(getEnvironmentFactory(), testFolderURI.appendSegment(testFileName), options); - return compilerChain.compile(outputName); + return compilerChain.compile(outputName); } public @NonNull Class<? extends Transformer> createGeneratedClass(@NonNull Transformation asTransformation, @NonNull String @NonNull... genModelFiles) throws Exception { @@ -143,7 +146,7 @@ public class QVTcCompilerTests extends LoadTestCase File explicitClassPath = new File("../org.eclipse.qvtd.xtext.qvtcore.tests/bin"); String qualifiedClassName = cg.getQualifiedName(); String javaCodeSource = cg.generateClassFile(); - OCL2JavaFileObject.saveClass(explicitClassPath.toString(), qualifiedClassName, javaCodeSource); + OCL2JavaFileObject.saveClass(ClassUtil.nonNullState(explicitClassPath.toString()), qualifiedClassName, javaCodeSource); @SuppressWarnings("unchecked") Class<? extends Transformer> txClass = (Class<? extends Transformer>) OCL2JavaFileObject.loadExplicitClass(explicitClassPath, qualifiedClassName); if (txClass == null) { @@ -152,13 +155,13 @@ public class QVTcCompilerTests extends LoadTestCase } return txClass; } - + public void createGeneratedExecutor(@NonNull Transformation asTransformation, @NonNull String @NonNull... genModelFiles) throws Exception { Class<? extends Transformer> txClass = createGeneratedClass(asTransformation, genModelFiles); createGeneratedExecutor(txClass); } - public QVTiTransformationExecutor createGeneratedExecutor(Class<? extends Transformer> txClass) throws Exception { + public QVTiTransformationExecutor createGeneratedExecutor(@NonNull Class<? extends Transformer> txClass) throws Exception { return generatedExecutor = new QVTiTransformationExecutor(getEnvironmentFactory(), txClass); } @@ -168,8 +171,8 @@ public class QVTcCompilerTests extends LoadTestCase } public void createModel(@NonNull String modelName, @NonNull String modelFile) { - URI modelURI = samplesBaseUri.appendSegment(modelFile); - interpretedExecutor.createModel(modelName, modelURI, null); + URI modelURI = samplesBaseUri.appendSegment(modelFile); + interpretedExecutor.createModel(modelName, modelURI, null); } @Override @@ -192,8 +195,8 @@ public class QVTcCompilerTests extends LoadTestCase public void executeTransformation() throws Exception { if (interpretedExecutor != null) { - interpretedExecutor.execute(); - interpretedExecutor.saveModels(TestsXMLUtil.defaultSavingOptions); + interpretedExecutor.execute(); + interpretedExecutor.saveModels(TestsXMLUtil.defaultSavingOptions); } else { Transformer transformer = generatedExecutor.getTransformer(); @@ -203,13 +206,13 @@ public class QVTcCompilerTests extends LoadTestCase @Override public @NonNull QVTiEnvironmentFactory getEnvironmentFactory() { - return (QVTiEnvironmentFactory) super.getEnvironmentFactory(); + return super.getEnvironmentFactory(); } - public @NonNull Map<Object, Object> getSaveOptions() { + public @NonNull Map<Object, Object> getSaveOptions() { return TestsXMLUtil.defaultSavingOptions; } - + private void loadGenModel(@NonNull URI genModelURI) { ResourceSet resourceSet = getResourceSet(); MetamodelManagerInternal metamodelManager = getMetamodelManager(); @@ -224,205 +227,207 @@ public class QVTcCompilerTests extends LoadTestCase } public void loadInput(@NonNull String modelName, @NonNull String modelFile) { - URI modelURI = samplesBaseUri.appendSegment(modelFile); - if (interpretedExecutor != null) { + URI modelURI = samplesBaseUri.appendSegment(modelFile); + if (interpretedExecutor != null) { interpretedExecutor.loadModel(modelName, modelURI); - } - else { - Resource inputResource = getResourceSet().getResource(modelURI, true); + } + else { + Resource inputResource = getResourceSet().getResource(modelURI, true); generatedExecutor.getTransformer().addRootObjects(modelName, ClassUtil.nonNullState(inputResource.getContents())); - } + } } public void saveOutput(@NonNull String modelName, @NonNull String modelFile, @Nullable String expectedFile, @Nullable ModelNormalizer normalizer) throws IOException, InterruptedException { - URI modelURI = samplesBaseUri.appendSegment(modelFile); + URI modelURI = samplesBaseUri.appendSegment(modelFile); ResourceSet resourceSet = getResourceSet(); Resource outputResource; - if (interpretedExecutor != null) { - outputResource = interpretedExecutor.saveModel(modelName, modelURI, null, getSaveOptions()); - } - else { + if (interpretedExecutor != null) { + outputResource = interpretedExecutor.saveModel(modelName, modelURI, null, getSaveOptions()); + } + else { outputResource = resourceSet.createResource(modelURI); outputResource.getContents().addAll(generatedExecutor.getTransformer().getRootEObjects(modelName)); outputResource.save(getSaveOptions()); - } - if (expectedFile != null) { - URI referenceModelURI = samplesBaseUri.appendSegment(expectedFile); + } + if ((outputResource != null) && (expectedFile != null)) { + URI referenceModelURI = samplesBaseUri.appendSegment(expectedFile); Resource referenceResource = resourceSet.getResource(referenceModelURI, true); assert referenceResource != null; if (normalizer != null) { normalizer.normalize(referenceResource); normalizer.normalize(outputResource); } - assertSameModel(referenceResource, outputResource); - } + assertSameModel(referenceResource, outputResource); + } } } /* (non-Javadoc) * @see org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase#setUp() */ + @Override @Before - public void setUp() throws Exception { + public void setUp() throws Exception { BaseLinkingService.DEBUG_RETRY.setState(true); Scheduler.DEBUG_GRAPHS.setState(true); super.setUp(); OCLstdlib.install(); QVTcTestUtil.doQVTcoreSetup(); QVTiTestUtil.doQVTimperativeSetup(); -// QVTcorePivotStandaloneSetup.doSetup(); -// QVTimperativePivotStandaloneSetup.doSetup(); - } + // QVTcorePivotStandaloneSetup.doSetup(); + // QVTimperativePivotStandaloneSetup.doSetup(); + } - /* (non-Javadoc) - * @see org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase#tearDown() - */ - @After - public void tearDown() throws Exception { + /* (non-Javadoc) + * @see org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase#tearDown() + */ + @Override + @After + public void tearDown() throws Exception { super.tearDown(); - } + } @Test - public void testQVTcCompiler_Families2Persons() throws Exception { -// AbstractTransformer.INVOCATIONS.setState(true); - MyQVT myQVT = new MyQVT("families2persons"); -// myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); - try { - Transformation asTransformation = myQVT.compileTransformation("Families2Persons.qvtc", "person"); - myQVT.createInterpretedExecutor(asTransformation); - myQVT.loadInput("family", "Families.xmi"); - myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "Families2Persons_trace.xmi"); - myQVT.createModel("person", "Persons_Interpreted.xmi"); - myQVT.executeTransformation(); + public void testQVTcCompiler_Families2Persons() throws Exception { + // AbstractTransformer.INVOCATIONS.setState(true); + MyQVT myQVT = new MyQVT("families2persons"); + // myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); + try { + Transformation asTransformation = myQVT.compileTransformation("Families2Persons.qvtc", "person"); + myQVT.createInterpretedExecutor(asTransformation); + myQVT.loadInput("family", "Families.xmi"); + myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "Families2Persons_trace.xmi"); + myQVT.createModel("person", "Persons_Interpreted.xmi"); + myQVT.executeTransformation(); myQVT.saveOutput("person", "Persons_Interpreted.xmi", "Persons_expected.xmi", Families2PersonsNormalizer.INSTANCE); } finally { - myQVT.dispose(); + myQVT.dispose(); } - } - - @Test - public void testQVTcCompiler_Families2Persons_CG() throws Exception { -// AbstractTransformer.INVOCATIONS.setState(true); -// Scheduler.EDGE_ORDER.setState(true); -// Scheduler.REGION_DEPTH.setState(true); -// Scheduler.REGION_ORDER.setState(true); -// Scheduler.REGION_TRAVERSAL.setState(true); -// QVTs2QVTiVisitor.POLLED_PROPERTIES.setState(true); - MyQVT myQVT = new MyQVT("families2persons", Families2PersonsPackage.eINSTANCE, FamiliesPackage.eINSTANCE, PersonsPackage.eINSTANCE); -// myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); + } + + @Test + public void testQVTcCompiler_Families2Persons_CG() throws Exception { + // AbstractTransformer.INVOCATIONS.setState(true); + // Scheduler.EDGE_ORDER.setState(true); + // Scheduler.REGION_DEPTH.setState(true); + // Scheduler.REGION_ORDER.setState(true); + // Scheduler.REGION_TRAVERSAL.setState(true); + // QVTs2QVTiVisitor.POLLED_PROPERTIES.setState(true); + MyQVT myQVT = new MyQVT("families2persons", Families2PersonsPackage.eINSTANCE, FamiliesPackage.eINSTANCE, PersonsPackage.eINSTANCE); + // myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); try { Class<? extends Transformer> txClass = myQVT.buildTransformation("Families2Persons.qvtc", "person", "Families2Persons.genmodel"); - // - myQVT.createGeneratedExecutor(txClass); + // + myQVT.createGeneratedExecutor(txClass); myQVT.loadInput("family", "Families.xmi"); - myQVT.executeTransformation(); + myQVT.executeTransformation(); myQVT.saveOutput("person", "Persons_CG.xmi", "Persons_expected.xmi", Families2PersonsNormalizer.INSTANCE); - // - myQVT.createGeneratedExecutor(txClass); + // + myQVT.createGeneratedExecutor(txClass); myQVT.loadInput("family", "FamiliesBig.xmi"); - myQVT.executeTransformation(); + myQVT.executeTransformation(); myQVT.saveOutput("person", "PersonsBig_CG.xmi", "PersonsBig_expected.xmi", Families2PersonsNormalizer.INSTANCE); } finally { - myQVT.dispose(); + myQVT.dispose(); } } - - @Test - public void testQVTcCompiler_HSVToHLS() throws Exception { -// AbstractTransformer.EXCEPTIONS.setState(true); -// AbstractTransformer.INVOCATIONS.setState(true); - MyQVT myQVT = new MyQVT("hsv2hls"); -// myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); - try { - Transformation asTransformation = myQVT.compileTransformation("HSV2HLS.qvtcas", "hls"); - myQVT.createInterpretedExecutor(asTransformation); - myQVT.loadInput("hsv", "SolarizedHSV.xmi"); - myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "HSV2HLS_trace.xmi"); - myQVT.createModel("hls", "SolarizedHLS_Interpreted.xmi"); - myQVT.executeTransformation(); - myQVT.saveOutput("hls", "SolarizedHLS_Interpreted.xmi", "SolarizedHLS_expected.xmi", HSV2HLSNormalizer.INSTANCE); // FIXME Bug 490497 remove normalizer + + @Test + public void testQVTcCompiler_HSVToHLS() throws Exception { + // AbstractTransformer.EXCEPTIONS.setState(true); + // AbstractTransformer.INVOCATIONS.setState(true); + MyQVT myQVT = new MyQVT("hsv2hls"); + // myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); + try { + Transformation asTransformation = myQVT.compileTransformation("HSV2HLS.qvtcas", "hls"); + myQVT.createInterpretedExecutor(asTransformation); + myQVT.loadInput("hsv", "SolarizedHSV.xmi"); + myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "HSV2HLS_trace.xmi"); + myQVT.createModel("hls", "SolarizedHLS_Interpreted.xmi"); + myQVT.executeTransformation(); + myQVT.saveOutput("hls", "SolarizedHLS_Interpreted.xmi", "SolarizedHLS_expected.xmi", HSV2HLSNormalizer.INSTANCE); // FIXME Bug 490497 remove normalizer } finally { - myQVT.dispose(); + myQVT.dispose(); } - } - - @Test - public void testQVTcCompiler_HSVToHLS_CG() throws Exception { -// AbstractTransformer.EXCEPTIONS.setState(true); -// AbstractTransformer.INVOCATIONS.setState(true); -// Scheduler.EDGE_ORDER.setState(true); -// Scheduler.REGION_DEPTH.setState(true); -// Scheduler.REGION_ORDER.setState(true); -// Scheduler.REGION_TRAVERSAL.setState(true); -// QVTs2QVTiVisitor.POLLED_PROPERTIES.setState(true); - MyQVT myQVT = new MyQVT("hsv2hls", HSV2HLSPackage.eINSTANCE, HSVTreePackage.eINSTANCE, HLSTreePackage.eINSTANCE); - try { - myQVT.buildTransformation("HSV2HLS.qvtcas", "hls", "HSV2HLS.genmodel"); + } + + @Test + public void testQVTcCompiler_HSVToHLS_CG() throws Exception { + // AbstractTransformer.EXCEPTIONS.setState(true); + // AbstractTransformer.INVOCATIONS.setState(true); + // Scheduler.EDGE_ORDER.setState(true); + // Scheduler.REGION_DEPTH.setState(true); + // Scheduler.REGION_ORDER.setState(true); + // Scheduler.REGION_TRAVERSAL.setState(true); + // QVTs2QVTiVisitor.POLLED_PROPERTIES.setState(true); + MyQVT myQVT = new MyQVT("hsv2hls", HSV2HLSPackage.eINSTANCE, HSVTreePackage.eINSTANCE, HLSTreePackage.eINSTANCE); + try { + myQVT.buildTransformation("HSV2HLS.qvtcas", "hls", "HSV2HLS.genmodel"); myQVT.loadInput("hsv", "SolarizedHSV.xmi"); myQVT.executeTransformation(); myQVT.saveOutput("hls", "SolarizedHLS_CG.xmi", "SolarizedHLS_expected.xmi", HSV2HLSNormalizer.INSTANCE); // FIXME Bug 490497 remove normalizer } finally { - myQVT.dispose(); + myQVT.dispose(); } } - - @Test // fails through at least lack of multi-headed support, which may not be needed if better partitioned - public void testQVTcCompiler_SimpleUML2RDBMS() throws Exception { -// AbstractTransformer.INVOCATIONS.setState(true); - MyQVT myQVT = new MyQVT("uml2rdbms"); -// myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); - try { - Transformation asTransformation = myQVT.compileTransformation("SimpleUML2RDBMS.qvtcas", "rdbms"); - myQVT.createInterpretedExecutor(asTransformation); - myQVT.loadInput("uml", "SimplerUMLPeople.xmi"); - myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "SimplerUML2RDBMS_trace.xmi"); - myQVT.createModel("rdbms", "SimplerRDBMSPeople_Interpreted.xmi"); - myQVT.executeTransformation(); - myQVT.saveOutput("rdbms", "SimplerRDBMSPeople_Interpreted.xmi", "SimplerRDBMSPeople_expected.xmi", SimpleRDBMSNormalizer.INSTANCE); - // - myQVT.createInterpretedExecutor(asTransformation); - myQVT.loadInput("uml", "SimplerUMLPeople2.xmi"); - myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "SimplerUML2RDBMS2_trace.xmi"); - myQVT.createModel("rdbms", "SimplerRDBMSPeople2_Interpreted.xmi"); - myQVT.executeTransformation(); - myQVT.saveOutput("rdbms", "SimplerRDBMSPeople2_Interpreted.xmi", "SimplerRDBMSPeople2_expected.xmi", SimpleRDBMSNormalizer.INSTANCE); - // - myQVT.createInterpretedExecutor(asTransformation); - myQVT.loadInput("uml", "SimpleUMLPeople.xmi"); - myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "SimpleUML2RDBMS_trace.xmi"); - myQVT.createModel("rdbms", "SimpleRDBMSPeople_Interpreted.xmi"); - myQVT.executeTransformation(); - myQVT.saveOutput("rdbms", "SimpleRDBMSPeople_Interpreted.xmi", "SimpleRDBMSPeople_expected.xmi", SimpleRDBMSNormalizer.INSTANCE); + + @Test // fails through at least lack of multi-headed support, which may not be needed if better partitioned + public void testQVTcCompiler_SimpleUML2RDBMS() throws Exception { + // AbstractTransformer.INVOCATIONS.setState(true); + MyQVT myQVT = new MyQVT("uml2rdbms"); + // myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); + try { + Transformation asTransformation = myQVT.compileTransformation("SimpleUML2RDBMS.qvtcas", "rdbms"); + myQVT.createInterpretedExecutor(asTransformation); + myQVT.loadInput("uml", "SimplerUMLPeople.xmi"); + myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "SimplerUML2RDBMS_trace.xmi"); + myQVT.createModel("rdbms", "SimplerRDBMSPeople_Interpreted.xmi"); + myQVT.executeTransformation(); + myQVT.saveOutput("rdbms", "SimplerRDBMSPeople_Interpreted.xmi", "SimplerRDBMSPeople_expected.xmi", SimpleRDBMSNormalizer.INSTANCE); + // + myQVT.createInterpretedExecutor(asTransformation); + myQVT.loadInput("uml", "SimplerUMLPeople2.xmi"); + myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "SimplerUML2RDBMS2_trace.xmi"); + myQVT.createModel("rdbms", "SimplerRDBMSPeople2_Interpreted.xmi"); + myQVT.executeTransformation(); + myQVT.saveOutput("rdbms", "SimplerRDBMSPeople2_Interpreted.xmi", "SimplerRDBMSPeople2_expected.xmi", SimpleRDBMSNormalizer.INSTANCE); + // + myQVT.createInterpretedExecutor(asTransformation); + myQVT.loadInput("uml", "SimpleUMLPeople.xmi"); + myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "SimpleUML2RDBMS_trace.xmi"); + myQVT.createModel("rdbms", "SimpleRDBMSPeople_Interpreted.xmi"); + myQVT.executeTransformation(); + myQVT.saveOutput("rdbms", "SimpleRDBMSPeople_Interpreted.xmi", "SimpleRDBMSPeople_expected.xmi", SimpleRDBMSNormalizer.INSTANCE); } finally { - myQVT.dispose(); + myQVT.dispose(); } - } - - @Test - public void testQVTcCompiler_SimpleUML2RDBMS_CG() throws Exception { -// AbstractTransformer.INVOCATIONS.setState(true); -// Scheduler.CONNECTION_ROUTING.setState(true); -// Scheduler.DEBUG_GRAPHS.setState(true); -// Scheduler.REGION_CYCLES.setState(true); -// Scheduler.REGION_DEPTH.setState(true); -// Scheduler.REGION_ORDER.setState(true); -// Scheduler.REGION_TRAVERSAL.setState(true); -// QVTs2QVTiVisitor.POLLED_PROPERTIES.setState(true); - HeadSplitter.SPLITTING.setState(true); - MyQVT myQVT = new MyQVT("uml2rdbms", Simpleuml2rdbmsPackage.eINSTANCE, SimpleumlPackage.eINSTANCE, SimplerdbmsPackage.eINSTANCE); - try { - Transformation asTransformation = myQVT.compileTransformation("SimpleUML2RDBMS.qvtcas", "rdbms"); - myQVT.createGeneratedExecutor(asTransformation, "SimpleUML2RDBMS.genmodel"); + } + + @Test + public void testQVTcCompiler_SimpleUML2RDBMS_CG() throws Exception { + // AbstractTransformer.INVOCATIONS.setState(true); + // Scheduler.CONNECTION_ROUTING.setState(true); + // Scheduler.DEBUG_GRAPHS.setState(true); + // Scheduler.REGION_CYCLES.setState(true); + // Scheduler.REGION_DEPTH.setState(true); + // Scheduler.REGION_ORDER.setState(true); + // Scheduler.REGION_TRAVERSAL.setState(true); + // QVTs2QVTiVisitor.POLLED_PROPERTIES.setState(true); + HeadSplitter.SPLITTING.setState(true); + MyQVT myQVT = new MyQVT("uml2rdbms", Simpleuml2rdbmsPackage.eINSTANCE, SimpleumlPackage.eINSTANCE, SimplerdbmsPackage.eINSTANCE); + try { + Transformation asTransformation = myQVT.compileTransformation("SimpleUML2RDBMS.qvtcas", "rdbms"); + myQVT.createGeneratedExecutor(asTransformation, "SimpleUML2RDBMS.genmodel"); myQVT.loadInput("uml", "SimplerUMLPeople.xmi"); myQVT.executeTransformation(); myQVT.saveOutput("rdbms", "SimplerRDBMSPeople_CG.xmi", "SimplerRDBMSPeople_expected.xmi", SimpleRDBMSNormalizer.INSTANCE); // - myQVT.createGeneratedExecutor(asTransformation, "SimpleUML2RDBMS.genmodel"); + myQVT.createGeneratedExecutor(asTransformation, "SimpleUML2RDBMS.genmodel"); myQVT.loadInput("uml", "SimplerUMLPeople2.xmi"); myQVT.executeTransformation(); myQVT.saveOutput("rdbms", "SimplerRDBMSPeople2_CG.xmi", "SimplerRDBMSPeople2_expected.xmi", SimpleRDBMSNormalizer.INSTANCE); @@ -433,47 +438,47 @@ public class QVTcCompilerTests extends LoadTestCase myQVT.saveOutput("rdbms", "SimpleRDBMSPeople_CG.xmi", "SimpleRDBMSPeople_expected.xmi", SimpleRDBMSNormalizer.INSTANCE); } finally { - myQVT.dispose(); + myQVT.dispose(); } } - @Test - public void testQVTcCompiler_Upper2Lower() throws Exception { -// QVTs2QVTiVisitor.POLLED_PROPERTIES.setState(true); - MyQVT myQVT = new MyQVT("upper2lower"); -// myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); - try { + @Test + public void testQVTcCompiler_Upper2Lower() throws Exception { + // QVTs2QVTiVisitor.POLLED_PROPERTIES.setState(true); + MyQVT myQVT = new MyQVT("upper2lower"); + // myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); + try { Transformation asTransformation = myQVT.compileTransformation("Upper2Lower.qvtcas", "lowerGraph"); - myQVT.createInterpretedExecutor(asTransformation); - myQVT.loadInput("upperGraph", "SimpleGraph.xmi"); - myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "Upper2Lower_trace.xmi"); - myQVT.createModel("lowerGraph", "SimpleGraphLower_Interpreted.xmi"); - myQVT.executeTransformation(); + myQVT.createInterpretedExecutor(asTransformation); + myQVT.loadInput("upperGraph", "SimpleGraph.xmi"); + myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "Upper2Lower_trace.xmi"); + myQVT.createModel("lowerGraph", "SimpleGraphLower_Interpreted.xmi"); + myQVT.executeTransformation(); myQVT.saveOutput("lowerGraph", "SimpleGraphLower_Interpreted.xmi", "SimpleGraphLower_expected.xmi", Upper2LowerNormalizer.INSTANCE); } finally { - myQVT.dispose(); + myQVT.dispose(); } - } + } - @Test - public void testQVTcCompiler_Upper2Lower_CG() throws Exception { -// Scheduler.EDGE_ORDER.setState(true); -// Scheduler.REGION_DEPTH.setState(true); -// Scheduler.REGION_LOCALITY.setState(true); -// Scheduler.REGION_ORDER.setState(true); -// Scheduler.REGION_STACK.setState(true); -// Scheduler.REGION_TRAVERSAL.setState(true); - MyQVT myQVT = new MyQVT("upper2lower", Simplegraph2graphPackage.eINSTANCE, SimplegraphPackage.eINSTANCE); -// myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); - try { - myQVT.buildTransformation("Upper2Lower.qvtcas", "lowerGraph", "SimpleGraph2Graph.genmodel"); + @Test + public void testQVTcCompiler_Upper2Lower_CG() throws Exception { + // Scheduler.EDGE_ORDER.setState(true); + // Scheduler.REGION_DEPTH.setState(true); + // Scheduler.REGION_LOCALITY.setState(true); + // Scheduler.REGION_ORDER.setState(true); + // Scheduler.REGION_STACK.setState(true); + // Scheduler.REGION_TRAVERSAL.setState(true); + MyQVT myQVT = new MyQVT("upper2lower", Simplegraph2graphPackage.eINSTANCE, SimplegraphPackage.eINSTANCE); + // myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); + try { + myQVT.buildTransformation("Upper2Lower.qvtcas", "lowerGraph", "SimpleGraph2Graph.genmodel"); myQVT.loadInput("upperGraph", "SimpleGraph.xmi"); - myQVT.executeTransformation(); + myQVT.executeTransformation(); myQVT.saveOutput("lowerGraph", "SimpleGraphLower_CG.xmi", "SimpleGraphLower_expected.xmi", Upper2LowerNormalizer.INSTANCE); - } - finally { - myQVT.dispose(); - } - } + } + finally { + myQVT.dispose(); + } + } } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java index b0ec8411f..900756531 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcDomainUsageTests.java @@ -53,7 +53,7 @@ import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.TestsXMLUtil; public class QVTcDomainUsageTests extends LoadTestCase { @SuppressWarnings("unused")private static ComposedEValidator makeSureRequiredBundleIsLoaded = null; - + protected static class MyQVT extends OCLInternal { public MyQVT(@NonNull EnvironmentFactoryInternal environmentFactory) { @@ -90,7 +90,7 @@ public class QVTcDomainUsageTests extends LoadTestCase EObject eObject = tit.next(); DomainUsage usage = operationAnalysis.getUsage((Element)eObject); assert usage != null : "No nested usage for " + eObject.eClass().getName() + " " + eObject; -// assert usage instanceof DomainUsageConstant : "Variable usage for " + eObject; + // assert usage instanceof DomainUsageConstant : "Variable usage for " + eObject; List<Element> list = usage2elements.get(usage); if (list == null) { list = new ArrayList<Element>(); @@ -103,7 +103,7 @@ public class QVTcDomainUsageTests extends LoadTestCase printAnalysis(usage2elements); } } - + public void printAnalysis(@NonNull Map<DomainUsage, List<Element>> usage2elements) { @SuppressWarnings("unchecked")Set<DomainUsage.Internal> keySet = (Set<DomainUsage.Internal>)(Set<?>)usage2elements.keySet(); List<DomainUsage.Internal> sortedUsages = new ArrayList<DomainUsage.Internal>(keySet); @@ -111,8 +111,11 @@ public class QVTcDomainUsageTests extends LoadTestCase for (DomainUsage usage : sortedUsages) { System.out.println(usage); List<String> lines = new ArrayList<String>(); - for (Element element : usage2elements.get(usage)) { - lines.add(element.eClass().getName() + " " + element); + List<Element> elements = usage2elements.get(usage); + if (elements != null) { + for (Element element : elements) { + lines.add(element.eClass().getName() + " " + element); + } } Collections.sort(lines); for (String line : lines) { @@ -121,15 +124,15 @@ public class QVTcDomainUsageTests extends LoadTestCase } } } - + protected static class MyQVTcEnvironmentFactory extends PivotEnvironmentFactory { public MyQVTcEnvironmentFactory(@NonNull ProjectManager projectMap, @Nullable ResourceSet externalResourceSet) { super(projectMap, externalResourceSet); - setEvaluationTracingEnabled(true); + setEvaluationTracingEnabled(true); } } - + protected static class MyQVTcTransformationExecutor extends AbstractTransformationExecutor { private MyQVTcTransformationExecutor(@NonNull EnvironmentFactoryInternal environmentFactory, @NonNull Class<? extends Transformer> txClass) throws ReflectiveOperationException { super(environmentFactory, txClass); @@ -157,37 +160,37 @@ public class QVTcDomainUsageTests extends LoadTestCase assert xtextResource != null; assertNoResourceErrors("Load failed", xtextResource); ASResource asResource = xtextResource.getASResource(); -// assertNoUnresolvedProxies("Unresolved proxies", xtextResource); -// System.out.println(Long.toString(System.currentTimeMillis() - startTime) + " validate()"); + // assertNoUnresolvedProxies("Unresolved proxies", xtextResource); + // System.out.println(Long.toString(System.currentTimeMillis() - startTime) + " validate()"); assertNoValidationErrors("Validation errors", xtextResource.getContents().get(0)); -// System.out.println(Long.toString(System.currentTimeMillis() - startTime) + " validated()"); + // System.out.println(Long.toString(System.currentTimeMillis() - startTime) + " validated()"); saveAsXMI(xtextResource, cstURI); asResource.setURI(pivotURI); - -// CompleteOCLStandaloneSetup.doSetup(); -// URI oclURI = ClassUtil.nonNullState(URI.createPlatformResourceURI("/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ocl", true)); -// CompleteOCLEObjectValidator completeOCLEObjectValidator2 = new CompleteOCLEObjectValidator(ClassUtil.nonNullState(QVTcoreBasePackage.eINSTANCE), oclURI, myQVT.getEnvironmentFactory()); -// completeOCLEObjectValidator2.initialize(); -// PivotEObjectValidator.install(ClassUtil.nonNullState(asResource.getResourceSet()), myQVT.getEnvironmentFactory()); -// PivotEObjectValidator.install(ClassUtil.nonNullState(QVTbasePackage.eINSTANCE)); -// PivotEObjectValidator.install(ClassUtil.nonNullState(QVTcoreBasePackage.eINSTANCE)); -// PivotEObjectValidator.install(ClassUtil.nonNullState(QVTcorePackage.eINSTANCE)); - -// assertNoValidationErrors("Pivot validation errors", asResource.getContents().get(0)); + + // CompleteOCLStandaloneSetup.doSetup(); + // URI oclURI = ClassUtil.nonNullState(URI.createPlatformResourceURI("/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ocl", true)); + // CompleteOCLEObjectValidator completeOCLEObjectValidator2 = new CompleteOCLEObjectValidator(ClassUtil.nonNullState(QVTcoreBasePackage.eINSTANCE), oclURI, myQVT.getEnvironmentFactory()); + // completeOCLEObjectValidator2.initialize(); + // PivotEObjectValidator.install(ClassUtil.nonNullState(asResource.getResourceSet()), myQVT.getEnvironmentFactory()); + // PivotEObjectValidator.install(ClassUtil.nonNullState(QVTbasePackage.eINSTANCE)); + // PivotEObjectValidator.install(ClassUtil.nonNullState(QVTcoreBasePackage.eINSTANCE)); + // PivotEObjectValidator.install(ClassUtil.nonNullState(QVTcorePackage.eINSTANCE)); + + // assertNoValidationErrors("Pivot validation errors", asResource.getContents().get(0)); asResource.save(getSaveOptions()); return asResource; } - protected @NonNull Map<Object, Object> getSaveOptions() { + protected @NonNull Map<Object, Object> getSaveOptions() { return TestsXMLUtil.defaultSavingOptions; } public void testCG_uml2rdbms_qvtu() throws Exception { - MyQVT myQVT = createQVT(); + MyQVT myQVT = createQVT(); URI transformURI = getProjectFileURI("models/uml2rdbms.qvtu.qvtc"); Transformation asTransformation = loadTransformation(myQVT, transformURI); myQVT.checkAnalysis(asTransformation, false); - myQVT.dispose(); + myQVT.dispose(); } protected @NonNull Transformation loadTransformation(@NonNull MyQVT myQVT, @NonNull URI transformURI) throws Exception { diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2PersonsNormalizer.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2PersonsNormalizer.java index 668d84349..278641d5c 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2PersonsNormalizer.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2PersonsNormalizer.java @@ -64,6 +64,7 @@ public class Families2PersonsNormalizer implements ModelNormalizer } } + @Override public @NonNull List<Normalizer> normalize(@NonNull Resource resource) { EObject eRoot = resource.getContents().get(0); EPackage ePackage = eRoot.eClass().getEPackage(); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLSNormalizer.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLSNormalizer.java index 9e0b0188c..5a9fdcf94 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLSNormalizer.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLSNormalizer.java @@ -54,6 +54,7 @@ public class HSV2HLSNormalizer implements ModelNormalizer } } + @Override public @NonNull List<Normalizer> normalize(@NonNull Resource resource) { EObject eRoot = resource.getContents().get(0); EPackage ePackage = eRoot.eClass().getEPackage(); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/SimpleRDBMSNormalizer.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/SimpleRDBMSNormalizer.java index a493ba7c9..74288689c 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/SimpleRDBMSNormalizer.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/SimpleRDBMSNormalizer.java @@ -103,6 +103,7 @@ public class SimpleRDBMSNormalizer implements ModelNormalizer } } + @Override public @NonNull List<Normalizer> normalize(@NonNull Resource resource) { EObject eRoot = resource.getContents().get(0); EPackage ePackage = eRoot.eClass().getEPackage(); diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/Upper2LowerNormalizer.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/Upper2LowerNormalizer.java index 3d510270a..5baf1d41d 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/Upper2LowerNormalizer.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/Upper2LowerNormalizer.java @@ -132,6 +132,7 @@ public class Upper2LowerNormalizer implements ModelNormalizer } } + @Override public @NonNull List<Normalizer> normalize(@NonNull Resource resource) { EObject eRoot = resource.getContents().get(0); EPackage ePackage = eRoot.eClass().getEPackage(); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassImpl.java index 3eec5d256..e264ebd4d 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassImpl.java @@ -69,6 +69,7 @@ public class ClassImpl extends NamedElementImpl implements classes.Class { * <!-- end-user-doc --> * @generated */ + @Override public classes.Class getSuperClass() { if (superClass != null && superClass.eIsProxy()) { InternalEObject oldSuperClass = (InternalEObject)superClass; @@ -95,6 +96,7 @@ public class ClassImpl extends NamedElementImpl implements classes.Class { * <!-- end-user-doc --> * @generated */ + @Override public void setSuperClass(classes.Class newSuperClass) { classes.Class oldSuperClass = superClass; superClass = newSuperClass; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassesFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassesFactoryImpl.java index d68dc5c55..136ae5ba8 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassesFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassesFactoryImpl.java @@ -81,6 +81,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public classes.Package createPackage() { PackageImpl package_ = new PackageImpl(); return package_; @@ -91,6 +92,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public classes.Class createClass() { ClassImpl class_ = new ClassImpl(); return class_; @@ -101,6 +103,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public Root createRoot() { RootImpl root = new RootImpl(); return root; @@ -111,6 +114,7 @@ public class ClassesFactoryImpl extends EFactoryImpl implements ClassesFactory { * <!-- end-user-doc --> * @generated */ + @Override public ClassesPackage getClassesPackage() { return (ClassesPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassesPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassesPackageImpl.java index 36a287563..7d76cbd6b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassesPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/ClassesPackageImpl.java @@ -158,6 +158,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getElement() { return elementEClass; } @@ -167,6 +168,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNamedElement() { return namedElementEClass; } @@ -176,6 +178,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNamedElement_Name() { return (EAttribute)namedElementEClass.getEStructuralFeatures().get(0); } @@ -185,6 +188,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNamespace() { return namespaceEClass; } @@ -194,6 +198,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackage() { return packageEClass; } @@ -203,6 +208,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackage_OwnedClasses() { return (EReference)packageEClass.getEStructuralFeatures().get(0); } @@ -212,6 +218,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackage_OwnedPackages() { return (EReference)packageEClass.getEStructuralFeatures().get(1); } @@ -221,6 +228,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getClass_() { return classEClass; } @@ -230,6 +238,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_SuperClass() { return (EReference)classEClass.getEStructuralFeatures().get(0); } @@ -239,6 +248,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getRoot() { return rootEClass; } @@ -248,6 +258,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getRoot_OwnedPackages() { return (EReference)rootEClass.getEStructuralFeatures().get(0); } @@ -257,6 +268,7 @@ public class ClassesPackageImpl extends EPackageImpl implements ClassesPackage { * <!-- end-user-doc --> * @generated */ + @Override public ClassesFactory getClassesFactory() { return (ClassesFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/NamedElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/NamedElementImpl.java index 00de21fd5..1018c1925 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/NamedElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/NamedElementImpl.java @@ -79,6 +79,7 @@ public abstract class NamedElementImpl extends ElementImpl implements NamedEleme * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -88,6 +89,7 @@ public abstract class NamedElementImpl extends ElementImpl implements NamedEleme * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/PackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/PackageImpl.java index 8e463062c..e7bfc91a2 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/PackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/PackageImpl.java @@ -85,6 +85,7 @@ public class PackageImpl extends NamedElementImpl implements classes.Package { * <!-- end-user-doc --> * @generated */ + @Override public EList<classes.Class> getOwnedClasses() { if (ownedClasses == null) { ownedClasses = new EObjectContainmentEList<classes.Class>(classes.Class.class, this, ClassesPackage.PACKAGE__OWNED_CLASSES); @@ -97,6 +98,7 @@ public class PackageImpl extends NamedElementImpl implements classes.Package { * <!-- end-user-doc --> * @generated */ + @Override public EList<classes.Package> getOwnedPackages() { if (ownedPackages == null) { ownedPackages = new EObjectContainmentEList<classes.Package>(classes.Package.class, this, ClassesPackage.PACKAGE__OWNED_PACKAGES); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/RootImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/RootImpl.java index 783066e90..26a064117 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/RootImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classes/impl/RootImpl.java @@ -75,6 +75,7 @@ public class RootImpl extends ElementImpl implements Root { * <!-- end-user-doc --> * @generated */ + @Override public EList<classes.Package> getOwnedPackages() { if (ownedPackages == null) { ownedPackages = new EObjectContainmentEList<classes.Package>(classes.Package.class, this, ClassesPackage.ROOT__OWNED_PACKAGES); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassCSImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassCSImpl.java index 831426698..ca9612593 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassCSImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassCSImpl.java @@ -72,6 +72,7 @@ public class ClassCSImpl extends NamedElementCSImpl implements ClassCS { * <!-- end-user-doc --> * @generated */ + @Override public PathNameCS getExtends() { return extends_; } @@ -96,6 +97,7 @@ public class ClassCSImpl extends NamedElementCSImpl implements ClassCS { * <!-- end-user-doc --> * @generated */ + @Override public void setExtends(PathNameCS newExtends) { if (newExtends != extends_) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassescsFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassescsFactoryImpl.java index c4e722c37..5cee65262 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassescsFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassescsFactoryImpl.java @@ -81,6 +81,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public PackageCS createPackageCS() { PackageCSImpl packageCS = new PackageCSImpl(); return packageCS; @@ -91,6 +92,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public ClassCS createClassCS() { ClassCSImpl classCS = new ClassCSImpl(); return classCS; @@ -101,6 +103,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public PathNameCS createPathNameCS() { PathNameCSImpl pathNameCS = new PathNameCSImpl(); return pathNameCS; @@ -111,6 +114,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public PathElementCS createPathElementCS() { PathElementCSImpl pathElementCS = new PathElementCSImpl(); return pathElementCS; @@ -121,6 +125,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public RootCS createRootCS() { RootCSImpl rootCS = new RootCSImpl(); return rootCS; @@ -131,6 +136,7 @@ public class ClassescsFactoryImpl extends EFactoryImpl implements ClassescsFacto * <!-- end-user-doc --> * @generated */ + @Override public ClassescsPackage getClassescsPackage() { return (ClassescsPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassescsPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassescsPackageImpl.java index adcffe609..43aadb074 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassescsPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ClassescsPackageImpl.java @@ -168,6 +168,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getElementCS() { return elementCSEClass; } @@ -177,6 +178,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getElementCS_Ast() { return (EReference)elementCSEClass.getEStructuralFeatures().get(0); } @@ -186,6 +188,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getNamedElementCS() { return namedElementCSEClass; } @@ -195,6 +198,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNamedElementCS_Name() { return (EAttribute)namedElementCSEClass.getEStructuralFeatures().get(0); } @@ -204,6 +208,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackageCS() { return packageCSEClass; } @@ -213,6 +218,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageCS_OwnedClasses() { return (EReference)packageCSEClass.getEStructuralFeatures().get(0); } @@ -222,6 +228,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getClassCS() { return classCSEClass; } @@ -231,6 +238,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassCS_Extends() { return (EReference)classCSEClass.getEStructuralFeatures().get(0); } @@ -240,6 +248,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPathNameCS() { return pathNameCSEClass; } @@ -249,6 +258,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPathNameCS_Path() { return (EReference)pathNameCSEClass.getEStructuralFeatures().get(0); } @@ -258,6 +268,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPathElementCS() { return pathElementCSEClass; } @@ -267,6 +278,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getRootCS() { return rootCSEClass; } @@ -276,6 +288,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getRootCS_OwnedPackages() { return (EReference)rootCSEClass.getEStructuralFeatures().get(0); } @@ -285,6 +298,7 @@ public class ClassescsPackageImpl extends EPackageImpl implements ClassescsPacka * <!-- end-user-doc --> * @generated */ + @Override public ClassescsFactory getClassescsFactory() { return (ClassescsFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ElementCSImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ElementCSImpl.java index 4efcc46ba..19edd0898 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ElementCSImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/ElementCSImpl.java @@ -73,6 +73,7 @@ public abstract class ElementCSImpl extends MinimalEObjectImpl.Container impleme * <!-- end-user-doc --> * @generated */ + @Override public Element getAst() { if (ast != null && ast.eIsProxy()) { InternalEObject oldAst = (InternalEObject)ast; @@ -99,6 +100,7 @@ public abstract class ElementCSImpl extends MinimalEObjectImpl.Container impleme * <!-- end-user-doc --> * @generated */ + @Override public void setAst(Element newAst) { Element oldAst = ast; ast = newAst; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/NamedElementCSImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/NamedElementCSImpl.java index 0e3c68751..ba69de74d 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/NamedElementCSImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/NamedElementCSImpl.java @@ -79,6 +79,7 @@ public abstract class NamedElementCSImpl extends ElementCSImpl implements NamedE * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -88,6 +89,7 @@ public abstract class NamedElementCSImpl extends ElementCSImpl implements NamedE * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/PackageCSImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/PackageCSImpl.java index dcc16656f..c652480c6 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/PackageCSImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/PackageCSImpl.java @@ -76,6 +76,7 @@ public class PackageCSImpl extends NamedElementCSImpl implements PackageCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<ClassCS> getOwnedClasses() { if (ownedClasses == null) { ownedClasses = new EObjectContainmentEList<ClassCS>(ClassCS.class, this, ClassescsPackage.PACKAGE_CS__OWNED_CLASSES); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/PathNameCSImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/PathNameCSImpl.java index 3aaa49e28..adbe28da9 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/PathNameCSImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/PathNameCSImpl.java @@ -76,6 +76,7 @@ public class PathNameCSImpl extends ElementCSImpl implements PathNameCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<PathElementCS> getPath() { if (path == null) { path = new EObjectContainmentEList<PathElementCS>(PathElementCS.class, this, ClassescsPackage.PATH_NAME_CS__PATH); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/RootCSImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/RootCSImpl.java index 27f6de92c..14fab9ce0 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/RootCSImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescs/impl/RootCSImpl.java @@ -75,6 +75,7 @@ public class RootCSImpl extends ElementCSImpl implements RootCS { * <!-- end-user-doc --> * @generated */ + @Override public EList<PackageCS> getOwnedPackages() { if (ownedPackages == null) { ownedPackages = new EObjectContainmentEList<PackageCS>(PackageCS.class, this, ClassescsPackage.ROOT_CS__OWNED_PACKAGES); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassCS2ClassImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassCS2ClassImpl.java index 33de9dbe9..a62ce86ba 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassCS2ClassImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassCS2ClassImpl.java @@ -84,6 +84,7 @@ public class ClassCS2ClassImpl extends MinimalEObjectImpl.Container implements C * <!-- end-user-doc --> * @generated */ + @Override public ClassCS getClassCS() { if (classCS != null && classCS.eIsProxy()) { InternalEObject oldClassCS = (InternalEObject)classCS; @@ -110,6 +111,7 @@ public class ClassCS2ClassImpl extends MinimalEObjectImpl.Container implements C * <!-- end-user-doc --> * @generated */ + @Override public void setClassCS(ClassCS newClassCS) { ClassCS oldClassCS = classCS; classCS = newClassCS; @@ -122,6 +124,7 @@ public class ClassCS2ClassImpl extends MinimalEObjectImpl.Container implements C * <!-- end-user-doc --> * @generated */ + @Override public classes.Class getClass_() { if (class_ != null && class_.eIsProxy()) { InternalEObject oldClass = (InternalEObject)class_; @@ -148,6 +151,7 @@ public class ClassCS2ClassImpl extends MinimalEObjectImpl.Container implements C * <!-- end-user-doc --> * @generated */ + @Override public void setClass(classes.Class newClass) { classes.Class oldClass = class_; class_ = newClass; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassescstracesFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassescstracesFactoryImpl.java index 97ca90310..570227eb3 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassescstracesFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassescstracesFactoryImpl.java @@ -79,6 +79,7 @@ public class ClassescstracesFactoryImpl extends EFactoryImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public PackageCS2Package createPackageCS2Package() { PackageCS2PackageImpl packageCS2Package = new PackageCS2PackageImpl(); return packageCS2Package; @@ -89,6 +90,7 @@ public class ClassescstracesFactoryImpl extends EFactoryImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public ClassCS2Class createClassCS2Class() { ClassCS2ClassImpl classCS2Class = new ClassCS2ClassImpl(); return classCS2Class; @@ -99,6 +101,7 @@ public class ClassescstracesFactoryImpl extends EFactoryImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public RootCS2Root createRootCS2Root() { RootCS2RootImpl rootCS2Root = new RootCS2RootImpl(); return rootCS2Root; @@ -109,6 +112,7 @@ public class ClassescstracesFactoryImpl extends EFactoryImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public ClassescstracesPackage getClassescstracesPackage() { return (ClassescstracesPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassescstracesPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassescstracesPackageImpl.java index 7fdd3e72e..a7edbb538 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassescstracesPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/ClassescstracesPackageImpl.java @@ -135,6 +135,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackageCS2Package() { return packageCS2PackageEClass; } @@ -144,6 +145,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageCS2Package_PackageCS() { return (EReference)packageCS2PackageEClass.getEStructuralFeatures().get(0); } @@ -153,6 +155,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageCS2Package_Package() { return (EReference)packageCS2PackageEClass.getEStructuralFeatures().get(1); } @@ -162,6 +165,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EClass getClassCS2Class() { return classCS2ClassEClass; } @@ -171,6 +175,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassCS2Class_ClassCS() { return (EReference)classCS2ClassEClass.getEStructuralFeatures().get(0); } @@ -180,6 +185,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassCS2Class_Class() { return (EReference)classCS2ClassEClass.getEStructuralFeatures().get(1); } @@ -189,6 +195,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EClass getRootCS2Root() { return rootCS2RootEClass; } @@ -198,6 +205,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getRootCS2Root_RootCS() { return (EReference)rootCS2RootEClass.getEStructuralFeatures().get(0); } @@ -207,6 +215,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public EReference getRootCS2Root_Root() { return (EReference)rootCS2RootEClass.getEStructuralFeatures().get(1); } @@ -216,6 +225,7 @@ public class ClassescstracesPackageImpl extends EPackageImpl implements Classesc * <!-- end-user-doc --> * @generated */ + @Override public ClassescstracesFactory getClassescstracesFactory() { return (ClassescstracesFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/PackageCS2PackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/PackageCS2PackageImpl.java index 3f758fe91..072aead15 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/PackageCS2PackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/PackageCS2PackageImpl.java @@ -84,6 +84,7 @@ public class PackageCS2PackageImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public PackageCS getPackageCS() { if (packageCS != null && packageCS.eIsProxy()) { InternalEObject oldPackageCS = (InternalEObject)packageCS; @@ -110,6 +111,7 @@ public class PackageCS2PackageImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public void setPackageCS(PackageCS newPackageCS) { PackageCS oldPackageCS = packageCS; packageCS = newPackageCS; @@ -122,6 +124,7 @@ public class PackageCS2PackageImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public classes.Package getPackage() { if (package_ != null && package_.eIsProxy()) { InternalEObject oldPackage = (InternalEObject)package_; @@ -148,6 +151,7 @@ public class PackageCS2PackageImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public void setPackage(classes.Package newPackage) { classes.Package oldPackage = package_; package_ = newPackage; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/RootCS2RootImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/RootCS2RootImpl.java index 1925da9f9..13fe8855c 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/RootCS2RootImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/classescstraces/impl/RootCS2RootImpl.java @@ -86,6 +86,7 @@ public class RootCS2RootImpl extends MinimalEObjectImpl.Container implements Roo * <!-- end-user-doc --> * @generated */ + @Override public RootCS getRootCS() { if (rootCS != null && rootCS.eIsProxy()) { InternalEObject oldRootCS = (InternalEObject)rootCS; @@ -112,6 +113,7 @@ public class RootCS2RootImpl extends MinimalEObjectImpl.Container implements Roo * <!-- end-user-doc --> * @generated */ + @Override public void setRootCS(RootCS newRootCS) { RootCS oldRootCS = rootCS; rootCS = newRootCS; @@ -124,6 +126,7 @@ public class RootCS2RootImpl extends MinimalEObjectImpl.Container implements Roo * <!-- end-user-doc --> * @generated */ + @Override public Root getRoot() { if (root != null && root.eIsProxy()) { InternalEObject oldRoot = (InternalEObject)root; @@ -150,6 +153,7 @@ public class RootCS2RootImpl extends MinimalEObjectImpl.Container implements Roo * <!-- end-user-doc --> * @generated */ + @Override public void setRoot(Root newRoot) { Root oldRoot = root; root = newRoot; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/ColumnImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/ColumnImpl.java index 4406ba4e4..378fdceab 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/ColumnImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/ColumnImpl.java @@ -115,6 +115,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public Table getOwner() { if (eContainerFeatureID() != RDBMSPackage.COLUMN__OWNER) return null; return (Table)eInternalContainer(); @@ -135,6 +136,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(Table newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != RDBMSPackage.COLUMN__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -156,6 +158,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public String getType() { return type; } @@ -165,6 +168,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public void setType(String newType) { String oldType = type; type = newType; @@ -177,6 +181,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public EList<ForeignKey> getForeignKeys() { if (foreignKeys == null) { foreignKeys = new EObjectWithInverseResolvingEList.ManyInverse<ForeignKey>(ForeignKey.class, this, RDBMSPackage.COLUMN__FOREIGN_KEYS, RDBMSPackage.FOREIGN_KEY__COLUMN); @@ -189,6 +194,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public EList<Key> getKey() { if (key == null) { key = new EObjectWithInverseResolvingEList.ManyInverse<Key>(Key.class, this, RDBMSPackage.COLUMN__KEY, RDBMSPackage.KEY__COLUMN); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/ForeignKeyImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/ForeignKeyImpl.java index 9f843089d..2226da902 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/ForeignKeyImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/ForeignKeyImpl.java @@ -94,6 +94,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public Key getRefersTo() { if (refersTo != null && refersTo.eIsProxy()) { InternalEObject oldRefersTo = (InternalEObject)refersTo; @@ -120,6 +121,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public void setRefersTo(Key newRefersTo) { Key oldRefersTo = refersTo; refersTo = newRefersTo; @@ -132,6 +134,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public EList<Column> getColumn() { if (column == null) { column = new EObjectWithInverseResolvingEList.ManyInverse<Column>(Column.class, this, RDBMSPackage.FOREIGN_KEY__COLUMN, RDBMSPackage.COLUMN__FOREIGN_KEYS); @@ -144,6 +147,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public Table getOwner() { if (eContainerFeatureID() != RDBMSPackage.FOREIGN_KEY__OWNER) return null; return (Table)eInternalContainer(); @@ -164,6 +168,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(Table newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != RDBMSPackage.FOREIGN_KEY__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/KeyImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/KeyImpl.java index 97193dbab..a37a7b031 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/KeyImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/KeyImpl.java @@ -82,6 +82,7 @@ public class KeyImpl extends RModelElementImpl implements Key { * <!-- end-user-doc --> * @generated */ + @Override public Table getOwner() { if (eContainerFeatureID() != RDBMSPackage.KEY__OWNER) return null; return (Table)eInternalContainer(); @@ -102,6 +103,7 @@ public class KeyImpl extends RModelElementImpl implements Key { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(Table newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != RDBMSPackage.KEY__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -123,6 +125,7 @@ public class KeyImpl extends RModelElementImpl implements Key { * <!-- end-user-doc --> * @generated */ + @Override public EList<Column> getColumn() { if (column == null) { column = new EObjectWithInverseResolvingEList.ManyInverse<Column>(Column.class, this, RDBMSPackage.KEY__COLUMN, RDBMSPackage.COLUMN__KEY); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RDBMSFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RDBMSFactoryImpl.java index 3252ff755..7b76dae42 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RDBMSFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RDBMSFactoryImpl.java @@ -81,6 +81,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public Column createColumn() { ColumnImpl column = new ColumnImpl(); return column; @@ -91,6 +92,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public ForeignKey createForeignKey() { ForeignKeyImpl foreignKey = new ForeignKeyImpl(); return foreignKey; @@ -101,6 +103,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public Key createKey() { KeyImpl key = new KeyImpl(); return key; @@ -111,6 +114,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public Schema createSchema() { SchemaImpl schema = new SchemaImpl(); return schema; @@ -121,6 +125,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public Table createTable() { TableImpl table = new TableImpl(); return table; @@ -131,6 +136,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public RDBMSPackage getRDBMSPackage() { return (RDBMSPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RDBMSPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RDBMSPackageImpl.java index 98ada77af..d1155ddc3 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RDBMSPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RDBMSPackageImpl.java @@ -160,6 +160,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getColumn() { return columnEClass; } @@ -169,6 +170,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getColumn_Owner() { return (EReference)columnEClass.getEStructuralFeatures().get(0); } @@ -178,6 +180,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getColumn_Type() { return (EAttribute)columnEClass.getEStructuralFeatures().get(1); } @@ -187,6 +190,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getColumn_ForeignKeys() { return (EReference)columnEClass.getEStructuralFeatures().get(2); } @@ -196,6 +200,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getColumn_Key() { return (EReference)columnEClass.getEStructuralFeatures().get(3); } @@ -205,6 +210,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getForeignKey() { return foreignKeyEClass; } @@ -214,6 +220,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getForeignKey_RefersTo() { return (EReference)foreignKeyEClass.getEStructuralFeatures().get(0); } @@ -223,6 +230,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getForeignKey_Column() { return (EReference)foreignKeyEClass.getEStructuralFeatures().get(1); } @@ -232,6 +240,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getForeignKey_Owner() { return (EReference)foreignKeyEClass.getEStructuralFeatures().get(2); } @@ -241,6 +250,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getKey() { return keyEClass; } @@ -250,6 +260,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getKey_Owner() { return (EReference)keyEClass.getEStructuralFeatures().get(0); } @@ -259,6 +270,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getKey_Column() { return (EReference)keyEClass.getEStructuralFeatures().get(1); } @@ -268,6 +280,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getRModelElement() { return rModelElementEClass; } @@ -277,6 +290,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getRModelElement_Name() { return (EAttribute)rModelElementEClass.getEStructuralFeatures().get(0); } @@ -286,6 +300,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getRModelElement_Kind() { return (EAttribute)rModelElementEClass.getEStructuralFeatures().get(1); } @@ -295,6 +310,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getSchema() { return schemaEClass; } @@ -304,6 +320,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getSchema_Tables() { return (EReference)schemaEClass.getEStructuralFeatures().get(0); } @@ -313,6 +330,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getTable() { return tableEClass; } @@ -322,6 +340,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_Column() { return (EReference)tableEClass.getEStructuralFeatures().get(0); } @@ -331,6 +350,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_Schema() { return (EReference)tableEClass.getEStructuralFeatures().get(1); } @@ -340,6 +360,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_TheKey() { return (EReference)tableEClass.getEStructuralFeatures().get(2); } @@ -349,6 +370,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_Key() { return (EReference)tableEClass.getEStructuralFeatures().get(3); } @@ -358,6 +380,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_ForeignKey() { return (EReference)tableEClass.getEStructuralFeatures().get(4); } @@ -367,6 +390,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public RDBMSFactory getRDBMSFactory() { return (RDBMSFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RModelElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RModelElementImpl.java index 06f8a046a..5a547fa35 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RModelElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/RModelElementImpl.java @@ -101,6 +101,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -110,6 +111,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -122,6 +124,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -131,6 +134,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/SchemaImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/SchemaImpl.java index 1804f6204..9eaf001df 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/SchemaImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/SchemaImpl.java @@ -76,6 +76,7 @@ public class SchemaImpl extends RModelElementImpl implements Schema { * <!-- end-user-doc --> * @generated */ + @Override public EList<Table> getTables() { if (tables == null) { tables = new EObjectContainmentWithInverseEList<Table>(Table.class, this, RDBMSPackage.SCHEMA__TABLES, RDBMSPackage.TABLE__SCHEMA); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/TableImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/TableImpl.java index 2468544a4..468a30e26 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/TableImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/rdbms/impl/TableImpl.java @@ -117,6 +117,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public EList<Column> getColumn() { if (column == null) { column = new EObjectContainmentWithInverseEList<Column>(Column.class, this, RDBMSPackage.TABLE__COLUMN, RDBMSPackage.COLUMN__OWNER); @@ -129,6 +130,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public Schema getSchema() { if (eContainerFeatureID() != RDBMSPackage.TABLE__SCHEMA) return null; return (Schema)eInternalContainer(); @@ -149,6 +151,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public void setSchema(Schema newSchema) { if (newSchema != eInternalContainer() || (eContainerFeatureID() != RDBMSPackage.TABLE__SCHEMA && newSchema != null)) { if (EcoreUtil.isAncestor(this, newSchema)) @@ -170,6 +173,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public Key getTheKey() { if (theKey != null && theKey.eIsProxy()) { InternalEObject oldTheKey = (InternalEObject)theKey; @@ -196,6 +200,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public void setTheKey(Key newTheKey) { Key oldTheKey = theKey; theKey = newTheKey; @@ -208,6 +213,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public EList<Key> getKey() { if (key == null) { key = new EObjectContainmentWithInverseEList<Key>(Key.class, this, RDBMSPackage.TABLE__KEY, RDBMSPackage.KEY__OWNER); @@ -220,6 +226,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public EList<ForeignKey> getForeignKey() { if (foreignKey == null) { foreignKey = new EObjectContainmentWithInverseEList<ForeignKey>(ForeignKey.class, this, RDBMSPackage.TABLE__FOREIGN_KEY, RDBMSPackage.FOREIGN_KEY__OWNER); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/AssociationImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/AssociationImpl.java index d84fd4e13..ca9dc2603 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/AssociationImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/AssociationImpl.java @@ -82,6 +82,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public manualuml2rdbms.uml.Class getSource() { if (source != null && source.eIsProxy()) { InternalEObject oldSource = (InternalEObject)source; @@ -123,6 +124,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public void setSource(manualuml2rdbms.uml.Class newSource) { if (newSource != source) { NotificationChain msgs = null; @@ -142,6 +144,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public manualuml2rdbms.uml.Class getDestination() { if (destination != null && destination.eIsProxy()) { InternalEObject oldDestination = (InternalEObject)destination; @@ -168,6 +171,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public void setDestination(manualuml2rdbms.uml.Class newDestination) { manualuml2rdbms.uml.Class oldDestination = destination; destination = newDestination; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/AttributeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/AttributeImpl.java index 9872d6f96..6a99d85eb 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/AttributeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/AttributeImpl.java @@ -75,6 +75,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public Classifier getType() { if (type != null && type.eIsProxy()) { InternalEObject oldType = (InternalEObject)type; @@ -116,6 +117,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public void setType(Classifier newType) { if (newType != type) { NotificationChain msgs = null; @@ -135,6 +137,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public manualuml2rdbms.uml.Class getOwner() { if (eContainerFeatureID() != UMLPackage.ATTRIBUTE__OWNER) return null; return (manualuml2rdbms.uml.Class)eInternalContainer(); @@ -155,6 +158,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(manualuml2rdbms.uml.Class newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UMLPackage.ATTRIBUTE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/ClassImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/ClassImpl.java index 05a9d6c5a..d409b4ce9 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/ClassImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/ClassImpl.java @@ -122,6 +122,7 @@ public class ClassImpl extends ClassifierImpl implements manualuml2rdbms.uml.Cla * <!-- end-user-doc --> * @generated */ + @Override public EList<manualuml2rdbms.uml.Class> getGeneral() { if (general == null) { general = new EObjectWithInverseResolvingEList.ManyInverse<manualuml2rdbms.uml.Class>(manualuml2rdbms.uml.Class.class, this, UMLPackage.CLASS__GENERAL, UMLPackage.CLASS__GENERAL_OPPOSITE); @@ -134,6 +135,7 @@ public class ClassImpl extends ClassifierImpl implements manualuml2rdbms.uml.Cla * <!-- end-user-doc --> * @generated */ + @Override public EList<Association> getForward() { if (forward == null) { forward = new EObjectWithInverseResolvingEList<Association>(Association.class, this, UMLPackage.CLASS__FORWARD, UMLPackage.ASSOCIATION__SOURCE); @@ -146,6 +148,7 @@ public class ClassImpl extends ClassifierImpl implements manualuml2rdbms.uml.Cla * <!-- end-user-doc --> * @generated */ + @Override public EList<Attribute> getAttributes() { if (attributes == null) { attributes = new EObjectContainmentWithInverseEList<Attribute>(Attribute.class, this, UMLPackage.CLASS__ATTRIBUTES, UMLPackage.ATTRIBUTE__OWNER); @@ -158,6 +161,7 @@ public class ClassImpl extends ClassifierImpl implements manualuml2rdbms.uml.Cla * <!-- end-user-doc --> * @generated */ + @Override public EList<Association> getReverse() { if (reverse == null) { reverse = new EObjectResolvingEList<Association>(Association.class, this, UMLPackage.CLASS__REVERSE); @@ -170,6 +174,7 @@ public class ClassImpl extends ClassifierImpl implements manualuml2rdbms.uml.Cla * <!-- end-user-doc --> * @generated */ + @Override public EList<manualuml2rdbms.uml.Class> getGeneralOpposite() { if (generalOpposite == null) { generalOpposite = new EObjectWithInverseResolvingEList.ManyInverse<manualuml2rdbms.uml.Class>(manualuml2rdbms.uml.Class.class, this, UMLPackage.CLASS__GENERAL_OPPOSITE, UMLPackage.CLASS__GENERAL); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/ClassifierImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/ClassifierImpl.java index 5096c54aa..67bc8802c 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/ClassifierImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/ClassifierImpl.java @@ -76,6 +76,7 @@ public abstract class ClassifierImpl extends PackageElementImpl implements Class * <!-- end-user-doc --> * @generated */ + @Override public EList<Attribute> getTypeOpposite() { if (typeOpposite == null) { typeOpposite = new EObjectWithInverseResolvingEList<Attribute>(Attribute.class, this, UMLPackage.CLASSIFIER__TYPE_OPPOSITE, UMLPackage.ATTRIBUTE__TYPE); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/PackageElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/PackageElementImpl.java index 06ea94e1a..6b09b8a22 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/PackageElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/PackageElementImpl.java @@ -63,6 +63,7 @@ public abstract class PackageElementImpl extends UMLModelElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public manualuml2rdbms.uml.Package getNamespace() { if (eContainerFeatureID() != UMLPackage.PACKAGE_ELEMENT__NAMESPACE) return null; return (manualuml2rdbms.uml.Package)eInternalContainer(); @@ -83,6 +84,7 @@ public abstract class PackageElementImpl extends UMLModelElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public void setNamespace(manualuml2rdbms.uml.Package newNamespace) { if (newNamespace != eInternalContainer() || (eContainerFeatureID() != UMLPackage.PACKAGE_ELEMENT__NAMESPACE && newNamespace != null)) { if (EcoreUtil.isAncestor(this, newNamespace)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/PackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/PackageImpl.java index 8dd2f7bf1..4ebc437f3 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/PackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/PackageImpl.java @@ -75,6 +75,7 @@ public class PackageImpl extends UMLModelElementImpl implements manualuml2rdbms. * <!-- end-user-doc --> * @generated */ + @Override public EList<PackageElement> getElements() { if (elements == null) { elements = new EObjectContainmentWithInverseEList<PackageElement>(PackageElement.class, this, UMLPackage.PACKAGE__ELEMENTS, UMLPackage.PACKAGE_ELEMENT__NAMESPACE); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLFactoryImpl.java index b6976f41f..528e63e0f 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLFactoryImpl.java @@ -85,6 +85,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public Attribute createAttribute() { AttributeImpl attribute = new AttributeImpl(); return attribute; @@ -95,6 +96,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public Association createAssociation() { AssociationImpl association = new AssociationImpl(); return association; @@ -105,6 +107,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public manualuml2rdbms.uml.Class createClass() { ClassImpl class_ = new ClassImpl(); return class_; @@ -115,6 +118,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public manualuml2rdbms.uml.Package createPackage() { PackageImpl package_ = new PackageImpl(); return package_; @@ -125,6 +129,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public PrimitiveDataType createPrimitiveDataType() { PrimitiveDataTypeImpl primitiveDataType = new PrimitiveDataTypeImpl(); return primitiveDataType; @@ -135,6 +140,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public UMLPackage getUMLPackage() { return (UMLPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLModelElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLModelElementImpl.java index 17bce332a..8b24e6dcc 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLModelElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLModelElementImpl.java @@ -101,6 +101,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -110,6 +111,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; @@ -122,6 +124,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -131,6 +134,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLPackageImpl.java index 5c13ac160..8808317a9 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml/impl/UMLPackageImpl.java @@ -174,6 +174,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getAttribute() { return attributeEClass; } @@ -183,6 +184,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getAttribute_Type() { return (EReference)attributeEClass.getEStructuralFeatures().get(0); } @@ -192,6 +194,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getAttribute_Owner() { return (EReference)attributeEClass.getEStructuralFeatures().get(1); } @@ -201,6 +204,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getAssociation() { return associationEClass; } @@ -210,6 +214,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociation_Source() { return (EReference)associationEClass.getEStructuralFeatures().get(0); } @@ -219,6 +224,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociation_Destination() { return (EReference)associationEClass.getEStructuralFeatures().get(1); } @@ -228,6 +234,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getClass_() { return classEClass; } @@ -237,6 +244,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_General() { return (EReference)classEClass.getEStructuralFeatures().get(0); } @@ -246,6 +254,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_Forward() { return (EReference)classEClass.getEStructuralFeatures().get(1); } @@ -255,6 +264,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_Attributes() { return (EReference)classEClass.getEStructuralFeatures().get(2); } @@ -264,6 +274,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_Reverse() { return (EReference)classEClass.getEStructuralFeatures().get(3); } @@ -273,6 +284,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_GeneralOpposite() { return (EReference)classEClass.getEStructuralFeatures().get(4); } @@ -282,6 +294,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getClassifier() { return classifierEClass; } @@ -291,6 +304,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassifier_TypeOpposite() { return (EReference)classifierEClass.getEStructuralFeatures().get(0); } @@ -300,6 +314,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackage() { return packageEClass; } @@ -309,6 +324,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackage_Elements() { return (EReference)packageEClass.getEStructuralFeatures().get(0); } @@ -318,6 +334,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackageElement() { return packageElementEClass; } @@ -327,6 +344,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageElement_Namespace() { return (EReference)packageElementEClass.getEStructuralFeatures().get(0); } @@ -336,6 +354,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPrimitiveDataType() { return primitiveDataTypeEClass; } @@ -345,6 +364,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getUMLModelElement() { return umlModelElementEClass; } @@ -354,6 +374,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getUMLModelElement_Kind() { return (EAttribute)umlModelElementEClass.getEStructuralFeatures().get(0); } @@ -363,6 +384,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getUMLModelElement_Name() { return (EAttribute)umlModelElementEClass.getEStructuralFeatures().get(1); } @@ -372,6 +394,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public UMLFactory getUMLFactory() { return (UMLFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/AssociationToForeignKeyImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/AssociationToForeignKeyImpl.java index f17790bee..5aa3cf00c 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/AssociationToForeignKeyImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/AssociationToForeignKeyImpl.java @@ -122,6 +122,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public ClassToTable getReferenced() { if (referenced != null && referenced.eIsProxy()) { InternalEObject oldReferenced = (InternalEObject)referenced; @@ -148,6 +149,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setReferenced(ClassToTable newReferenced) { ClassToTable oldReferenced = referenced; referenced = newReferenced; @@ -160,6 +162,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public ClassToTable getOwner() { if (eContainerFeatureID() != UML2RDBMSPackage.ASSOCIATION_TO_FOREIGN_KEY__OWNER) return null; return (ClassToTable)eInternalContainer(); @@ -180,6 +183,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(ClassToTable newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UML2RDBMSPackage.ASSOCIATION_TO_FOREIGN_KEY__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -201,6 +205,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -210,6 +215,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -222,6 +228,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public Association getAssociation() { if (association != null && association.eIsProxy()) { InternalEObject oldAssociation = (InternalEObject)association; @@ -248,6 +255,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setAssociation(Association newAssociation) { Association oldAssociation = association; association = newAssociation; @@ -260,6 +268,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public ForeignKey getForeignKey() { if (foreignKey != null && foreignKey.eIsProxy()) { InternalEObject oldForeignKey = (InternalEObject)foreignKey; @@ -286,6 +295,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setForeignKey(ForeignKey newForeignKey) { ForeignKey oldForeignKey = foreignKey; foreignKey = newForeignKey; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/AttributeToColumnImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/AttributeToColumnImpl.java index 9a26cd811..5f729ce8e 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/AttributeToColumnImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/AttributeToColumnImpl.java @@ -85,6 +85,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public Column getColumn() { if (column != null && column.eIsProxy()) { InternalEObject oldColumn = (InternalEObject)column; @@ -111,6 +112,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public void setColumn(Column newColumn) { Column oldColumn = column; column = newColumn; @@ -123,6 +125,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public PrimitiveToName getType() { if (type != null && type.eIsProxy()) { InternalEObject oldType = (InternalEObject)type; @@ -149,6 +152,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public void setType(PrimitiveToName newType) { PrimitiveToName oldType = type; type = newType; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/ClassToTableImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/ClassToTableImpl.java index c58e6baff..594a81024 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/ClassToTableImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/ClassToTableImpl.java @@ -152,6 +152,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public Column getColumn() { if (column != null && column.eIsProxy()) { InternalEObject oldColumn = (InternalEObject)column; @@ -178,6 +179,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setColumn(Column newColumn) { Column oldColumn = column; column = newColumn; @@ -190,6 +192,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public PackageToSchema getOwner() { if (eContainerFeatureID() != UML2RDBMSPackage.CLASS_TO_TABLE__OWNER) return null; return (PackageToSchema)eInternalContainer(); @@ -210,6 +213,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(PackageToSchema newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UML2RDBMSPackage.CLASS_TO_TABLE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -231,6 +235,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public EList<AssociationToForeignKey> getAssociationsToForeignKeys() { if (associationsToForeignKeys == null) { associationsToForeignKeys = new EObjectContainmentWithInverseEList<AssociationToForeignKey>(AssociationToForeignKey.class, this, UML2RDBMSPackage.CLASS_TO_TABLE__ASSOCIATIONS_TO_FOREIGN_KEYS, UML2RDBMSPackage.ASSOCIATION_TO_FOREIGN_KEY__OWNER); @@ -243,6 +248,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -252,6 +258,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -264,6 +271,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public manualuml2rdbms.uml.Class getUmlClass() { if (umlClass != null && umlClass.eIsProxy()) { InternalEObject oldUmlClass = (InternalEObject)umlClass; @@ -290,6 +298,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setUmlClass(manualuml2rdbms.uml.Class newUmlClass) { manualuml2rdbms.uml.Class oldUmlClass = umlClass; umlClass = newUmlClass; @@ -302,6 +311,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public Table getTable() { if (table != null && table.eIsProxy()) { InternalEObject oldTable = (InternalEObject)table; @@ -328,6 +338,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setTable(Table newTable) { Table oldTable = table; table = newTable; @@ -340,6 +351,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public Key getPrimaryKey() { if (primaryKey != null && primaryKey.eIsProxy()) { InternalEObject oldPrimaryKey = (InternalEObject)primaryKey; @@ -366,6 +378,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setPrimaryKey(Key newPrimaryKey) { Key oldPrimaryKey = primaryKey; primaryKey = newPrimaryKey; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/FromAttributeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/FromAttributeImpl.java index 656725d4b..37c49969d 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/FromAttributeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/FromAttributeImpl.java @@ -137,6 +137,7 @@ public abstract class FromAttributeImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -146,6 +147,7 @@ public abstract class FromAttributeImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -158,6 +160,7 @@ public abstract class FromAttributeImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -167,6 +170,7 @@ public abstract class FromAttributeImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; @@ -179,6 +183,7 @@ public abstract class FromAttributeImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public FromAttributeOwner getOwner() { if (eContainerFeatureID() != UML2RDBMSPackage.FROM_ATTRIBUTE__OWNER) return null; return (FromAttributeOwner)eInternalContainer(); @@ -199,6 +204,7 @@ public abstract class FromAttributeImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(FromAttributeOwner newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UML2RDBMSPackage.FROM_ATTRIBUTE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -220,6 +226,7 @@ public abstract class FromAttributeImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public EList<AttributeToColumn> getLeafs() { if (leafs == null) { leafs = new EObjectResolvingEList<AttributeToColumn>(AttributeToColumn.class, this, UML2RDBMSPackage.FROM_ATTRIBUTE__LEAFS); @@ -232,6 +239,7 @@ public abstract class FromAttributeImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public Attribute getAttribute() { if (attribute != null && attribute.eIsProxy()) { InternalEObject oldAttribute = (InternalEObject)attribute; @@ -258,6 +266,7 @@ public abstract class FromAttributeImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public void setAttribute(Attribute newAttribute) { Attribute oldAttribute = attribute; attribute = newAttribute; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/FromAttributeOwnerImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/FromAttributeOwnerImpl.java index 5d4ec924d..299d58acc 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/FromAttributeOwnerImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/FromAttributeOwnerImpl.java @@ -78,6 +78,7 @@ public abstract class FromAttributeOwnerImpl extends MinimalEObjectImpl.Containe * <!-- end-user-doc --> * @generated */ + @Override public EList<FromAttribute> getFromAttributes() { if (fromAttributes == null) { fromAttributes = new EObjectContainmentWithInverseEList<FromAttribute>(FromAttribute.class, this, UML2RDBMSPackage.FROM_ATTRIBUTE_OWNER__FROM_ATTRIBUTES, UML2RDBMSPackage.FROM_ATTRIBUTE__OWNER); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/NonLeafAttributeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/NonLeafAttributeImpl.java index f86d534ca..b379396cf 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/NonLeafAttributeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/NonLeafAttributeImpl.java @@ -137,6 +137,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -146,6 +147,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -158,6 +160,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -167,6 +170,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; @@ -179,6 +183,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public FromAttributeOwner getOwner() { if (eContainerFeatureID() != UML2RDBMSPackage.NON_LEAF_ATTRIBUTE__OWNER) return null; return (FromAttributeOwner)eInternalContainer(); @@ -199,6 +204,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(FromAttributeOwner newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UML2RDBMSPackage.NON_LEAF_ATTRIBUTE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -220,6 +226,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public EList<AttributeToColumn> getLeafs() { if (leafs == null) { leafs = new EObjectResolvingEList<AttributeToColumn>(AttributeToColumn.class, this, UML2RDBMSPackage.NON_LEAF_ATTRIBUTE__LEAFS); @@ -232,6 +239,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public Attribute getAttribute() { if (attribute != null && attribute.eIsProxy()) { InternalEObject oldAttribute = (InternalEObject)attribute; @@ -258,6 +266,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setAttribute(Attribute newAttribute) { Attribute oldAttribute = attribute; attribute = newAttribute; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/PackageToSchemaImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/PackageToSchemaImpl.java index 1f102a4a7..e64f7fd12 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/PackageToSchemaImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/PackageToSchemaImpl.java @@ -137,6 +137,7 @@ public class PackageToSchemaImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public EList<ClassToTable> getClassesToTables() { if (classesToTables == null) { classesToTables = new EObjectContainmentWithInverseEList<ClassToTable>(ClassToTable.class, this, UML2RDBMSPackage.PACKAGE_TO_SCHEMA__CLASSES_TO_TABLES, UML2RDBMSPackage.CLASS_TO_TABLE__OWNER); @@ -149,6 +150,7 @@ public class PackageToSchemaImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public EList<PrimitiveToName> getPrimitivesToNames() { if (primitivesToNames == null) { primitivesToNames = new EObjectContainmentWithInverseEList<PrimitiveToName>(PrimitiveToName.class, this, UML2RDBMSPackage.PACKAGE_TO_SCHEMA__PRIMITIVES_TO_NAMES, UML2RDBMSPackage.PRIMITIVE_TO_NAME__OWNER); @@ -161,6 +163,7 @@ public class PackageToSchemaImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -170,6 +173,7 @@ public class PackageToSchemaImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -182,6 +186,7 @@ public class PackageToSchemaImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public manualuml2rdbms.uml.Package getUmlPackage() { if (umlPackage != null && umlPackage.eIsProxy()) { InternalEObject oldUmlPackage = (InternalEObject)umlPackage; @@ -208,6 +213,7 @@ public class PackageToSchemaImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setUmlPackage(manualuml2rdbms.uml.Package newUmlPackage) { manualuml2rdbms.uml.Package oldUmlPackage = umlPackage; umlPackage = newUmlPackage; @@ -220,6 +226,7 @@ public class PackageToSchemaImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public Schema getSchema() { if (schema != null && schema.eIsProxy()) { InternalEObject oldSchema = (InternalEObject)schema; @@ -246,6 +253,7 @@ public class PackageToSchemaImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setSchema(Schema newSchema) { Schema oldSchema = schema; schema = newSchema; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/PrimitiveToNameImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/PrimitiveToNameImpl.java index c65a0b5e4..8f09b96e9 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/PrimitiveToNameImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/PrimitiveToNameImpl.java @@ -120,6 +120,7 @@ public class PrimitiveToNameImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public PackageToSchema getOwner() { if (eContainerFeatureID() != UML2RDBMSPackage.PRIMITIVE_TO_NAME__OWNER) return null; return (PackageToSchema)eInternalContainer(); @@ -140,6 +141,7 @@ public class PrimitiveToNameImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(PackageToSchema newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UML2RDBMSPackage.PRIMITIVE_TO_NAME__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -161,6 +163,7 @@ public class PrimitiveToNameImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -170,6 +173,7 @@ public class PrimitiveToNameImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -182,6 +186,7 @@ public class PrimitiveToNameImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public PrimitiveDataType getPrimitive() { if (primitive != null && primitive.eIsProxy()) { InternalEObject oldPrimitive = (InternalEObject)primitive; @@ -208,6 +213,7 @@ public class PrimitiveToNameImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setPrimitive(PrimitiveDataType newPrimitive) { PrimitiveDataType oldPrimitive = primitive; primitive = newPrimitive; @@ -220,6 +226,7 @@ public class PrimitiveToNameImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public String getTypeName() { return typeName; } @@ -229,6 +236,7 @@ public class PrimitiveToNameImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setTypeName(String newTypeName) { String oldTypeName = typeName; typeName = newTypeName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/ToColumnImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/ToColumnImpl.java index a2a20ec0c..4920a3ee9 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/ToColumnImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/ToColumnImpl.java @@ -73,6 +73,7 @@ public class ToColumnImpl extends MinimalEObjectImpl.Container implements ToColu * <!-- end-user-doc --> * @generated */ + @Override public Column getColumn() { if (column != null && column.eIsProxy()) { InternalEObject oldColumn = (InternalEObject)column; @@ -99,6 +100,7 @@ public class ToColumnImpl extends MinimalEObjectImpl.Container implements ToColu * <!-- end-user-doc --> * @generated */ + @Override public void setColumn(Column newColumn) { Column oldColumn = column; column = newColumn; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/UML2RDBMSFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/UML2RDBMSFactoryImpl.java index b63833e62..cf790b276 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/UML2RDBMSFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/UML2RDBMSFactoryImpl.java @@ -83,6 +83,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public AttributeToColumn createAttributeToColumn() { AttributeToColumnImpl attributeToColumn = new AttributeToColumnImpl(); return attributeToColumn; @@ -93,6 +94,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public AssociationToForeignKey createAssociationToForeignKey() { AssociationToForeignKeyImpl associationToForeignKey = new AssociationToForeignKeyImpl(); return associationToForeignKey; @@ -103,6 +105,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public ClassToTable createClassToTable() { ClassToTableImpl classToTable = new ClassToTableImpl(); return classToTable; @@ -113,6 +116,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public NonLeafAttribute createNonLeafAttribute() { NonLeafAttributeImpl nonLeafAttribute = new NonLeafAttributeImpl(); return nonLeafAttribute; @@ -123,6 +127,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public PackageToSchema createPackageToSchema() { PackageToSchemaImpl packageToSchema = new PackageToSchemaImpl(); return packageToSchema; @@ -133,6 +138,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public PrimitiveToName createPrimitiveToName() { PrimitiveToNameImpl primitiveToName = new PrimitiveToNameImpl(); return primitiveToName; @@ -143,6 +149,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public ToColumn createToColumn() { ToColumnImpl toColumn = new ToColumnImpl(); return toColumn; @@ -153,6 +160,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public UML2RDBMSPackage getUML2RDBMSPackage() { return (UML2RDBMSPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java index ffccf8c5e..38a896f40 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/manualuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java @@ -184,6 +184,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getAttributeToColumn() { return attributeToColumnEClass; } @@ -193,6 +194,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAttributeToColumn_Type() { return (EReference)attributeToColumnEClass.getEStructuralFeatures().get(0); } @@ -202,6 +204,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getAssociationToForeignKey() { return associationToForeignKeyEClass; } @@ -211,6 +214,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_Referenced() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(0); } @@ -220,6 +224,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_Owner() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(1); } @@ -229,6 +234,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getAssociationToForeignKey_Name() { return (EAttribute)associationToForeignKeyEClass.getEStructuralFeatures().get(2); } @@ -238,6 +244,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_Association() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(3); } @@ -247,6 +254,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_ForeignKey() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(4); } @@ -256,6 +264,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getClassToTable() { return classToTableEClass; } @@ -265,6 +274,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_Owner() { return (EReference)classToTableEClass.getEStructuralFeatures().get(0); } @@ -274,6 +284,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_AssociationsToForeignKeys() { return (EReference)classToTableEClass.getEStructuralFeatures().get(1); } @@ -283,6 +294,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getClassToTable_Name() { return (EAttribute)classToTableEClass.getEStructuralFeatures().get(2); } @@ -292,6 +304,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_UmlClass() { return (EReference)classToTableEClass.getEStructuralFeatures().get(3); } @@ -301,6 +314,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_Table() { return (EReference)classToTableEClass.getEStructuralFeatures().get(4); } @@ -310,6 +324,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_PrimaryKey() { return (EReference)classToTableEClass.getEStructuralFeatures().get(5); } @@ -319,6 +334,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getFromAttribute() { return fromAttributeEClass; } @@ -328,6 +344,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getFromAttribute_Name() { return (EAttribute)fromAttributeEClass.getEStructuralFeatures().get(0); } @@ -337,6 +354,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getFromAttribute_Kind() { return (EAttribute)fromAttributeEClass.getEStructuralFeatures().get(1); } @@ -346,6 +364,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttribute_Owner() { return (EReference)fromAttributeEClass.getEStructuralFeatures().get(2); } @@ -355,6 +374,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttribute_Leafs() { return (EReference)fromAttributeEClass.getEStructuralFeatures().get(3); } @@ -364,6 +384,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttribute_Attribute() { return (EReference)fromAttributeEClass.getEStructuralFeatures().get(4); } @@ -373,6 +394,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getFromAttributeOwner() { return fromAttributeOwnerEClass; } @@ -382,6 +404,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttributeOwner_FromAttributes() { return (EReference)fromAttributeOwnerEClass.getEStructuralFeatures().get(0); } @@ -391,6 +414,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getNonLeafAttribute() { return nonLeafAttributeEClass; } @@ -400,6 +424,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackageToSchema() { return packageToSchemaEClass; } @@ -409,6 +434,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_ClassesToTables() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(0); } @@ -418,6 +444,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_PrimitivesToNames() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(1); } @@ -427,6 +454,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getPackageToSchema_Name() { return (EAttribute)packageToSchemaEClass.getEStructuralFeatures().get(2); } @@ -436,6 +464,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_UmlPackage() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(3); } @@ -445,6 +474,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_Schema() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(4); } @@ -454,6 +484,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPrimitiveToName() { return primitiveToNameEClass; } @@ -463,6 +494,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPrimitiveToName_Owner() { return (EReference)primitiveToNameEClass.getEStructuralFeatures().get(0); } @@ -472,6 +504,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getPrimitiveToName_Name() { return (EAttribute)primitiveToNameEClass.getEStructuralFeatures().get(1); } @@ -481,6 +514,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPrimitiveToName_Primitive() { return (EReference)primitiveToNameEClass.getEStructuralFeatures().get(2); } @@ -490,6 +524,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getPrimitiveToName_TypeName() { return (EAttribute)primitiveToNameEClass.getEStructuralFeatures().get(3); } @@ -499,6 +534,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getToColumn() { return toColumnEClass; } @@ -508,6 +544,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getToColumn_Column() { return (EReference)toColumnEClass.getEStructuralFeatures().get(0); } @@ -517,6 +554,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public UML2RDBMSFactory getUML2RDBMSFactory() { return (UML2RDBMSFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/ColumnImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/ColumnImpl.java index f19fe97b4..434915c8c 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/ColumnImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/ColumnImpl.java @@ -115,6 +115,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public String getType() { return type; } @@ -124,6 +125,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public void setType(String newType) { String oldType = type; type = newType; @@ -136,6 +138,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public Table getOwner() { if (eContainerFeatureID() != RDBMSPackage.COLUMN__OWNER) return null; return (Table)eInternalContainer(); @@ -156,6 +159,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(Table newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != RDBMSPackage.COLUMN__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -177,6 +181,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public EList<ForeignKey> getForeignKeys() { if (foreignKeys == null) { foreignKeys = new EObjectWithInverseResolvingEList.ManyInverse<ForeignKey>(ForeignKey.class, this, RDBMSPackage.COLUMN__FOREIGN_KEYS, RDBMSPackage.FOREIGN_KEY__COLUMNS); @@ -189,6 +194,7 @@ public class ColumnImpl extends RModelElementImpl implements Column { * <!-- end-user-doc --> * @generated */ + @Override public EList<Key> getKeys() { if (keys == null) { keys = new EObjectWithInverseResolvingEList.ManyInverse<Key>(Key.class, this, RDBMSPackage.COLUMN__KEYS, RDBMSPackage.KEY__COLUMN); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/ForeignKeyImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/ForeignKeyImpl.java index ee71c7085..7caff0844 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/ForeignKeyImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/ForeignKeyImpl.java @@ -94,6 +94,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public Key getRefersTo() { if (refersTo != null && refersTo.eIsProxy()) { InternalEObject oldRefersTo = (InternalEObject)refersTo; @@ -120,6 +121,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public void setRefersTo(Key newRefersTo) { Key oldRefersTo = refersTo; refersTo = newRefersTo; @@ -132,6 +134,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public EList<Column> getColumns() { if (columns == null) { columns = new EObjectWithInverseResolvingEList.ManyInverse<Column>(Column.class, this, RDBMSPackage.FOREIGN_KEY__COLUMNS, RDBMSPackage.COLUMN__FOREIGN_KEYS); @@ -144,6 +147,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public Table getOwner() { if (eContainerFeatureID() != RDBMSPackage.FOREIGN_KEY__OWNER) return null; return (Table)eInternalContainer(); @@ -164,6 +168,7 @@ public class ForeignKeyImpl extends RModelElementImpl implements ForeignKey { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(Table newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != RDBMSPackage.FOREIGN_KEY__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/KeyImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/KeyImpl.java index 3aa9666ef..7cc4fdb29 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/KeyImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/KeyImpl.java @@ -82,6 +82,7 @@ public class KeyImpl extends RModelElementImpl implements Key { * <!-- end-user-doc --> * @generated */ + @Override public Table getOwner() { if (eContainerFeatureID() != RDBMSPackage.KEY__OWNER) return null; return (Table)eInternalContainer(); @@ -102,6 +103,7 @@ public class KeyImpl extends RModelElementImpl implements Key { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(Table newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != RDBMSPackage.KEY__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -123,6 +125,7 @@ public class KeyImpl extends RModelElementImpl implements Key { * <!-- end-user-doc --> * @generated */ + @Override public EList<Column> getColumn() { if (column == null) { column = new EObjectWithInverseResolvingEList.ManyInverse<Column>(Column.class, this, RDBMSPackage.KEY__COLUMN, RDBMSPackage.COLUMN__KEYS); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RDBMSFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RDBMSFactoryImpl.java index 26f78ee8a..c80fcb87d 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RDBMSFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RDBMSFactoryImpl.java @@ -112,6 +112,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public Column createColumn() { ColumnImpl column = new ColumnImpl(); return column; @@ -122,6 +123,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public ForeignKey createForeignKey() { ForeignKeyImpl foreignKey = new ForeignKeyImpl(); return foreignKey; @@ -132,6 +134,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public Key createKey() { KeyImpl key = new KeyImpl(); return key; @@ -142,6 +145,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public Schema createSchema() { SchemaImpl schema = new SchemaImpl(); return schema; @@ -152,6 +156,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public Table createTable() { TableImpl table = new TableImpl(); return table; @@ -180,6 +185,7 @@ public class RDBMSFactoryImpl extends EFactoryImpl implements RDBMSFactory { * <!-- end-user-doc --> * @generated */ + @Override public RDBMSPackage getRDBMSPackage() { return (RDBMSPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RDBMSPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RDBMSPackageImpl.java index f5c7b6b44..739e68408 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RDBMSPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RDBMSPackageImpl.java @@ -168,6 +168,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getColumn() { return columnEClass; } @@ -177,6 +178,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getColumn_Type() { return (EAttribute)columnEClass.getEStructuralFeatures().get(0); } @@ -186,6 +188,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getColumn_Owner() { return (EReference)columnEClass.getEStructuralFeatures().get(1); } @@ -195,6 +198,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getColumn_ForeignKeys() { return (EReference)columnEClass.getEStructuralFeatures().get(2); } @@ -204,6 +208,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getColumn_Keys() { return (EReference)columnEClass.getEStructuralFeatures().get(3); } @@ -213,6 +218,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getForeignKey() { return foreignKeyEClass; } @@ -222,6 +228,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getForeignKey_RefersTo() { return (EReference)foreignKeyEClass.getEStructuralFeatures().get(0); } @@ -231,6 +238,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getForeignKey_Columns() { return (EReference)foreignKeyEClass.getEStructuralFeatures().get(1); } @@ -240,6 +248,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getForeignKey_Owner() { return (EReference)foreignKeyEClass.getEStructuralFeatures().get(2); } @@ -249,6 +258,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getKey() { return keyEClass; } @@ -258,6 +268,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getKey_Owner() { return (EReference)keyEClass.getEStructuralFeatures().get(0); } @@ -267,6 +278,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getKey_Column() { return (EReference)keyEClass.getEStructuralFeatures().get(1); } @@ -276,6 +288,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getRModelElement() { return rModelElementEClass; } @@ -285,6 +298,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getRModelElement_Name() { return (EAttribute)rModelElementEClass.getEStructuralFeatures().get(0); } @@ -294,6 +308,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getRModelElement_Kind() { return (EAttribute)rModelElementEClass.getEStructuralFeatures().get(1); } @@ -303,6 +318,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getSchema() { return schemaEClass; } @@ -312,6 +328,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getSchema_Tables() { return (EReference)schemaEClass.getEStructuralFeatures().get(0); } @@ -321,6 +338,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getTable() { return tableEClass; } @@ -330,6 +348,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_Columns() { return (EReference)tableEClass.getEStructuralFeatures().get(0); } @@ -339,6 +358,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_Schema() { return (EReference)tableEClass.getEStructuralFeatures().get(1); } @@ -348,6 +368,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_Keys() { return (EReference)tableEClass.getEStructuralFeatures().get(2); } @@ -357,6 +378,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getTable_ForeignKeys() { return (EReference)tableEClass.getEStructuralFeatures().get(3); } @@ -366,6 +388,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EDataType getString() { return stringEDataType; } @@ -375,6 +398,7 @@ public class RDBMSPackageImpl extends EPackageImpl implements RDBMSPackage { * <!-- end-user-doc --> * @generated */ + @Override public RDBMSFactory getRDBMSFactory() { return (RDBMSFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RModelElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RModelElementImpl.java index c3a1a49c5..9eb3482a6 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RModelElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/RModelElementImpl.java @@ -101,6 +101,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -110,6 +111,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -122,6 +124,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -131,6 +134,7 @@ public abstract class RModelElementImpl extends MinimalEObjectImpl.Container imp * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/SchemaImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/SchemaImpl.java index f22aaba77..fbb64774e 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/SchemaImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/SchemaImpl.java @@ -76,6 +76,7 @@ public class SchemaImpl extends RModelElementImpl implements Schema { * <!-- end-user-doc --> * @generated */ + @Override public EList<Table> getTables() { if (tables == null) { tables = new EObjectContainmentWithInverseEList<Table>(Table.class, this, RDBMSPackage.SCHEMA__TABLES, RDBMSPackage.TABLE__SCHEMA); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/TableImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/TableImpl.java index d86a00b06..e71a74d8b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/TableImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/rdbms/impl/TableImpl.java @@ -106,6 +106,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public EList<Column> getColumns() { if (columns == null) { columns = new EObjectContainmentWithInverseEList<Column>(Column.class, this, RDBMSPackage.TABLE__COLUMNS, RDBMSPackage.COLUMN__OWNER); @@ -118,6 +119,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public Schema getSchema() { if (eContainerFeatureID() != RDBMSPackage.TABLE__SCHEMA) return null; return (Schema)eInternalContainer(); @@ -138,6 +140,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public void setSchema(Schema newSchema) { if (newSchema != eInternalContainer() || (eContainerFeatureID() != RDBMSPackage.TABLE__SCHEMA && newSchema != null)) { if (EcoreUtil.isAncestor(this, newSchema)) @@ -159,6 +162,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public EList<Key> getKeys() { if (keys == null) { keys = new EObjectContainmentWithInverseEList<Key>(Key.class, this, RDBMSPackage.TABLE__KEYS, RDBMSPackage.KEY__OWNER); @@ -171,6 +175,7 @@ public class TableImpl extends RModelElementImpl implements Table { * <!-- end-user-doc --> * @generated */ + @Override public EList<ForeignKey> getForeignKeys() { if (foreignKeys == null) { foreignKeys = new EObjectContainmentWithInverseEList<ForeignKey>(ForeignKey.class, this, RDBMSPackage.TABLE__FOREIGN_KEYS, RDBMSPackage.FOREIGN_KEY__OWNER); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/AssociationImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/AssociationImpl.java index 30a50ac67..0f62196e6 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/AssociationImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/AssociationImpl.java @@ -82,6 +82,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public simpleuml2rdbms.uml.Class getDestination() { if (destination != null && destination.eIsProxy()) { InternalEObject oldDestination = (InternalEObject)destination; @@ -123,6 +124,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public void setDestination(simpleuml2rdbms.uml.Class newDestination) { if (newDestination != destination) { NotificationChain msgs = null; @@ -142,6 +144,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public simpleuml2rdbms.uml.Class getSource() { if (source != null && source.eIsProxy()) { InternalEObject oldSource = (InternalEObject)source; @@ -183,6 +186,7 @@ public class AssociationImpl extends PackageElementImpl implements Association { * <!-- end-user-doc --> * @generated */ + @Override public void setSource(simpleuml2rdbms.uml.Class newSource) { if (newSource != source) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/AttributeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/AttributeImpl.java index 3a9a89fd7..45756455b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/AttributeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/AttributeImpl.java @@ -75,6 +75,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public simpleuml2rdbms.uml.Class getOwner() { if (eContainerFeatureID() != UMLPackage.ATTRIBUTE__OWNER) return null; return (simpleuml2rdbms.uml.Class)eInternalContainer(); @@ -95,6 +96,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(simpleuml2rdbms.uml.Class newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UMLPackage.ATTRIBUTE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -116,6 +118,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public Classifier getType() { if (type != null && type.eIsProxy()) { InternalEObject oldType = (InternalEObject)type; @@ -157,6 +160,7 @@ public class AttributeImpl extends UMLModelElementImpl implements Attribute { * <!-- end-user-doc --> * @generated */ + @Override public void setType(Classifier newType) { if (newType != type) { NotificationChain msgs = null; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/ClassImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/ClassImpl.java index 5295d1427..33ae06cad 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/ClassImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/ClassImpl.java @@ -121,6 +121,7 @@ public class ClassImpl extends ClassifierImpl implements simpleuml2rdbms.uml.Cla * <!-- end-user-doc --> * @generated */ + @Override public EList<Attribute> getAttributes() { if (attributes == null) { attributes = new EObjectContainmentWithInverseEList<Attribute>(Attribute.class, this, UMLPackage.CLASS__ATTRIBUTES, UMLPackage.ATTRIBUTE__OWNER); @@ -133,6 +134,7 @@ public class ClassImpl extends ClassifierImpl implements simpleuml2rdbms.uml.Cla * <!-- end-user-doc --> * @generated */ + @Override public EList<Association> getForward() { if (forward == null) { forward = new EObjectWithInverseResolvingEList<Association>(Association.class, this, UMLPackage.CLASS__FORWARD, UMLPackage.ASSOCIATION__SOURCE); @@ -145,6 +147,7 @@ public class ClassImpl extends ClassifierImpl implements simpleuml2rdbms.uml.Cla * <!-- end-user-doc --> * @generated */ + @Override public EList<simpleuml2rdbms.uml.Class> getGeneral() { if (general == null) { general = new EObjectWithInverseResolvingEList.ManyInverse<simpleuml2rdbms.uml.Class>(simpleuml2rdbms.uml.Class.class, this, UMLPackage.CLASS__GENERAL, UMLPackage.CLASS__GENERAL_OPPOSITE); @@ -157,6 +160,7 @@ public class ClassImpl extends ClassifierImpl implements simpleuml2rdbms.uml.Cla * <!-- end-user-doc --> * @generated */ + @Override public EList<simpleuml2rdbms.uml.Class> getGeneralOpposite() { if (generalOpposite == null) { generalOpposite = new EObjectWithInverseResolvingEList.ManyInverse<simpleuml2rdbms.uml.Class>(simpleuml2rdbms.uml.Class.class, this, UMLPackage.CLASS__GENERAL_OPPOSITE, UMLPackage.CLASS__GENERAL); @@ -169,6 +173,7 @@ public class ClassImpl extends ClassifierImpl implements simpleuml2rdbms.uml.Cla * <!-- end-user-doc --> * @generated */ + @Override public EList<Association> getReverse() { if (reverse == null) { reverse = new EObjectWithInverseResolvingEList<Association>(Association.class, this, UMLPackage.CLASS__REVERSE, UMLPackage.ASSOCIATION__DESTINATION); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/ClassifierImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/ClassifierImpl.java index 45c9a0eae..51782d0fa 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/ClassifierImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/ClassifierImpl.java @@ -76,6 +76,7 @@ public abstract class ClassifierImpl extends PackageElementImpl implements Class * <!-- end-user-doc --> * @generated */ + @Override public EList<Attribute> getTypeOpposite() { if (typeOpposite == null) { typeOpposite = new EObjectWithInverseResolvingEList<Attribute>(Attribute.class, this, UMLPackage.CLASSIFIER__TYPE_OPPOSITE, UMLPackage.ATTRIBUTE__TYPE); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/PackageElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/PackageElementImpl.java index 25e514ca5..bce254e00 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/PackageElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/PackageElementImpl.java @@ -63,6 +63,7 @@ public abstract class PackageElementImpl extends UMLModelElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public simpleuml2rdbms.uml.Package getNamespace() { if (eContainerFeatureID() != UMLPackage.PACKAGE_ELEMENT__NAMESPACE) return null; return (simpleuml2rdbms.uml.Package)eInternalContainer(); @@ -83,6 +84,7 @@ public abstract class PackageElementImpl extends UMLModelElementImpl implements * <!-- end-user-doc --> * @generated */ + @Override public void setNamespace(simpleuml2rdbms.uml.Package newNamespace) { if (newNamespace != eInternalContainer() || (eContainerFeatureID() != UMLPackage.PACKAGE_ELEMENT__NAMESPACE && newNamespace != null)) { if (EcoreUtil.isAncestor(this, newNamespace)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/PackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/PackageImpl.java index d0e2e63f1..787b79389 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/PackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/PackageImpl.java @@ -75,6 +75,7 @@ public class PackageImpl extends UMLModelElementImpl implements simpleuml2rdbms. * <!-- end-user-doc --> * @generated */ + @Override public EList<PackageElement> getElements() { if (elements == null) { elements = new EObjectContainmentWithInverseEList<PackageElement>(PackageElement.class, this, UMLPackage.PACKAGE__ELEMENTS, UMLPackage.PACKAGE_ELEMENT__NAMESPACE); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLFactoryImpl.java index 1be63464c..c9f9bb65b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLFactoryImpl.java @@ -85,6 +85,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public Attribute createAttribute() { AttributeImpl attribute = new AttributeImpl(); return attribute; @@ -95,6 +96,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public Association createAssociation() { AssociationImpl association = new AssociationImpl(); return association; @@ -105,6 +107,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public simpleuml2rdbms.uml.Class createClass() { ClassImpl class_ = new ClassImpl(); return class_; @@ -115,6 +118,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public simpleuml2rdbms.uml.Package createPackage() { PackageImpl package_ = new PackageImpl(); return package_; @@ -125,6 +129,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public PrimitiveDataType createPrimitiveDataType() { PrimitiveDataTypeImpl primitiveDataType = new PrimitiveDataTypeImpl(); return primitiveDataType; @@ -135,6 +140,7 @@ public class UMLFactoryImpl extends EFactoryImpl implements UMLFactory { * <!-- end-user-doc --> * @generated */ + @Override public UMLPackage getUMLPackage() { return (UMLPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLModelElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLModelElementImpl.java index fee674d0c..a13460869 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLModelElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLModelElementImpl.java @@ -101,6 +101,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -110,6 +111,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; @@ -122,6 +124,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -131,6 +134,7 @@ public abstract class UMLModelElementImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLPackageImpl.java index 246ae7cea..33d01470b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml/impl/UMLPackageImpl.java @@ -174,6 +174,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getAttribute() { return attributeEClass; } @@ -183,6 +184,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getAttribute_Owner() { return (EReference)attributeEClass.getEStructuralFeatures().get(0); } @@ -192,6 +194,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getAttribute_Type() { return (EReference)attributeEClass.getEStructuralFeatures().get(1); } @@ -201,6 +204,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getAssociation() { return associationEClass; } @@ -210,6 +214,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociation_Destination() { return (EReference)associationEClass.getEStructuralFeatures().get(0); } @@ -219,6 +224,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociation_Source() { return (EReference)associationEClass.getEStructuralFeatures().get(1); } @@ -228,6 +234,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getClass_() { return classEClass; } @@ -237,6 +244,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_Attributes() { return (EReference)classEClass.getEStructuralFeatures().get(0); } @@ -246,6 +254,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_Forward() { return (EReference)classEClass.getEStructuralFeatures().get(1); } @@ -255,6 +264,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_General() { return (EReference)classEClass.getEStructuralFeatures().get(2); } @@ -264,6 +274,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_GeneralOpposite() { return (EReference)classEClass.getEStructuralFeatures().get(3); } @@ -273,6 +284,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClass_Reverse() { return (EReference)classEClass.getEStructuralFeatures().get(4); } @@ -282,6 +294,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getClassifier() { return classifierEClass; } @@ -291,6 +304,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassifier_TypeOpposite() { return (EReference)classifierEClass.getEStructuralFeatures().get(0); } @@ -300,6 +314,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackage() { return packageEClass; } @@ -309,6 +324,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackage_Elements() { return (EReference)packageEClass.getEStructuralFeatures().get(0); } @@ -318,6 +334,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackageElement() { return packageElementEClass; } @@ -327,6 +344,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageElement_Namespace() { return (EReference)packageElementEClass.getEStructuralFeatures().get(0); } @@ -336,6 +354,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getPrimitiveDataType() { return primitiveDataTypeEClass; } @@ -345,6 +364,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getUMLModelElement() { return umlModelElementEClass; } @@ -354,6 +374,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getUMLModelElement_Kind() { return (EAttribute)umlModelElementEClass.getEStructuralFeatures().get(0); } @@ -363,6 +384,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getUMLModelElement_Name() { return (EAttribute)umlModelElementEClass.getEStructuralFeatures().get(1); } @@ -372,6 +394,7 @@ public class UMLPackageImpl extends EPackageImpl implements UMLPackage { * <!-- end-user-doc --> * @generated */ + @Override public UMLFactory getUMLFactory() { return (UMLFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/AssociationToForeignKeyImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/AssociationToForeignKeyImpl.java index 285d231a5..4f2ae4598 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/AssociationToForeignKeyImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/AssociationToForeignKeyImpl.java @@ -123,6 +123,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -132,6 +133,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -144,6 +146,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public Association getAssociation() { if (association != null && association.eIsProxy()) { InternalEObject oldAssociation = (InternalEObject)association; @@ -170,6 +173,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setAssociation(Association newAssociation) { Association oldAssociation = association; association = newAssociation; @@ -182,6 +186,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public ForeignKey getForeignKey() { if (foreignKey != null && foreignKey.eIsProxy()) { InternalEObject oldForeignKey = (InternalEObject)foreignKey; @@ -208,6 +213,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setForeignKey(ForeignKey newForeignKey) { ForeignKey oldForeignKey = foreignKey; foreignKey = newForeignKey; @@ -220,6 +226,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public ClassToTable getOwner() { if (eContainerFeatureID() != UML2RDBMSPackage.ASSOCIATION_TO_FOREIGN_KEY__OWNER) return null; return (ClassToTable)eInternalContainer(); @@ -240,6 +247,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(ClassToTable newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UML2RDBMSPackage.ASSOCIATION_TO_FOREIGN_KEY__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -261,6 +269,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public ClassToTable getReferenced() { if (referenced != null && referenced.eIsProxy()) { InternalEObject oldReferenced = (InternalEObject)referenced; @@ -287,6 +296,7 @@ public class AssociationToForeignKeyImpl extends ToColumnImpl implements Associa * <!-- end-user-doc --> * @generated */ + @Override public void setReferenced(ClassToTable newReferenced) { ClassToTable oldReferenced = referenced; referenced = newReferenced; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/AttributeToColumnImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/AttributeToColumnImpl.java index d1dd97250..832fe3e58 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/AttributeToColumnImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/AttributeToColumnImpl.java @@ -85,6 +85,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public Column getColumn() { if (column != null && column.eIsProxy()) { InternalEObject oldColumn = (InternalEObject)column; @@ -111,6 +112,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public void setColumn(Column newColumn) { Column oldColumn = column; column = newColumn; @@ -123,6 +125,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public PrimitiveToName getType() { if (type != null && type.eIsProxy()) { InternalEObject oldType = (InternalEObject)type; @@ -149,6 +152,7 @@ public class AttributeToColumnImpl extends FromAttributeImpl implements Attribut * <!-- end-user-doc --> * @generated */ + @Override public void setType(PrimitiveToName newType) { PrimitiveToName oldType = type; type = newType; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/ClassToTableImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/ClassToTableImpl.java index db2fd2ab8..09952fe31 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/ClassToTableImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/ClassToTableImpl.java @@ -153,6 +153,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public Column getColumn() { if (column != null && column.eIsProxy()) { InternalEObject oldColumn = (InternalEObject)column; @@ -179,6 +180,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setColumn(Column newColumn) { Column oldColumn = column; column = newColumn; @@ -191,6 +193,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -200,6 +203,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -212,6 +216,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public EList<AssociationToForeignKey> getAssociationsToForeignKeys() { if (associationsToForeignKeys == null) { associationsToForeignKeys = new EObjectContainmentWithInverseEList<AssociationToForeignKey>(AssociationToForeignKey.class, this, UML2RDBMSPackage.CLASS_TO_TABLE__ASSOCIATIONS_TO_FOREIGN_KEYS, UML2RDBMSPackage.ASSOCIATION_TO_FOREIGN_KEY__OWNER); @@ -224,6 +229,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public PackageToSchema getOwner() { if (eContainerFeatureID() != UML2RDBMSPackage.CLASS_TO_TABLE__OWNER) return null; return (PackageToSchema)eInternalContainer(); @@ -244,6 +250,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(PackageToSchema newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UML2RDBMSPackage.CLASS_TO_TABLE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -265,6 +272,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public Key getPrimaryKey() { if (primaryKey != null && primaryKey.eIsProxy()) { InternalEObject oldPrimaryKey = (InternalEObject)primaryKey; @@ -291,6 +299,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setPrimaryKey(Key newPrimaryKey) { Key oldPrimaryKey = primaryKey; primaryKey = newPrimaryKey; @@ -303,6 +312,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public Table getTable() { if (table != null && table.eIsProxy()) { InternalEObject oldTable = (InternalEObject)table; @@ -329,6 +339,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setTable(Table newTable) { Table oldTable = table; table = newTable; @@ -341,6 +352,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public simpleuml2rdbms.uml.Class getUmlClass() { if (umlClass != null && umlClass.eIsProxy()) { InternalEObject oldUmlClass = (InternalEObject)umlClass; @@ -367,6 +379,7 @@ public class ClassToTableImpl extends FromAttributeOwnerImpl implements ClassToT * <!-- end-user-doc --> * @generated */ + @Override public void setUmlClass(simpleuml2rdbms.uml.Class newUmlClass) { simpleuml2rdbms.uml.Class oldUmlClass = umlClass; umlClass = newUmlClass; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/FromAttributeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/FromAttributeImpl.java index a9838a522..d9282cf48 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/FromAttributeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/FromAttributeImpl.java @@ -115,6 +115,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -124,6 +125,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; @@ -136,6 +138,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public Attribute getAttribute() { if (attribute != null && attribute.eIsProxy()) { InternalEObject oldAttribute = (InternalEObject)attribute; @@ -162,6 +165,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public void setAttribute(Attribute newAttribute) { Attribute oldAttribute = attribute; attribute = newAttribute; @@ -174,6 +178,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public EList<AttributeToColumn> getLeafs() { if (leafs == null) { leafs = new EObjectResolvingEList<AttributeToColumn>(AttributeToColumn.class, this, UML2RDBMSPackage.FROM_ATTRIBUTE__LEAFS); @@ -186,6 +191,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public FromAttributeOwner getOwner() { if (eContainerFeatureID() != UML2RDBMSPackage.FROM_ATTRIBUTE__OWNER) return null; return (FromAttributeOwner)eInternalContainer(); @@ -206,6 +212,7 @@ public abstract class FromAttributeImpl extends UmlToRdbmsModelElementImpl imple * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(FromAttributeOwner newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UML2RDBMSPackage.FROM_ATTRIBUTE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/FromAttributeOwnerImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/FromAttributeOwnerImpl.java index 7801c896a..8152ab79e 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/FromAttributeOwnerImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/FromAttributeOwnerImpl.java @@ -78,6 +78,7 @@ public abstract class FromAttributeOwnerImpl extends MinimalEObjectImpl.Containe * <!-- end-user-doc --> * @generated */ + @Override public EList<FromAttribute> getFromAttributes() { if (fromAttributes == null) { fromAttributes = new EObjectContainmentWithInverseEList<FromAttribute>(FromAttribute.class, this, UML2RDBMSPackage.FROM_ATTRIBUTE_OWNER__FROM_ATTRIBUTES, UML2RDBMSPackage.FROM_ATTRIBUTE__OWNER); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/NonLeafAttributeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/NonLeafAttributeImpl.java index e0b40d847..c9b3e9d2e 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/NonLeafAttributeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/NonLeafAttributeImpl.java @@ -138,6 +138,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -147,6 +148,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -159,6 +161,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public String getKind() { return kind; } @@ -168,6 +171,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setKind(String newKind) { String oldKind = kind; kind = newKind; @@ -180,6 +184,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public Attribute getAttribute() { if (attribute != null && attribute.eIsProxy()) { InternalEObject oldAttribute = (InternalEObject)attribute; @@ -206,6 +211,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setAttribute(Attribute newAttribute) { Attribute oldAttribute = attribute; attribute = newAttribute; @@ -218,6 +224,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public EList<AttributeToColumn> getLeafs() { if (leafs == null) { leafs = new EObjectResolvingEList<AttributeToColumn>(AttributeToColumn.class, this, UML2RDBMSPackage.NON_LEAF_ATTRIBUTE__LEAFS); @@ -230,6 +237,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public FromAttributeOwner getOwner() { if (eContainerFeatureID() != UML2RDBMSPackage.NON_LEAF_ATTRIBUTE__OWNER) return null; return (FromAttributeOwner)eInternalContainer(); @@ -250,6 +258,7 @@ public class NonLeafAttributeImpl extends FromAttributeOwnerImpl implements NonL * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(FromAttributeOwner newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UML2RDBMSPackage.NON_LEAF_ATTRIBUTE__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/PackageToSchemaImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/PackageToSchemaImpl.java index 6295c7bae..dd5f35d69 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/PackageToSchemaImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/PackageToSchemaImpl.java @@ -115,6 +115,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public EList<ClassToTable> getClassesToTables() { if (classesToTables == null) { classesToTables = new EObjectContainmentWithInverseEList<ClassToTable>(ClassToTable.class, this, UML2RDBMSPackage.PACKAGE_TO_SCHEMA__CLASSES_TO_TABLES, UML2RDBMSPackage.CLASS_TO_TABLE__OWNER); @@ -127,6 +128,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public EList<PrimitiveToName> getPrimitivesToNames() { if (primitivesToNames == null) { primitivesToNames = new EObjectContainmentWithInverseEList<PrimitiveToName>(PrimitiveToName.class, this, UML2RDBMSPackage.PACKAGE_TO_SCHEMA__PRIMITIVES_TO_NAMES, UML2RDBMSPackage.PRIMITIVE_TO_NAME__OWNER); @@ -139,6 +141,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public Schema getSchema() { if (schema != null && schema.eIsProxy()) { InternalEObject oldSchema = (InternalEObject)schema; @@ -165,6 +168,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public void setSchema(Schema newSchema) { Schema oldSchema = schema; schema = newSchema; @@ -177,6 +181,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public simpleuml2rdbms.uml.Package getUmlPackage() { if (umlPackage != null && umlPackage.eIsProxy()) { InternalEObject oldUmlPackage = (InternalEObject)umlPackage; @@ -203,6 +208,7 @@ public class PackageToSchemaImpl extends UmlToRdbmsModelElementImpl implements P * <!-- end-user-doc --> * @generated */ + @Override public void setUmlPackage(simpleuml2rdbms.uml.Package newUmlPackage) { simpleuml2rdbms.uml.Package oldUmlPackage = umlPackage; umlPackage = newUmlPackage; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/PrimitiveToNameImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/PrimitiveToNameImpl.java index d5f98efb0..a297da67d 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/PrimitiveToNameImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/PrimitiveToNameImpl.java @@ -98,6 +98,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public String getTypeName() { return typeName; } @@ -107,6 +108,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public void setTypeName(String newTypeName) { String oldTypeName = typeName; typeName = newTypeName; @@ -119,6 +121,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public PackageToSchema getOwner() { if (eContainerFeatureID() != UML2RDBMSPackage.PRIMITIVE_TO_NAME__OWNER) return null; return (PackageToSchema)eInternalContainer(); @@ -139,6 +142,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public void setOwner(PackageToSchema newOwner) { if (newOwner != eInternalContainer() || (eContainerFeatureID() != UML2RDBMSPackage.PRIMITIVE_TO_NAME__OWNER && newOwner != null)) { if (EcoreUtil.isAncestor(this, newOwner)) @@ -160,6 +164,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public PrimitiveDataType getPrimitive() { if (primitive != null && primitive.eIsProxy()) { InternalEObject oldPrimitive = (InternalEObject)primitive; @@ -186,6 +191,7 @@ public abstract class PrimitiveToNameImpl extends UmlToRdbmsModelElementImpl imp * <!-- end-user-doc --> * @generated */ + @Override public void setPrimitive(PrimitiveDataType newPrimitive) { PrimitiveDataType oldPrimitive = primitive; primitive = newPrimitive; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/ToColumnImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/ToColumnImpl.java index 9f5c23df0..e2f2cf4cc 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/ToColumnImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/ToColumnImpl.java @@ -73,6 +73,7 @@ public abstract class ToColumnImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public Column getColumn() { if (column != null && column.eIsProxy()) { InternalEObject oldColumn = (InternalEObject)column; @@ -99,6 +100,7 @@ public abstract class ToColumnImpl extends MinimalEObjectImpl.Container implemen * <!-- end-user-doc --> * @generated */ + @Override public void setColumn(Column newColumn) { Column oldColumn = column; column = newColumn; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSFactoryImpl.java index 25acfc2b4..be2d7a804 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSFactoryImpl.java @@ -84,6 +84,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public AttributeToColumn createAttributeToColumn() { AttributeToColumnImpl attributeToColumn = new AttributeToColumnImpl(); return attributeToColumn; @@ -94,6 +95,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public AssociationToForeignKey createAssociationToForeignKey() { AssociationToForeignKeyImpl associationToForeignKey = new AssociationToForeignKeyImpl(); return associationToForeignKey; @@ -104,6 +106,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public BooleanToBoolean createBooleanToBoolean() { BooleanToBooleanImpl booleanToBoolean = new BooleanToBooleanImpl(); return booleanToBoolean; @@ -114,6 +117,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public ClassToTable createClassToTable() { ClassToTableImpl classToTable = new ClassToTableImpl(); return classToTable; @@ -124,6 +128,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public IntegerToNumber createIntegerToNumber() { IntegerToNumberImpl integerToNumber = new IntegerToNumberImpl(); return integerToNumber; @@ -134,6 +139,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public NonLeafAttribute createNonLeafAttribute() { NonLeafAttributeImpl nonLeafAttribute = new NonLeafAttributeImpl(); return nonLeafAttribute; @@ -144,6 +150,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public PackageToSchema createPackageToSchema() { PackageToSchemaImpl packageToSchema = new PackageToSchemaImpl(); return packageToSchema; @@ -154,6 +161,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public StringToVarchar createStringToVarchar() { StringToVarcharImpl stringToVarchar = new StringToVarcharImpl(); return stringToVarchar; @@ -164,6 +172,7 @@ public class UML2RDBMSFactoryImpl extends EFactoryImpl implements UML2RDBMSFacto * <!-- end-user-doc --> * @generated */ + @Override public UML2RDBMSPackage getUML2RDBMSPackage() { return (UML2RDBMSPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java index 70a458a66..0f623bf5a 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java @@ -216,6 +216,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getAttributeToColumn() { return attributeToColumnEClass; } @@ -225,6 +226,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAttributeToColumn_Type() { return (EReference)attributeToColumnEClass.getEStructuralFeatures().get(0); } @@ -234,6 +236,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getAssociationToForeignKey() { return associationToForeignKeyEClass; } @@ -243,6 +246,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_Association() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(0); } @@ -252,6 +256,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_ForeignKey() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(1); } @@ -261,6 +266,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_Owner() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(2); } @@ -270,6 +276,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getAssociationToForeignKey_Referenced() { return (EReference)associationToForeignKeyEClass.getEStructuralFeatures().get(3); } @@ -279,6 +286,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getBooleanToBoolean() { return booleanToBooleanEClass; } @@ -288,6 +296,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getClassToTable() { return classToTableEClass; } @@ -297,6 +306,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_AssociationsToForeignKeys() { return (EReference)classToTableEClass.getEStructuralFeatures().get(0); } @@ -306,6 +316,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_Owner() { return (EReference)classToTableEClass.getEStructuralFeatures().get(1); } @@ -315,6 +326,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_PrimaryKey() { return (EReference)classToTableEClass.getEStructuralFeatures().get(2); } @@ -324,6 +336,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_Table() { return (EReference)classToTableEClass.getEStructuralFeatures().get(3); } @@ -333,6 +346,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getClassToTable_UmlClass() { return (EReference)classToTableEClass.getEStructuralFeatures().get(4); } @@ -342,6 +356,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getFromAttribute() { return fromAttributeEClass; } @@ -351,6 +366,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getFromAttribute_Kind() { return (EAttribute)fromAttributeEClass.getEStructuralFeatures().get(0); } @@ -360,6 +376,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttribute_Attribute() { return (EReference)fromAttributeEClass.getEStructuralFeatures().get(1); } @@ -369,6 +386,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttribute_Leafs() { return (EReference)fromAttributeEClass.getEStructuralFeatures().get(2); } @@ -378,6 +396,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttribute_Owner() { return (EReference)fromAttributeEClass.getEStructuralFeatures().get(3); } @@ -387,6 +406,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getFromAttributeOwner() { return fromAttributeOwnerEClass; } @@ -396,6 +416,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getFromAttributeOwner_FromAttributes() { return (EReference)fromAttributeOwnerEClass.getEStructuralFeatures().get(0); } @@ -405,6 +426,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getIntegerToNumber() { return integerToNumberEClass; } @@ -414,6 +436,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getNonLeafAttribute() { return nonLeafAttributeEClass; } @@ -423,6 +446,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPackageToSchema() { return packageToSchemaEClass; } @@ -432,6 +456,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_ClassesToTables() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(0); } @@ -441,6 +466,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_PrimitivesToNames() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(1); } @@ -450,6 +476,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_Schema() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(2); } @@ -459,6 +486,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPackageToSchema_UmlPackage() { return (EReference)packageToSchemaEClass.getEStructuralFeatures().get(3); } @@ -468,6 +496,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getPrimitiveToName() { return primitiveToNameEClass; } @@ -477,6 +506,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getPrimitiveToName_TypeName() { return (EAttribute)primitiveToNameEClass.getEStructuralFeatures().get(0); } @@ -486,6 +516,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPrimitiveToName_Owner() { return (EReference)primitiveToNameEClass.getEStructuralFeatures().get(1); } @@ -495,6 +526,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getPrimitiveToName_Primitive() { return (EReference)primitiveToNameEClass.getEStructuralFeatures().get(2); } @@ -504,6 +536,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getStringToVarchar() { return stringToVarcharEClass; } @@ -513,6 +546,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getToColumn() { return toColumnEClass; } @@ -522,6 +556,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EReference getToColumn_Column() { return (EReference)toColumnEClass.getEStructuralFeatures().get(0); } @@ -531,6 +566,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EClass getUmlToRdbmsModelElement() { return umlToRdbmsModelElementEClass; } @@ -540,6 +576,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getUmlToRdbmsModelElement_Name() { return (EAttribute)umlToRdbmsModelElementEClass.getEStructuralFeatures().get(0); } @@ -549,6 +586,7 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka * <!-- end-user-doc --> * @generated */ + @Override public UML2RDBMSFactory getUML2RDBMSFactory() { return (UML2RDBMSFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UmlToRdbmsModelElementImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UmlToRdbmsModelElementImpl.java index 798a5ea32..e456583ed 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UmlToRdbmsModelElementImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UmlToRdbmsModelElementImpl.java @@ -80,6 +80,7 @@ public abstract class UmlToRdbmsModelElementImpl extends MinimalEObjectImpl.Cont * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -89,6 +90,7 @@ public abstract class UmlToRdbmsModelElementImpl extends MinimalEObjectImpl.Cont * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSNodeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSNodeImpl.java index fc80c8c25..15d15c0c0 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSNodeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSNodeImpl.java @@ -123,6 +123,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public HLSNode getParent() { if (eContainerFeatureID() != HLSTreePackage.HLS_NODE__PARENT) return null; return (HLSNode)eInternalContainer(); @@ -143,6 +144,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public void setParent(HLSNode newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != HLSTreePackage.HLS_NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) @@ -164,6 +166,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public EList<HLSNode> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<HLSNode>(HLSNode.class, this, HLSTreePackage.HLS_NODE__CHILDREN, HLSTreePackage.HLS_NODE__PARENT); @@ -176,6 +179,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public String getHls() { return hls; } @@ -185,6 +189,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public void setHls(String newHls) { String oldHls = hls; hls = newHls; @@ -197,6 +202,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -206,6 +212,7 @@ public class HLSNodeImpl extends MinimalEObjectImpl.Container implements HLSNode * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSTreeFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSTreeFactoryImpl.java index 2006e43b6..f5adcb454 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSTreeFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSTreeFactoryImpl.java @@ -108,6 +108,7 @@ public class HLSTreeFactoryImpl extends EFactoryImpl implements HLSTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HLSNode createHLSNode() { HLSNodeImpl hlsNode = new HLSNodeImpl(); return hlsNode; @@ -136,6 +137,7 @@ public class HLSTreeFactoryImpl extends EFactoryImpl implements HLSTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HLSTreePackage getHLSTreePackage() { return (HLSTreePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSTreePackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSTreePackageImpl.java index ef967c14f..ebb60c95b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSTreePackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hls/HLSTree/impl/HLSTreePackageImpl.java @@ -128,6 +128,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getHLSNode() { return hlsNodeEClass; } @@ -137,6 +138,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHLSNode_Parent() { return (EReference)hlsNodeEClass.getEStructuralFeatures().get(0); } @@ -146,6 +148,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHLSNode_Children() { return (EReference)hlsNodeEClass.getEStructuralFeatures().get(1); } @@ -155,6 +158,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHLSNode_Hls() { return (EAttribute)hlsNodeEClass.getEStructuralFeatures().get(2); } @@ -164,6 +168,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHLSNode_Name() { return (EAttribute)hlsNodeEClass.getEStructuralFeatures().get(3); } @@ -173,6 +178,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EDataType getHLS() { return hlsEDataType; } @@ -182,6 +188,7 @@ public class HLSTreePackageImpl extends EPackageImpl implements HLSTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public HLSTreeFactory getHLSTreeFactory() { return (HLSTreeFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVNodeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVNodeImpl.java index 70577b71a..bc02518db 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVNodeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVNodeImpl.java @@ -123,6 +123,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public HSVNode getParent() { if (eContainerFeatureID() != HSVTreePackage.HSV_NODE__PARENT) return null; return (HSVNode)eInternalContainer(); @@ -143,6 +144,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public void setParent(HSVNode newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != HSVTreePackage.HSV_NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) @@ -164,6 +166,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public EList<HSVNode> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<HSVNode>(HSVNode.class, this, HSVTreePackage.HSV_NODE__CHILDREN, HSVTreePackage.HSV_NODE__PARENT); @@ -176,6 +179,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public String getHsv() { return hsv; } @@ -185,6 +189,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public void setHsv(String newHsv) { String oldHsv = hsv; hsv = newHsv; @@ -197,6 +202,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -206,6 +212,7 @@ public class HSVNodeImpl extends MinimalEObjectImpl.Container implements HSVNode * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVTreeFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVTreeFactoryImpl.java index 0556f8700..8c2ff3c7f 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVTreeFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVTreeFactoryImpl.java @@ -108,6 +108,7 @@ public class HSVTreeFactoryImpl extends EFactoryImpl implements HSVTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HSVNode createHSVNode() { HSVNodeImpl hsvNode = new HSVNodeImpl(); return hsvNode; @@ -136,6 +137,7 @@ public class HSVTreeFactoryImpl extends EFactoryImpl implements HSVTreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public HSVTreePackage getHSVTreePackage() { return (HSVTreePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVTreePackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVTreePackageImpl.java index a999eec1c..75805c9d1 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVTreePackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/hsv/HSVTree/impl/HSVTreePackageImpl.java @@ -128,6 +128,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getHSVNode() { return hsvNodeEClass; } @@ -137,6 +138,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode_Parent() { return (EReference)hsvNodeEClass.getEStructuralFeatures().get(0); } @@ -146,6 +148,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode_Children() { return (EReference)hsvNodeEClass.getEStructuralFeatures().get(1); } @@ -155,6 +158,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode_Hsv() { return (EAttribute)hsvNodeEClass.getEStructuralFeatures().get(2); } @@ -164,6 +168,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode_Name() { return (EAttribute)hsvNodeEClass.getEStructuralFeatures().get(3); } @@ -173,6 +178,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EDataType getHSV() { return hsvEDataType; } @@ -182,6 +188,7 @@ public class HSVTreePackageImpl extends EPackageImpl implements HSVTreePackage { * <!-- end-user-doc --> * @generated */ + @Override public HSVTreeFactory getHSVTreeFactory() { return (HSVTreeFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSV2HLSFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSV2HLSFactoryImpl.java index 89f28b73c..729b12591 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSV2HLSFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSV2HLSFactoryImpl.java @@ -107,6 +107,7 @@ public class HSV2HLSFactoryImpl extends EFactoryImpl implements HSV2HLSFactory { * <!-- end-user-doc --> * @generated */ + @Override public @NonNull HSVNode2HLSNode createHSVNode2HLSNode() { HSVNode2HLSNodeImpl hsvNode2HLSNode = new HSVNode2HLSNodeImpl(); return hsvNode2HLSNode; @@ -135,6 +136,7 @@ public class HSV2HLSFactoryImpl extends EFactoryImpl implements HSV2HLSFactory { * <!-- end-user-doc --> * @generated */ + @Override public HSV2HLSPackage getHSV2HLSPackage() { return (HSV2HLSPackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSV2HLSPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSV2HLSPackageImpl.java index 4e920ccb9..c92f0a305 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSV2HLSPackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSV2HLSPackageImpl.java @@ -128,6 +128,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getHSVNode2HLSNode() { return hsvNode2HLSNodeEClass; } @@ -137,6 +138,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Parent() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(0); } @@ -146,6 +148,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Children() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(1); } @@ -155,6 +158,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Hsv() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(2); } @@ -164,6 +168,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getHSVNode2HLSNode_Hls() { return (EReference)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(3); } @@ -173,6 +178,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode2HLSNode_Rgb() { return (EAttribute)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(4); } @@ -182,6 +188,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getHSVNode2HLSNode_Name() { return (EAttribute)hsvNode2HLSNodeEClass.getEStructuralFeatures().get(5); } @@ -191,6 +198,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public EDataType getRGB() { return rgbEDataType; } @@ -200,6 +208,7 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage { * <!-- end-user-doc --> * @generated */ + @Override public HSV2HLSFactory getHSV2HLSFactory() { return (HSV2HLSFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSVNode2HLSNodeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSVNode2HLSNodeImpl.java index 1f40619bd..59c06ad27 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSVNode2HLSNodeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/test/middle/HSV2HLS/impl/HSVNode2HLSNodeImpl.java @@ -149,6 +149,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public HSVNode2HLSNode getParent() { if (eContainerFeatureID() != HSV2HLSPackage.HSV_NODE2_HLS_NODE__PARENT) return null; return (HSVNode2HLSNode)eInternalContainer(); @@ -169,6 +170,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setParent(HSVNode2HLSNode newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != HSV2HLSPackage.HSV_NODE2_HLS_NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) @@ -190,6 +192,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public EList<HSVNode2HLSNode> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<HSVNode2HLSNode>(HSVNode2HLSNode.class, this, HSV2HLSPackage.HSV_NODE2_HLS_NODE__CHILDREN, HSV2HLSPackage.HSV_NODE2_HLS_NODE__PARENT); @@ -202,6 +205,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public HSVNode getHsv() { if (hsv != null && hsv.eIsProxy()) { InternalEObject oldHsv = (InternalEObject)hsv; @@ -228,6 +232,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setHsv(HSVNode newHsv) { HSVNode oldHsv = hsv; hsv = newHsv; @@ -240,6 +245,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public HLSNode getHls() { if (hls != null && hls.eIsProxy()) { InternalEObject oldHls = (InternalEObject)hls; @@ -266,6 +272,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setHls(HLSNode newHls) { HLSNode oldHls = hls; hls = newHls; @@ -278,6 +285,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public String getRgb() { return rgb; } @@ -287,6 +295,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setRgb(String newRgb) { String oldRgb = rgb; rgb = newRgb; @@ -299,6 +308,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -308,6 +318,7 @@ public class HSVNode2HLSNodeImpl extends MinimalEObjectImpl.Container implements * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TallNodeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TallNodeImpl.java index fa6201288..fb6108989 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TallNodeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TallNodeImpl.java @@ -121,6 +121,7 @@ public class TallNodeImpl extends MinimalEObjectImpl.Container implements TallNo * <!-- end-user-doc --> * @generated */ + @Override public EList<TallNode> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<TallNode>(TallNode.class, this, TalltreePackage.TALL_NODE__CHILDREN, TalltreePackage.TALL_NODE__PARENT); @@ -133,6 +134,7 @@ public class TallNodeImpl extends MinimalEObjectImpl.Container implements TallNo * <!-- end-user-doc --> * @generated */ + @Override public int getHeight() { return height; } @@ -142,6 +144,7 @@ public class TallNodeImpl extends MinimalEObjectImpl.Container implements TallNo * <!-- end-user-doc --> * @generated */ + @Override public void setHeight(int newHeight) { int oldHeight = height; height = newHeight; @@ -154,6 +157,7 @@ public class TallNodeImpl extends MinimalEObjectImpl.Container implements TallNo * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -163,6 +167,7 @@ public class TallNodeImpl extends MinimalEObjectImpl.Container implements TallNo * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -175,6 +180,7 @@ public class TallNodeImpl extends MinimalEObjectImpl.Container implements TallNo * <!-- end-user-doc --> * @generated */ + @Override public TallNode getParent() { if (eContainerFeatureID() != TalltreePackage.TALL_NODE__PARENT) return null; return (TallNode)eInternalContainer(); @@ -195,6 +201,7 @@ public class TallNodeImpl extends MinimalEObjectImpl.Container implements TallNo * <!-- end-user-doc --> * @generated */ + @Override public void setParent(TallNode newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != TalltreePackage.TALL_NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TalltreeFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TalltreeFactoryImpl.java index 93c369aad..8b5d271ae 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TalltreeFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TalltreeFactoryImpl.java @@ -75,6 +75,7 @@ public class TalltreeFactoryImpl extends EFactoryImpl implements TalltreeFactory * <!-- end-user-doc --> * @generated */ + @Override public TallNode createTallNode() { TallNodeImpl tallNode = new TallNodeImpl(); return tallNode; @@ -85,6 +86,7 @@ public class TalltreeFactoryImpl extends EFactoryImpl implements TalltreeFactory * <!-- end-user-doc --> * @generated */ + @Override public TalltreePackage getTalltreePackage() { return (TalltreePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TalltreePackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TalltreePackageImpl.java index 31af406e0..cb94385b1 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TalltreePackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/talltree/impl/TalltreePackageImpl.java @@ -118,6 +118,7 @@ public class TalltreePackageImpl extends EPackageImpl implements TalltreePackage * <!-- end-user-doc --> * @generated */ + @Override public EClass getTallNode() { return tallNodeEClass; } @@ -127,6 +128,7 @@ public class TalltreePackageImpl extends EPackageImpl implements TalltreePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getTallNode_Children() { return (EReference)tallNodeEClass.getEStructuralFeatures().get(0); } @@ -136,6 +138,7 @@ public class TalltreePackageImpl extends EPackageImpl implements TalltreePackage * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getTallNode_Height() { return (EAttribute)tallNodeEClass.getEStructuralFeatures().get(1); } @@ -145,6 +148,7 @@ public class TalltreePackageImpl extends EPackageImpl implements TalltreePackage * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getTallNode_Name() { return (EAttribute)tallNodeEClass.getEStructuralFeatures().get(2); } @@ -154,6 +158,7 @@ public class TalltreePackageImpl extends EPackageImpl implements TalltreePackage * <!-- end-user-doc --> * @generated */ + @Override public EReference getTallNode_Parent() { return (EReference)tallNodeEClass.getEStructuralFeatures().get(3); } @@ -163,6 +168,7 @@ public class TalltreePackageImpl extends EPackageImpl implements TalltreePackage * <!-- end-user-doc --> * @generated */ + @Override public TalltreeFactory getTalltreeFactory() { return (TalltreeFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/NodeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/NodeImpl.java index 81f55eea9..c5e36cf15 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/NodeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/NodeImpl.java @@ -100,6 +100,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node { * <!-- end-user-doc --> * @generated */ + @Override public EList<Node> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<Node>(Node.class, this, TreePackage.NODE__CHILDREN, TreePackage.NODE__PARENT); @@ -112,6 +113,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node { * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -121,6 +123,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node { * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -133,6 +136,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node { * <!-- end-user-doc --> * @generated */ + @Override public Node getParent() { if (eContainerFeatureID() != TreePackage.NODE__PARENT) return null; return (Node)eInternalContainer(); @@ -153,6 +157,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node { * <!-- end-user-doc --> * @generated */ + @Override public void setParent(Node newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != TreePackage.NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/TreeFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/TreeFactoryImpl.java index f8f75bcd4..81da54126 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/TreeFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/TreeFactoryImpl.java @@ -75,6 +75,7 @@ public class TreeFactoryImpl extends EFactoryImpl implements TreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public Node createNode() { NodeImpl node = new NodeImpl(); return node; @@ -85,6 +86,7 @@ public class TreeFactoryImpl extends EFactoryImpl implements TreeFactory { * <!-- end-user-doc --> * @generated */ + @Override public TreePackage getTreePackage() { return (TreePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/TreePackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/TreePackageImpl.java index 653928195..0f25ca096 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/TreePackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree/impl/TreePackageImpl.java @@ -118,6 +118,7 @@ public class TreePackageImpl extends EPackageImpl implements TreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getNode() { return nodeEClass; } @@ -127,6 +128,7 @@ public class TreePackageImpl extends EPackageImpl implements TreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode_Children() { return (EReference)nodeEClass.getEStructuralFeatures().get(0); } @@ -136,6 +138,7 @@ public class TreePackageImpl extends EPackageImpl implements TreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNode_Name() { return (EAttribute)nodeEClass.getEStructuralFeatures().get(1); } @@ -145,6 +148,7 @@ public class TreePackageImpl extends EPackageImpl implements TreePackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode_Parent() { return (EReference)nodeEClass.getEStructuralFeatures().get(2); } @@ -154,6 +158,7 @@ public class TreePackageImpl extends EPackageImpl implements TreePackage { * <!-- end-user-doc --> * @generated */ + @Override public TreeFactory getTreeFactory() { return (TreeFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Node2TallNodeImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Node2TallNodeImpl.java index ef6bc1d47..64c88ae85 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Node2TallNodeImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Node2TallNodeImpl.java @@ -126,6 +126,7 @@ public class Node2TallNodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public EList<Node2TallNode> getChildren() { if (children == null) { children = new EObjectContainmentWithInverseEList<Node2TallNode>(Node2TallNode.class, this, Tree2talltreePackage.NODE2_TALL_NODE__CHILDREN, Tree2talltreePackage.NODE2_TALL_NODE__PARENT); @@ -138,6 +139,7 @@ public class Node2TallNodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -147,6 +149,7 @@ public class Node2TallNodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -159,6 +162,7 @@ public class Node2TallNodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public Node2TallNode getParent() { if (eContainerFeatureID() != Tree2talltreePackage.NODE2_TALL_NODE__PARENT) return null; return (Node2TallNode)eInternalContainer(); @@ -179,6 +183,7 @@ public class Node2TallNodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public void setParent(Node2TallNode newParent) { if (newParent != eInternalContainer() || (eContainerFeatureID() != Tree2talltreePackage.NODE2_TALL_NODE__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) @@ -200,6 +205,7 @@ public class Node2TallNodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public Node getNode() { if (node != null && node.eIsProxy()) { InternalEObject oldNode = (InternalEObject)node; @@ -226,6 +232,7 @@ public class Node2TallNodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public void setNode(Node newNode) { Node oldNode = node; node = newNode; @@ -238,6 +245,7 @@ public class Node2TallNodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public TallNode getTallNode() { if (tallNode != null && tallNode.eIsProxy()) { InternalEObject oldTallNode = (InternalEObject)tallNode; @@ -264,6 +272,7 @@ public class Node2TallNodeImpl extends MinimalEObjectImpl.Container implements N * <!-- end-user-doc --> * @generated */ + @Override public void setTallNode(TallNode newTallNode) { TallNode oldTallNode = tallNode; tallNode = newTallNode; diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Tree2talltreeFactoryImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Tree2talltreeFactoryImpl.java index d9b06d8f0..fc475d5b9 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Tree2talltreeFactoryImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Tree2talltreeFactoryImpl.java @@ -75,6 +75,7 @@ public class Tree2talltreeFactoryImpl extends EFactoryImpl implements Tree2tallt * <!-- end-user-doc --> * @generated */ + @Override public Node2TallNode createNode2TallNode() { Node2TallNodeImpl node2TallNode = new Node2TallNodeImpl(); return node2TallNode; @@ -85,6 +86,7 @@ public class Tree2talltreeFactoryImpl extends EFactoryImpl implements Tree2tallt * <!-- end-user-doc --> * @generated */ + @Override public Tree2talltreePackage getTree2talltreePackage() { return (Tree2talltreePackage)getEPackage(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Tree2talltreePackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Tree2talltreePackageImpl.java index 873f9b795..bad911ca6 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Tree2talltreePackageImpl.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/tree2talltree/tree2talltree/impl/Tree2talltreePackageImpl.java @@ -118,6 +118,7 @@ public class Tree2talltreePackageImpl extends EPackageImpl implements Tree2tallt * <!-- end-user-doc --> * @generated */ + @Override public EClass getNode2TallNode() { return node2TallNodeEClass; } @@ -127,6 +128,7 @@ public class Tree2talltreePackageImpl extends EPackageImpl implements Tree2tallt * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode2TallNode_Children() { return (EReference)node2TallNodeEClass.getEStructuralFeatures().get(0); } @@ -136,6 +138,7 @@ public class Tree2talltreePackageImpl extends EPackageImpl implements Tree2tallt * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getNode2TallNode_Name() { return (EAttribute)node2TallNodeEClass.getEStructuralFeatures().get(1); } @@ -145,6 +148,7 @@ public class Tree2talltreePackageImpl extends EPackageImpl implements Tree2tallt * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode2TallNode_Parent() { return (EReference)node2TallNodeEClass.getEStructuralFeatures().get(2); } @@ -154,6 +158,7 @@ public class Tree2talltreePackageImpl extends EPackageImpl implements Tree2tallt * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode2TallNode_Node() { return (EReference)node2TallNodeEClass.getEStructuralFeatures().get(3); } @@ -163,6 +168,7 @@ public class Tree2talltreePackageImpl extends EPackageImpl implements Tree2tallt * <!-- end-user-doc --> * @generated */ + @Override public EReference getNode2TallNode_TallNode() { return (EReference)node2TallNodeEClass.getEStructuralFeatures().get(4); } @@ -172,6 +178,7 @@ public class Tree2talltreePackageImpl extends EPackageImpl implements Tree2tallt * <!-- end-user-doc --> * @generated */ + @Override public Tree2talltreeFactory getTree2talltreeFactory() { return (Tree2talltreeFactory)getEFactoryInstance(); } diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/ManualUML2RDBMS/ManualRDBMSNormalizer.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/ManualUML2RDBMS/ManualRDBMSNormalizer.java index 6bc93a957..cc7ffcfb4 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/ManualUML2RDBMS/ManualRDBMSNormalizer.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/ManualUML2RDBMS/ManualRDBMSNormalizer.java @@ -100,6 +100,7 @@ public class ManualRDBMSNormalizer implements ModelNormalizer } } + @Override public @NonNull List<Normalizer> normalize(@NonNull Resource resource) { EObject eRoot = resource.getContents().get(0); EPackage ePackage = eRoot.eClass().getEPackage(); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiEditorTests.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiEditorTests.java index 42596ca9d..152d05647 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiEditorTests.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiEditorTests.java @@ -24,6 +24,7 @@ import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase; */ public class QVTiEditorTests extends LoadTestCase { + @Override public void doLoad_Concrete(@NonNull String inputName) throws IOException { OCL ocl = QVTimperative.newInstance(getProjectMap(), null); // OCL ocl = OCL.newInstance(getProjectMap()); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java index 2905a42bc..7cd7b5c9b 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java @@ -80,6 +80,7 @@ public class QVTiInterpreterTests extends LoadTestCase return new MyQvtiExecutor(getEnvironmentFactory(), fileNamePrefix, transformationFileName, mode); } + @Override public @NonNull QVTiEnvironmentFactory getEnvironmentFactory() { return (QVTiEnvironmentFactory) super.getEnvironmentFactory(); } @@ -248,6 +249,7 @@ public class QVTiInterpreterTests extends LoadTestCase /* (non-Javadoc) * @see org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase#setUp() */ + @Override @Before public void setUp() throws Exception { BaseLinkingService.DEBUG_RETRY.setState(true); diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/SimpleUML2RDBMS/SimpleRDBMSNormalizer.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/SimpleUML2RDBMS/SimpleRDBMSNormalizer.java index e9f0639b5..105c11e12 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/SimpleUML2RDBMS/SimpleRDBMSNormalizer.java +++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/SimpleUML2RDBMS/SimpleRDBMSNormalizer.java @@ -100,6 +100,7 @@ public class SimpleRDBMSNormalizer implements ModelNormalizer } } + @Override public @NonNull List<Normalizer> normalize(@NonNull Resource resource) { EObject eRoot = resource.getContents().get(0); EPackage ePackage = eRoot.eClass().getEPackage(); diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/LoadTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/LoadTests.java index 85ff56b9e..92618b1be 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/LoadTests.java +++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/LoadTests.java @@ -36,6 +36,7 @@ public class LoadTests extends LoadTestCase ocl.dispose(); } + @Override public void doLoad_Concrete(@NonNull String inputName) throws IOException { OCL ocl = QVTbase.newInstance(getProjectMap(), null); // OCL ocl = OCL.newInstance(getProjectMap()); diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java index 481bc75ac..b3d805440 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java +++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java @@ -85,28 +85,28 @@ public class QVTrCompilerTests extends LoadTestCase private BasicQVTiExecutor interpretedExecutor = null; private QVTiTransformationExecutor generatedExecutor = null; private Set<@NonNull String> nsURIs = new HashSet<@NonNull String>(); - private Collection<@NonNull GenPackage> usedGenPackages = null; - + private Collection<@NonNull GenPackage> usedGenPackages = null; + public MyQVT(@NonNull String testFolderName, @NonNull EPackage... eInstances) { super(new QVTiEnvironmentFactory(getProjectMap(), null)); this.testFolderName = testFolderName; this.testFolderURI = TESTS_BASE_URI.appendSegment(testFolderName); - this.samplesBaseUri = testFolderURI.appendSegment("samples"); + this.samplesBaseUri = testFolderURI.appendSegment("samples"); installEPackages(eInstances); } public void addUsedGenPackage(@NonNull String resourcePath, @Nullable String fragment) { - if (usedGenPackages == null) { - usedGenPackages = new ArrayList<@NonNull GenPackage>(); - } - URI uri = URI.createPlatformResourceURI(resourcePath, false); - if (fragment != null) { - uri = uri.appendFragment(fragment); - } - usedGenPackages.add((@NonNull GenPackage)getResourceSet().getEObject(uri, true)); + if (usedGenPackages == null) { + usedGenPackages = new ArrayList<@NonNull GenPackage>(); + } + URI uri = URI.createPlatformResourceURI(resourcePath, false); + if (fragment != null) { + uri = uri.appendFragment(fragment); + } + usedGenPackages.add(ClassUtil.nonNullState((GenPackage)getResourceSet().getEObject(uri, true))); } -/* public @NonNull Class<? extends Transformer> buildTransformation(@NonNull String testName, @NonNull String txName, @NonNull String outputName, @NonNull String middleNsURI, @NonNull String... suffixes) throws Exception { + /* public @NonNull Class<? extends Transformer> buildTransformation(@NonNull String testName, @NonNull String txName, @NonNull String outputName, @NonNull String middleNsURI, @NonNull String... suffixes) throws Exception { String projectTestName = PROJECT_NAME + "." + testName; if (suffixes != null) { for (@NonNull String suffix : suffixes) { @@ -133,18 +133,18 @@ public class QVTrCompilerTests extends LoadTestCase compilerChain = new QVTrCompilerChain(getEnvironmentFactory(), testFolderURI.appendSegment(testFileName), options); Class<? extends Transformer> txClass = compilerChain.build(outputName, genModelFiles); createGeneratedExecutor(txClass); - return txClass; + return txClass; } public void checkOutput(@NonNull Resource outputResource, @NonNull String expectedFile, @Nullable ModelNormalizer normalizer) throws IOException, InterruptedException { - URI referenceModelURI = samplesBaseUri.appendSegment(expectedFile); - Resource referenceResource = outputResource.getResourceSet().getResource(referenceModelURI, true); - assert referenceResource != null; - if (normalizer != null) { - normalizer.normalize(referenceResource); - normalizer.normalize(outputResource); - } - assertSameModel(referenceResource, outputResource); + URI referenceModelURI = samplesBaseUri.appendSegment(expectedFile); + Resource referenceResource = outputResource.getResourceSet().getResource(referenceModelURI, true); + assert referenceResource != null; + if (normalizer != null) { + normalizer.normalize(referenceResource); + normalizer.normalize(outputResource); + } + assertSameModel(referenceResource, outputResource); } public @NonNull Transformation compileTransformation(@NonNull String testFileName, @NonNull String outputName, @NonNull String basePrefix, @NonNull String middleNsURI) throws Exception { @@ -152,8 +152,8 @@ public class QVTrCompilerTests extends LoadTestCase genModelOptions.put(CompilerChain.GENMODEL_BASE_PREFIX, basePrefix); genModelOptions.put(CompilerChain.GENMODEL_COPYRIGHT_TEXT, "Copyright (c) 2015, 2016 Willink Transformations and others.\n;All rights reserved. This program and the accompanying materials\n;are made available under the terms of the Eclipse Public License v1.0\n;which accompanies this distribution, and is available at\n;http://www.eclipse.org/legal/epl-v10.html\n;\n;Contributors:\n; E.D.Willink - Initial API and implementation"); Map<@NonNull String, @Nullable String> traceOptions = new HashMap<@NonNull String, @Nullable String>(); -// traceOptions.put(CompilerChain.TRACE_NS_URI, middleNsURI); - Map<@NonNull String, @NonNull Map<CompilerChain.@NonNull Key<Object>, @Nullable Object>> options = new HashMap<@NonNull String, @Nullable Map<CompilerChain.@NonNull Key<Object>, @Nullable Object>>(); + // traceOptions.put(CompilerChain.TRACE_NS_URI, middleNsURI); + Map<@NonNull String, @Nullable Map<CompilerChain.@NonNull Key<Object>, @Nullable Object>> options = new HashMap<@NonNull String, @Nullable Map<CompilerChain.@NonNull Key<Object>, @Nullable Object>>(); QVTrCompilerChain.setOption(options, CompilerChain.DEFAULT_STEP, CompilerChain.SAVE_OPTIONS_KEY, getSaveOptions()); QVTrCompilerChain.setOption(options, CompilerChain.JAVA_STEP, CompilerChain.URI_KEY, null); QVTrCompilerChain.setOption(options, CompilerChain.CLASS_STEP, CompilerChain.URI_KEY, null); @@ -162,7 +162,7 @@ public class QVTrCompilerTests extends LoadTestCase QVTrCompilerChain.setOption(options, CompilerChain.GENMODEL_STEP, CompilerChain.GENMODEL_OPTIONS_KEY, genModelOptions); URI prefixURI = testFolderURI.appendSegment(testFileName); compilerChain = new QVTrCompilerChain(getEnvironmentFactory(), prefixURI, options); - return compilerChain.compile(outputName); + return compilerChain.compile(outputName); } public @NonNull Class<? extends Transformer> createGeneratedClass(@NonNull Transformation asTransformation, @NonNull String @NonNull... genModelFiles) throws Exception { @@ -177,13 +177,13 @@ public class QVTrCompilerTests extends LoadTestCase QVTiCodeGenerator cg = new QVTiCodeGenerator(getEnvironmentFactory(), asTransformation); QVTiCodeGenOptions options = cg.getOptions(); options.setUseNullAnnotations(true); -// options.setPackagePrefix("cg"); + // options.setPackagePrefix("cg"); cg.generateClassFile(); cg.saveSourceFile("../" + PROJECT_NAME + "/test-gen/"); File explicitClassPath = new File("../" + PROJECT_NAME + "/bin"); String qualifiedClassName = cg.getQualifiedName(); String javaCodeSource = cg.generateClassFile(); - OCL2JavaFileObject.saveClass(explicitClassPath.toString(), qualifiedClassName, javaCodeSource); + OCL2JavaFileObject.saveClass(ClassUtil.nonNullState(explicitClassPath.toString()), qualifiedClassName, javaCodeSource); @SuppressWarnings("unchecked") Class<? extends Transformer> txClass = (Class<? extends Transformer>) OCL2JavaFileObject.loadExplicitClass(explicitClassPath, qualifiedClassName); if (txClass == null) { @@ -192,13 +192,13 @@ public class QVTrCompilerTests extends LoadTestCase } return txClass; } - + public void createGeneratedExecutor(@NonNull Transformation asTransformation, @NonNull String @NonNull... genModelFiles) throws Exception { Class<? extends Transformer> txClass = createGeneratedClass(asTransformation, genModelFiles); createGeneratedExecutor(txClass); } - public QVTiTransformationExecutor createGeneratedExecutor(Class<? extends Transformer> txClass) throws Exception { + public QVTiTransformationExecutor createGeneratedExecutor(@NonNull Class<? extends Transformer> txClass) throws Exception { return generatedExecutor = new QVTiTransformationExecutor(getEnvironmentFactory(), txClass); } @@ -208,8 +208,8 @@ public class QVTrCompilerTests extends LoadTestCase } public void createModel(@NonNull String modelName, @NonNull String modelFile) { - URI modelURI = samplesBaseUri.appendSegment(modelFile); - interpretedExecutor.createModel(modelName, modelURI, null); + URI modelURI = samplesBaseUri.appendSegment(modelFile); + interpretedExecutor.createModel(modelName, modelURI, null); } @Override @@ -232,8 +232,8 @@ public class QVTrCompilerTests extends LoadTestCase public void executeTransformation() throws Exception { if (interpretedExecutor != null) { - interpretedExecutor.execute(); - interpretedExecutor.saveModels(TestsXMLUtil.defaultSavingOptions); + interpretedExecutor.execute(); + interpretedExecutor.saveModels(TestsXMLUtil.defaultSavingOptions); } else { generatedExecutor.getTransformer().run(); @@ -242,10 +242,10 @@ public class QVTrCompilerTests extends LoadTestCase @Override public @NonNull QVTiEnvironmentFactory getEnvironmentFactory() { - return (QVTiEnvironmentFactory) super.getEnvironmentFactory(); + return super.getEnvironmentFactory(); } - public @NonNull Map<Object, Object> getSaveOptions() { + public @NonNull Map<Object, Object> getSaveOptions() { Map<Object, Object> saveOptions = new HashMap<Object, Object>(TestsXMLUtil.defaultSavingOptions); saveOptions.put(ASResource.OPTION_NORMALIZE_CONTENTS, Boolean.TRUE); return saveOptions; @@ -265,11 +265,14 @@ public class QVTrCompilerTests extends LoadTestCase public void installEPackages(EPackage... eInstances) { ResourceSetImpl resourceSet = (ResourceSetImpl) getResourceSet(); for (EPackage eInstance : eInstances) { - nsURIs.add(eInstance.getNsURI()); + String nsURI = eInstance.getNsURI(); + if (nsURI != null) { + nsURIs.add(nsURI); + } resourceSet.getURIResourceMap().put(testFolderURI.appendSegment(eInstance.getName()+".ecore"), eInstance.eResource()); } } - + private void loadGenModel(@NonNull URI genModelURI) { ResourceSet resourceSet = getResourceSet(); MetamodelManagerInternal metamodelManager = getMetamodelManager(); @@ -284,35 +287,36 @@ public class QVTrCompilerTests extends LoadTestCase } public void loadInput(@NonNull String modelName, @NonNull String modelFile) { - URI modelURI = samplesBaseUri.appendSegment(modelFile); - if (interpretedExecutor != null) { + URI modelURI = samplesBaseUri.appendSegment(modelFile); + if (interpretedExecutor != null) { interpretedExecutor.loadModel(modelName, modelURI); - } - else { - Resource inputResource = /*getResourceSet()*/environmentFactory.getMetamodelManager().getASResourceSet().getResource(modelURI, true); + } + else { + Resource inputResource = /*getResourceSet()*/environmentFactory.getMetamodelManager().getASResourceSet().getResource(modelURI, true); generatedExecutor.getTransformer().addRootObjects(modelName, ClassUtil.nonNullState(inputResource.getContents())); - } + } } public @NonNull Resource saveOutput(@NonNull String modelName, @NonNull String modelFile, @Nullable String expectedFile, @Nullable ModelNormalizer normalizer) throws IOException, InterruptedException { - URI modelURI = samplesBaseUri.appendSegment(modelFile); + URI modelURI = samplesBaseUri.appendSegment(modelFile); ResourceSet resourceSet = /*getResourceSet()*/environmentFactory.getMetamodelManager().getASResourceSet(); Resource outputResource; - if (interpretedExecutor != null) { - outputResource = interpretedExecutor.saveModel(modelName, modelURI, null, getSaveOptions()); - } - else { + if (interpretedExecutor != null) { + outputResource = interpretedExecutor.saveModel(modelName, modelURI, null, getSaveOptions()); + } + else { outputResource = resourceSet.createResource(modelURI); outputResource.getContents().addAll(generatedExecutor.getTransformer().getRootEObjects(modelName)); outputResource.save(getSaveOptions()); - } - if (expectedFile != null) { - checkOutput(outputResource, expectedFile, normalizer); - } - return outputResource; + } + assert outputResource != null; + if (expectedFile != null) { + checkOutput(outputResource, expectedFile, normalizer); + } + return outputResource; } - public URI getURI(@NonNull String genmodelStep, @NonNull Key<URI> uriKey) { + public @NonNull URI getURI(@NonNull String genmodelStep, @NonNull Key<URI> uriKey) { return compilerChain.getURI(CompilerChain.GENMODEL_STEP, CompilerChain.URI_KEY); } } @@ -320,8 +324,9 @@ public class QVTrCompilerTests extends LoadTestCase /* (non-Javadoc) * @see org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase#setUp() */ + @Override @Before - public void setUp() throws Exception { + public void setUp() throws Exception { BaseLinkingService.DEBUG_RETRY.setState(true); Scheduler.DEBUG_GRAPHS.setState(true);; super.setUp(); @@ -329,19 +334,20 @@ public class QVTrCompilerTests extends LoadTestCase QVTrTestUtil.doQVTrelationSetup(); QVTcTestUtil.doQVTcoreSetup(); QVTiTestUtil.doQVTimperativeSetup(); -// QVTrelationPivotStandaloneSetup.doSetup(); -// QVTimperativePivotStandaloneSetup.doSetup(); - } + // QVTrelationPivotStandaloneSetup.doSetup(); + // QVTimperativePivotStandaloneSetup.doSetup(); + } - /* (non-Javadoc) - * @see org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase#tearDown() - */ - @After - public void tearDown() throws Exception { + /* (non-Javadoc) + * @see org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase#tearDown() + */ + @Override + @After + public void tearDown() throws Exception { super.tearDown(); - } + } -/* @Test + /* @Test public void testQVTrCompiler_ClassModelToClassModel() throws Exception { // AbstractTransformer.EXCEPTIONS.setState(true); // AbstractTransformer.INVOCATIONS.setState(true); @@ -386,161 +392,161 @@ public class QVTrCompilerTests extends LoadTestCase } */ @Test - public void testQVTrCompiler_HierarchicalStateMachine2FlatStateMachine() throws Exception { -// AbstractTransformer.EXCEPTIONS.setState(true); -// AbstractTransformer.INVOCATIONS.setState(true); - MyQVT myQVT = new MyQVT("hstm2fstm"); - myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); - try { - Transformation asTransformation = myQVT.compileTransformation("HierarchicalStateMachine2FlatStateMachine.qvtr", "flat", PROJECT_NAME + ".HierarchicalStateMachine2FlatStateMachine", "http://www.eclipse.org/qvtd/xtext/qvtrelation/tests/hstm2fstm/HierarchicalStateMachine2FlatStateMachine"); - // - myQVT.createInterpretedExecutor(asTransformation); - myQVT.loadInput("hier", "MiniModel.xmi"); -// myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "HierarchicalStateMachine2FlatStateMachine_trace.xmi"); - myQVT.createModel("flat", "MiniModel_Interpreted.xmi"); - myQVT.executeTransformation(); + public void testQVTrCompiler_HierarchicalStateMachine2FlatStateMachine() throws Exception { + // AbstractTransformer.EXCEPTIONS.setState(true); + // AbstractTransformer.INVOCATIONS.setState(true); + MyQVT myQVT = new MyQVT("hstm2fstm"); + myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); + try { + Transformation asTransformation = myQVT.compileTransformation("HierarchicalStateMachine2FlatStateMachine.qvtr", "flat", PROJECT_NAME + ".HierarchicalStateMachine2FlatStateMachine", "http://www.eclipse.org/qvtd/xtext/qvtrelation/tests/hstm2fstm/HierarchicalStateMachine2FlatStateMachine"); + // + myQVT.createInterpretedExecutor(asTransformation); + myQVT.loadInput("hier", "MiniModel.xmi"); + // myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "HierarchicalStateMachine2FlatStateMachine_trace.xmi"); + myQVT.createModel("flat", "MiniModel_Interpreted.xmi"); + myQVT.executeTransformation(); myQVT.saveOutput("flat", "MiniModel_Interpreted.xmi", "MiniModel_expected.xmi", FlatStateMachineNormalizer.INSTANCE); - // - myQVT.createInterpretedExecutor(asTransformation); - myQVT.loadInput("hier", "SimpleModel.xmi"); -// myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "HierarchicalStateMachine2FlatStateMachine_trace.xmi"); - myQVT.createModel("flat", "SimpleModel_Interpreted.xmi"); - myQVT.executeTransformation(); + // + myQVT.createInterpretedExecutor(asTransformation); + myQVT.loadInput("hier", "SimpleModel.xmi"); + // myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "HierarchicalStateMachine2FlatStateMachine_trace.xmi"); + myQVT.createModel("flat", "SimpleModel_Interpreted.xmi"); + myQVT.executeTransformation(); myQVT.saveOutput("flat", "SimpleModel_Interpreted.xmi", "SimpleModel_expected.xmi", FlatStateMachineNormalizer.INSTANCE); - // - myQVT.createInterpretedExecutor(asTransformation); - myQVT.loadInput("hier", "LargerModel.xmi"); -// myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "HierarchicalStateMachine2FlatStateMachine_trace.xmi"); - myQVT.createModel("flat", "LargerModel_Interpreted.xmi"); - myQVT.executeTransformation(); + // + myQVT.createInterpretedExecutor(asTransformation); + myQVT.loadInput("hier", "LargerModel.xmi"); + // myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "HierarchicalStateMachine2FlatStateMachine_trace.xmi"); + myQVT.createModel("flat", "LargerModel_Interpreted.xmi"); + myQVT.executeTransformation(); myQVT.saveOutput("flat", "LargerModel_Interpreted.xmi", "LargerModel_expected.xmi", FlatStateMachineNormalizer.INSTANCE); } finally { - myQVT.dispose(); + myQVT.dispose(); } - } + } @Test - public void testQVTrCompiler_HierarchicalStateMachine2FlatStateMachine_CG() throws Exception { - HeadSplitter.SPLITTING.setState(true); + public void testQVTrCompiler_HierarchicalStateMachine2FlatStateMachine_CG() throws Exception { + HeadSplitter.SPLITTING.setState(true); Scheduler.DEBUG_GRAPHS.setState(true); AbstractTransformer.EXCEPTIONS.setState(true); -// AbstractTransformer.INVOCATIONS.setState(true); -// QVTm2QVTp.PARTITIONING.setState(true); -// QVTr2QVTc.VARIABLES.setState(true); + // AbstractTransformer.INVOCATIONS.setState(true); + // QVTm2QVTp.PARTITIONING.setState(true); + // QVTr2QVTc.VARIABLES.setState(true); MyQVT myQVT = new MyQVT("hstm2fstm"); - try { + try { Class<? extends Transformer> txClass = myQVT.buildTransformation("HierarchicalStateMachine2FlatStateMachine", - "HierarchicalStateMachine2FlatStateMachine.qvtr", "flat", + "HierarchicalStateMachine2FlatStateMachine.qvtr", "flat", "http://www.eclipse.org/qvtd/xtext/qvtrelation/tests/hstm2fstm/HierarchicalStateMachine2FlatStateMachine");//, -// "FlatStateMachine.FlatStateMachinePackage", "HierarchicalStateMachine.HierarchicalStateMachinePackage"); - // - myQVT.createGeneratedExecutor(txClass); - myQVT.loadInput("hier", "MiniModel.xmi"); - myQVT.executeTransformation(); + // "FlatStateMachine.FlatStateMachinePackage", "HierarchicalStateMachine.HierarchicalStateMachinePackage"); + // + myQVT.createGeneratedExecutor(txClass); + myQVT.loadInput("hier", "MiniModel.xmi"); + myQVT.executeTransformation(); myQVT.saveOutput("flat", "MiniModel_CG.xmi", "MiniModel_expected.xmi", FlatStateMachineNormalizer.INSTANCE); - // - myQVT.createGeneratedExecutor(txClass); - myQVT.loadInput("hier", "SimpleModel.xmi"); - myQVT.executeTransformation(); + // + myQVT.createGeneratedExecutor(txClass); + myQVT.loadInput("hier", "SimpleModel.xmi"); + myQVT.executeTransformation(); myQVT.saveOutput("flat", "SimpleModel_CG.xmi", "SimpleModel_expected.xmi", FlatStateMachineNormalizer.INSTANCE); - // - myQVT.createGeneratedExecutor(txClass); - myQVT.loadInput("hier", "LargerModel.xmi"); - myQVT.executeTransformation(); + // + myQVT.createGeneratedExecutor(txClass); + myQVT.loadInput("hier", "LargerModel.xmi"); + myQVT.executeTransformation(); myQVT.saveOutput("flat", "LargerModel_CG.xmi", "LargerModel_expected.xmi", FlatStateMachineNormalizer.INSTANCE); - // -// myQVT.createGeneratedExecutor(txClass); -// myQVT.loadInput("seqDgm", "SeqUM.xmi"); -// myQVT.executeTransformation(); -// myQVT.saveOutput("stm", "StmcUM_CG.xmi", "StmcUM_expected.xmi", null); + // + // myQVT.createGeneratedExecutor(txClass); + // myQVT.loadInput("seqDgm", "SeqUM.xmi"); + // myQVT.executeTransformation(); + // myQVT.saveOutput("stm", "StmcUM_CG.xmi", "StmcUM_expected.xmi", null); } finally { - myQVT.dispose(); + myQVT.dispose(); } - } + } @Test - public void testQVTrCompiler_SeqToStm() throws Exception { -// AbstractTransformer.EXCEPTIONS.setState(true); -// AbstractTransformer.INVOCATIONS.setState(true); - MyQVT myQVT = new MyQVT("seq2stm"); - myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); - try { - Transformation asTransformation = myQVT.compileTransformation("SeqToStm.qvtr", "stm", PROJECT_NAME + ".seq2stm", "http://www.eclipse.org/qvtd/xtext/qvtrelation/tests/seq2stm/SeqToStm"); - myQVT.createInterpretedExecutor(asTransformation); - myQVT.loadInput("seqDgm", "Seq.xmi"); - myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "Seq2Stmc_trace.xmi"); - myQVT.createModel("stm", "Stmc_Interpreted.xmi"); - myQVT.executeTransformation(); + public void testQVTrCompiler_SeqToStm() throws Exception { + // AbstractTransformer.EXCEPTIONS.setState(true); + // AbstractTransformer.INVOCATIONS.setState(true); + MyQVT myQVT = new MyQVT("seq2stm"); + myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); + try { + Transformation asTransformation = myQVT.compileTransformation("SeqToStm.qvtr", "stm", PROJECT_NAME + ".seq2stm", "http://www.eclipse.org/qvtd/xtext/qvtrelation/tests/seq2stm/SeqToStm"); + myQVT.createInterpretedExecutor(asTransformation); + myQVT.loadInput("seqDgm", "Seq.xmi"); + myQVT.createModel(QVTimperativeUtil.MIDDLE_DOMAIN_NAME, "Seq2Stmc_trace.xmi"); + myQVT.createModel("stm", "Stmc_Interpreted.xmi"); + myQVT.executeTransformation(); myQVT.saveOutput("stm", "Stmc_Interpreted.xmi", "Stmc_expected.xmi", null); } finally { - myQVT.dispose(); + myQVT.dispose(); } - } + } @Test - public void testQVTrCompiler_SeqToStm_CG() throws Exception { - HeadSplitter.SPLITTING.setState(true); -// AbstractTransformer.EXCEPTIONS.setState(true); -// AbstractTransformer.INVOCATIONS.setState(true); -// QVTm2QVTp.PARTITIONING.setState(true); - MyQVT myQVT = new MyQVT("seq2stm"); - try { - Class<? extends Transformer> txClass = myQVT.buildTransformation("seq2stm", "SeqToStm.qvtr", "stm", - "http://www.eclipse.org/qvtd/xtext/qvtrelation/tests/seq2stm/SeqToStm");//, -// "SeqMM.SeqMMPackage", "PSeqToStm.PSeqToStmPackage"); - // - myQVT.createGeneratedExecutor(txClass); - myQVT.loadInput("seqDgm", "Seq.xmi"); - myQVT.executeTransformation(); + public void testQVTrCompiler_SeqToStm_CG() throws Exception { + HeadSplitter.SPLITTING.setState(true); + // AbstractTransformer.EXCEPTIONS.setState(true); + // AbstractTransformer.INVOCATIONS.setState(true); + // QVTm2QVTp.PARTITIONING.setState(true); + MyQVT myQVT = new MyQVT("seq2stm"); + try { + Class<? extends Transformer> txClass = myQVT.buildTransformation("seq2stm", "SeqToStm.qvtr", "stm", + "http://www.eclipse.org/qvtd/xtext/qvtrelation/tests/seq2stm/SeqToStm");//, + // "SeqMM.SeqMMPackage", "PSeqToStm.PSeqToStmPackage"); + // + myQVT.createGeneratedExecutor(txClass); + myQVT.loadInput("seqDgm", "Seq.xmi"); + myQVT.executeTransformation(); myQVT.saveOutput("stm", "Stmc_CG.xmi", "Stmc_expected.xmi", null); - // -// myQVT.createGeneratedExecutor(txClass); -// myQVT.loadInput("seqDgm", "SeqUM.xmi"); -// myQVT.executeTransformation(); -// myQVT.saveOutput("stm", "StmcUM_CG.xmi", "StmcUM_expected.xmi", null); + // + // myQVT.createGeneratedExecutor(txClass); + // myQVT.loadInput("seqDgm", "SeqUM.xmi"); + // myQVT.executeTransformation(); + // myQVT.saveOutput("stm", "StmcUM_CG.xmi", "StmcUM_expected.xmi", null); } finally { - myQVT.dispose(); + myQVT.dispose(); } - } + } @Test - public void testQVTrCompiler_SimplerRel2Core_CG() throws Exception { + public void testQVTrCompiler_SimplerRel2Core_CG() throws Exception { AbstractTransformer.EXCEPTIONS.setState(true); AbstractTransformer.INVOCATIONS.setState(true); -// QVTm2QVTp.PARTITIONING.setState(true); -// QVTr2QVTc.SYNTHESIS.setState(true); -// QVTr2QVTc.VARIABLES.setState(true); - MyQVT myQVT = new MyQVT("rel2core"); - try { - myQVT.addUsedGenPackage("org.eclipse.ocl.pivot/model/Pivot.genmodel", "//pivot"); + // QVTm2QVTp.PARTITIONING.setState(true); + // QVTr2QVTc.SYNTHESIS.setState(true); + // QVTr2QVTc.VARIABLES.setState(true); + MyQVT myQVT = new MyQVT("rel2core"); + try { + myQVT.addUsedGenPackage("org.eclipse.ocl.pivot/model/Pivot.genmodel", "//pivot"); myQVT.addUsedGenPackage("org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel", "//qvtbase"); myQVT.addUsedGenPackage("org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.genmodel", "//qvtcore"); myQVT.addUsedGenPackage("org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.genmodel", "//qvtcorebase"); myQVT.addUsedGenPackage("org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.genmodel", "//qvtrelation"); myQVT.addUsedGenPackage("org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.genmodel", "//qvttemplate"); - Class<? extends Transformer> txClass = myQVT.buildTransformation("rel2core", "RelToCore.qvtr", "core", - "http://www.eclipse.org/qvtd/xtext/qvtrelation/tests/rel2core/RelToCore"); - // - myQVT.createGeneratedExecutor(txClass); - myQVT.loadInput("relations", "MiniSeq2Stm.qvtras"); - myQVT.executeTransformation(); -// myQVT.getResourceSet().getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore", new EcoreResourceFactoryImpl()); -// myQVT.getEnvironmentFactory().getMetamodelManager().getASResourceSet().getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore", new EcoreResourceFactoryImpl()); + Class<? extends Transformer> txClass = myQVT.buildTransformation("rel2core", "RelToCore.qvtr", "core", + "http://www.eclipse.org/qvtd/xtext/qvtrelation/tests/rel2core/RelToCore"); + // + myQVT.createGeneratedExecutor(txClass); + myQVT.loadInput("relations", "MiniSeq2Stm.qvtras"); + myQVT.executeTransformation(); + // myQVT.getResourceSet().getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore", new EcoreResourceFactoryImpl()); + // myQVT.getEnvironmentFactory().getMetamodelManager().getASResourceSet().getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore", new EcoreResourceFactoryImpl()); Resource outputResource = myQVT.saveOutput("core", "MiniSeq2Stm_CG.oclas", null, null); myQVT.saveOutput("middle", "MiniSeq2Stm_CG_Trace.xmi", null, null); myQVT.checkOutput(outputResource, "MiniSeq2Stm_expected.oclas", PivotNormalizer.INSTANCE); - // -// myQVT.createGeneratedExecutor(txClass); -// myQVT.loadInput("seqDgm", "SeqUM.xmi"); -// myQVT.executeTransformation(); -// myQVT.saveOutput("stm", "StmcUM_CG.xmi", "StmcUM_expected.xmi", null); + // + // myQVT.createGeneratedExecutor(txClass); + // myQVT.loadInput("seqDgm", "SeqUM.xmi"); + // myQVT.executeTransformation(); + // myQVT.saveOutput("stm", "StmcUM_CG.xmi", "StmcUM_expected.xmi", null); } finally { - myQVT.dispose(); + myQVT.dispose(); } - } + } } diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/hstm2fstm/FlatStateMachineNormalizer.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/hstm2fstm/FlatStateMachineNormalizer.java index 2bb09e691..2977f7119 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/hstm2fstm/FlatStateMachineNormalizer.java +++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/hstm2fstm/FlatStateMachineNormalizer.java @@ -32,14 +32,14 @@ import org.eclipse.qvtd.xtext.qvtimperative.tests.ModelNormalizer; /** * UpperToLowerNormalizer normalises the results of the UpperToLower transformation. - * + * * Even though everything is ordered in the input/output model, the edges/incoming/outgoing lists cn be independently ordered, and only * the edges order is preserved in the middle model. */ public class FlatStateMachineNormalizer implements ModelNormalizer { public static final @NonNull FlatStateMachineNormalizer INSTANCE = new FlatStateMachineNormalizer(); - + protected abstract class AbstractComparator implements Comparator<@NonNull EObject> { protected final @NonNull EClass eClass; @@ -49,7 +49,7 @@ public class FlatStateMachineNormalizer implements ModelNormalizer eClass2comparator.put(eClass, this); } } - + protected class StateComparator extends AbstractComparator { private final @NonNull EAttribute stateName; @@ -58,7 +58,7 @@ public class FlatStateMachineNormalizer implements ModelNormalizer super(stateClass); this.stateName = stateName; } - + @Override public int compare(@NonNull EObject o1, @NonNull EObject o2) { if (eClass.isInstance(o1)) { @@ -76,7 +76,7 @@ public class FlatStateMachineNormalizer implements ModelNormalizer return ClassUtil.safeCompareTo(n1, n2); } } - + protected class StateMachineComparator extends AbstractComparator { private final @NonNull EAttribute stateMachineName; @@ -85,7 +85,7 @@ public class FlatStateMachineNormalizer implements ModelNormalizer super(stateMachineClass); this.stateMachineName = stateMachineName; } - + @Override public int compare(@NonNull EObject o1, @NonNull EObject o2) { if (eClass.isInstance(o1)) { @@ -103,7 +103,7 @@ public class FlatStateMachineNormalizer implements ModelNormalizer return ClassUtil.safeCompareTo(n1, n2); } } - + protected class TransitionComparator extends AbstractComparator { private final @NonNull EAttribute transitionName; @@ -119,7 +119,7 @@ public class FlatStateMachineNormalizer implements ModelNormalizer this.transitionToState = transitionToState; this.stateName = stateName; } - + @Override public int compare(@NonNull EObject o1, @NonNull EObject o2) { if (eClass.isInstance(o1)) { @@ -150,7 +150,7 @@ public class FlatStateMachineNormalizer implements ModelNormalizer return diff; } } - + protected abstract class AbstractNormalizer { protected final @NonNull EClass eClass; @@ -162,7 +162,7 @@ public class FlatStateMachineNormalizer implements ModelNormalizer public abstract void normalize(@NonNull EObject eObject); } - + protected class ResourceNormalizer extends AbstractNormalizer { private final @NonNull EReference stateMachineOwnedStates; @@ -184,10 +184,10 @@ public class FlatStateMachineNormalizer implements ModelNormalizer @Override public void normalize(@NonNull EObject eObject) { ECollections.sort((EList<EObject>)eObject.eGet(stateMachineOwnedStates), stateComparator); - ECollections.sort((EList<EObject>)eObject.eGet(stateMachineOwnedTransitions), transitionComparator); + ECollections.sort((EList<EObject>)eObject.eGet(stateMachineOwnedTransitions), transitionComparator); } } - + protected class StateNormalizer extends AbstractNormalizer { private final @NonNull EReference stateOutTransitions; @@ -206,10 +206,10 @@ public class FlatStateMachineNormalizer implements ModelNormalizer @Override public void normalize(@NonNull EObject eObject) { ECollections.sort((EList<EObject>)eObject.eGet(stateOutTransitions), transitionComparator); - ECollections.sort((EList<EObject>)eObject.eGet(stateInTransitions), transitionComparator); + ECollections.sort((EList<EObject>)eObject.eGet(stateInTransitions), transitionComparator); } } - + protected class StateMachineNormalizer extends AbstractNormalizer { private final @NonNull EReference stateMachineOwnedStates; @@ -231,13 +231,14 @@ public class FlatStateMachineNormalizer implements ModelNormalizer @Override public void normalize(@NonNull EObject eObject) { ECollections.sort((EList<EObject>)eObject.eGet(stateMachineOwnedStates), stateComparator); - ECollections.sort((EList<EObject>)eObject.eGet(stateMachineOwnedTransitions), transitionComparator); + ECollections.sort((EList<EObject>)eObject.eGet(stateMachineOwnedTransitions), transitionComparator); } } - + protected final @NonNull Map<@NonNull EClass, @NonNull AbstractComparator> eClass2comparator = new HashMap<@NonNull EClass, @NonNull AbstractComparator>(); protected final @NonNull Map<@NonNull EClass, @NonNull AbstractNormalizer> eClass2normalizer = new HashMap<@NonNull EClass, @NonNull AbstractNormalizer>(); + @Override public @NonNull List<Normalizer> normalize(@NonNull Resource resource) { EObject eRoot = resource.getContents().get(0); EPackage ePackage = eRoot.eClass().getEPackage(); @@ -272,7 +273,7 @@ public class FlatStateMachineNormalizer implements ModelNormalizer } for (@NonNull EObject eObject : eObjects) { EClass eClass = eObject.eClass(); - AbstractNormalizer normalizer = eClass2normalizer.get(eClass); + AbstractNormalizer normalizer = ClassUtil.nonNullState(eClass2normalizer.get(eClass)); normalizer.normalize(eObject); } ECollections.sort(resource.getContents(), stateMachineComparator); diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/PivotNormalizer.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/PivotNormalizer.java index dde0937bd..b0f135403 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/PivotNormalizer.java +++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/PivotNormalizer.java @@ -103,6 +103,7 @@ public class PivotNormalizer implements ModelNormalizer } } + @Override public @NonNull List<Normalizer> normalize(@NonNull Resource resource) { List<Normalizer> normalizers = new ArrayList<Normalizer>(); for (TreeIterator<EObject> tit = resource.getAllContents(); tit.hasNext(); ) { |