T.setPlanId(pr.getPlan().getId());
T.setPlanName(pr.getPlan().getName());
- T.setMethodName(mvi.getMethodValidation().getName());
- T.setMethodDescription(mvi.getMethodValidation().getDescription());
- T.setExpression(mvi.getMethodValidation().getExpression());
- T.setExpressionDomain(mvi.getMethodValidation().getExpressionDomain());
- T.setMethodValidationParamDef(new HashMap<String, String>());
+ if (mvi != null){
+ T.setMethodName(mvi.getMethodValidation().getName());
+ T.setMethodDescription(mvi.getMethodValidation().getDescription());
+ T.setExpression(mvi.getMethodValidation().getExpression());
+ T.setExpressionDomain(mvi.getMethodValidation().getExpressionDomain());
+ T.setMethodValidationParamDef(new HashMap<String, String>());
- for (Entry<String, String> entry : mvi.getMethodValidation().getMethodValidationParameters().entrySet()){
+ for (Entry<String, String> entry : mvi.getMethodValidation().getMethodValidationParameters().entrySet()){
- T.getMethodValidationParamDef().put(entry.getKey(), entry.getValue());
+ T.getMethodValidationParamDef().put(entry.getKey(), entry.getValue());
+ }
+ T.setMethodValidationParameters(mvi.getMethodValidationInstanceParameters());
}
- T.setMethodValidationParameters(mvi.getMethodValidationInstanceParameters());
-
String scenarioName = "";
Set<PlanRef> spr = planDAO.getRelatedPlanRefs(entityIds, idReferentiels, planId);
for (PlanRef pr : spr) {
- if (pr.getMethodValidationInstance() != null && (pr.getViewValidation() || roles != null)) {
+ if ((pr.getViewValidation() || roles != null)) {
TUserCompositeValidation t = this.getUserTable(pr.getId(), sicId, login, EDIds, ESIIds);
- if (t != null) {
+ if (t != null && pr.getMethodValidationInstance() != null) {
t.setExpression(pr.getMethodValidationInstance()
.getMethodValidation().getExpression());
t.setMethodValidationParameters(pr.getMethodValidationInstance().getMethodValidationInstanceParameters());
+ tu.add(t);
+ }else if (t != null ){
tu.add(t);
}
}