From d3ee90a8c112c2d6110389ee806042b9123f216b Mon Sep 17 00:00:00 2001
From: Sophie Coudert <sophie.coudert@telecom-paris.fr>
Date: Wed, 17 Jul 2024 17:18:22 +0200
Subject: [PATCH] checkTypes restored
---
.../java/avatartranslator/tosysmlv2/AvatarFromSysML.java | 1 +
src/main/java/ui/AvatarMethod.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
index b9961d5c30..45a73e8d20 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
@@ -500,6 +500,7 @@ public class AvatarFromSysML {
// create method
AvatarMethod am = new AvatarMethod(sm.getName(),null);
// add method
+ System.out.println("$$$$$$$$$$$ " + theBlock.getName() + " : " + am.getName());
theBlock.addMethod(am);
// add input parameters to method
buildProfile(sm, am, theBlock);
diff --git a/src/main/java/ui/AvatarMethod.java b/src/main/java/ui/AvatarMethod.java
index 84ef5c782b..5b0442fa53 100644
--- a/src/main/java/ui/AvatarMethod.java
+++ b/src/main/java/ui/AvatarMethod.java
@@ -154,7 +154,7 @@ public class AvatarMethod {
// So, there is a return type!
rt = tmp.trim();
method = method.substring(index2 + 1, method.length()).trim();
- if (!isAValidId(rt, false, false, false, false, extraTypes)) {
+ if (!isAValidId(rt, false, false, false, checkTypes, extraTypes)) {
TraceManager.addDev("Unvalid return type: " + rt);
return null;
}
@@ -252,12 +252,12 @@ public class AvatarMethod {
return null;
}
TraceManager.addDev("Checking input parameter");
- if (!isAValidId(splitted[i], false, false,false, false, extraTypes)) {
+ if (!isAValidId(splitted[i], false, false,false, checkTypes, extraTypes)) {
TraceManager.addDev("Unvalid input type #" + i + ": " + splitted[i]);
return null;
}
- if (!isAValidId(splitted[i + 1], true, true,true, checkTypes, extraTypes)) {
+ if (!isAValidId(splitted[i + 1], true, true,true, false, extraTypes)) {
TraceManager.addDev("Unvalid id of parameter " + splitted[i + 1]);
return null;
}
--
GitLab