This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit d69d186bcc24b44996b4040f785fa0f9564e264d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 7 22:14:38 2015 +0200 fix entities order to replicate --- .../java/fr/ird/observe/entities/Entities.java | 42 ++++++++++------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java index f914e3b..e958c12 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -205,29 +205,23 @@ public class Entities { ObserveEntityEnum.Route, ObserveEntityEnum.TripSeine, + ObserveEntityEnum.HooksComposition, + ObserveEntityEnum.BranchlinesComposition, ObserveEntityEnum.BaitsComposition, ObserveEntityEnum.FloatlinesComposition, - ObserveEntityEnum.BranchlinesComposition, - ObserveEntityEnum.HooksComposition, - + ObserveEntityEnum.SizeMeasure, + ObserveEntityEnum.WeightMeasure, ObserveEntityEnum.SetLongline, - ObserveEntityEnum.ActivityLongline, - - ObserveEntityEnum.Basket, ObserveEntityEnum.Branchline, + ObserveEntityEnum.Basket, ObserveEntityEnum.Section, - ObserveEntityEnum.CatchLongline, - //FIXME Find out why Tdr are not saved by replication ObserveEntityEnum.Tdr, ObserveEntityEnum.Encounter, - ObserveEntityEnum.SensorUsed, - ObserveEntityEnum.SizeMeasure, - + ObserveEntityEnum.ActivityLongline, ObserveEntityEnum.TdrRecord, - ObserveEntityEnum.TripLongline, - ObserveEntityEnum.WeightMeasure + ObserveEntityEnum.TripLongline }; /** @@ -264,23 +258,23 @@ public class Entities { public static final ObserveEntityEnum[] DATA_LONGLINE_ENTITIES = new ObserveEntityEnum[]{ - ObserveEntityEnum.ActivityLongline, + ObserveEntityEnum.HooksComposition, + ObserveEntityEnum.BranchlinesComposition, ObserveEntityEnum.BaitsComposition, - ObserveEntityEnum.Basket, + ObserveEntityEnum.FloatlinesComposition, + ObserveEntityEnum.SizeMeasure, + ObserveEntityEnum.WeightMeasure, + ObserveEntityEnum.SetLongline, ObserveEntityEnum.Branchline, - ObserveEntityEnum.BranchlinesComposition, + ObserveEntityEnum.Basket, + ObserveEntityEnum.Section, ObserveEntityEnum.CatchLongline, + ObserveEntityEnum.Tdr, ObserveEntityEnum.Encounter, - ObserveEntityEnum.SetLongline, - ObserveEntityEnum.FloatlinesComposition, - ObserveEntityEnum.HooksComposition, - ObserveEntityEnum.Section, ObserveEntityEnum.SensorUsed, - ObserveEntityEnum.SizeMeasure, - ObserveEntityEnum.Tdr, + ObserveEntityEnum.ActivityLongline, ObserveEntityEnum.TdrRecord, - ObserveEntityEnum.TripLongline, - ObserveEntityEnum.WeightMeasure + ObserveEntityEnum.TripLongline }; public static final ObserveEntityEnum[] ALL_ENTITIES = -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.