diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java index 5d782a544b5a1e72e2d9df3c46b8e7f84d485454..4886803e606c9a49a32d86b91ed71f60dbef0be4 100644 --- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java +++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java @@ -1875,12 +1875,12 @@ public class EntityUtil { public EList<String> getTransitionEffectParameters(Transition transition) { OpaqueBehavior effect = getTransitionEffect(transition); EList<String> paramsNames = new BasicEList<String>(); - for (Parameter par : effect.getOwnedParameters()) { + for(Parameter par: effect.getOwnedParameters()){ paramsNames.add(par.getName()); } return paramsNames; } - + public String getTransitionEffectText(Transition transition, String language) { OpaqueBehavior effect = getTransitionEffect(transition); if (effect != null) { @@ -3957,9 +3957,8 @@ public class EntityUtil { // methodName + " , " + paramIndex); Operation operation = getOperation(methodName, retrieveBlockType); // logger.debug("getParameterType operation: " + operation); - if ((operation != null) // && (operation.getMethods() != null) && - // (!operation.getMethods().isEmpty()) - ) { + if ((operation != null) //&& (operation.getMethods() != null) && (!operation.getMethods().isEmpty()) + ) { if (operation.inputParameters() != null) { EList<Parameter> params = operation.inputParameters(); @@ -4023,7 +4022,7 @@ public class EntityUtil { public EList<Parameter> getOperationParameters(String operationName, Class parentClass) { Operation op = parentClass.getOwnedOperation(operationName, null, null); - if (op != null) { + if(op!=null){ return op.getOwnedParameters(); } return null; @@ -4038,24 +4037,10 @@ public class EntityUtil { public EList<String> getParametersNames(Operation operation) { EList<String> parametersNames = new BasicEList<String>(); - for (Parameter par : operation.getOwnedParameters()) { + for(Parameter par: operation.getOwnedParameters()){ parametersNames.add(par.getName()); } return parametersNames; } - public Object getParameterType(String paramName, String methodName, Class retrieveBlockType) { - Operation operation = getOperation(methodName, retrieveBlockType); - if ((operation != null)) { - if (operation.inputParameters() != null) { - Parameter par = operation.getOwnedParameter(paramName, null); - if (par != null) { - // logger.debug("getParameterType par: " + par); - return par.getType(); - } - } - } - return null; - } - } \ No newline at end of file diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java index 84156a975611c6d8a97e73437f2c44c8ec01b131..28892b7200a2ce60ff5d42d4b738f185414ca4d4 100644 --- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java +++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java @@ -1127,9 +1127,4 @@ return EntityUtil.getInstance().isCallEventByOperationName(idName,currBlock); public Object getCallEventOperation(Object callEvent) throws Exception { return EntityUtil.getInstance().getCallEventOperation((CallEvent)callEvent); } - - @Override - public Object getParameterType(String paramName, String methodName, Object retrieveBlockType) { - return EntityUtil.getInstance().getParameterType(paramName, methodName, (Class)retrieveBlockType); - } }