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 040da557668bc9aefed1ddf6889979ba600c3255 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 25 18:50:48 2016 +0100 refs #8429 il manquait des focus managers --- .../swing/ui/content/ObserveFocusManager.java | 26 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java index da7d05f..cde124b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java @@ -23,9 +23,7 @@ package fr.ird.observe.application.swing.ui.content; */ import com.google.common.collect.ImmutableMap; -import fr.ird.observe.application.swing.ui.content.impl.longline.BranchlineUI; 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.FloatingObjectTransmittingBuoyOperationUI; import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectUI; @@ -66,6 +64,8 @@ import fr.ird.observe.application.swing.ui.content.table.impl.seine.ObjectSchool import fr.ird.observe.application.swing.ui.content.table.impl.seine.SchoolEstimateUI; import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetCatchUI; import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetDiscardCatchUI; +import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleCaptureUI; +import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleRejeteUI; import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleUI; import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.editor.bean.BeanComboBox; @@ -143,7 +143,7 @@ public class ObserveFocusManager { } int selectedIndex = ui.getFishingOperationTabPane().getSelectedIndex(); if (selectedIndex == 2) { - ui.getBranchlineDetailUI().getComment2(); + return ui.getBranchlineDetailUI().getComment2(); } return super.getLastComponent(aContainer); } @@ -505,11 +505,29 @@ public class ObserveFocusManager { } }); - builder.put(TargetSampleUI.class, new ObserveLayoutFocusTraversalPolicy<TargetSampleUI>() { + builder.put(TargetSampleCaptureUI.class, new ObserveLayoutFocusTraversalPolicy<TargetSampleCaptureUI>() { @Override protected Component getFirstComponentForEdit(Container aContainer) { + TargetSampleCaptureUI ui = getUi(); + if (ui.getAcquisitionModeEffectif().isEnabled()) { + return ui.getAcquisitionModeEffectif(); + } + return ui.getSizeMeasureType(); + } + + @Override + protected Component getLastComponentForEdit(Container aContainer) { TargetSampleUI ui = getUi(); + return getTableDefaultLastComponent(ui, ui.getComment2()); + } + + }); + builder.put(TargetSampleRejeteUI.class, new ObserveLayoutFocusTraversalPolicy<TargetSampleRejeteUI>() { + + @Override + protected Component getFirstComponentForEdit(Container aContainer) { + TargetSampleRejeteUI ui = getUi(); if (ui.getAcquisitionModeEffectif().isEnabled()) { return ui.getAcquisitionModeEffectif(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.