Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
617ae27b
by tchemit at 2019-01-22T14:15:59Z
-
346b1b61
by tchemit at 2019-01-22T14:16:28Z
-
3d237aed
by tchemit at 2019-01-22T16:38:32Z
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:
| ... | ... | @@ -116,7 +116,15 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi |
| 116 | 116 |
pairingConfig.getLonglineActivityPairingMaxTime(), pairingConfig.getLonglineActivityPairingMaxDistance())));
|
| 117 | 117 |
panel.add(BorderLayout.CENTER, editor);
|
| 118 | 118 |
|
| 119 |
- JOptionPane pane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]);
|
|
| 119 |
+ JOptionPane pane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]) {
|
|
| 120 |
+ @Override
|
|
| 121 |
+ public void selectInitialValue() {
|
|
| 122 |
+ if (editor.getData().size() == 1) {
|
|
| 123 |
+ editor.setSelectedItem(editor.getData().get(0));
|
|
| 124 |
+ }
|
|
| 125 |
+ editor.requestFocusInWindow();
|
|
| 126 |
+ }
|
|
| 127 |
+ };
|
|
| 120 | 128 |
|
| 121 | 129 |
JButton jButton = UsageUIHandlerSupport.findButton(pane, continueActionText);
|
| 122 | 130 |
Objects.requireNonNull(jButton);
|
| ... | ... | @@ -132,6 +132,6 @@ |
| 132 | 132 |
|
| 133 | 133 |
#chooseRelatedObservedActivity {
|
| 134 | 134 |
visible:{!model.isReadingMode()};
|
| 135 |
- enabled:{model.isValid()};
|
|
| 135 |
+ enabled:{model.isValid() && bean.getLatitude() != null && bean.getLongitude() != null && bean.getQuadrant() != null};
|
|
| 136 | 136 |
_observeAction:{ChooseRelatedObservedActivityUIAction.ACTION_NAME};
|
| 137 | 137 |
}
|
| ... | ... | @@ -162,7 +162,7 @@ |
| 162 | 162 |
|
| 163 | 163 |
<!--<lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia>-->
|
| 164 | 164 |
<!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
|
| 165 |
- <!--<lib.version.java4all.jaxx>3.0-alpha-45-SNAPSHOT</lib.version.java4all.jaxx>-->
|
|
| 165 |
+ <lib.version.java4all.jaxx>3.0-alpha-48</lib.version.java4all.jaxx>
|
|
| 166 | 166 |
<!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->
|
| 167 | 167 |
<!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>-->
|
| 168 | 168 |
<!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
|