branch develop updated (8b785fb -> aafa3db)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 8b785fb Merge branch 'feature/7589' into develop new aafa3db suppression du log des marées au démarage. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit aafa3db0b36ef1ff6ffd6ca8efb935a04acb241a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 13 14:08:54 2015 +0200 suppression du log des marées au démarage. Summary of changes: .../observe/ObserveSwingApplicationContext.java | 47 +++------------------- 1 file changed, 6 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 aafa3db0b36ef1ff6ffd6ca8efb935a04acb241a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 13 14:08:54 2015 +0200 suppression du log des marées au démarage. --- .../observe/ObserveSwingApplicationContext.java | 47 +++------------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 5ee0f06..d16b7b0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -25,8 +25,6 @@ import com.google.common.base.Preconditions; import fr.ird.observe.business.BinderService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.gps.GPSService; -import fr.ird.observe.validation.ObserveSwingValidator; -import fr.ird.observe.validation.ValidationContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constantes.DbMode; @@ -37,19 +35,10 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceMainFactory; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ProgramDtos; -import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveMainUIHandler; @@ -71,6 +60,8 @@ import fr.ird.observe.ui.actions.shared.SelectNodeUIAction; import fr.ird.observe.ui.actions.shared.SelectOpenNodeUIAction; import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.tree.ObserveTreeHelper; +import fr.ird.observe.validation.ObserveSwingValidator; +import fr.ird.observe.validation.ValidationContext; import jaxx.runtime.JAXXUtil; import jaxx.runtime.context.DefaultApplicationContext; import jaxx.runtime.context.JAXXContextEntryDef; @@ -80,8 +71,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import javax.swing.*; -import java.awt.*; +import javax.swing.ActionMap; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import java.awt.Component; import java.io.File; import java.util.Arrays; import java.util.List; @@ -731,34 +724,6 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { t("observe.message.db.loaded", source.getLabel())); } - - if (log.isInfoEnabled()) { - ReferentialService referentialService = source.newService(ReferentialService.class); - TripSeineService tripSeineService = source.newService(TripSeineService.class); - TripLonglineService tripLonglineService = source.newService(TripLonglineService.class); - - ReferenceSetDto<ProgramDto> programDtoRefs = referentialService.getReferentialReferenceSet(ProgramDto.class); - for (ReferenceDto<ProgramDto> programDtoRef : programDtoRefs.getReference()) { - String programName = (String) programDtoRef.getPropertyValue("label"); - log.info("- " + programName); - if (ProgramDtos.isProgramSeine(programDtoRef)) { - ReferenceSetDto<TripSeineDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); - for (ReferenceDto tripSeine : tripSeines.getReference()) { - log.info(" - " + tripSeine.getPropertyValue(TripSeineDto.PROPERTY_VESSEL) - + " " + tripSeine.getPropertyValue(TripSeineDto.PROPERTY_START_DATE) - + " - " + tripSeine.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); - } - - } else if (ProgramDtos.isProgramLongline(programDtoRef)) { - ReferenceSetDto<TripLonglineDto> tripLonglines = tripLonglineService.getTripLonglineByProgram(programDtoRef.getId()); - for (ReferenceDto tripLongline : tripLonglines.getReference()) { - log.info(" - " + tripLongline.getPropertyValue(TripLonglineDto.PROPERTY_VESSEL) - + " " + tripLongline.getPropertyValue(TripLonglineDto.PROPERTY_START_DATE) - + " - " + tripLongline.getPropertyValue(TripLonglineDto.PROPERTY_END_DATE)); - } - } - } - } } }); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm