Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
2 changed files:
Changes:
| ... | ... | @@ -432,6 +432,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> |
| 432 | 432 |
if (log.isDebugEnabled()) {
|
| 433 | 433 |
log.debug("init combobox for " + BeanFilterableComboBox.getBeanType());
|
| 434 | 434 |
}
|
| 435 |
+ BeanFilterableComboBox.getCombobox().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, 0), "none");
|
|
| 435 | 436 |
Class referenceType = BeanFilterableComboBox.getBeanType();
|
| 436 | 437 |
BeanFilterableComboBox.setI18nLabelBuilder(ObserveI18nLabelsBuilder.createFromReferenceType(referenceType));
|
| 437 | 438 |
BeanFilterableComboBox.setI18nPrefix("observe.common.");
|
| ... | ... | @@ -646,6 +647,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> |
| 646 | 647 |
}
|
| 647 | 648 |
});
|
| 648 | 649 |
}
|
| 650 |
+ editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, 0), "none");
|
|
| 649 | 651 |
}
|
| 650 | 652 |
|
| 651 | 653 |
protected void init(JComponent editor, Set<String> notBlockingComponents) {
|
| ... | ... | @@ -734,6 +736,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> |
| 734 | 736 |
labelsBuilder.put(e, label);
|
| 735 | 737 |
}
|
| 736 | 738 |
editor.setRenderer(new EnumEditorRenderer<>(labelsBuilder.build()));
|
| 739 |
+ editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, 0), "none");
|
|
| 737 | 740 |
}
|
| 738 | 741 |
|
| 739 | 742 |
private boolean isAutoSelectOnFocus(JComponent comp) {
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>io.ultreia.maven</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>2018.49</version>
|
|
| 30 |
+ <version>2018.50</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<groupId>fr.ird.observe</groupId>
|