This is an automated email from the git hooks/post-receive script. New commit to branch feature/fix_validation in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c51aecec055417ca16138831a9d94cf9934404ae Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 26 16:52:14 2016 +0200 On déplace dans le module service-model des choses qui n'ont rien à faire au niveau de l'application swing (et surtout pas dans un paquetage entité...) --- .../java/fr/ird/observe/services/dto}/longline/SectionTemplate.java | 3 +-- .../fr/ird/observe/services/dto}/longline/SectionWithTemplate.java | 3 ++- .../fr/ird/observe/services/dto}/longline/SectionWithTemplates.java | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java similarity index 98% rename from observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java index ec1ed81..2ad0685 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.longline; +package fr.ird.observe.services.dto.longline; /* * #%L @@ -24,7 +24,6 @@ package fr.ird.observe.entities.longline; import com.google.common.base.Objects; import com.google.common.base.Preconditions; -import fr.ird.observe.services.dto.longline.BasketDto; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java similarity index 97% rename from observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java index ac36c83..42a3390 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplate.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.longline; +package fr.ird.observe.services.dto.longline; /* * #%L @@ -24,6 +24,7 @@ package fr.ird.observe.entities.longline; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SectionTemplate; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java similarity index 95% rename from observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java index 565bd78..56ccf82 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionWithTemplates.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.longline; +package fr.ird.observe.services.dto.longline; /* * #%L @@ -25,7 +25,6 @@ package fr.ird.observe.entities.longline; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import fr.ird.observe.services.dto.longline.SectionDto; import java.util.ArrayList; import java.util.Collection; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.