Description Stefan Baramov 2010-08-02 13:35:18 EDT

Build Identifier: 20100218-1602

The JMerger ignores the 'sourceTransfer' when merging the super type. For example if one takes the original emf-merge.xml and modifies it to look like this: 

<merge:pull 
    sourceGet="Type/getSuperclass"
    sourceTransfer="(\s*@\s*extends)(.*?)(?:&lt;!--|(?:\n\r?|\r\n?))"
    targetMarkup="^lastgen$|^gen$|^modifiable$|^model$"
    targetPut="Type/setSuperclass"/>
<merge:pull 
    sourceGet="Type/getSuperInterfaces"
    sourceTransfer="(\s*@\s*implements)(.*?)(?:&lt;!--|(?:\n\r?|\r\n?))"
    targetMarkup="^lastgen$|^gen$|^modifiable$|^model$"
    targetPut="Type/addSuperInterface"/>

Then, one would expect to see that the super type is taken from the original code. For example if the existing code (or so called 'target') is like this:

/**
 * Data class.
 * <!-- begin-user-doc -->
 * @extends DataContent 
 * @implements Serializable
 * <!-- end-user-doc -->
 * @generated
 */
public class Data extends DataContent implements Serializable {
....
}
and the generated code (so called 'source') is like this: 

/**
 * Data class.
 * <!-- begin-user-doc -->
 * <!-- end-user-doc -->
 * @generated
 */
public class Data {
....
}

then I would expect to have the original preserved. Instead I get 

/**
 * Data class.
 * <!-- begin-user-doc -->
 * @extends DataContent 
 * @implements Serializable
 * <!-- end-user-doc -->
 * @generated
 */
public class Data implements Serializable {
....
}

Where, the super type is gone besides the fact that existed in the target and the pull rule has specified a source transfer. The fault appear to be in the org.eclipse.emf.codegen.merge.java.JMerger.applyPullRules(JNode, JNode) method. In my copy of the source code this will be line 773 : 

targetPutMethod.invoke(targetNode, new Object [] { value });

where the oldValue is completely ignored. 

While this is intended implementation or not, I do not know. The newsgroup is down so I can discuss it there. Hence, the bug report. I only hope I am not creating too much useless noise.

Regards
- Stefan 

Reproducible: Always