Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9492f99e by Tony CHEMIT at 2018-07-03T17:03:14Z [PS] Forçage du focus lors de la création d'une nouvelle actiité - closes #998 - - - - - 18 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/SetLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SetSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthWeightParameterUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/ProgramUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesGroupUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesListUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java @@ -43,6 +43,7 @@ import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.util.Calendar; import java.util.Date; ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java @@ -212,6 +212,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } public void resetBranchline() { @@ -727,7 +728,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat if (!newValue && getUi().getMainTabbedPane().getSelectedIndex() > 2) { // go back to first tab - getUi().getMainTabbedPane().setSelectedIndex(0); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java @@ -188,9 +188,8 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } - @Override public void startEditUI(String... binding) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java @@ -58,6 +58,7 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComboBox; import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; import javax.swing.event.ChangeListener; import javax.swing.event.TableModelListener; import java.beans.PropertyChangeListener; @@ -428,8 +429,6 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - // Always go back to first tab - getUi().getMainTabbedPane().setSelectedIndex(0); } finally { @@ -441,6 +440,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong getUi().startEdit(null); } + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java @@ -43,6 +43,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import java.util.Optional; import static org.nuiton.i18n.I18n.t; @@ -208,7 +209,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong compositionUI.open(); } - + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/SetLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/SetLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/SetLonglineUIHandler.java @@ -50,6 +50,7 @@ import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditorModel; import org.nuiton.jaxx.widgets.hidor.HidorButton; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.beans.PropertyChangeListener; import java.util.HashSet; @@ -250,6 +251,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto, SetLo getUi().startEdit(null); } + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java @@ -53,6 +53,7 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JTable; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeListener; @@ -225,6 +226,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUIHandler.java @@ -238,6 +238,8 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto, // on annule la modification engendree par ce binding getModel().setModified(create); + + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java @@ -198,13 +198,11 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, getUi().startEdit(null); } + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } @Override protected void openedUI() { - if (getModel().isCreatingMode()) { - getUi().getMainTabbedPane().setSelectedIndex(0); - } SwingUtilities.invokeLater(this::forceGrabFocusOnForm); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SetSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SetSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SetSeineUIHandler.java @@ -49,6 +49,7 @@ import org.nuiton.jaxx.widgets.hidor.HidorButton; import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.beans.PropertyChangeListener; import java.util.Date; @@ -193,8 +194,9 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto, SetSeineUI> if (mode != ContentMode.READ) { getUi().startEdit(null); } + super.openUI(); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } - @Override public void startEditUI(String... binding) { ContentUIModel<SetSeineDto> model = getModel(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearUIHandler.java @@ -30,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.util.HashSet; import java.util.Set; @@ -73,7 +74,7 @@ public class GearUIHandler extends ContentReferenceUIHandler<GearDto, GearRefere SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getMainTabbedPane().setSelectedIndex(0); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUIHandler.java @@ -30,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.util.HashSet; import java.util.Set; @@ -72,7 +73,7 @@ public class LengthLengthParameterUIHandler extends ContentReferenceUIHandler<Le SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getMainTabbedPane().setSelectedIndex(0); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthWeightParameterUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthWeightParameterUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthWeightParameterUIHandler.java @@ -30,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.util.HashSet; import java.util.Set; @@ -73,7 +74,7 @@ public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<Le SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getMainTabbedPane().setSelectedIndex(0); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/common/ProgramUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/ProgramUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/ProgramUIHandler.java @@ -30,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.util.HashSet; import java.util.Set; @@ -72,7 +73,7 @@ public class ProgramUIHandler extends ContentReferenceUIHandler<ProgramDto, Prog SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getMainTabbedPane().setSelectedIndex(0); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesGroupUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesGroupUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesGroupUIHandler.java @@ -30,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.util.HashSet; import java.util.Set; @@ -67,7 +68,7 @@ public class SpeciesGroupUIHandler extends ContentReferenceUIHandler<SpeciesGrou public void selectBean(SpeciesGroupReference selectedReference) { super.selectBean(selectedReference); computeTabValidState(getUi().getErrorTableModel()); - getUi().getMainTabbedPane().setSelectedIndex(0); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesListUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesListUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesListUIHandler.java @@ -30,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.util.HashSet; import java.util.Set; @@ -69,7 +70,7 @@ public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesListD super.selectBean(selectedBean); computeTabValidState(getUi().getErrorTableModel()); - getUi().getMainTabbedPane().setSelectedIndex(0); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUIHandler.java @@ -30,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.util.HashSet; import java.util.Set; @@ -73,7 +74,7 @@ public class SpeciesUIHandler extends ContentReferenceUIHandler<SpeciesDto, Spec SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getMainTabbedPane().setSelectedIndex(0); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUIHandler.java @@ -30,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.util.HashSet; import java.util.Set; @@ -71,7 +72,7 @@ public class VesselUIHandler extends ContentReferenceUIHandler<VesselDto, Vessel SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getMainTabbedPane().setSelectedIndex(0); + SwingUtilities.invokeLater(() -> ui.getMainTabbedPane().setSelectedIndex(0)); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9492f99e744202f9eb563be296ef... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9492f99e744202f9eb563be296ef... You're receiving this email because of your account on gitlab.com.