Author: chatellier Date: 2011-03-29 15:32:40 +0000 (Tue, 29 Mar 2011) New Revision: 3214 Log: Modify code (one return...) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-29 15:29:34 UTC (rev 3213) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-29 15:32:40 UTC (rev 3214) @@ -246,27 +246,30 @@ } protected String getNominalValue(Factor factor) { + String result = null; + Domain domain = factor.getDomain(); if (domain instanceof MatrixContinuousDomain) { - return "1.0"; + result = "1.0"; } + else { + String path = factor.getPath(); + String topiaId = path.substring(0, path.lastIndexOf("#")); + String propertyName=path.substring(path.lastIndexOf("#") + 1); - String path = factor.getPath(); - String topiaId = path.substring(0,path.lastIndexOf("#")); - String propertyName=path.substring(path.lastIndexOf("#") + 1); - - Object value = null; - try { - TopiaEntity entity = context.findByTopiaId(topiaId); - value = BeanUtils.getProperty(entity, propertyName); - } catch (Exception ee) { - log.error("An error occurred while trying to get nominal value",ee); + try { + TopiaEntity entity = context.findByTopiaId(topiaId); + result = BeanUtils.getProperty(entity, propertyName); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("An error occurred while trying to get nominal value", ex); + } + } } - if (value == null){ - return null; + if (log.isDebugEnabled()) { + log.debug("Nominal value :" + result); } - log.info("Nominal value :" + value); - return value.toString(); + return result; } protected String editRInstruction(String rCall){