Attachment #237662 for bug #403440

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




 *   
 * Contributors:
 *     Borland Software Corporation - initial API and implementation
 *     Alex Paperno - bugs 416584, 401521, 403440
 *******************************************************************************/
package org.eclipse.m2m.internal.qvt.oml.ast.env;


		return TypeUtil.findOperationMatching(this, owner, name, args);
	}
	
    public List<MappingOperation> lookupMappingOperations(EClassifier owner, String name) {
        if (owner == null) {
            owner = getModuleContextType();
            if(owner == null) {


        UMLReflection<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint> uml = getUMLReflection();
        List<EOperation> operations = TypeUtil.getOperations(this, owner);
        List<MappingOperation> result = new ArrayList<MappingOperation>();
		for (EOperation operation : operations) {
		    if (uml.getName(operation).equals(name) && QvtOperationalUtil.isMappingOperation(operation)) {
		        result.add((MappingOperation)operation);
		    }
		}





 *     Borland Software Corporation - initial API and implementation
 *     Christopher Gerking - bugs 302594, 310991
 *     Alex Paperno - bugs 272869, 268636, 404647, 414363, 414363, 401521,
 *                         419299, 403440 
 *******************************************************************************/
package org.eclipse.m2m.internal.qvt.oml.ast.parser;


	/**
	 * TODO - make a common resolution operation, reusable in for ResolveInExp too. 
	 */
	private List<MappingOperation> resolveMappingOperationReference(ScopedNameCS identifierCS, QvtOperationalEnv env) {
		List<MappingOperation> result = Collections.emptyList();
		
		TypeCS typeCS = identifierCS.getTypeCS();
		EClassifier owningType = null;		

		}
		// filter out inherited mappings
		if(!result.isEmpty()) {
			List<MappingOperation> ownerLocalOpers = new ArrayList<MappingOperation>(result.size());
	        for (MappingOperation operation : result) {
	            EClassifier owner = env.getUMLReflection().getOwningClassifier(operation);
	            if ((typeCS == null && owner == null) || (TypeUtil.resolveType(env, owner) == owningType)) {
	                ownerLocalOpers.add(operation);

				MappingExtensionKindCS kind = extensionCS.getKind();
				
				for (ScopedNameCS identifierCS : extensionCS.getMappingIdentifiers()) {
					List<MappingOperation> mappings = resolveMappingOperationReference(identifierCS, env);
					if(mappings.size() == 1) {
						boolean isAdded = false;
						MappingOperation extendedMapping = mappings.get(0);
						if(kind == MappingExtensionKindCS.INHERITS) {
							isAdded = operation.getInherited().add(extendedMapping);
							MappingExtensionHelper.bind2SourceElement(operation, identifierCS, kind);

        EClassifier eClassifier = (contextTypeCS == null) ? null : visitTypeCS(contextTypeCS, null, env); // mapping context type
        eClassifier = eClassifier != null ? eClassifier : env.getModuleContextType();
        String mappingName = resolveInExpCS.getInMappingName().getValue();
        List<MappingOperation> rawMappingOperations = env.lookupMappingOperations(eClassifier, mappingName);
        List<MappingOperation> unfilteredMappingOperations = new ArrayList<MappingOperation>();
        List<MappingOperation> mappingOperations = new ArrayList<MappingOperation>();
        
        for (MappingOperation operation : rawMappingOperations) {
            EClassifier owner = env.getUMLReflection().getOwningClassifier(operation);
            if (((contextTypeCS == null) && (owner == null))
                    || (TypeUtil.resolveType(env, owner) == eClassifier)) {
            	unfilteredMappingOperations.add(operation);
            }
        }
        mappingOperations.addAll(unfilteredMappingOperations);
        for (MappingOperation operation : unfilteredMappingOperations) {
            if (unfilteredMappingOperations.contains(operation.getOverridden())) {
            	mappingOperations.remove(operation.getOverridden());
            }
        }
        if (mappingOperations.size() == 1) {

Return to bug 403440

Lines 8-14 Link Here

(-)a/plugins/org.eclipse.m2m.qvt.oml/src/org/eclipse/m2m/internal/qvt/oml/ast/env/QvtOperationalEnv.java (-4 / +4 lines)
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Borland Software Corporation - initial API and implementation	10	* Borland Software Corporation - initial API and implementation
11	* Alex Paperno - bugs 416584, 401521	11	* Alex Paperno - bugs 416584, 401521, 403440
12	*******************************************************************************/	12	*******************************************************************************/
13	package org.eclipse.m2m.internal.qvt.oml.ast.env;	13	package org.eclipse.m2m.internal.qvt.oml.ast.env;
14		14
Lines 258-264 Link Here
258	return TypeUtil.findOperationMatching(this, owner, name, args);	258	return TypeUtil.findOperationMatching(this, owner, name, args);
259	}	259	}
260		260
261	public List<EOperation> lookupMappingOperations(EClassifier owner, String name) {	261	public List<MappingOperation> lookupMappingOperations(EClassifier owner, String name) {
262	if (owner == null) {	262	if (owner == null) {
263	owner = getModuleContextType();	263	owner = getModuleContextType();
264	if(owner == null) {	264	if(owner == null) {
Lines 268-277 Link Here
268		268
269	UMLReflection<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint> uml = getUMLReflection();	269	UMLReflection<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint> uml = getUMLReflection();
270	List<EOperation> operations = TypeUtil.getOperations(this, owner);	270	List<EOperation> operations = TypeUtil.getOperations(this, owner);
271	List<EOperation> result = new ArrayList<EOperation>();	271	List<MappingOperation> result = new ArrayList<MappingOperation>();
272	for (EOperation operation : operations) {	272	for (EOperation operation : operations) {
273	if (uml.getName(operation).equals(name) && QvtOperationalUtil.isMappingOperation(operation)) {	273	if (uml.getName(operation).equals(name) && QvtOperationalUtil.isMappingOperation(operation)) {
274	result.add(operation);	274	result.add((MappingOperation)operation);
275	}	275	}
276	}	276	}
277		277