Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
26eef53a
by Tony CHEMIT at 2017-10-13T04:31:03+02:00
2 changed files:
- client/src/main/java/fr/ird/observe/client/form/open/longline/TripLonglineUIHandler.java
- client/src/main/java/fr/ird/observe/client/form/open/seine/TripSeineUIHandler.java
Changes:
| ... | ... | @@ -83,10 +83,9 @@ class TripLonglineUIHandler extends ObserveOpenDataFormUIHandler<TripLonglineDto |
| 83 | 83 |
protected void initialize(FormUIInitializerContext<TripLonglineUI> initializerContext) {
|
| 84 | 84 |
super.initialize(initializerContext);
|
| 85 | 85 |
|
| 86 |
+ //FIXME!!! Use a initializer for TripMap
|
|
| 86 | 87 |
TripMapUI tripMap = ui.getTripMap();
|
| 87 |
- ClientConfig config = ObserveClientApplicationContext.get().getConfig();
|
|
| 88 |
- |
|
| 89 |
- tripMap.getHandler().setConfig(config);
|
|
| 88 |
+ tripMap.getHandler().setConfig(ui.getMainUI().getConfig());
|
|
| 90 | 89 |
tripMap.getHandler().init(ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW), mainUI.getActionMap());
|
| 91 | 90 |
|
| 92 | 91 |
//FIXME!!! Use a action (shared with TripSeineHandler)
|
| ... | ... | @@ -81,9 +81,8 @@ class TripSeineUIHandler extends ObserveOpenDataFormUIHandler<TripSeineDto, Trip |
| 81 | 81 |
super.initialize(initializerContext);
|
| 82 | 82 |
|
| 83 | 83 |
TripMapUI tripMap = ui.getTripMap();
|
| 84 |
- ClientConfig config = ObserveClientApplicationContext.get().getConfig();
|
|
| 85 |
- |
|
| 86 |
- tripMap.getHandler().setConfig(config);
|
|
| 84 |
+ //FIXME!!! Use a initializer for TripMap
|
|
| 85 |
+ tripMap.getHandler().setConfig(ui.getMainUI().getConfig());
|
|
| 87 | 86 |
tripMap.getHandler().init(ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW), mainUI.getActionMap());
|
| 88 | 87 |
|
| 89 | 88 |
ui.getMainTabbedPane().addChangeListener(e -> {
|