From 44e4cbcc4fb19c3bc0f98d9895b2fe2306691be9 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr>
Date: Wed, 19 Jun 2024 17:28:42 +0200
Subject: [PATCH] Solving bug on method addition ticket 409
---
src/main/java/ui/AvatarMethod.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/ui/AvatarMethod.java b/src/main/java/ui/AvatarMethod.java
index 35e25bc1ed..5b0442fa53 100644
--- a/src/main/java/ui/AvatarMethod.java
+++ b/src/main/java/ui/AvatarMethod.java
@@ -111,6 +111,8 @@ public class AvatarMethod {
//TraceManager.addDev("Is a valid method? " + _method);
+
+
String method, tmp, id;
String rt = "";
@@ -337,19 +339,17 @@ public class AvatarMethod {
}
if (checkTypes) {
- TraceManager.addDev("Checking types with lowerid=" + lowerid);
- b4 = !((lowerid.equals(getStringType(0).toLowerCase())) || (lowerid.equals(getStringType(1).toLowerCase())) ||
- (lowerid.equals(getStringType(2).toLowerCase())) || (lowerid.equals(getStringType(3).toLowerCase())) ||
- (lowerid.equals(getStringType(4).toLowerCase())));
-
- TraceManager.addDev("b4=" + b4 + " extraTypes=" + extraTypes);
- if (extraTypes != null) {
- TraceManager.addDev("Checking extra types, with extraTypes = " + extraTypes);
+ //TraceManager.addDev("Checking types with lowerid=" + lowerid);
+ b4 = ((lowerid.equals(getStringType(INTEGER).toLowerCase())) || (lowerid.equals(getStringType(BOOLEAN).toLowerCase())));
+
+ //TraceManager.addDev("b4=" + b4 + " extraTypes=" + extraTypes);
+ if ((extraTypes != null) && (b4 == false)){
+ //TraceManager.addDev("Checking extra types, with extraTypes = " + extraTypes);
for(String type: extraTypes) {
String typ = type.toLowerCase();
- TraceManager.addDev("Comparing type >" + typ + "< with >" + lowerid + "<");
+ //TraceManager.addDev("Comparing type >" + typ + "< with >" + lowerid + "<");
if (type.toLowerCase().compareTo(lowerid) == 0) {
- TraceManager.addDev("Similar type");
+ //TraceManager.addDev("Similar type");
b4 = true;
break;
}
--
GitLab