Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

2 changed files:

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
    84 84 
         @Override
    85 85 
         public void treeWillCollapse(TreeExpansionEvent event) throws ExpandVetoException {
    86 86 
             //FIXME check this is working ?
    87 
    -        tree.getSelectionModel().fireTreeWillCollapseEvent(event);
    87 
    +//        tree.getSelectionModel().fireTreeWillCollapseEvent(event);
    88 88
    89 89 
             NavigationNode node = (NavigationNode) event.getPath().getLastPathComponent();
    90 90

  • 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 {
    47 47
    48 48 
         @Override
    49 49 
         protected ContentOpen<ActivityUI> createContentOpen(ActivityUI ui) {
    50 
    -        ContentOpenableUIOpenExecutor<ActivityDto, ActivityUI> executor = new ContentOpenableUIOpenExecutor<ActivityDto, ActivityUI>() {
    50 
    +        ContentOpenableUIOpenExecutor<ActivityDto, ActivityUI> executor = new ContentOpenableUIOpenExecutor<>() {
    51 51 
                 @Override
    52 52 
                 public void openModel(ActivityUI ui) {
    53 53 
                     ActivityUIModel model = getModel();
    ... ... @@ -57,13 +57,12 @@ class ActivityUIHandler extends GeneratedActivityUIHandler {
    57 57 
                     onOpenAfterOpenModel();
    58 58 
                 }
    59 59 
             };
    60 
    -        return new ContentOpen<ActivityUI>(ui, executor, executor) {
    60 
    +        return new ContentOpen<>(ui, executor, executor) {
    61 61 
                 @Override
    62 62 
                 public DefaultUIInitializerResult init(ContentUIInitializer<ActivityUI> initializer) {
    63 63 
                     //FIXME Bug in Jaxx
    64 64 
                     this.getUi().getRelatedObservedActivity().setBeanType(fr.ird.observe.dto.data.ll.observation.ActivityReference.class);
    65 
    -                super.init(initializer);
    66 
    -                return null;
    65 
    +                return super.init(initializer);
    67 66 
                 }
    68 67 
             };
    69 68 
         }

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.