Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26eef53a by Tony CHEMIT at 2017-10-13T04:31:03+02:00 add fixme - - - - - 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: ===================================== client/src/main/java/fr/ird/observe/client/form/open/longline/TripLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/open/longline/TripLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/open/longline/TripLonglineUIHandler.java @@ -83,10 +83,9 @@ class TripLonglineUIHandler extends ObserveOpenDataFormUIHandler<TripLonglineDto protected void initialize(FormUIInitializerContext<TripLonglineUI> initializerContext) { super.initialize(initializerContext); + //FIXME!!! Use a initializer for TripMap TripMapUI tripMap = ui.getTripMap(); - ClientConfig config = ObserveClientApplicationContext.get().getConfig(); - - tripMap.getHandler().setConfig(config); + tripMap.getHandler().setConfig(ui.getMainUI().getConfig()); tripMap.getHandler().init(ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW), mainUI.getActionMap()); //FIXME!!! Use a action (shared with TripSeineHandler) ===================================== client/src/main/java/fr/ird/observe/client/form/open/seine/TripSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/form/open/seine/TripSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/form/open/seine/TripSeineUIHandler.java @@ -81,9 +81,8 @@ class TripSeineUIHandler extends ObserveOpenDataFormUIHandler<TripSeineDto, Trip super.initialize(initializerContext); TripMapUI tripMap = ui.getTripMap(); - ClientConfig config = ObserveClientApplicationContext.get().getConfig(); - - tripMap.getHandler().setConfig(config); + //FIXME!!! Use a initializer for TripMap + tripMap.getHandler().setConfig(ui.getMainUI().getConfig()); tripMap.getHandler().init(ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW), mainUI.getActionMap()); ui.getMainTabbedPane().addChangeListener(e -> { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/26eef53a7e247ff116ce7625b6e8... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/26eef53a7e247ff116ce7625b6e8... You're receiving this email because of your account on gitlab.com.