Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 617ae27b by tchemit at 2019-01-22T14:15:59Z select combobox in dialog - - - - - 346b1b61 by tchemit at 2019-01-22T14:16:28Z Can't select related observed activity if logbook activity has no coordinate - - - - - 3d237aed by tchemit at 2019-01-22T16:38:32Z Use Ctrl-Tab instead of Tab to select in a ComboBox - Coses #1200 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jcss - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/ChooseRelatedObservedActivityUIAction.java ===================================== @@ -116,7 +116,15 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi pairingConfig.getLonglineActivityPairingMaxTime(), pairingConfig.getLonglineActivityPairingMaxDistance()))); panel.add(BorderLayout.CENTER, editor); - JOptionPane pane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]); + JOptionPane pane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]) { + @Override + public void selectInitialValue() { + if (editor.getData().size() == 1) { + editor.setSelectedItem(editor.getData().get(0)); + } + editor.requestFocusInWindow(); + } + }; JButton jButton = UsageUIHandlerSupport.findButton(pane, continueActionText); Objects.requireNonNull(jButton); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jcss ===================================== @@ -132,6 +132,6 @@ #chooseRelatedObservedActivity { visible:{!model.isReadingMode()}; - enabled:{model.isValid()}; + enabled:{model.isValid() && bean.getLatitude() != null && bean.getLongitude() != null && bean.getQuadrant() != null}; _observeAction:{ChooseRelatedObservedActivityUIAction.ACTION_NAME}; } ===================================== pom.xml ===================================== @@ -162,7 +162,7 @@ <!--<lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia>--> <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>--> - <!--<lib.version.java4all.jaxx>3.0-alpha-45-SNAPSHOT</lib.version.java4all.jaxx>--> + <lib.version.java4all.jaxx>3.0-alpha-48</lib.version.java4all.jaxx> <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>--> <!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>--> <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>--> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/990dc64cf1382586cfe6c2661a7... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/990dc64cf1382586cfe6c2661a7... You're receiving this email because of your account on gitlab.com.