diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java index b9961d5c30d1a7b224d0281c6ac2da36c82a207c..45a73e8d20d086a89540933ae9a206e92026dd27 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 84ef5c782b5c420b2600f6c2a24fad1b5039453f..5b0442fa5321ddacd0280adf4b7ec4e9e5a67ea1 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; }