Final fix for issue #792

tsantalis · Oct 28, 2024 · 512227a · 512227a
1 parent 5d024c6
commit 512227a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/gr/uom/java/xmi/decomposition/AbstractExpression.java b/src/main/java/gr/uom/java/xmi/decomposition/AbstractExpression.java
@@ -2,6 +2,7 @@
 
 import static gr.uom.java.xmi.decomposition.Visitor.stringify;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
@@ -126,6 +127,18 @@ public List<VariableDeclaration> getVariableDeclarations() {
 		return variableDeclarations;
 	}
 
+	public List<AbstractCall> getAllOperationInvocations() {
+		List<AbstractCall> list = new ArrayList<>();
+		list.addAll(getMethodInvocations());
+		for(LambdaExpressionObject lambda : this.getLambdas()) {
+			list.addAll(lambda.getAllOperationInvocations());
+		}
+		for(AnonymousClassDeclarationObject anonymous : this.getAnonymousClassDeclarations()) {
+			list.addAll(anonymous.getMethodInvocations());
+		}
+		return list;
+	}
+
 	@Override
 	public List<AbstractCall> getMethodInvocations() {
 		return methodInvocations;

diff --git a/src/main/java/gr/uom/java/xmi/decomposition/LambdaExpressionObject.java b/src/main/java/gr/uom/java/xmi/decomposition/LambdaExpressionObject.java
@@ -281,7 +281,7 @@ public List<LambdaExpressionObject> getAllLambdas() {
 	@Override
 	public List<AbstractCall> getAllOperationInvocations() {
 		if(expression != null) {
-			return new ArrayList<>(expression.getMethodInvocations());
+			return new ArrayList<>(expression.getAllOperationInvocations());
 		}
 		if(body != null) {
 			return body.getAllOperationInvocations();