This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 88e82627049cded842b672d890c9bd87f00ed389 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 21:55:30 2016 +0200 suppression de l'ancien écran systèmes observés et tout ce qui s'y rapporte --- .../swing/decoration/DecoratorService.java | 2 - ...bservedSystemDto-ui-update-error-validation.xml | 63 ------ ...ervedSystemDto-ui-update-warning-validation.xml | 50 ----- .../validation/BeanValidatorDetectorTest.java | 4 - .../swing/db/ObserveSwingDataSource.java | 6 - .../swing/ui/content/ContentUIManager.java | 3 - .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 113 ---------- .../impl/seine/ActivitySeineObservedSystemUI.jcss | 78 ------- .../ActivitySeineObservedSystemUIHandler.java | 133 ------------ .../seine/ActivitySeineObservedSystemUIModel.java | 42 ---- .../tree/loadors/ActivitySeineNodeChildLoador.java | 6 - ...tivitySeineObservedSystemServiceController.java | 49 ----- application-web/src/main/resources/mapping | 2 - .../request/ReferenceSetRequestDefinitions.java | 5 - .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59777 -> 58913 bytes services-dto/src/main/xmi/observe-services-dto.ini | 3 - .../topia/binder/BinderEngineInitializer.java | 234 ++++++++++----------- .../data/ActivitySeineObservedSystemDtoBinder.java | 62 ------ .../ActivitySeineObservedSystemServiceTopia.java | 67 ------ .../services/topia/binder/BinderEngineTest.java | 2 - .../observe/services/ObserveServicesProvider.java | 3 - .../seine/ActivitySeineObservedSystemService.java | 47 ----- 22 files changed, 113 insertions(+), 861 deletions(-) diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index 08a5827..638550f 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -110,7 +110,6 @@ import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; @@ -455,7 +454,6 @@ public class DecoratorService extends DecoratorProvider { registerDataAndDataReferenceDecorator(SetLonglineDto.class, t("observe.type.setLongline")); registerDataAndDataReferenceDecorator(TripSeineGearUseDto.class, t("observe.type.tripSeineGearUse")); registerDataAndDataReferenceDecorator(TripLonglineGearUseDto.class, t("observe.type.tripLonglineGearUse")); - registerDataAndDataReferenceDecorator(ActivitySeineObservedSystemDto.class, t("observe.type.activitySeineObservedSystem")); registerDataAndDataReferenceDecorator(SetSeineSchoolEstimateDto.class, t("observe.type.setSeineSchoolEstimate")); registerDataAndDataReferenceDecorator(SetSeineTargetCatchDto.class, t("observe.type.setSeineTargetCatch")); registerDataAndDataReferenceDecorator(SetSeineNonTargetCatchDto.class, t("observe.type.setSeineNonTargetCatch")); diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-error-validation.xml deleted file mode 100644 index afa2c51..0000000 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-error-validation.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Application Swing Validation - %% - Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="observedSystem"> - - <!-- objectOperation selectionnee desactivte --> - <field-validator type="collectionFieldExpression"> - <param name="collectionFieldName">observedSystem</param> - <param name="mode">ALL</param> - <param name="useSensitiveContext">true</param> - <param name="expression"><![CDATA[ current.enabled ]]></param> - <message>validator.ui.activity.desactivated.observedSystem</message> - </field-validator> - - </field> - - <field name="comment"> - - <!-- comentaire de moins de 1024 caractères --> - <field-validator type="stringlength"> - <param name="maxLength">1024</param> - <message>validator.ui.activity.comment.tobig</message> - </field-validator> - - <!-- comment requis selon le systeme observe --> - - <field-validator type="collectionFieldExpression"> - <param name="collectionFieldName">observedSystem</param> - <param name="mode">ALL</param> - <param name="useSensitiveContext">true</param> - <param name="expression"> - <![CDATA[ (comment != null && !comment.empty) || !current.needComment ]]></param> - <message>validator.ui.activity.required.comment.for.observedSystem</message> - </field-validator> - - </field> - -</validators> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-warning-validation.xml deleted file mode 100644 index 9734bc30..0000000 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-warning-validation.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Application Swing Validation - %% - Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="observedSystemDistance"> - - <!-- Pas de distance au système observé renseignee --> - <field-validator type="required" short-circuit="true"> - <message>validator.ui.activity.null.observedSystemDistance</message> - </field-validator> - - </field> - - <field name="observedSystem"> - - <!-- Aucun systeme observe renseigne --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ !observedSystemEmpty ]]> - </param> - <message>validator.ui.activity.null.observedSystem</message> - </field-validator> - - </field> - -</validators> diff --git a/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java b/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java index c6601db..281bff7 100644 --- a/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java +++ b/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java @@ -101,7 +101,6 @@ import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; @@ -166,7 +165,6 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { ActivityLonglineEncounterDto.class, ActivityLonglineSensorUsedDto.class, ActivitySeineDto.class, - ActivitySeineObservedSystemDto.class, BaitsCompositionDto.class, BaitHaulingStatusDto.class, BaitSettingStatusDto.class, @@ -382,7 +380,6 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { ActivityLonglineEncounterDto.class, ActivityLonglineSensorUsedDto.class, ActivitySeineDto.class, - ActivitySeineObservedSystemDto.class, BaitHaulingStatusDto.class, BaitSettingStatusDto.class, BaitTypeDto.class, @@ -485,7 +482,6 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { assertValidatorSetWithMultiContextName(validators, // contextName + "-encounter", ActivityLonglineDto.class, // contextName + "-sensorUsed", ActivityLonglineDto.class, -// contextName + "-observedSystem", ActivitySeineDto.class, contextName + "-table", BasketDto.class, contextName + "-catchLongline", BranchlineDto.class, contextName + "-table", BranchlineDto.class, diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java index 63200d8..9e12fe6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java @@ -77,7 +77,6 @@ import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.services.service.longline.TdrService; import fr.ird.observe.services.service.longline.TripLonglineGearUseService; import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.services.service.seine.NonTargetCatchService; @@ -602,11 +601,6 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements } @Override - public ActivitySeineObservedSystemService newActivitySeineObservedSystemService() { - return newService(ActivitySeineObservedSystemService.class); - } - - @Override public SetLonglineGlobalCompositionService newSetLonglineGlobalCompositionService() { return newService(SetLonglineGlobalCompositionService.class); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java index c3d73c3..959f06f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java @@ -28,7 +28,6 @@ import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.impl.longline.LonglineDetailCompositionUI; import fr.ird.observe.application.swing.ui.content.impl.longline.LonglineGlobalCompositionUI; import fr.ird.observe.application.swing.ui.content.impl.longline.SetLonglineUI; -import fr.ird.observe.application.swing.ui.content.impl.seine.ActivitySeineObservedSystemUI; import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectTransmittingBuoyOperationUI; import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectUI; import fr.ird.observe.application.swing.ui.content.impl.seine.SetSeineUI; @@ -75,7 +74,6 @@ import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialHelper; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; -import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.DiscardedTargetCatchDto; import fr.ird.observe.services.dto.seine.DiscardedTargetSampleDto; @@ -142,7 +140,6 @@ public class ContentUIManager { addMapping(DATA, ActivitySeineDto.class, null, ActivitySeineUI.class); addMapping(DATA, ActivitySeineDto.class, n("observe.type.activitySeine.unsaved"), ActivitySeineUI.class); - addMapping(DATA, ActivitySeineDto.class, ObservedSystemDto.class, ActivitySeineObservedSystemUI.class); addMapping(DATA, SetSeineDto.class, null, SetSeineUI.class); addMapping(DATA, SetSeineDto.class, n("observe.type.setSeine.unsaved"), SetSeineUI.class); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx deleted file mode 100644 index b83de11..0000000 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx +++ /dev/null @@ -1,113 +0,0 @@ -<!-- - #%L - ObServe :: Application Swing - %% - Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<fr.ird.observe.application.swing.ui.content.ContentUI superGenericType='ActivitySeineObservedSystemDto' contentTitle='{n("observe.storage.activitySeineObservedSystem.title")}'> - - <import> - fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto - fr.ird.observe.services.dto.referential.ReferentialReference - fr.ird.observe.services.dto.referential.seine.ObservedSystemDto - fr.ird.observe.application.swing.ui.actions.shared.ResetEditUIAction - fr.ird.observe.application.swing.ui.actions.shared.SaveEditUIAction - - jaxx.runtime.swing.editor.NumberEditor - org.nuiton.jaxx.widgets.select.FilterableDoubleList - - java.util.List - java.util.ArrayList - java.util.Collection - - java.awt.Dimension - - javax.swing.DefaultListModel - javax.swing.ListSelectionModel - - static fr.ird.observe.application.swing.ui.UIHelper.getStringValue - static org.nuiton.i18n.I18n.n - </import> - - <!-- handler --> - <ActivitySeineObservedSystemUIHandler id='handler'/> - - <!-- model --> - <ActivitySeineObservedSystemUIModel id='model'/> - - <!-- edit bean --> - <ActivitySeineObservedSystemDto id='bean'/> - - <!-- validator --> - <BeanValidator id='validator' - beanClass='fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto' - errorTableModel='{getErrorTableModel()}' - context='ui-update'> - <field name='observedSystem' component='observedSystemPane'/> - <field name='observedSystemDistance'/> - <field name='comment'/> - </BeanValidator> - - <!-- formulaire --> - <JPanel id="body" layout='{new BorderLayout()}'> - <Table fill='both' constraints="BorderLayout.CENTER"> - <!-- systeme observe --> - <row> - <cell columns="2" fill="both" weighty="0.7"> - <JScrollPane id='observedSystemPane' onFocusGained='observedSystem.requestFocus()'> - <FilterableDoubleList id='observedSystem' - genericType='ReferentialReference<ObservedSystemDto>' - _entityClass='ObservedSystemDto.class'/> - </JScrollPane> - </cell> - </row> - <!-- distance au système observe --> - <row> - <cell anchor='west'> - <JLabel id='observedSystemDistanceLabel'/> - </cell> - <cell weightx="1" fill="both"> - <NumberEditor id='observedSystemDistance' constructorParams='this'/> - </cell> - </row> - <!-- comment --> - <row> - <cell columns='2' fill="both" weighty="0.3"> - <JScrollPane id='comment' - onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' - onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> - </cell> - </row> - </Table> - </JPanel> - - <!-- actions --> - <Table id="actions" fill='both' weightx='1' insets='0'> - <row> - <cell weightx="0.5"> - <JButton id='reset'/> - </cell> - <cell weightx="0.5"> - <JButton id='save'/> - </cell> - </row> - </Table> -</fr.ird.observe.application.swing.ui.content.ContentUI> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jcss deleted file mode 100644 index 6d27625..0000000 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jcss +++ /dev/null @@ -1,78 +0,0 @@ -/* - * #%L - * ObServe :: Swing - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -#model { - editable:true; - modified:{validator.isChanged()}; - valid:{validator.isValid()}; - enabled:{!model.isReadingMode()}; -} - -#observedSystemPane { - /*columnHeaderView:{new JLabel(t("observe.common.observedSystem"))};*/ - minimumSize:{new Dimension(10,150)}; -} - -#observedSystem { - bean:{bean}; - property: {ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM}; - selected:{(Collection)bean.getObservedSystem()}; - _validatorLabel: {t("observe.common.observedSystem")}; - showListLabel: true; - universeLabel:{t("observe.storage.activityObservedSystem.availableObservedSystem")}; - selectedLabel:{t("observe.storage.activityObservedSystem.selectedObservedSystem")}; -} - -#observedSystemDistanceLabel { - text:"observe.common.observedSystemDistance"; - labelFor:{observedSystemDistance}; -} - -#observedSystemDistance { - bean:{bean}; - property: {ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE}; - model:{bean.getObservedSystemDistance()}; - useFloat:true; - numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.DECIMAL2_PATTERN}; -} - -#comment { - columnHeaderView:{new JLabel(t("observe.common.comment.activity"))}; - minimumSize:{new Dimension(10,50)}; -} - -#comment2 { - text:{getStringValue(bean.getComment())}; -} - -#reset { - _observeAction:{ResetEditUIAction.ACTION_NAME}; - visible:{model.isUpdatingMode()}; - enabled:{model.isModified()}; -} - -#save { - _observeAction:{SaveEditUIAction.ACTION_NAME}; - visible:{model.isEnabled()}; - enabled:{model.isModified() && model.isValid()}; -} - diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java deleted file mode 100644 index 21284ac..0000000 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * #%L - * ObServe :: Application Swing - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.application.swing.ui.content.impl.seine; - -import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.db.DataContext; -import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.db.constants.DataContextType; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemHelper; -import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.validator.NuitonValidatorScope; - -import static org.nuiton.i18n.I18n.t; - -/** - * @author Tony Chemit - chemit@codelutin.com - * @since 1.0 - */ -public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<ActivitySeineObservedSystemDto> { - - /** Logger */ - private static final Log log = LogFactory.getLog(ActivitySeineObservedSystemUIHandler.class); - - public ActivitySeineObservedSystemUIHandler(ActivitySeineObservedSystemUI ui) { - super(ui, DataContextType.ActivitySeine, null); - } - - @Override - public ActivitySeineObservedSystemUI getUi() { - return (ActivitySeineObservedSystemUI) super.getUi(); - } - - @Override - protected boolean computeCanWrite(ObserveSwingDataSource source) { - return source.canWriteData(); - } - - @Override - protected ContentMode getContentMode(DataContext dataContext) { - - if (getOpenDataManager().isOpenActivitySeine(dataContext.getSelectedActivitySeineId())) { - - // l'activity courante est ouverte, on peut modifier - return ContentMode.UPDATE; - } - - // activity courante non ouverte - addMessage(getUi(), - NuitonValidatorScope.INFO, - getTypeI18nKey(ActivitySeineDto.class), - t("observe.storage.activitySeine.message.not.open")); - - return ContentMode.READ; - } - - @Override - public void openUI() { - super.openUI(); - - String activityId = getSelectedParentId(); - - if (log.isInfoEnabled()) { - log.info("activityId = " + activityId); - } - - ContentMode mode = computeContentMode(); - - getModel().setMode(mode); - - Form<ActivitySeineObservedSystemDto> form = getActivitySeineObservedSystemService().loadForm(activityId); - - loadReferentialReferenceSetsInModel(form); - - getModel().setForm(form); - ActivitySeineObservedSystemHelper.copyActivitySeineObservedSystemDto(form.getObject(), getBean()); - - if (mode == ContentMode.UPDATE) { - getUi().startEdit(null); - } - } - - @Override - public void startEditUI(String... binding) { - - addMessage(getUi(), - NuitonValidatorScope.INFO, - getTypeI18nKey(ActivitySeineDto.class), - t("observe.storage.activitySeine.message.updating")); - - super.startEditUI(binding); - } - - @Override - protected boolean doSave(ActivitySeineObservedSystemDto bean) throws Exception { - - // on sauvegarde l'activity (mais pas la calée) - SaveResultDto saveResult = getActivitySeineObservedSystemService().save(bean); - saveResult.toDto(bean); - - return true; - } - - protected ActivitySeineObservedSystemService getActivitySeineObservedSystemService() { - return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newActivitySeineObservedSystemService(); - } -} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java deleted file mode 100644 index b2bda03..0000000 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java +++ /dev/null @@ -1,42 +0,0 @@ -package fr.ird.observe.application.swing.ui.content.impl.seine; - -/* - * #%L - * ObServe :: Application Swing - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; -import fr.ird.observe.application.swing.ui.content.ContentUIModel; - -/** - * Created on 9/28/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since XXX - */ -public class ActivitySeineObservedSystemUIModel extends ContentUIModel<ActivitySeineObservedSystemDto> { - - private static final long serialVersionUID = 1L; - - public ActivitySeineObservedSystemUIModel() { - super(ActivitySeineObservedSystemDto.class); - } - -} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java index b778d83..1de8cf1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -28,7 +28,6 @@ import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.node.SetSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -64,11 +63,6 @@ public class ActivitySeineNodeChildLoador extends AbstractDataReferenceChildLoad "Could not find containerNode of " + parentNode); } - // Creation d'un node systeme observe - ObserveNode child = createPluralizeStringNode(ObservedSystemDto.class, null); - - parentNode.add(child); - DataReference<ActivitySeineDto> activitySeineRef = ((ActivitySeineNode) parentNode).getEntity(); DataReference<SetSeineDto> setSeineRef = (DataReference) activitySeineRef.getPropertyValue(ActivitySeineDto.PROPERTY_SET_SEINE); if (setSeineRef != null) { diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java deleted file mode 100644 index 674d936..0000000 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java +++ /dev/null @@ -1,49 +0,0 @@ -package fr.ird.observe.application.web.controller.v1.seine; - -/* - * #%L - * ObServe :: Application Web - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; -import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ActivitySeineObservedSystemServiceController extends ObserveAuthenticatedServiceControllerSupport<ActivitySeineObservedSystemService> implements ActivitySeineObservedSystemService { - - public ActivitySeineObservedSystemServiceController() { - super(ActivitySeineObservedSystemService.class); - } - - @Override - public Form<ActivitySeineObservedSystemDto> loadForm(String activitySeineId) { - return service.loadForm(activitySeineId); - } - - @Override - public SaveResultDto save(ActivitySeineObservedSystemDto dto) { - return service.save(dto); - } -} diff --git a/application-web/src/main/resources/mapping b/application-web/src/main/resources/mapping index 46645bc..e47165f 100644 --- a/application-web/src/main/resources/mapping +++ b/application-web/src/main/resources/mapping @@ -127,7 +127,6 @@ GET /api/v1/longline/TripLonglineService/loadDto GET /api/v1/longline/TripLonglineService/loadForm v1.longline.TripLonglineServiceController.loadForm GET /api/v1/longline/TripLonglineService/loadReferenceToRead v1.longline.TripLonglineServiceController.loadReferenceToRead GET /api/v1/longline/TripLonglineService/preCreate v1.longline.TripLonglineServiceController.preCreate -GET /api/v1/seine/ActivitySeineObservedSystemService/loadForm v1.seine.ActivitySeineObservedSystemServiceController.loadForm GET /api/v1/seine/ActivitySeineService/exists v1.seine.ActivitySeineServiceController.exists GET /api/v1/seine/ActivitySeineService/getActivitySeineByRoute v1.seine.ActivitySeineServiceController.getActivitySeineByRoute GET /api/v1/seine/ActivitySeineService/getActivitySeinePositionInRoute v1.seine.ActivitySeineServiceController.getActivitySeinePositionInRoute @@ -203,7 +202,6 @@ POST /api/v1/longline/TripLonglineGearUseService/save POST /api/v1/longline/TripLonglineService/moveTripLonglineToProgram v1.longline.TripLonglineServiceController.moveTripLonglineToProgram POST /api/v1/longline/TripLonglineService/moveTripLonglinesToProgram v1.longline.TripLonglineServiceController.moveTripLonglinesToProgram POST /api/v1/longline/TripLonglineService/save v1.longline.TripLonglineServiceController.save -POST /api/v1/seine/ActivitySeineObservedSystemService/save v1.seine.ActivitySeineObservedSystemServiceController.save POST /api/v1/seine/ActivitySeineService/moveActivitySeineToRoute v1.seine.ActivitySeineServiceController.moveActivitySeineToRoute POST /api/v1/seine/ActivitySeineService/moveActivitySeinesToRoute v1.seine.ActivitySeineServiceController.moveActivitySeinesToRoute POST /api/v1/seine/ActivitySeineService/save v1.seine.ActivitySeineServiceController.save diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java index 820af5e..76876da 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java @@ -103,7 +103,6 @@ import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; @@ -314,10 +313,6 @@ public enum ReferenceSetRequestDefinitions { .addKey(ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, FPA_ZONE) .addKey(ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM, OBSERVED_SYSTEM)), - ACTIVITY_SEINE_OBSERVED_SYSTEM_FORM( - newBuilder(ActivitySeineObservedSystemDto.class) - .addKey(ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, OBSERVED_SYSTEM)), - SET_SEINE_FORM( newBuilder(SetSeineDto.class) .addKey(SetSeineDto.PROPERTY_REASON_FOR_NULL_SET, REASON_FOR_NULL_SET)), diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo index 8c10b27..10d1a35 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services-dto/src/main/xmi/observe-services-dto.ini b/services-dto/src/main/xmi/observe-services-dto.ini index 52b494f..88d3728 100644 --- a/services-dto/src/main/xmi/observe-services-dto.ini +++ b/services-dto/src/main/xmi/observe-services-dto.ini @@ -191,9 +191,6 @@ surroundingActivity.attributeGeneric = fr.ird.observe.services.dto.referential.s vesselActivitySeine.attributeGeneric = fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto wind.attributeGeneric = fr.ird.observe.services.dto.referential.seine.WindDto -[class fr.ird.observe.services.dto.seine.ActivitySeineObservedSystem] -observedSystem.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObservedSystemDto - [class fr.ird.observe.services.dto.seine.FloatingObject] objectFate.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectFateDto objectOperation.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObjectOperationDto diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java index 098b00b..41c624a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java @@ -120,120 +120,6 @@ import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.entities.seine.TransmittingBuoy; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.topia.binder.data.ActivityLonglineBinder; -import fr.ird.observe.services.topia.binder.data.ActivityLonglineEncouterDtoBinder; -import fr.ird.observe.services.topia.binder.data.ActivityLonglineSensorUsedDtoBinder; -import fr.ird.observe.services.topia.binder.data.ActivityLonglineStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.ActivitySeineBinder; -import fr.ird.observe.services.topia.binder.data.ActivitySeineObservedSystemDtoBinder; -import fr.ird.observe.services.topia.binder.data.ActivitySeineStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.BaitsCompositionBinder; -import fr.ird.observe.services.topia.binder.data.BasketBinder; -import fr.ird.observe.services.topia.binder.data.BranchlineBinder; -import fr.ird.observe.services.topia.binder.data.BranchlinesCompositionBinder; -import fr.ird.observe.services.topia.binder.data.CatchLonglineBinder; -import fr.ird.observe.services.topia.binder.data.EncounterBinder; -import fr.ird.observe.services.topia.binder.data.FloatingObjectBinder; -import fr.ird.observe.services.topia.binder.data.FloatingObjectObservedSpeciesDtoBinder; -import fr.ird.observe.services.topia.binder.data.FloatingObjectSchoolEstimateDtoBinder; -import fr.ird.observe.services.topia.binder.data.FloatingObjectTransmittingBuoyDtoBinder; -import fr.ird.observe.services.topia.binder.data.FloatlinesCompositionBinder; -import fr.ird.observe.services.topia.binder.data.GearUseFeaturesLonglineBinder; -import fr.ird.observe.services.topia.binder.data.GearUseFeaturesMeasurementLonglineBinder; -import fr.ird.observe.services.topia.binder.data.GearUseFeaturesMeasurementSeineBinder; -import fr.ird.observe.services.topia.binder.data.GearUseFeaturesSeineBinder; -import fr.ird.observe.services.topia.binder.data.HooksCompositionBinder; -import fr.ird.observe.services.topia.binder.data.NonTargetCatchBinder; -import fr.ird.observe.services.topia.binder.data.NonTargetLengthBinder; -import fr.ird.observe.services.topia.binder.data.NonTargetSampleBinder; -import fr.ird.observe.services.topia.binder.data.ObjectObservedSpeciesBinder; -import fr.ird.observe.services.topia.binder.data.ObjectSchoolEstimateBinder; -import fr.ird.observe.services.topia.binder.data.RouteBinder; -import fr.ird.observe.services.topia.binder.data.RouteStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.SchoolEstimateBinder; -import fr.ird.observe.services.topia.binder.data.SectionBinder; -import fr.ird.observe.services.topia.binder.data.SensorUsedBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineCatchDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineDetailCompositionDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineGlobalCompositionDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineTdrDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetSeineBinder; -import fr.ird.observe.services.topia.binder.data.SetSeineNonTargetCatchDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetSeineSchoolEstimateDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetSeineTargetCatchDtoBinder; -import fr.ird.observe.services.topia.binder.data.SizeMeasureBinder; -import fr.ird.observe.services.topia.binder.data.TargetCatchBinder; -import fr.ird.observe.services.topia.binder.data.TargetLengthBinder; -import fr.ird.observe.services.topia.binder.data.TargetSampleBinder; -import fr.ird.observe.services.topia.binder.data.TdrBinder; -import fr.ird.observe.services.topia.binder.data.TransmittingBuoyBinder; -import fr.ird.observe.services.topia.binder.data.TripLonglineActivityDtoBinder; -import fr.ird.observe.services.topia.binder.data.TripLonglineBinder; -import fr.ird.observe.services.topia.binder.data.TripLonglineGearUseDtoBinder; -import fr.ird.observe.services.topia.binder.data.TripSeineBinder; -import fr.ird.observe.services.topia.binder.data.TripSeineGearUseDtoBinder; -import fr.ird.observe.services.topia.binder.data.WeightMeasureBinder; -import fr.ird.observe.services.topia.binder.referential.BaitHaulingStatusBinder; -import fr.ird.observe.services.topia.binder.referential.BaitSettingStatusBinder; -import fr.ird.observe.services.topia.binder.referential.BaitTypeBinder; -import fr.ird.observe.services.topia.binder.referential.CatchFateLonglineBinder; -import fr.ird.observe.services.topia.binder.referential.CountryBinder; -import fr.ird.observe.services.topia.binder.referential.DetectionModeBinder; -import fr.ird.observe.services.topia.binder.referential.EncounterTypeBinder; -import fr.ird.observe.services.topia.binder.referential.FpaZoneBinder; -import fr.ird.observe.services.topia.binder.referential.GearBinder; -import fr.ird.observe.services.topia.binder.referential.GearCaracteristicBinder; -import fr.ird.observe.services.topia.binder.referential.GearCaracteristicTypeBinder; -import fr.ird.observe.services.topia.binder.referential.HarbourBinder; -import fr.ird.observe.services.topia.binder.referential.HealthnessBinder; -import fr.ird.observe.services.topia.binder.referential.HookPositionBinder; -import fr.ird.observe.services.topia.binder.referential.HookSizeBinder; -import fr.ird.observe.services.topia.binder.referential.HookTypeBinder; -import fr.ird.observe.services.topia.binder.referential.ItemHorizontalPositionBinder; -import fr.ird.observe.services.topia.binder.referential.ItemVerticalPositionBinder; -import fr.ird.observe.services.topia.binder.referential.LengthWeightParameterBinder; -import fr.ird.observe.services.topia.binder.referential.LightsticksColorBinder; -import fr.ird.observe.services.topia.binder.referential.LightsticksTypeBinder; -import fr.ird.observe.services.topia.binder.referential.LineTypeBinder; -import fr.ird.observe.services.topia.binder.referential.MaturityStatusBinder; -import fr.ird.observe.services.topia.binder.referential.MitigationTypeBinder; -import fr.ird.observe.services.topia.binder.referential.ObjectFateBinder; -import fr.ird.observe.services.topia.binder.referential.ObjectOperationBinder; -import fr.ird.observe.services.topia.binder.referential.ObjectTypeBinder; -import fr.ird.observe.services.topia.binder.referential.ObservedSystemBinder; -import fr.ird.observe.services.topia.binder.referential.OceanBinder; -import fr.ird.observe.services.topia.binder.referential.OrganismBinder; -import fr.ird.observe.services.topia.binder.referential.PersonBinder; -import fr.ird.observe.services.topia.binder.referential.ProgramBinder; -import fr.ird.observe.services.topia.binder.referential.ReasonForDiscardBinder; -import fr.ird.observe.services.topia.binder.referential.ReasonForNoFishingBinder; -import fr.ird.observe.services.topia.binder.referential.ReasonForNullSetBinder; -import fr.ird.observe.services.topia.binder.referential.SensorBrandBinder; -import fr.ird.observe.services.topia.binder.referential.SensorDataFormatBinder; -import fr.ird.observe.services.topia.binder.referential.SensorTypeBinder; -import fr.ird.observe.services.topia.binder.referential.SettingShapeBinder; -import fr.ird.observe.services.topia.binder.referential.SexBinder; -import fr.ird.observe.services.topia.binder.referential.SizeMeasureTypeBinder; -import fr.ird.observe.services.topia.binder.referential.SpeciesBinder; -import fr.ird.observe.services.topia.binder.referential.SpeciesFateBinder; -import fr.ird.observe.services.topia.binder.referential.SpeciesGroupBinder; -import fr.ird.observe.services.topia.binder.referential.SpeciesListBinder; -import fr.ird.observe.services.topia.binder.referential.SpeciesStatusBinder; -import fr.ird.observe.services.topia.binder.referential.StomacFullnessBinder; -import fr.ird.observe.services.topia.binder.referential.SurroundingActivityBinder; -import fr.ird.observe.services.topia.binder.referential.TransmittingBuoyOperationBinder; -import fr.ird.observe.services.topia.binder.referential.TransmittingBuoyTypeBinder; -import fr.ird.observe.services.topia.binder.referential.TripTypeBinder; -import fr.ird.observe.services.topia.binder.referential.VesselActivityLonglineBinder; -import fr.ird.observe.services.topia.binder.referential.VesselActivitySeineBinder; -import fr.ird.observe.services.topia.binder.referential.VesselBinder; -import fr.ird.observe.services.topia.binder.referential.VesselSizeCategoryBinder; -import fr.ird.observe.services.topia.binder.referential.VesselTypeBinder; -import fr.ird.observe.services.topia.binder.referential.WeightCategoryBinder; -import fr.ird.observe.services.topia.binder.referential.WeightMeasureTypeBinder; -import fr.ird.observe.services.topia.binder.referential.WindBinder; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.ObserveModelInitializer; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -327,7 +213,6 @@ import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; @@ -353,6 +238,119 @@ import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; +import fr.ird.observe.services.topia.binder.data.ActivityLonglineBinder; +import fr.ird.observe.services.topia.binder.data.ActivityLonglineEncouterDtoBinder; +import fr.ird.observe.services.topia.binder.data.ActivityLonglineSensorUsedDtoBinder; +import fr.ird.observe.services.topia.binder.data.ActivityLonglineStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.ActivitySeineBinder; +import fr.ird.observe.services.topia.binder.data.ActivitySeineStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.BaitsCompositionBinder; +import fr.ird.observe.services.topia.binder.data.BasketBinder; +import fr.ird.observe.services.topia.binder.data.BranchlineBinder; +import fr.ird.observe.services.topia.binder.data.BranchlinesCompositionBinder; +import fr.ird.observe.services.topia.binder.data.CatchLonglineBinder; +import fr.ird.observe.services.topia.binder.data.EncounterBinder; +import fr.ird.observe.services.topia.binder.data.FloatingObjectBinder; +import fr.ird.observe.services.topia.binder.data.FloatingObjectObservedSpeciesDtoBinder; +import fr.ird.observe.services.topia.binder.data.FloatingObjectSchoolEstimateDtoBinder; +import fr.ird.observe.services.topia.binder.data.FloatingObjectTransmittingBuoyDtoBinder; +import fr.ird.observe.services.topia.binder.data.FloatlinesCompositionBinder; +import fr.ird.observe.services.topia.binder.data.GearUseFeaturesLonglineBinder; +import fr.ird.observe.services.topia.binder.data.GearUseFeaturesMeasurementLonglineBinder; +import fr.ird.observe.services.topia.binder.data.GearUseFeaturesMeasurementSeineBinder; +import fr.ird.observe.services.topia.binder.data.GearUseFeaturesSeineBinder; +import fr.ird.observe.services.topia.binder.data.HooksCompositionBinder; +import fr.ird.observe.services.topia.binder.data.NonTargetCatchBinder; +import fr.ird.observe.services.topia.binder.data.NonTargetLengthBinder; +import fr.ird.observe.services.topia.binder.data.NonTargetSampleBinder; +import fr.ird.observe.services.topia.binder.data.ObjectObservedSpeciesBinder; +import fr.ird.observe.services.topia.binder.data.ObjectSchoolEstimateBinder; +import fr.ird.observe.services.topia.binder.data.RouteBinder; +import fr.ird.observe.services.topia.binder.data.RouteStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.SchoolEstimateBinder; +import fr.ird.observe.services.topia.binder.data.SectionBinder; +import fr.ird.observe.services.topia.binder.data.SensorUsedBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineCatchDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineDetailCompositionDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineGlobalCompositionDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetLonglineTdrDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetSeineBinder; +import fr.ird.observe.services.topia.binder.data.SetSeineNonTargetCatchDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetSeineSchoolEstimateDtoBinder; +import fr.ird.observe.services.topia.binder.data.SetSeineTargetCatchDtoBinder; +import fr.ird.observe.services.topia.binder.data.SizeMeasureBinder; +import fr.ird.observe.services.topia.binder.data.TargetCatchBinder; +import fr.ird.observe.services.topia.binder.data.TargetLengthBinder; +import fr.ird.observe.services.topia.binder.data.TargetSampleBinder; +import fr.ird.observe.services.topia.binder.data.TdrBinder; +import fr.ird.observe.services.topia.binder.data.TransmittingBuoyBinder; +import fr.ird.observe.services.topia.binder.data.TripLonglineActivityDtoBinder; +import fr.ird.observe.services.topia.binder.data.TripLonglineBinder; +import fr.ird.observe.services.topia.binder.data.TripLonglineGearUseDtoBinder; +import fr.ird.observe.services.topia.binder.data.TripSeineBinder; +import fr.ird.observe.services.topia.binder.data.TripSeineGearUseDtoBinder; +import fr.ird.observe.services.topia.binder.data.WeightMeasureBinder; +import fr.ird.observe.services.topia.binder.referential.BaitHaulingStatusBinder; +import fr.ird.observe.services.topia.binder.referential.BaitSettingStatusBinder; +import fr.ird.observe.services.topia.binder.referential.BaitTypeBinder; +import fr.ird.observe.services.topia.binder.referential.CatchFateLonglineBinder; +import fr.ird.observe.services.topia.binder.referential.CountryBinder; +import fr.ird.observe.services.topia.binder.referential.DetectionModeBinder; +import fr.ird.observe.services.topia.binder.referential.EncounterTypeBinder; +import fr.ird.observe.services.topia.binder.referential.FpaZoneBinder; +import fr.ird.observe.services.topia.binder.referential.GearBinder; +import fr.ird.observe.services.topia.binder.referential.GearCaracteristicBinder; +import fr.ird.observe.services.topia.binder.referential.GearCaracteristicTypeBinder; +import fr.ird.observe.services.topia.binder.referential.HarbourBinder; +import fr.ird.observe.services.topia.binder.referential.HealthnessBinder; +import fr.ird.observe.services.topia.binder.referential.HookPositionBinder; +import fr.ird.observe.services.topia.binder.referential.HookSizeBinder; +import fr.ird.observe.services.topia.binder.referential.HookTypeBinder; +import fr.ird.observe.services.topia.binder.referential.ItemHorizontalPositionBinder; +import fr.ird.observe.services.topia.binder.referential.ItemVerticalPositionBinder; +import fr.ird.observe.services.topia.binder.referential.LengthWeightParameterBinder; +import fr.ird.observe.services.topia.binder.referential.LightsticksColorBinder; +import fr.ird.observe.services.topia.binder.referential.LightsticksTypeBinder; +import fr.ird.observe.services.topia.binder.referential.LineTypeBinder; +import fr.ird.observe.services.topia.binder.referential.MaturityStatusBinder; +import fr.ird.observe.services.topia.binder.referential.MitigationTypeBinder; +import fr.ird.observe.services.topia.binder.referential.ObjectFateBinder; +import fr.ird.observe.services.topia.binder.referential.ObjectOperationBinder; +import fr.ird.observe.services.topia.binder.referential.ObjectTypeBinder; +import fr.ird.observe.services.topia.binder.referential.ObservedSystemBinder; +import fr.ird.observe.services.topia.binder.referential.OceanBinder; +import fr.ird.observe.services.topia.binder.referential.OrganismBinder; +import fr.ird.observe.services.topia.binder.referential.PersonBinder; +import fr.ird.observe.services.topia.binder.referential.ProgramBinder; +import fr.ird.observe.services.topia.binder.referential.ReasonForDiscardBinder; +import fr.ird.observe.services.topia.binder.referential.ReasonForNoFishingBinder; +import fr.ird.observe.services.topia.binder.referential.ReasonForNullSetBinder; +import fr.ird.observe.services.topia.binder.referential.SensorBrandBinder; +import fr.ird.observe.services.topia.binder.referential.SensorDataFormatBinder; +import fr.ird.observe.services.topia.binder.referential.SensorTypeBinder; +import fr.ird.observe.services.topia.binder.referential.SettingShapeBinder; +import fr.ird.observe.services.topia.binder.referential.SexBinder; +import fr.ird.observe.services.topia.binder.referential.SizeMeasureTypeBinder; +import fr.ird.observe.services.topia.binder.referential.SpeciesBinder; +import fr.ird.observe.services.topia.binder.referential.SpeciesFateBinder; +import fr.ird.observe.services.topia.binder.referential.SpeciesGroupBinder; +import fr.ird.observe.services.topia.binder.referential.SpeciesListBinder; +import fr.ird.observe.services.topia.binder.referential.SpeciesStatusBinder; +import fr.ird.observe.services.topia.binder.referential.StomacFullnessBinder; +import fr.ird.observe.services.topia.binder.referential.SurroundingActivityBinder; +import fr.ird.observe.services.topia.binder.referential.TransmittingBuoyOperationBinder; +import fr.ird.observe.services.topia.binder.referential.TransmittingBuoyTypeBinder; +import fr.ird.observe.services.topia.binder.referential.TripTypeBinder; +import fr.ird.observe.services.topia.binder.referential.VesselActivityLonglineBinder; +import fr.ird.observe.services.topia.binder.referential.VesselActivitySeineBinder; +import fr.ird.observe.services.topia.binder.referential.VesselBinder; +import fr.ird.observe.services.topia.binder.referential.VesselSizeCategoryBinder; +import fr.ird.observe.services.topia.binder.referential.VesselTypeBinder; +import fr.ird.observe.services.topia.binder.referential.WeightCategoryBinder; +import fr.ird.observe.services.topia.binder.referential.WeightMeasureTypeBinder; +import fr.ird.observe.services.topia.binder.referential.WindBinder; import java.util.Map; @@ -670,12 +668,6 @@ class BinderEngineInitializer implements ObserveModelInitializer { } @Override - public void initActivitySeineObservedSystemDto() { - dataDtoToEntityTypeBuilder.put(ActivitySeineObservedSystemDto.class, ActivitySeine.class); - dataBinderBuilder.put(ActivitySeineObservedSystemDto.class, new ActivitySeineObservedSystemDtoBinder()); - } - - @Override public void initActivitySeineStubDto() { dataDtoToEntityTypeBuilder.put(ActivitySeineStubDto.class, ActivitySeine.class); dataBinderBuilder.put(ActivitySeineStubDto.class, new ActivitySeineStubDtoBinder()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineObservedSystemDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineObservedSystemDtoBinder.java deleted file mode 100644 index b64ef03..0000000 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineObservedSystemDtoBinder.java +++ /dev/null @@ -1,62 +0,0 @@ -package fr.ird.observe.services.topia.binder.data; - -/*- - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.referentiel.seine.ObservedSystem; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; - -/** - * Created on 24/11/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ActivitySeineObservedSystemDtoBinder extends DataBinderSupport<ActivitySeine, ActivitySeineObservedSystemDto> { - - public ActivitySeineObservedSystemDtoBinder() { - super(ActivitySeine.class, ActivitySeineObservedSystemDto.class, false); - } - - @Override - public void copyToEntity(ReferentialLocale referentialLocale, ActivitySeineObservedSystemDto dto, ActivitySeine entity) { - - copyDtoDataFieldsToEntity(dto, entity); - - entity.setObservedSystem(toEntitySet(dto.getObservedSystem(), ObservedSystem.class)); - entity.setObservedSystemDistance(dto.getObservedSystemDistance()); - - } - - @Override - public void copyToDto(ReferentialLocale referentialLocale, ActivitySeine entity, ActivitySeineObservedSystemDto dto) { - - copyEntityDataFieldsToDto(entity, dto); - - dto.setObservedSystem(toReferentialReferenceList(referentialLocale, entity.getObservedSystem(), ObservedSystemDto.class)); - dto.setObservedSystemDistance(entity.getObservedSystemDistance()); - - } - -} diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java deleted file mode 100644 index 907dd4e..0000000 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java +++ /dev/null @@ -1,67 +0,0 @@ -package fr.ird.observe.services.topia.service.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; -import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; -import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ActivitySeineObservedSystemServiceTopia extends ObserveServiceTopia implements ActivitySeineObservedSystemService { - - private static final Log log = LogFactory.getLog(ActivitySeineObservedSystemServiceTopia.class); - - @Override - public Form<ActivitySeineObservedSystemDto> loadForm(String activitySeineId) { - if (log.isTraceEnabled()) { - log.trace("loadForm(" + activitySeineId + ")"); - } - - ActivitySeine activitySeine = loadEntity(ActivitySeineObservedSystemDto.class, activitySeineId); - - return dataEntityToForm(ActivitySeineObservedSystemDto.class, - activitySeine, - ReferenceSetRequestDefinitions.ACTIVITY_SEINE_OBSERVED_SYSTEM_FORM); - } - - @Override - public SaveResultDto save(ActivitySeineObservedSystemDto dto) { - if (log.isTraceEnabled()) { - log.trace("save(" + dto.getId() + ")"); - } - - ActivitySeine entity = loadOrCreateEntityFromDataDto(dto); - checkLastUpdateDate(entity, dto); - copyDataDtoToEntity(dto, entity); - return saveEntity(entity); - - } -} diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java index 002c8d3..d954003 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java @@ -116,7 +116,6 @@ import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; @@ -271,7 +270,6 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { transformDataEntityToDto(TripLonglineGearUseDto.class); transformDataEntityToDto(WeightMeasureDto.class); transformDataEntityToDto(ActivitySeineDto.class); - transformDataEntityToDto(ActivitySeineObservedSystemDto.class); transformDataEntityToDto(ActivitySeineStubDto.class); transformDataEntityToDto(FloatingObjectDto.class); transformDataEntityToDto(FloatingObjectObservedSpeciesDto.class); diff --git a/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java b/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java index 3dd5bfb..7fad17f 100644 --- a/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveServicesProvider.java @@ -44,7 +44,6 @@ import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.services.service.longline.TdrService; import fr.ird.observe.services.service.longline.TripLonglineGearUseService; import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.services.service.seine.FloatingObjectService; import fr.ird.observe.services.service.seine.NonTargetCatchService; @@ -111,8 +110,6 @@ public interface ObserveServicesProvider { SetLonglineService newSetLonglineService(); - ActivitySeineObservedSystemService newActivitySeineObservedSystemService(); - SetLonglineGlobalCompositionService newSetLonglineGlobalCompositionService(); SetLonglineDetailCompositionService newSetLonglineDetailCompositionService(); diff --git a/services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java deleted file mode 100644 index da9323f..0000000 --- a/services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java +++ /dev/null @@ -1,47 +0,0 @@ -package fr.ird.observe.services.service.seine; - -/* - * #%L - * ObServe :: Services API - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; -import fr.ird.observe.services.spi.PostRequest; -import fr.ird.observe.services.spi.ReadDataPermission; -import fr.ird.observe.services.spi.Write; -import fr.ird.observe.services.spi.WriteDataPermission; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public interface ActivitySeineObservedSystemService extends ObserveService { - - @ReadDataPermission - Form<ActivitySeineObservedSystemDto> loadForm(String activitySeineId); - - @Write - @WriteDataPermission - @PostRequest - SaveResultDto save(ActivitySeineObservedSystemDto dto); - -} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.