This is an automated email from the git hooks/post-receive script. New commit to branch feature/2 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit caa6f9363aebd37b4e59e62e8e8fad90479aa0ed Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 17 16:44:20 2016 +0100 On contrôle si on peut donner le focus au formulaire (uniquement si le focus n'est pas sur l'arbre de navigation) (Closes #2) --- .../ird/observe/application/swing/ui/UIHelper.java | 10 ++++++ .../application/swing/ui/content/ContentUI.jaxx | 33 +++++++++---------- .../swing/ui/content/ContentUIHandler.java | 37 +++++++--------------- .../swing/ui/content/ObserveActionMap.java | 2 +- .../content/impl/longline/BranchlineUIModel.java | 2 +- .../LonglineCompositionTableModelSupport.java | 2 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 6 ++-- .../longline/LonglineDetailCompositionUIModel.java | 2 +- ...onglineDetailCompositionUIValidationHelper.java | 2 +- .../LonglineGlobalCompositionUIHandler.java | 4 --- .../longline/LonglineGlobalCompositionUIModel.java | 2 +- .../impl/longline/SectionTemplatesTableModel.java | 6 ++-- .../content/impl/longline/SetLonglineUIModel.java | 2 +- ...tingObjectTransmittingBuoyOperationUIModel.java | 2 +- .../content/impl/seine/FloatingObjectUIModel.java | 2 +- .../impl/longline/ActivityLonglinesUIModel.java | 2 +- .../list/impl/seine/ActivitySeinesUIModel.java | 2 +- .../ui/content/list/impl/seine/RoutesUIModel.java | 2 +- .../content/list/impl/seine/TripSeinesUIModel.java | 2 +- .../application/swing/ui/content/list/package.html | 2 +- .../ui/content/open/ContentOpenableUIModel.java | 2 +- .../impl/longline/ActivityLonglineUIModel.java | 2 +- .../open/impl/longline/TripLonglineUIModel.java | 2 +- .../ui/content/open/impl/seine/RouteUIModel.java | 2 +- .../content/open/impl/seine/TripSeineUIModel.java | 2 +- .../ref/impl/LengthWeightParameterUIHandler.java | 3 +- .../ref/impl/longline/BaitTypeUIHandler.java | 1 - .../swing/ui/content/table/ContentTableModel.java | 2 +- .../swing/ui/content/table/ContentTableUI.jaxx | 7 ++-- .../content/table/ContentTableUIInitializer.java | 2 +- .../ui/content/table/ContentTableUIModel.java | 4 +-- .../impl/longline/BaitsCompositionUIHandler.java | 2 +- .../longline/BranchlinesCompositionUIHandler.java | 2 +- .../impl/longline/CatchAcquisitionModeEnum.java | 2 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 2 +- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../longline/FloatlinesCompositionUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/longline/HooksCompositionUIHandler.java | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../impl/longline/SizeMeasuresTableModel.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../ui/content/table/impl/longline/TdrUIModel.java | 8 ++--- .../impl/longline/WeightMeasuresTableModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../impl/seine/ModeSaisieEchantillonEnum.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 2 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 2 +- 55 files changed, 99 insertions(+), 108 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java index 60bcd4a..ed2a1ab 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java @@ -519,4 +519,14 @@ public class UIHelper extends SwingUtil { // Fix http://forge.codelutin.com/issues/2781 selectedTreePane.getViewport().setBackground(Color.WHITE); } + + public static void askFocus(JComponent component) { + if (component == null) { + return; + } + boolean focusOnNavigation = ObserveSwingApplicationContext.get().getMainUI().getModel().isFocusOnNavigation(); + if (!focusOnNavigation) { + SwingUtilities.invokeLater(component::requestFocusInWindow); + } + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx index c4a5c40..e6a4e8c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx @@ -21,16 +21,17 @@ --> <org.jdesktop.swingx.JXTitledPanel - abstract='true' genericType='E extends IdDto, U extends ContentUI<E, U>' implements="fr.ird.observe.application.swing.ui.content.ObserveContentUI<E, U>" - contentContainer='{contentContainer}' - leftDecoration='{titleLeft}' - rightDecoration='{titleRightToolBar}' - _READIcon='SwingUtil.getUIManagerActionIcon("mode-read")' - _CREATEIcon='SwingUtil.getUIManagerActionIcon("mode-create")' - _UPDATEIcon='SwingUtil.getUIManagerActionIcon("mode-update")' - _READTip='t("observe.content.mode.read.tip")' - _CREATERip='t("observe.content.mode.create.tip")' - _UPDATETip='t("observe.content.mode.update.tip")'> + abstract='true' genericType='E extends IdDto, U extends ContentUI<E, U>' + implements="fr.ird.observe.application.swing.ui.content.ObserveContentUI<E, U>" + contentContainer='{contentContainer}' + leftDecoration='{titleLeft}' + rightDecoration='{titleRightToolBar}' + _READIcon='SwingUtil.getUIManagerActionIcon("mode-read")' + _CREATEIcon='SwingUtil.getUIManagerActionIcon("mode-create")' + _UPDATEIcon='SwingUtil.getUIManagerActionIcon("mode-update")' + _READTip='t("observe.content.mode.read.tip")' + _CREATERip='t("observe.content.mode.create.tip")' + _UPDATETip='t("observe.content.mode.update.tip")'> <import> fr.ird.observe.application.swing.ObserveSwingApplicationContext @@ -55,17 +56,17 @@ <ObserveSwingApplicationConfig id='config' initializer='ObserveSwingApplicationContext.get().getConfig()'/> - <SwingValidatorMessageTableModel id='errorTableModel' initializer='getContextValue(SwingValidatorMessageTableModel.class)'/> + <SwingValidatorMessageTableModel id='errorTableModel' + initializer='getContextValue(SwingValidatorMessageTableModel.class)'/> <!--FIXME a supprimer a la fin de la migration de service --> - <ObserveSwingDataSource id='dataSource' initializer='ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource()'/> + <ObserveSwingDataSource id='dataSource' + initializer='ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource()'/> <DataContext id='dataContext' javaBean='ObserveSwingApplicationContext.get().getDataContext()'/> <ContentUIModel id='model' genericType='E' initializer='ContentUIModel.newModel((U) this)'/> - <!--<ContentUIHandler id='handler' genericType='E, U' initializer='ContentUIHandler.newHandler((U) this)'/>--> - <IdDto id='bean' initializer='model.getBean()'/> <!-- icon of the content --> @@ -87,10 +88,6 @@ public Object getSelectedBean(JList list) { return list.getSelectedValue(); } -//public void init() { -// getHandler().initUI(); -//} - public void open() { getHandler().openUI(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index 1e449c9..384ae44 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ObserveSwingTechnicalException; 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; @@ -34,6 +33,7 @@ import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; @@ -60,7 +60,6 @@ import jaxx.runtime.swing.editor.bean.BeanListHeader; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -122,22 +121,6 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U /** l'interface graphique que le controleur utilise */ protected U ui; - public static <E extends IdDto, U extends ContentUI<E, U>> ContentUIHandler<E, U> newHandler(U ui) { - - String uiName = ui.getClass().getName(); - String modelName = uiName + "Handler"; - - try { - - Class<ContentUIHandler<E, U>> handlerClass = (Class) Class.forName(modelName); - return ConstructorUtils.invokeConstructor(handlerClass, ui); - - } catch (Exception e) { - throw new ObserveSwingTechnicalException("Could not create handler for ui: " + ui, e); - } - - } - public void beforeInit(U ui) { this.ui = ui; @@ -432,14 +415,16 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U updateActions(); - FocusTraversalPolicy focusTraversalPolicy = ui.getFocusTraversalPolicy(); - if (focusTraversalPolicy != null) { - JComponent firstComponent = (JComponent) focusTraversalPolicy.getFirstComponent(ui); - if (log.isInfoEnabled()) { - log.info("Grab focus on first component: " + firstComponent); - } - if (firstComponent != null) { - firstComponent.grabFocus(); + ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); + boolean focusOnNavigation = mainUI.getModel().isFocusOnNavigation(); + if (!focusOnNavigation) { + FocusTraversalPolicy focusTraversalPolicy = ui.getFocusTraversalPolicy(); + if (focusTraversalPolicy != null) { + JComponent firstComponent = (JComponent) focusTraversalPolicy.getFirstComponent(ui); + if (log.isInfoEnabled()) { + log.info("Grab focus on first component: " + firstComponent); + } + UIHelper.askFocus(firstComponent); } } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java index db09e26..33b7b3b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java @@ -25,8 +25,8 @@ package fr.ird.observe.application.swing.ui.content; import com.google.common.collect.ImmutableMap; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; +import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; import org.apache.commons.beanutils.ConstructorUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java index 43544dc..af154d8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.services.dto.longline.BranchlineDto; import java.util.Date; import java.util.Set; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineCompositionTableModelSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineCompositionTableModelSupport.java index 698f2eb..9dab8e4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineCompositionTableModelSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineCompositionTableModelSupport.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; * #L% */ +import fr.ird.observe.application.swing.ui.util.table.EditableTableModelSupport; import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.longline.LonglineCompositionDto; -import fr.ird.observe.application.swing.ui.util.table.EditableTableModelSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx index f0a574c..298c06c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx @@ -83,8 +83,10 @@ </BeanValidator> <JPopupMenu id='sectionTemplatesPopup'> - <JMenuItem id='insertBeforeSelectedSectionTemplate' onActionPerformed='getHandler().insertBeforeSelectedSectionTemplate()'/> - <JMenuItem id='insertAfterSelectedSectionTemplate' onActionPerformed='getHandler().insertAfterSelectedSectionTemplate()'/> + <JMenuItem id='insertBeforeSelectedSectionTemplate' + onActionPerformed='getHandler().insertBeforeSelectedSectionTemplate()'/> + <JMenuItem id='insertAfterSelectedSectionTemplate' + onActionPerformed='getHandler().insertAfterSelectedSectionTemplate()'/> <JMenuItem id='deleteSelectedSectionTemplate' onActionPerformed='getHandler().deleteSelectedSectionTemplate()'/> </JPopupMenu> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIModel.java index 76e1156..1e4379d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIModel.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; * #L% */ -import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; /** * Created on 12/5/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java index 1183f31..dd3053b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java @@ -25,11 +25,11 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.decoration.DecoratorService; +import fr.ird.observe.application.swing.ui.util.ObserveSwingValidatorMessageTableModel; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SectionWithTemplate; -import fr.ird.observe.application.swing.ui.util.ObserveSwingValidatorMessageTableModel; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index 2a52ec3..446bd65 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -99,7 +99,6 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // init floatlinesComposition tab FloatlinesCompositionUI compositionUI = ui.getFloatlinesCompositionUI(); -// compositionUI.init(); ui.getFloatlinesCompositionPanel().remove(compositionUI); ui.getFloatlinesCompositionPanel().add(compositionUI.getBody()); } @@ -107,7 +106,6 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // init branchlinesComposition tab BranchlinesCompositionUI compositionUI = ui.getBranchlinesCompositionUI(); -// compositionUI.init(); ui.getBranchlinesCompositionPanel().remove(compositionUI); ui.getBranchlinesCompositionPanel().add(compositionUI.getBody()); } @@ -115,7 +113,6 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // init hooksComposition tab HooksCompositionUI compositionUI = ui.getHooksCompositionUI(); -// compositionUI.init(); ui.getHooksCompositionPanel().remove(compositionUI); ui.getHooksCompositionPanel().add(compositionUI.getBody()); } @@ -123,7 +120,6 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // init baitsComposition tab BaitsCompositionUI compositionUI = ui.getBaitsCompositionUI(); -// compositionUI.init(); ui.getBaitsCompositionPanel().remove(compositionUI); ui.getBaitsCompositionPanel().add(compositionUI.getBody()); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java index ed198e4..c899fa0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; * #L% */ -import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; /** * Created on 12/5/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionTemplatesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionTemplatesTableModel.java index 144dce7..af6ff72 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionTemplatesTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionTemplatesTableModel.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; * #L% */ -import fr.ird.observe.services.dto.longline.SectionTemplate; import fr.ird.observe.application.swing.ui.util.table.EditableTableModelSupport; +import fr.ird.observe.services.dto.longline.SectionTemplate; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -56,8 +56,8 @@ public class SectionTemplatesTableModel extends EditableTableModelSupport<Sectio @Override public boolean isRowValid(SectionTemplate row) { return StringUtils.isNotBlank(row.getId()) && - StringUtils.isNotBlank(row.getFloatlineLengths()) && - row.isFloatlineLengthsValid(); + StringUtils.isNotBlank(row.getFloatlineLengths()) && + row.isFloatlineLengthsValid(); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIModel.java index b58c3e8..872ff15 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIModel.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.services.dto.longline.SetLonglineDto; import java.util.Set; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java index 6940225..19d4127 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.impl.seine; * #L% */ -import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; /** * Created on 9/28/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java index 42a657e..7e3b320 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.impl.seine; * #L% */ -import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; /** * Created on 9/28/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIModel.java index ad54e9d..42eb628 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIModel.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.content.list.impl.longline; * #L% */ +import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; /** * Created on 9/26/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIModel.java index 9f1ce5e..9c4d5cb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIModel.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.content.list.impl.seine; * #L% */ +import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; /** * Created on 9/26/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIModel.java index 668886f..f26c8d7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIModel.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.content.list.impl.seine; * #L% */ +import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; /** * Created on 9/26/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java index be568c3..966bac0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java @@ -22,10 +22,10 @@ package fr.ird.observe.application.swing.ui.content.list.impl.seine; * #L% */ +import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; import java.util.List; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/package.html b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/package.html index 943cb04..1572637 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/package.html +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/package.html @@ -22,6 +22,6 @@ <html> <body> <h1>Le paquetage des écrans de données observateurs intermédiaires (marées, - routes, activités).</h1> + routes, activités).</h1> </body> </html> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIModel.java index 98696c7..4788148 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIModel.java @@ -21,8 +21,8 @@ */ package fr.ird.observe.application.swing.ui.content.open; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.services.dto.IdDto; /** * Le modèle pour un écran d'édition avec des fils. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java index 34b89cb..327f385 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java @@ -22,11 +22,11 @@ package fr.ird.observe.application.swing.ui.content.open.impl.longline; * #L% */ +import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineHelper; -import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.DateUtil; import java.util.Date; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIModel.java index 28e8c01..1061f1b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIModel.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.open.impl.longline; * #L% */ -import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; +import fr.ird.observe.services.dto.longline.TripLonglineDto; /** * Created on 9/26/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIModel.java index b347079..ac11efa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIModel.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.open.impl.seine; * #L% */ -import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; +import fr.ird.observe.services.dto.seine.RouteDto; /** * Created on 9/26/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIModel.java index a9d51dc..33b4f4e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIModel.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.open.impl.seine; * #L% */ -import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; +import fr.ird.observe.services.dto.seine.TripSeineDto; /** * Created on 9/26/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java index b89642a..6954a5f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java @@ -62,7 +62,8 @@ public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<Le // To be sure always remove listener (could prevent some leaks) ui.getErrorTableModel().removeTableModelListener(computeTabValidStateListener); // listen messages to see if required to add - ui.getErrorTableModel().addTableModelListener(computeTabValidStateListener); } + ui.getErrorTableModel().addTableModelListener(computeTabValidStateListener); + } @Override public void selectBean(ReferentialReference<LengthWeightParameterDto> selectedBean) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIHandler.java index 8b98423..744027c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIHandler.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline; */ import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; -import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; import jaxx.runtime.spi.UIHandler; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java index 3cfcb10..7f49996 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.application.swing.ui.content.table; +import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.application.swing.ui.UIHelper; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx index de3f9f8..67d502e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx @@ -21,9 +21,10 @@ --> <fr.ird.observe.application.swing.ui.content.ContentUI - abstract='true' - superGenericType='E, U' implements="fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI<E, D, U>" - genericType='E extends IdDto, D extends IdDto, U extends ContentTableUI<E, D, U>'> + abstract='true' + superGenericType='E, U' + implements="fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI<E, D, U>" + genericType='E extends IdDto, D extends IdDto, U extends ContentTableUI<E, D, U>'> <import> fr.ird.observe.application.swing.ui.actions.content.ResetEditUIAction diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java index 55c22b6..d26814c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.table; * #L% */ -import fr.ird.observe.application.swing.ui.content.ObserveActionMap; import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; +import fr.ird.observe.application.swing.ui.content.ObserveActionMap; import fr.ird.observe.application.swing.ui.util.BooleanEditor; import fr.ird.observe.services.dto.IdDto; import jaxx.runtime.SwingUtil; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java index a4d27ce..5d659d8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.table; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.services.dto.IdDto; import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -116,7 +116,7 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte } - protected abstract ContentTableModel<E, D> createTableModel(ObserveContentTableUI<E, D, ?> ui, List<ContentTableMeta<D>> metas) ; + protected abstract ContentTableModel<E, D> createTableModel(ObserveContentTableUI<E, D, ?> ui, List<ContentTableMeta<D>> metas); public Class<D> getChildType() { return childType; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java index 670fcef..1215aa1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java @@ -65,7 +65,7 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); } - getUi().getBaitType().requestFocus(); + UIHelper.askFocus(getUi().getBaitType()); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java index 9d8a3a1..15151f8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java @@ -65,7 +65,7 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); } - getUi().getTopType().requestFocus(); + UIHelper.askFocus(getUi().getTopType()); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java index a8e329a..2a048e3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchAcquisitionModeEnum.java @@ -51,7 +51,7 @@ public enum CatchAcquisitionModeEnum { } throw new IllegalArgumentException( "could not find a " + CatchAcquisitionModeEnum.class.getSimpleName() + - " value for ordinal " + ordinal); + " value for ordinal " + ordinal); } public String getI18nKey() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java index 7f88417..afe10af 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; */ +import fr.ird.observe.application.swing.ui.content.table.ContentTableUIInitializer; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIInitializer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil; 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 5b68d52..2fa41e5 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 @@ -482,7 +482,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat LonglinePositionHelper<CatchLonglineDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(ui); positionHelper.resetPosition(bean); - requestFocus.requestFocus(); + UIHelper.askFocus(requestFocus); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java index 7d3b3c0..9d45014 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java @@ -72,7 +72,7 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); } - getUi().getEncounterType().requestFocus(); + UIHelper.askFocus(getUi().getEncounterType()); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java index baceadc..dfff67a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java @@ -64,7 +64,7 @@ public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLon if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); } - getUi().getLineType().requestFocus(); + UIHelper.askFocus(getUi().getLineType()); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 41359b0..cfed1e0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -288,7 +288,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } - requestFocus.requestFocus(); + UIHelper.askFocus(requestFocus); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java index 5cb0f7b..b242283 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java @@ -65,7 +65,7 @@ public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLongline if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); } - getUi().getHookType().requestFocus(); + UIHelper.askFocus(getUi().getHookType()); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java index 8e3455b..529a3fe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -74,7 +74,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); } - getUi().getSensorType().requestFocus(); + UIHelper.askFocus(getUi().getSensorType()); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java index 2e614a1..c85661b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java @@ -22,10 +22,10 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; * #L% */ +import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; -import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; /** * Created on 12/3/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java index 38ee769..081a394 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java @@ -153,7 +153,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt LonglinePositionHelper<TdrDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(ui); positionHelper.resetPosition(bean); - requestFocus.requestFocus(); + UIHelper.askFocus(requestFocus); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java index 793fa1d..4d05cb9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIModel.java @@ -23,14 +23,13 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; */ import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; -import fr.ird.observe.services.dto.longline.TdrDto; -import fr.ird.observe.services.dto.longline.TdrHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIModel; import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; +import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; +import fr.ird.observe.services.dto.longline.TdrDto; +import fr.ird.observe.services.dto.longline.TdrHelper; import java.util.Arrays; import java.util.Collection; @@ -164,6 +163,7 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineTdrDto, TdrDto> { List<ContentTableMeta<TdrDto>> contentTableMetas) { return new ContentTableModel<SetLonglineTdrDto, TdrDto>(ui, contentTableMetas) { private static final long serialVersionUID = 1L; + @Override protected Collection<TdrDto> getChilds(SetLonglineTdrDto bean) { return bean.getTdr(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java index 6aac938..dfbee61 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java @@ -22,10 +22,10 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; * #L% */ +import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; -import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; /** * Created on 12/3/14. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index f770ffa..3f69734 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -287,7 +287,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } - requestFocus.requestFocus(); + UIHelper.askFocus(requestFocus); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java index d4f9b78..1a0142c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ModeSaisieEchantillonEnum.java @@ -62,7 +62,7 @@ public enum ModeSaisieEchantillonEnum { } throw new IllegalArgumentException( "could not find a " + ModeSaisieEchantillonEnum.class.getSimpleName() + - " value for ordinal " + ordinal); + " value for ordinal " + ordinal); } public String getI18nKey() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index 9258954..f386b2c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -226,7 +226,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa } ui.getSpecies().setData(availableEspeces); - requestFocus.requestFocus(); + UIHelper.askFocus(requestFocus); NonTargetCatchDto tableEditBean = getTableEditBean(); tableEditBean.removePropertyChangeListener(NonTargetCatchDto.PROPERTY_TOTAL_COUNT, totalCountChanged); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index 903e5a8..f5328cd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -169,7 +169,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS } ui.getSpecies().setData(availableEspeces); - requestFocus.requestFocus(); + UIHelper.askFocus(requestFocus); tableEditBean.addPropertyChangeListener(NonTargetLengthDto.PROPERTY_WEIGHT, weightChanged); tableEditBean.addPropertyChangeListener(NonTargetLengthDto.PROPERTY_LENGTH, lengthChanged); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index a5906df..2a7e376 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -75,7 +75,7 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati log.debug("Row has changed to " + editingRow); } if (getTableModel().isEditable()) { - getUi().getSpecies().requestFocus(); + UIHelper.askFocus(getUi().getSpecies()); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java index 1cd6a6a..4888d86 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -69,7 +69,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin if (log.isDebugEnabled()) { log.debug("Row has changed to " + editingRow); } - getUi().getSpecies().requestFocus(); + UIHelper.askFocus(getUi().getSpecies()); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index 103ce33..a964ec0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -103,7 +103,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo requestFocus = ui.getTotalWeight(); } ui.getSpecies().setData(availableEspeces); - requestFocus.requestFocus(); + UIHelper.askFocus(requestFocus); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java index db949f8..ad8f07b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -212,7 +212,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa log.debug("selected weightcategory " + weightCategory); log.debug("selected species " + species); } - requestFocus.requestFocus(); + UIHelper.askFocus(requestFocus); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index e8ff611..95fd9b0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -256,7 +256,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT requestFocus = ui.getCatchWeight(); } - requestFocus.requestFocus(); + UIHelper.askFocus(requestFocus); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 3a65dff..94b387f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -192,7 +192,7 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar } ui.getSpecies().setSelectedItem(species); } - requestFocus.requestFocus(); + UIHelper.askFocus(requestFocus); tableEditBean.addPropertyChangeListener(TargetLengthDto.PROPERTY_WEIGHT, weightChanged); tableEditBean.addPropertyChangeListener(TargetLengthDto.PROPERTY_LENGTH, lengthChanged); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.