Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 09f0824e by Tony Chemit at 2020-12-17T16:20:18+01:00 [LL] Bug sur création d'activité logbook LL - Closes #1672 - - - - - 8a5edc9f by Tony Chemit at 2020-12-17T16:20:41+01:00 Fix bug when collapsing a node (need a second review on those magic listener) - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeSelectionListenerImpl.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeSelectionListenerImpl.java ===================================== @@ -84,7 +84,7 @@ class NavigationTreeSelectionListenerImpl implements fr.ird.observe.client.datas @Override public void treeWillCollapse(TreeExpansionEvent event) throws ExpandVetoException { //FIXME check this is working ? - tree.getSelectionModel().fireTreeWillCollapseEvent(event); +// tree.getSelectionModel().fireTreeWillCollapseEvent(event); NavigationNode node = (NavigationNode) event.getPath().getLastPathComponent(); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java ===================================== @@ -47,7 +47,7 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { @Override protected ContentOpen<ActivityUI> createContentOpen(ActivityUI ui) { - ContentOpenableUIOpenExecutor<ActivityDto, ActivityUI> executor = new ContentOpenableUIOpenExecutor<ActivityDto, ActivityUI>() { + ContentOpenableUIOpenExecutor<ActivityDto, ActivityUI> executor = new ContentOpenableUIOpenExecutor<>() { @Override public void openModel(ActivityUI ui) { ActivityUIModel model = getModel(); @@ -57,13 +57,12 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { onOpenAfterOpenModel(); } }; - return new ContentOpen<ActivityUI>(ui, executor, executor) { + return new ContentOpen<>(ui, executor, executor) { @Override public DefaultUIInitializerResult init(ContentUIInitializer<ActivityUI> initializer) { //FIXME Bug in Jaxx this.getUi().getRelatedObservedActivity().setBeanType(fr.ird.observe.dto.data.ll.observation.ActivityReference.class); - super.init(initializer); - return null; + return super.init(initializer); } }; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5094b739a0b7fa39888b0f048... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5094b739a0b7fa39888b0f048... You're receiving this email because of your account on gitlab.com.