From c70b508361ee5d9f110b04ba3ae9d722eff6ef50 Mon Sep 17 00:00:00 2001 From: tsantalis Date: Thu, 19 Dec 2024 08:03:11 -0500 Subject: [PATCH] Fix for issue #831 --- .../java/xmi/decomposition/ReplacementAlgorithm.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/gr/uom/java/xmi/decomposition/ReplacementAlgorithm.java b/src/main/java/gr/uom/java/xmi/decomposition/ReplacementAlgorithm.java index 061d362ea9..cdb5c79d79 100644 --- a/src/main/java/gr/uom/java/xmi/decomposition/ReplacementAlgorithm.java +++ b/src/main/java/gr/uom/java/xmi/decomposition/ReplacementAlgorithm.java @@ -2328,12 +2328,12 @@ else if(invocationCoveringTheEntireStatement1 != null && (r = invocationCovering } for(String methodInvocation1 : methodInvocations1) { for(AbstractCall operationInvocation1 : methodInvocationMap1.get(methodInvocation1)) { - if(statement1.getString().endsWith(methodInvocation1 + JAVA.STATEMENT_TERMINATION) && (r = operationInvocation1.makeReplacementForReturnedArgument(replacementInfo.getArgumentizedString2())) != null) { - if(operationInvocation1.makeReplacementForReturnedArgument(statement2.getString()) != null) { + if((statement1.getString().endsWith(methodInvocation1 + JAVA.STATEMENT_TERMINATION) || statement1.getString().startsWith(methodInvocation1 + ".")) && (r = operationInvocation1.makeReplacementForReturnedArgument(replacementInfo.getArgumentizedString2())) != null) { + //if(operationInvocation1.makeReplacementForReturnedArgument(statement2.getString()) != null) { replacementInfo.addReplacement(r); addLeafMappings(statement1, statement2, r, replacementInfo, container1, container2); return replacementInfo.getReplacements(); - } + //} } } } @@ -2349,12 +2349,12 @@ else if(invocationCoveringTheEntireStatement1 != null && (r = invocationCovering } for(String methodInvocation2 : methodInvocations2) { for(AbstractCall operationInvocation2 : methodInvocationMap2.get(methodInvocation2)) { - if(statement2.getString().endsWith(methodInvocation2 + JAVA.STATEMENT_TERMINATION) && (r = operationInvocation2.makeReplacementForWrappedCall(replacementInfo.getArgumentizedString1())) != null) { - if(operationInvocation2.makeReplacementForWrappedCall(statement1.getString()) != null) { + if((statement2.getString().endsWith(methodInvocation2 + JAVA.STATEMENT_TERMINATION) || statement2.getString().startsWith(methodInvocation2 + ".")) && (r = operationInvocation2.makeReplacementForWrappedCall(replacementInfo.getArgumentizedString1())) != null) { + //if(operationInvocation2.makeReplacementForWrappedCall(statement1.getString()) != null) { replacementInfo.addReplacement(r); addLeafMappings(statement1, statement2, r, replacementInfo, container1, container2); return replacementInfo.getReplacements(); - } + //} } } }