branch feature/25 created (now 6e96a6f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/25 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 6e96a6f ajout des raccourcis claviers sur les onglets (Closes #25) This branch includes the following new commits: new 6e96a6f ajout des raccourcis claviers sur les onglets (Closes #25) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6e96a6fd063a132373cc57dcdadc73ee482fbd53 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 31 10:44:45 2016 +0100 ajout des raccourcis claviers sur les onglets (Closes #25) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/25 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 6e96a6fd063a132373cc57dcdadc73ee482fbd53 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 31 10:44:45 2016 +0100 ajout des raccourcis claviers sur les onglets (Closes #25) --- .../application/swing/ui/ObserveKeyStrokes.java | 48 ++++++++++++- .../ui/actions/content/GoToSubTab1UIAction.java | 20 ++++++ .../ui/actions/content/GoToSubTab2UIAction.java | 20 ++++++ .../ui/actions/content/GoToSubTab3UIAction.java | 20 ++++++ .../swing/ui/actions/content/GoToTab1UIAction.java | 20 ++++++ .../swing/ui/actions/content/GoToTab2UIAction.java | 20 ++++++ .../swing/ui/actions/content/GoToTab3UIAction.java | 20 ++++++ .../swing/ui/actions/content/GoToTab4UIAction.java | 20 ++++++ .../swing/ui/actions/content/GoToTab5UIAction.java | 20 ++++++ .../swing/ui/actions/content/GoToTab6UIAction.java | 20 ++++++ .../ui/actions/content/GoToTabUIActionSupport.java | 39 +++++++++++ .../swing/ui/content/ContentUIBlockingLayerUI.java | 35 ++++++++-- .../swing/ui/content/ContentUIInitializer.java | 79 +++++++++++++++++++--- .../swing/ui/content/ObserveFocusManager.java | 34 +++++----- .../ui/content/impl/longline/BranchlineUI.jaxx | 2 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 2 +- .../LonglineDetailCompositionUIHandler.java | 25 +++++-- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 2 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 2 +- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 2 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 6 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 2 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 2 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../swing/ui/content/ref/impl/GearUI.jaxx | 2 +- .../swing/ui/content/ref/impl/GearUIHandler.java | 2 +- .../content/ref/impl/LengthLengthParameterUI.jaxx | 2 +- .../ref/impl/LengthLengthParameterUIHandler.java | 2 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 2 +- .../ref/impl/LengthWeightParameterUIHandler.java | 2 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 2 +- .../ui/content/ref/impl/ProgramUIHandler.java | 2 +- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 2 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 2 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 2 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 2 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 2 +- .../swing/ui/content/ref/impl/VesselUIHandler.java | 2 +- .../table/impl/longline/CatchLonglineUI.jaxx | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 12 ++-- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- 47 files changed, 440 insertions(+), 80 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java index 9e54c2b..6b6eb92 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java @@ -22,12 +22,14 @@ package fr.ird.observe.application.swing.ui; * #L% */ +import com.google.common.collect.ImmutableList; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; -import org.nuiton.jaxx.runtime.JAXXObject; import org.apache.commons.lang3.StringUtils; +import org.nuiton.jaxx.runtime.JAXXObject; import javax.swing.AbstractButton; +import javax.swing.JTabbedPane; import javax.swing.KeyStroke; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; @@ -94,6 +96,30 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_SHOW_DECORATOR_POPUP = KeyStroke.getKeyStroke("ctrl pressed F"); public static final KeyStroke KEY_STROKE_GO_DOWN_TABLE_ENTRY = KeyStroke.getKeyStroke("shift pressed W"); public static final KeyStroke KEY_STROKE_GO_UP_TABLE_ENTRY = KeyStroke.getKeyStroke("shift pressed Q"); + public static final KeyStroke KEY_STROKE_GO_TAB_1 = KeyStroke.getKeyStroke("ctrl pressed F5"); + public static final KeyStroke KEY_STROKE_GO_TAB_2 = KeyStroke.getKeyStroke("ctrl pressed F6"); + public static final KeyStroke KEY_STROKE_GO_TAB_3 = KeyStroke.getKeyStroke("ctrl pressed F7"); + public static final KeyStroke KEY_STROKE_GO_TAB_4 = KeyStroke.getKeyStroke("ctrl pressed F8"); + public static final KeyStroke KEY_STROKE_GO_TAB_5 = KeyStroke.getKeyStroke("ctrl pressed F9"); + public static final KeyStroke KEY_STROKE_GO_TAB_6 = KeyStroke.getKeyStroke("ctrl pressed F10"); + + public static final KeyStroke KEY_STROKE_GO_SUB_TAB_1 = KeyStroke.getKeyStroke("shift ctrl pressed F5"); + public static final KeyStroke KEY_STROKE_GO_SUB_TAB_2 = KeyStroke.getKeyStroke("shift ctrl pressed F6"); + public static final KeyStroke KEY_STROKE_GO_SUB_TAB_3 = KeyStroke.getKeyStroke("shift ctrl pressed F7"); + + public static final ImmutableList<KeyStroke> KEY_STROKE_GO_TABS = ImmutableList.of( + KEY_STROKE_GO_TAB_1, + KEY_STROKE_GO_TAB_2, + KEY_STROKE_GO_TAB_3, + KEY_STROKE_GO_TAB_4, + KEY_STROKE_GO_TAB_5, + KEY_STROKE_GO_TAB_6 + ); + public static final ImmutableList<KeyStroke> KEY_STROKE_GO_SUB_TABS = ImmutableList.of( + KEY_STROKE_GO_SUB_TAB_1, + KEY_STROKE_GO_SUB_TAB_2, + KEY_STROKE_GO_SUB_TAB_3 + ); private static String keyStrokeToStr(KeyStroke actionKey) { String result = ""; @@ -193,6 +219,26 @@ public abstract class ObserveKeyStrokes { addKeyStrokeFromMnemonic(jaxxObject, done); } + public static void addKeyStrokeToMainTabbedPane(JTabbedPane tabbedPane) { + if (isShowMnemonic()) { + int tabCount = tabbedPane.getTabCount(); + for (int i = 0; i < tabCount; i++) { + String titleAt = tabbedPane.getTitleAt(i); + tabbedPane.setTitleAt(i, titleAt + keyStrokeToStr(KEY_STROKE_GO_TABS.get(i))); + } + } + } + + public static void addKeyStrokeToSubTabbedPane(JTabbedPane tabbedPane) { + if (isShowMnemonic()) { + int tabCount = tabbedPane.getTabCount(); + for (int i = 0; i < tabCount; i++) { + String titleAt = tabbedPane.getTitleAt(i); + tabbedPane.setTitleAt(i, titleAt + keyStrokeToStr(KEY_STROKE_GO_SUB_TABS.get(i))); + } + } + } + protected static void addKeyStrokeFromMnemonic(JAXXObject jaxxObject, Set<JAXXObject> done) { if (done.contains(jaxxObject)) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToSubTab1UIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToSubTab1UIAction.java new file mode 100644 index 0000000..7b32e6c --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToSubTab1UIAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +/** + * Created on 31/12/16. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 6.0 + */ +public class GoToSubTab1UIAction extends GoToTabUIActionSupport { + + public static final String ACTION_NAME = GoToSubTab1UIAction.class.getName(); + + public GoToSubTab1UIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_GO_SUB_TAB_1, 0, SUB_TABBED_PANE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToSubTab2UIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToSubTab2UIAction.java new file mode 100644 index 0000000..533e856 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToSubTab2UIAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +/** + * Created on 31/12/16. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 6.0 + */ +public class GoToSubTab2UIAction extends GoToTabUIActionSupport { + + public static final String ACTION_NAME = GoToSubTab2UIAction.class.getName(); + + public GoToSubTab2UIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_GO_SUB_TAB_2, 1, SUB_TABBED_PANE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToSubTab3UIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToSubTab3UIAction.java new file mode 100644 index 0000000..7ed05ad --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToSubTab3UIAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +/** + * Created on 31/12/16. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 6.0 + */ +public class GoToSubTab3UIAction extends GoToTabUIActionSupport { + + public static final String ACTION_NAME = GoToSubTab3UIAction.class.getName(); + + public GoToSubTab3UIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_GO_SUB_TAB_3, 2, SUB_TABBED_PANE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab1UIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab1UIAction.java new file mode 100644 index 0000000..b0b4737 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab1UIAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +/** + * Created on 31/12/16. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 6.0 + */ +public class GoToTab1UIAction extends GoToTabUIActionSupport { + + public static final String ACTION_NAME = GoToTab1UIAction.class.getName(); + + public GoToTab1UIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_GO_TAB_1, 0, MAIN_TABBED_PANE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab2UIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab2UIAction.java new file mode 100644 index 0000000..1ab6e83 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab2UIAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +/** + * Created on 31/12/16. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 6.0 + */ +public class GoToTab2UIAction extends GoToTabUIActionSupport { + + public static final String ACTION_NAME = GoToTab2UIAction.class.getName(); + + public GoToTab2UIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_GO_TAB_2, 1, MAIN_TABBED_PANE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab3UIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab3UIAction.java new file mode 100644 index 0000000..d2c097a --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab3UIAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +/** + * Created on 31/12/16. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 6.0 + */ +public class GoToTab3UIAction extends GoToTabUIActionSupport { + + public static final String ACTION_NAME = GoToTab3UIAction.class.getName(); + + public GoToTab3UIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_GO_TAB_3, 2, MAIN_TABBED_PANE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab4UIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab4UIAction.java new file mode 100644 index 0000000..d018b5a --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab4UIAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +/** + * Created on 31/12/16. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 6.0 + */ +public class GoToTab4UIAction extends GoToTabUIActionSupport { + + public static final String ACTION_NAME = GoToTab4UIAction.class.getName(); + + public GoToTab4UIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_GO_TAB_4, 3, MAIN_TABBED_PANE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab5UIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab5UIAction.java new file mode 100644 index 0000000..e3e45f3 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab5UIAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +/** + * Created on 31/12/16. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 6.0 + */ +public class GoToTab5UIAction extends GoToTabUIActionSupport { + + public static final String ACTION_NAME = GoToTab5UIAction.class.getName(); + + public GoToTab5UIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_GO_TAB_5, 4, MAIN_TABBED_PANE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab6UIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab6UIAction.java new file mode 100644 index 0000000..a6d7ebb --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTab6UIAction.java @@ -0,0 +1,20 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; +import fr.ird.observe.application.swing.ui.ObserveMainUI; + +/** + * Created on 31/12/16. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 6.0 + */ +public class GoToTab6UIAction extends GoToTabUIActionSupport { + + public static final String ACTION_NAME = GoToTab6UIAction.class.getName(); + + public GoToTab6UIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_GO_TAB_6, 5, MAIN_TABBED_PANE); + } + +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTabUIActionSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTabUIActionSupport.java new file mode 100644 index 0000000..ff422d6 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTabUIActionSupport.java @@ -0,0 +1,39 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.content.ContentUI; + +import javax.swing.JTabbedPane; +import javax.swing.KeyStroke; + +/** + * Created on 31/12/16. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 6.0 + */ +public abstract class GoToTabUIActionSupport extends AbstractContentUIAction { + + public static final String MAIN_TABBED_PANE = "mainTabbedPane"; + public static final String SUB_TABBED_PANE = "subTabbedPane"; + + private final int tabIndex; + private final String tabbedPaneName; + + public GoToTabUIActionSupport(ObserveMainUI mainUI, String actionName, KeyStroke keyStroke, int tabIndex, String tabbedPaneName) { + super(mainUI, actionName, null, null, null, keyStroke); + this.tabIndex = tabIndex; + this.tabbedPaneName = tabbedPaneName; + } + + @Override + protected void actionPerformed(ContentUI<?, ?> contentUI) { + JTabbedPane mainTabbedPane = (JTabbedPane) contentUI.getObjectById(tabbedPaneName); + if (mainTabbedPane == null) { + + // rien à faire + return; + } + mainTabbedPane.setSelectedIndex(tabIndex); + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIBlockingLayerUI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIBlockingLayerUI.java index 088f720..47f3177 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIBlockingLayerUI.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIBlockingLayerUI.java @@ -60,7 +60,11 @@ public class ContentUIBlockingLayerUI extends BlockingLayerUI { KeyEvent.VK_F5, KeyEvent.VK_F6, KeyEvent.VK_F7, - KeyEvent.VK_F8 + KeyEvent.VK_F8, + KeyEvent.VK_F9, + KeyEvent.VK_F10, + KeyEvent.VK_F11, + KeyEvent.VK_F12 ); private final ContentUI ui; @@ -85,6 +89,9 @@ public class ContentUIBlockingLayerUI extends BlockingLayerUI { @Override protected void processKeyEvent(KeyEvent e, JXLayer<? extends JComponent> l) { + if (log.isInfoEnabled()) { + log.info(e); + } InputMap inputMap = ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = ui.getActionMap(); @@ -101,17 +108,31 @@ public class ContentUIBlockingLayerUI extends BlockingLayerUI { consumed = doAction(keyStroke, inputMap, actionMap); } - if (!consumed && e.getID() == KeyEvent.KEY_PRESSED && !e.isControlDown() && !e.isShiftDown() && !e.isAltDown() && !e.isAltGraphDown() + if (!consumed && e.getID() == KeyEvent.KEY_RELEASED && !e.isAltDown() && !e.isAltGraphDown() && !e.isMetaDown() && GLOBAL_KEY_CODES.contains(e.getKeyCode())) { - KeyStroke keyStroke = KeyStroke.getKeyStroke(e.getKeyCode(), 0); + if (!e.isShiftDown()) { - if (keyStroke == null) { - super.processKeyEvent(e, l); - return; + KeyStroke keyStroke = KeyStroke.getKeyStroke(e.getKeyCode(), e.isControlDown() ? KeyEvent.CTRL_DOWN_MASK : 0); + if (keyStroke == null) { + super.processKeyEvent(e, l); + return; + } + + consumed = doAction(keyStroke, inputMap, actionMap); + + } else if (e.isControlDown()) { + + KeyStroke keyStroke = KeyStroke.getKeyStroke(e.getKeyCode(), KeyEvent.CTRL_DOWN_MASK + KeyEvent.SHIFT_DOWN_MASK); + if (keyStroke == null) { + super.processKeyEvent(e, l); + return; + } + + consumed = doAction(keyStroke, inputMap, actionMap); } - consumed = doAction(keyStroke, inputMap, actionMap); + } if (consumed) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java index 9492876..e09cdcd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -32,6 +32,16 @@ import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecor import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; +import fr.ird.observe.application.swing.ui.actions.content.GoToSubTab1UIAction; +import fr.ird.observe.application.swing.ui.actions.content.GoToSubTab2UIAction; +import fr.ird.observe.application.swing.ui.actions.content.GoToSubTab3UIAction; +import fr.ird.observe.application.swing.ui.actions.content.GoToTab1UIAction; +import fr.ird.observe.application.swing.ui.actions.content.GoToTab2UIAction; +import fr.ird.observe.application.swing.ui.actions.content.GoToTab3UIAction; +import fr.ird.observe.application.swing.ui.actions.content.GoToTab4UIAction; +import fr.ird.observe.application.swing.ui.actions.content.GoToTab5UIAction; +import fr.ird.observe.application.swing.ui.actions.content.GoToTab6UIAction; +import fr.ird.observe.application.swing.ui.actions.content.GoToTabUIActionSupport; import fr.ird.observe.application.swing.ui.util.BooleanEditor; import fr.ird.observe.application.swing.ui.util.tripMap.ObserveMapPane; import fr.ird.observe.application.swing.validation.ObserveSwingValidator; @@ -41,7 +51,15 @@ import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialDto; -import org.nuiton.jaxx.validator.JAXXValidator; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXDatePicker; +import org.jdesktop.swingx.JXMonthView; +import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; +import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; +import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil; import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.runtime.swing.JAXXWidgetUtil; import org.nuiton.jaxx.runtime.swing.editor.EnumEditor; @@ -52,16 +70,8 @@ import org.nuiton.jaxx.runtime.swing.editor.bean.BeanUIUtil; import org.nuiton.jaxx.runtime.swing.editor.cell.NumberCellEditor; import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.nuiton.jaxx.runtime.swing.renderer.EnumEditorRenderer; +import org.nuiton.jaxx.validator.JAXXValidator; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXDatePicker; -import org.jdesktop.swingx.JXMonthView; -import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; -import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; -import org.nuiton.decorator.Decorator; -import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil; import org.nuiton.jaxx.widgets.datetime.DateTimeEditor; import org.nuiton.jaxx.widgets.datetime.TimeEditor; import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; @@ -80,6 +90,7 @@ import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JScrollBar; import javax.swing.JSpinner; +import javax.swing.JTabbedPane; import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.KeyStroke; @@ -295,6 +306,10 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> if (o instanceof JTextArea) { init((JTextArea) o); + continue; + } + if (o instanceof JTabbedPane) { + init((JTabbedPane) o); } } @@ -557,6 +572,50 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } } + protected void init(JTabbedPane tabbedPane) { + boolean mainTabbedPane = GoToTabUIActionSupport.MAIN_TABBED_PANE.equals(tabbedPane.getName()); + boolean subTabbedPane = GoToTabUIActionSupport.SUB_TABBED_PANE.equals(tabbedPane.getName()); + if (!mainTabbedPane && !subTabbedPane) { + return; + } + int tabCount = tabbedPane.getTabCount(); + InputMap inputMap = ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); + if (mainTabbedPane) { + ObserveKeyStrokes.addKeyStrokeToMainTabbedPane(tabbedPane); + if (tabCount > 0) { + inputMap.put(ObserveKeyStrokes.KEY_STROKE_GO_TAB_1, GoToTab1UIAction.ACTION_NAME); + } + if (tabCount > 1) { + inputMap.put(ObserveKeyStrokes.KEY_STROKE_GO_TAB_2, GoToTab2UIAction.ACTION_NAME); + } + if (tabCount > 2) { + inputMap.put(ObserveKeyStrokes.KEY_STROKE_GO_TAB_3, GoToTab3UIAction.ACTION_NAME); + } + if (tabCount > 3) { + inputMap.put(ObserveKeyStrokes.KEY_STROKE_GO_TAB_4, GoToTab4UIAction.ACTION_NAME); + } + if (tabCount > 4) { + inputMap.put(ObserveKeyStrokes.KEY_STROKE_GO_TAB_5, GoToTab5UIAction.ACTION_NAME); + } + if (tabCount > 5) { + inputMap.put(ObserveKeyStrokes.KEY_STROKE_GO_TAB_6, GoToTab6UIAction.ACTION_NAME); + } + } + if (subTabbedPane) { + ObserveKeyStrokes.addKeyStrokeToSubTabbedPane(tabbedPane); + if (tabCount > 0) { + inputMap.put(ObserveKeyStrokes.KEY_STROKE_GO_SUB_TAB_1, GoToSubTab1UIAction.ACTION_NAME); + } + if (tabCount > 1) { + inputMap.put(ObserveKeyStrokes.KEY_STROKE_GO_SUB_TAB_2, GoToSubTab2UIAction.ACTION_NAME); + } + if (tabCount > 2) { + inputMap.put(ObserveKeyStrokes.KEY_STROKE_GO_SUB_TAB_3, GoToSubTab3UIAction.ACTION_NAME); + } + } + + } + protected void init(BooleanEditor editor) { if (log.isDebugEnabled()) { log.debug("init boolean editor " + editor.getName()); 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 5ca9995..bde2485 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 @@ -120,14 +120,14 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { LonglineDetailCompositionUI ui = getUi(); - int selectedIndex = ui.getFishingOperationTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: return ui.getCanGenerate(); case 1: return ui.getDeleteAll(); case 2: - int subSelectedIndex = ui.getBranchlineDetailUI().getFishingOperationTabPane().getSelectedIndex(); + int subSelectedIndex = ui.getBranchlineDetailUI().getSubTabbedPane().getSelectedIndex(); switch (subSelectedIndex) { case 0: return ui.getBranchlineDetailUI().getTopType(); @@ -148,7 +148,7 @@ public class ObserveFocusManager { if (ui.getReset().isEnabled()) { return ui.getReset(); } - int selectedIndex = ui.getFishingOperationTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: return ui.getCanGenerate(); @@ -167,7 +167,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { SetLonglineUI ui = getUi(); - int selectedIndex = ui.getFishingOperationTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: return ui.getHomeId(); @@ -211,7 +211,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { SetSeineUI ui = getUi(); - int selectedIndex = ui.getFishingOperationTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: JComponent editor = ui.getStartTime().getHourEditor().getEditor(); @@ -324,7 +324,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { ActivitySeineUI ui = getUi(); - int selectedIndex = ui.getFishingOperationTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: JComponent editor = ui.getTime().getHourEditor().getEditor(); @@ -390,7 +390,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { TdrUI ui = getUi(); - int selectedIndex = ui.getEditTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: return ui.getHomeId(); @@ -454,7 +454,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { GearUseFeaturesLonglineUI ui = getUi(); - int selectedIndex = ui.getGearUseFeaturesTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: return ui.getGear(); @@ -495,7 +495,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { CatchLonglineUI ui = getUi(); - int selectedIndex = ui.getFishingOperationTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: if (ui.getTableModel().isCreate()) { @@ -677,7 +677,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { GearUseFeaturesSeineUI ui = getUi(); - int selectedIndex = ui.getGearUseFeaturesTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: return ui.getGear(); @@ -749,7 +749,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { VesselUI ui = getUi(); - int selectedIndex = ui.getTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: return ui.getKeelCode(); @@ -771,7 +771,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { SpeciesUI ui = getUi(); - int selectedIndex = ui.getTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: return ui.getUri(); @@ -793,7 +793,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { SpeciesListUI ui = getUi(); - int selectedIndex = ui.getTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: return ui.getUri(); @@ -815,7 +815,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { ProgramUI ui = getUi(); - int selectedIndex = ui.getTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: return ui.getUri(); @@ -837,7 +837,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { LengthWeightParameterUI ui = getUi(); - int selectedIndex = ui.getTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: if (ui.getModel().isCreatingMode()) { @@ -864,7 +864,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { LengthLengthParameterUI ui = getUi(); - int selectedIndex = ui.getTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: if (ui.getModel().isCreatingMode()) { @@ -891,7 +891,7 @@ public class ObserveFocusManager { @Override protected Component getFirstComponentForEdit(Container aContainer) { GearUI ui = getUi(); - int selectedIndex = ui.getTabPane().getSelectedIndex(); + int selectedIndex = ui.getMainTabbedPane().getSelectedIndex(); switch (selectedIndex) { case 0: return ui.getUri(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx index e89a343..2fc17f3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx @@ -73,7 +73,7 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> <row> <cell anchor="north" weightx="1"> - <JTabbedPane id='fishingOperationTabPane'> + <JTabbedPane id='subTabbedPane'> <tab id='generalTab'> <JPanel layout='{new BorderLayout()}'> 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 298c06c..7416d3b 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 @@ -111,7 +111,7 @@ <!-- formulaire --> <JPanel id="body" layout='{new BorderLayout()}'> - <JVetoableTabbedPane id='fishingOperationTabPane' constraints='BorderLayout.CENTER'> + <JVetoableTabbedPane id='mainTabbedPane' constraints='BorderLayout.CENTER'> <!-- generation tab --> <tab id='generateTab'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 0f580ea..8a19e42 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -29,9 +29,11 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.actions.content.GoToTabUIActionSupport; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; import fr.ird.observe.application.swing.ui.util.JVetoableTabbedPane; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -45,11 +47,11 @@ import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; -import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComboBox; @@ -271,10 +273,23 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong @Override public void afterInit(LonglineDetailCompositionUI ui) { - super.afterInit(ui); + + LonglineDetailCompositionUIModel model = ui.getModel(); + + model.addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, evt -> updateUiWithReferenceSetsFromModel()); + + installFocusTraversalPolicy(); + + model.addPropertyChangeListener(ContentListUIModel.PROPERTY_MODE, evt -> updateTitle((ContentMode) evt.getNewValue())); + + ui.setTitle(t(updateTitle(ui.getContentTitle()))); + updateTitle(model.getMode()); + LonglineDetailCompositionUIInitializer uiInitializer = new LonglineDetailCompositionUIInitializer(ui); uiInitializer.initUI(); + ui.get$objectMap().put(GoToTabUIActionSupport.SUB_TABBED_PANE, ui.getBranchlineDetailUI().getSubTabbedPane()); + this.validationHelper = new LonglineDetailCompositionUIValidationHelper(ui, getDecoratorService()); getBranchlineDetailUIModel().addPropertyChangeListener(BranchlineUIModel.PROPERTY_SAVED, branchlineDetailChanged); @@ -318,7 +333,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - JVetoableTabbedPane tabPane = ui.getFishingOperationTabPane(); + JVetoableTabbedPane tabPane = ui.getMainTabbedPane(); tabPane.setChangeSelectedIndex(tabbedPaneWillChanged); tabPane.addChangeListener(tabbedPaneChanged); @@ -406,7 +421,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } // Always go back to first tab - getUi().getFishingOperationTabPane().setSelectedIndex(0); + getUi().getMainTabbedPane().setSelectedIndex(0); } finally { @@ -440,7 +455,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong boolean continueSave = true; - if (getUi().getFishingOperationTabPane().getSelectedIndex() == 2) { + if (getUi().getMainTabbedPane().getSelectedIndex() == 2) { BranchlineUIHandler branchlineUIHandler = branchlineDetailUI.getHandler(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx index f1ef641..ac08e2c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx @@ -72,7 +72,7 @@ <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> <row> <cell anchor="north"> - <JTabbedPane id='fishingOperationTabPane'> + <JTabbedPane id='mainTabbedPane'> <!-- floatlinesComposition --> <tab id='floatlinesCompositionTab'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx index 6fcdb83..27c1446 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx @@ -93,7 +93,7 @@ <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> <row> <cell anchor="north"> - <JTabbedPane id='fishingOperationTabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='settingTab'> <JPanel layout='{new BorderLayout()}'> <Table fill='both' constraints='BorderLayout.NORTH'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx index ac7226e..557fe39 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx @@ -67,7 +67,7 @@ <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> <row> <cell anchor="north" weightx="1"> - <JTabbedPane id='fishingOperationTabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> <row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx index 1e1649b..5003143 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx @@ -72,7 +72,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityDto> <!-- formulaire --> <JPanel id="body" layout='{new BorderLayout()}'> - <JTabbedPane id='tripLonglineTabPane' constraints='BorderLayout.CENTER'> + <JTabbedPane id='mainTabbedPane' constraints='BorderLayout.CENTER'> <tab id='generalTab'> <Table fill="both"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java index fd2e72c..45a6e83 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -40,9 +40,9 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineService; -import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.util.DateUtil; import javax.swing.JTabbedPane; @@ -89,7 +89,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr tripMap.getHandler().setConfig(config); - getUi().getTripLonglineTabPane().addChangeListener(e -> { + getUi().getMainTabbedPane().addChangeListener(e -> { JTabbedPane tripLonglineTabPane = (JTabbedPane) e.getSource(); TripLonglineUI ui1 = getUi(); TripMapUI tripMap1 = ui1.getTripMap(); @@ -168,7 +168,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr getModel().setForm(form); TripLonglineHelper.copyTripLonglineDto(form.getObject(), bean); - getUi().getTripLonglineTabPane().setSelectedIndex(0); + getUi().getMainTabbedPane().setSelectedIndex(0); getUi().getTripMap().getHandler().doCloseMap(); buildTripMap = true; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx index 0e16c34..97c8658 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx @@ -79,7 +79,7 @@ <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> <row> <cell anchor="north" weightx="1"> - <JTabbedPane id='fishingOperationTabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> <!-- heure observation --> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx index 9eb9664..867a3c2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx @@ -79,7 +79,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<RouteStubDto> routes) { <!-- formulaire --> <JPanel id="body" layout='{new BorderLayout()}'> - <JTabbedPane id='tripSeineTabPane' constraints='BorderLayout.CENTER'> + <JTabbedPane id='mainTabbedPane' constraints='BorderLayout.CENTER'> <tab id='generalTab'> <Table insets="0" fill="both" id="formGeneral"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java index 545a43c..2741357 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -87,7 +87,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein tripMap.getHandler().setConfig(config); - ui.getTripSeineTabPane().addChangeListener(e -> { + ui.getMainTabbedPane().addChangeListener(e -> { JTabbedPane tripSeineTabPane = (JTabbedPane) e.getSource(); TripMapUI tripMap1 = ui.getTripMap(); if (tripSeineTabPane.getSelectedComponent().equals(tripMap1)) { @@ -162,7 +162,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein getModel().setForm(form); TripSeineHelper.copyTripSeineDto(form.getObject(), bean); - getUi().getTripSeineTabPane().setSelectedIndex(0); + getUi().getMainTabbedPane().setSelectedIndex(0); getUi().getTripMap().getHandler().doCloseMap(); buildTripMap = true; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx index 5aa1757..814d4e0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx @@ -50,7 +50,7 @@ <Table id="editView" insets="0" fill="both"> <row> <cell anchor="north" weightx="1"> - <JTabbedPane id='tabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java index 3a934d1..19cb560 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java @@ -73,7 +73,7 @@ public class GearUIHandler extends ContentReferenceUIHandler<GearDto, GearUI> im SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getTabPane().setSelectedIndex(0); + getUi().getMainTabbedPane().setSelectedIndex(0); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx index 78aba8d..9668743 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx @@ -56,7 +56,7 @@ <Table id="editView" insets="0" fill="both"> <row> <cell anchor="north" weightx="1"> - <JTabbedPane id='tabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java index 3dea3b4..dd16267 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java @@ -73,7 +73,7 @@ public class LengthLengthParameterUIHandler extends ContentReferenceUIHandler<Le SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getTabPane().setSelectedIndex(0); + getUi().getMainTabbedPane().setSelectedIndex(0); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx index 499e7c3..6235266 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx @@ -79,7 +79,7 @@ public void decorateUniqueKeyTable(JTable table, <Table id="editView" insets="0" fill="both"> <row> <cell anchor="north" weightx="1"> - <JTabbedPane id='tabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> 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 c6bd411..84cdcbe 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 @@ -73,7 +73,7 @@ public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<Le SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getTabPane().setSelectedIndex(0); + getUi().getMainTabbedPane().setSelectedIndex(0); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx index 0d6a51f..1921ffa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx @@ -60,7 +60,7 @@ <Table id="editView" insets="0" fill="both"> <row> <cell anchor="north" weightx="1"> - <JTabbedPane id='tabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java index e6e4eec..71b5999 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java @@ -72,7 +72,7 @@ public class ProgramUIHandler extends ContentReferenceUIHandler<ProgramDto, Prog SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getTabPane().setSelectedIndex(0); + getUi().getMainTabbedPane().setSelectedIndex(0); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx index 734ead8..19c1c05 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx @@ -57,7 +57,7 @@ <Table id="editView" insets="0" fill="both"> <row> <cell anchor="north" weightx="1"> - <JTabbedPane id='tabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java index f2639b9..1273ce3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java @@ -71,7 +71,7 @@ public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesListD SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getTabPane().setSelectedIndex(0); + getUi().getMainTabbedPane().setSelectedIndex(0); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx index 1ea0f89..b0f2b2a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx @@ -56,7 +56,7 @@ <Table id="editView" insets="0" fill="both"> <row> <cell anchor="north" weightx="1"> - <JTabbedPane id='tabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java index 543d32a..f9342c3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java @@ -73,7 +73,7 @@ public class SpeciesUIHandler extends ContentReferenceUIHandler<SpeciesDto, Spec SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getTabPane().setSelectedIndex(0); + getUi().getMainTabbedPane().setSelectedIndex(0); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx index ccbfbde..2155852 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx @@ -56,7 +56,7 @@ <Table id="editView" insets="0" fill="both"> <row> <cell anchor="north" weightx="1"> - <JTabbedPane id='tabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java index 0ec43f5..cc478e3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java @@ -71,7 +71,7 @@ public class VesselUIHandler extends ContentReferenceUIHandler<VesselDto, Vessel SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getUi().getTabPane().setSelectedIndex(0); + getUi().getMainTabbedPane().setSelectedIndex(0); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx index b991dda..bd571bc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx @@ -133,7 +133,7 @@ <Table id='editorPanel' fill='both' insets='0'> <row> <cell weightx="1" weighty="1"> - <JTabbedPane id='fishingOperationTabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='caracteristicTab'> <Table id='editForm' fill='both' insets='1'> 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 f2f718c..b8ae462 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 @@ -61,14 +61,14 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.BranchlineService; import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; import fr.ird.observe.services.service.data.longline.TripLonglineService; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; @@ -423,7 +423,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat if (tableModel.isCreate()) { // go back to first pane - ui.getFishingOperationTabPane().setSelectedIndex(0); + ui.getMainTabbedPane().setSelectedIndex(0); NavigationTree treeHelper = getTreeHelper(ui); NavigationTreeNodeSupport selectedNode = treeHelper.getSelectedNode(); @@ -753,10 +753,10 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat getUi().getSizeMeasuresFormTab().setEnabled(newValue); getUi().getWeightMeasuresFormTab().setEnabled(newValue); - if (!newValue && getUi().getFishingOperationTabPane().getSelectedIndex() > 2) { + if (!newValue && getUi().getMainTabbedPane().getSelectedIndex() > 2) { // go back to first tab - getUi().getFishingOperationTabPane().setSelectedIndex(0); + getUi().getMainTabbedPane().setSelectedIndex(0); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx index 61e0dc8..d0e7608 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx @@ -78,7 +78,7 @@ <row> <cell weightx="1" weighty="0.9"> - <JTabbedPane id='gearUseFeaturesTabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> 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 83f0af2..0f1962a 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 @@ -277,7 +277,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip if (tableModel.isCreate()) { // go back to first pane - ui.getGearUseFeaturesTabPane().setSelectedIndex(0); + ui.getMainTabbedPane().setSelectedIndex(0); requestFocus = ui.getGear(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx index c6f32de..ea7e3a5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx @@ -78,7 +78,7 @@ <Table id='editorPanel' fill='both' insets='0'> <row> <cell weightx="1" weighty="1"> - <JTabbedPane id='editTabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='caracteristicsTab'> 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 a678522..3cc67e0 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 @@ -138,7 +138,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt setTimestamp(bean, settingStartTimeStamp); // go back to first tab - ui.getEditTabPane().setSelectedIndex(0); + ui.getMainTabbedPane().setSelectedIndex(0); // enable timestamps ui.getEnableTimestamp().setSelected(true); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx index 801b280..4759e58 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx @@ -78,7 +78,7 @@ <row> <cell weightx="1" weighty="0.9"> - <JTabbedPane id='gearUseFeaturesTabPane'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> 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 e123cbc..944362f 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 @@ -276,7 +276,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei if (tableModel.isCreate()) { // go back to first pane - ui.getGearUseFeaturesTabPane().setSelectedIndex(0); + ui.getMainTabbedPane().setSelectedIndex(0); requestFocus = ui.getGear(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm