Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: b4da1f66 by Tony CHEMIT at 2018-03-19T14:38:33Z fix migration script names - - - - - c3708ae6 by Tony CHEMIT at 2018-03-19T14:55:46Z Problème d'UI en cas de traitement N2 (et N3) avec période de 1 mois (closes #280) - - - - - 8 changed files: - t3-domain/src/main/java/fr/ird/t3/entities/type/T3Date.java - t3-domain/src/main/resources/db/migration/V_2_3_03-spatialize-ocean.sql → t3-domain/src/main/resources/db/migration/V2_3_03-spatialize-ocean.sql - t3-domain/src/main/resources/db/migration/V_2_3_04-add-WeightCategoryLogbook-unknown.sql → t3-domain/src/main/resources/db/migration/V2_3_04-add-WeightCategoryLogbook-unknown.sql - t3-domain/src/main/resources/db/migration/V_2_3_05-spatialize-harbour.sql → t3-domain/src/main/resources/db/migration/V2_3_05-spatialize-harbour.sql - t3-domain/src/main/resources/db/migration/V_2_3_05_change-Activity-stratum-type.sql → t3-domain/src/main/resources/db/migration/V2_3_05_change-Activity-stratum-type.sql - t3-domain/src/main/resources/db/migration/V_2_4_01_delete_idx.sql → t3-domain/src/main/resources/db/migration/V2_4_01_delete_idx.sql - t3-domain/src/main/resources/db/migration/V_2_4_02-spatialize-ocean.sql → t3-domain/src/main/resources/db/migration/V2_4_02-spatialize-ocean.sql - t3-domain/src/main/resources/db/migration/V_2_4_03-review-referential.sql → t3-domain/src/main/resources/db/migration/V2_4_03-review-referential.sql Changes: ===================================== t3-domain/src/main/java/fr/ird/t3/entities/type/T3Date.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/type/T3Date.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/type/T3Date.java @@ -20,14 +20,13 @@ */ package fr.ird.t3.entities.type; -import com.google.common.base.Preconditions; import com.google.common.collect.Sets; + import java.io.Serializable; import java.util.Calendar; import java.util.Date; import java.util.Set; - import static org.nuiton.i18n.I18n.n; public class T3Date implements Comparable<T3Date>, Serializable { @@ -152,15 +151,15 @@ public class T3Date implements Comparable<T3Date>, Serializable { } public void fromT3Date(T3Date date) { - month = date.getMonth(); year = date.getYear(); } public T3Date incrementsMonths(int nbMonth) { - Preconditions.checkArgument( - nbMonth > 0, - "nbMonth must be a strict positif integer but was : " + nbMonth); + if (nbMonth==0) { + // ok just return this date + return this; + } int nmonth = getMonth(); int nyear = getYear(); int nbMonthCount = nbMonth; @@ -176,9 +175,9 @@ public class T3Date implements Comparable<T3Date>, Serializable { } public T3Date decrementsMonths(int nbMonth) { - Preconditions.checkArgument( - nbMonth > 0, - "nbMonth must be a strict positif integer but was : " + nbMonth); + if (nbMonth == 0) { + return this; + } int nmonth = getMonth(); int nyear = getYear(); @@ -201,7 +200,7 @@ public class T3Date implements Comparable<T3Date>, Serializable { } @Override - public int compareTo(T3Date date) { + public int compareTo(@SuppressWarnings("NullableProblems") T3Date date) { int result = year - date.year; if (result != 0) { return result; ===================================== t3-domain/src/main/resources/db/migration/V_2_3_03-spatialize-ocean.sql → t3-domain/src/main/resources/db/migration/V2_3_03-spatialize-ocean.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_3_04-add-WeightCategoryLogbook-unknown.sql → t3-domain/src/main/resources/db/migration/V2_3_04-add-WeightCategoryLogbook-unknown.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_3_05-spatialize-harbour.sql → t3-domain/src/main/resources/db/migration/V2_3_05-spatialize-harbour.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_3_05_change-Activity-stratum-type.sql → t3-domain/src/main/resources/db/migration/V2_3_05_change-Activity-stratum-type.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_4_01_delete_idx.sql → t3-domain/src/main/resources/db/migration/V2_4_01_delete_idx.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_4_02-spatialize-ocean.sql → t3-domain/src/main/resources/db/migration/V2_4_02-spatialize-ocean.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V_2_4_03-review-referential.sql → t3-domain/src/main/resources/db/migration/V2_4_03-review-referential.sql ===================================== View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/8d2bcfb750646023f3dddff7cf63c836... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/8d2bcfb750646023f3dddff7cf63c836... You're receiving this email because of your account on gitlab.com.