From b5eba7751ce567696591e410deab8b86fc0105a1 Mon Sep 17 00:00:00 2001
From: jerray <jawher.jerray@eurecom.fr>
Date: Mon, 17 Jun 2024 12:56:19 +0200
Subject: [PATCH] solve conflict
---
src/main/java/ui/avatarbd/AvatarBDBlock.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/ui/avatarbd/AvatarBDBlock.java b/src/main/java/ui/avatarbd/AvatarBDBlock.java
index 6ab0325288..e6121e8edd 100644
--- a/src/main/java/ui/avatarbd/AvatarBDBlock.java
+++ b/src/main/java/ui/avatarbd/AvatarBDBlock.java
@@ -981,7 +981,7 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
//addCryptoElements();
}
- am = AvatarMethod.isAValidMethod(method);
+ am = AvatarMethod.isAValidMethod(method, null, false);
if (am != null) {
//TraceManager.addDev("Setting to " + implementation + " the implementation of " + am);
am.setImplementationProvided(implementation);
@@ -1344,12 +1344,16 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
}
public void addMethodIfApplicable(String methodString) {
+ addMethodIfApplicable(methodString, tdp.getExtraTypes());
+ }
+
+ public void addMethodIfApplicable(String methodString, List<String> extraTypes) {
for (AvatarMethod am : this.myMethods)
// TODO: replace by a more OO way...
if (am.toString().equals(methodString))
return;
- AvatarMethod am = AvatarMethod.isAValidMethod(methodString);
+ AvatarMethod am = AvatarMethod.isAValidMethod(methodString, extraTypes, true);
if (am != null)
this.myMethods.add(am);
}
--
GitLab