Update for issue
Supporting multiple inlines in the same target method
@@ -1733,8 +1733,9 @@ public class UMLModelDiff {
removedOperationInvocations.add(invocation);
}
}
- if(removedOperationInvocations.size() > 0 && !invocationMatchesWithAddedOperation(removedOperationInvocations.get(0), mapper.getOperation1().variableTypeMap(), mapper.getOperation2().getAllOperationInvocations())) {
- OperationInvocation removedOperationInvocation = removedOperationInvocations.get(0);
+ if(removedOperationInvocations.size() > 0) {
+ for(OperationInvocation removedOperationInvocation : removedOperationInvocations) {
+ if(!invocationMatchesWithAddedOperation(removedOperationInvocation, mapper.getOperation1().variableTypeMap(), mapper.getOperation2().getAllOperationInvocations())) {
List<String> arguments = removedOperationInvocation.getArguments();
List<String> parameters = removedOperation.getParameterNameList();
Map<String, String> parameterToArgumentMap1 = new LinkedHashMap<String, String>();
@@ -1760,6 +1761,8 @@ public class UMLModelDiff {
}
}
}
+ }
+ }
private boolean moveAndInlineMatchCondition(UMLOperationBodyMapper operationBodyMapper, UMLOperationBodyMapper parentMapper) {
List<AbstractCodeMapping> mappingList = new ArrayList<AbstractCodeMapping>(operationBodyMapper.getMappings());
