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 576bc1d13706ec52c0bd31c4addf3cb639a8a1a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 14:54:48 2016 +0200 Conditionner l'utilisation selon le type de marée (LL) --- .../table/impl/longline/CatchLonglineUI.jcss | 1 - .../impl/longline/CatchLonglineUIHandler.java | 38 +++++++++++++++++----- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss index 5b6069d..0bb7962 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss @@ -155,7 +155,6 @@ #hookWhenDiscarded { _tablePropertyName:{CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED}; - _propertyName:{CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED}; booleanValue:{tableEditBean.getHookWhenDiscarded()}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java index bf75e79..9d06255 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -33,6 +33,9 @@ import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; +import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.TripLonglineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BasketDto; @@ -43,6 +46,7 @@ import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchHelper; import fr.ird.observe.services.dto.longline.SizeMeasureDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -111,6 +115,8 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat private final JAXXContextEntryDef<LonglinePositionHelper<CatchLonglineDto>> POSITION_HELPER_ENTRY = UIHelper.newContextEntryDef("CatchLonglineUI-positionHelper", LonglinePositionHelper.class); + private static final String GROUPED_TRIP_TYPE_ID = "fr.ird.observe.entities.referentiel.longline.TripType#1239832686136#0.1"; + public CatchLonglineUIHandler(CatchLonglineUI ui) { super(ui, DataContextType.SetLongline); computeTabValidStateListener = e -> { @@ -119,7 +125,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat computeTabValidState(source); }; - catchFateChanged = evt -> onCatchFateChanged((ReferentialReference<CatchFateLonglineDto>) evt.getNewValue(), (CatchLonglineDto) evt.getSource()); + catchFateChanged = evt -> onCatchFateChanged((ReferentialReference<CatchFateLonglineDto>) evt.getNewValue()); branchlineChanged = evt -> onBranchlineChanged((DataReference<BranchlineDto>) evt.getNewValue()); weightTableModelModified = evt -> onWeightTableModelModified((Boolean) evt.getNewValue()); sizeTableModelModified = evt -> onSizeTableModelModified((Boolean) evt.getNewValue()); @@ -406,14 +412,28 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat JComponent requestFocus; + CatchAcquisitionModeEnum acquisitionModeEnum; + if (tableModel.isCreate()) { // go back to first pane ui.getFishingOperationTabPane().setSelectedIndex(0); // select by default individual acquisition mode - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(CatchAcquisitionModeEnum.INDIVIDUAL); + String openTripLonglineId = getDataContext().getOpenTripLonglineId(); + + ObserveTreeHelper treeHelper = ObserveSwingApplicationContext.get().getMainUI().getTreeHelper(); + ObserveNode selectedNode = treeHelper.getSelectedNode(); + while (!(selectedNode instanceof TripLonglineNode)) { + selectedNode = selectedNode.getParent(); + } + DataReference<TripLonglineDto> tripReference = ((TripLonglineNode) selectedNode).getEntity(); + String tripTypeId = (String) tripReference.getPropertyValue(TripLonglineDto.PROPERTY_TRIP_TYPE + "Id"); + if (log.isInfoEnabled()) { + log.info("Use tripId: " + tripTypeId); + } + acquisitionModeEnum = GROUPED_TRIP_TYPE_ID.equals(tripTypeId) + ? CatchAcquisitionModeEnum.GROUPED : CatchAcquisitionModeEnum.INDIVIDUAL; ui.getPredator().setEnabled(false); ui.getHookWhenDiscarded().setEnabled(false); @@ -426,11 +446,10 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } else { int acquisitionMode = bean.getAcquisitionMode(); - CatchAcquisitionModeEnum enumValue = CatchAcquisitionModeEnum.valueOf(acquisitionMode); - ui.getAcquisitionModeGroup().setSelectedValue(null); - ui.getAcquisitionModeGroup().setSelectedValue(enumValue); - if (enumValue.equals(CatchAcquisitionModeEnum.GROUPED)) { + acquisitionModeEnum = CatchAcquisitionModeEnum.valueOf(acquisitionMode); + + if (acquisitionModeEnum.equals(CatchAcquisitionModeEnum.GROUPED)) { requestFocus = ui.getCount(); @@ -445,6 +464,9 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } + ui.getAcquisitionModeGroup().setSelectedValue(null); + ui.getAcquisitionModeGroup().setSelectedValue(acquisitionModeEnum); + bean.removePropertyChangeListener(CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); bean.addPropertyChangeListener(CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, catchFateChanged); @@ -717,7 +739,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } - protected void onCatchFateChanged(ReferentialReference<CatchFateLonglineDto> newValue, CatchLonglineDto tableEditBean) { + protected void onCatchFateChanged(ReferentialReference<CatchFateLonglineDto> newValue) { CatchLonglineUI ui = getUi(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.