This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1462d44a5cbba96dcdaea6feff9e056d264e0382 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 8 14:05:07 2015 +0100 remover unused method + add shortcut other one --- .../CaracteristicQualitativeValues.java | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicQualitativeValues.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicQualitativeValues.java index 81c3725..0566ab6 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicQualitativeValues.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicQualitativeValues.java @@ -29,23 +29,21 @@ import java.util.Iterator; public class CaracteristicQualitativeValues extends AbstractCaracteristicQualitativeValues { - public static CaracteristicQualitativeValue getCaracteristicQualitativeValue(Caracteristic caracteristic, Integer id) { - CaracteristicQualitativeValue result = null; - if (id != null && !caracteristic.isQualitativeValueEmpty()) { - for (CaracteristicQualitativeValue caracteristicQualitativeValue : caracteristic.getQualitativeValue()) { - if (id.equals(caracteristicQualitativeValue.getIdAsInt())) { - result = caracteristicQualitativeValue; - break; - } + public static CaracteristicQualitativeValue getQualitativeValue(Caracteristic caracteristic, Integer qualitativeValueId) { + CaracteristicQualitativeValue value = null; + for (CaracteristicQualitativeValue qv : caracteristic.getQualitativeValue()) { + if (qualitativeValueId.equals(qv.getIdAsInt())) { + value = qv; + break; } } - return result; + return value; } - public static CaracteristicQualitativeValue getQualitativeValue(Caracteristic caracteristic, Integer qualitativeValueId) { + public static CaracteristicQualitativeValue getQualitativeValue(Caracteristic caracteristic, String qualitativeValueId) { CaracteristicQualitativeValue value = null; for (CaracteristicQualitativeValue qv : caracteristic.getQualitativeValue()) { - if (qualitativeValueId.equals(qv.getIdAsInt())) { + if (qualitativeValueId.equals(qv.getId())) { value = qv; break; } @@ -53,8 +51,7 @@ public class CaracteristicQualitativeValues extends AbstractCaracteristicQualita return value; } - public static void removeQualitativeValue(Collection<CaracteristicQualitativeValue> values, - int id) { + public static void removeQualitativeValue(Collection<CaracteristicQualitativeValue> values, int id) { Iterator<CaracteristicQualitativeValue> iterator = values.iterator(); while (iterator.hasNext()) { CaracteristicQualitativeValue next = iterator.next(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.