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

Commits:

2 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java
    ... ... @@ -128,6 +128,10 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e
    128 128
     
    
    129 129
             getModel().addPropertyChangeListener(ContentTableUIModel.PROPERTY_SHOW_DATA, evt -> onShowDataChanged((Boolean) evt.getNewValue()));
    
    130 130
     
    
    131
    +        ui.getSelectFirstTableEntry().setEnabled(false);
    
    132
    +        ui.getSelectPreviousTableEntry().setEnabled(false);
    
    133
    +        ui.getSelectNextTableEntry().setEnabled(false);
    
    134
    +        ui.getSelectLastTableEntry().setEnabled(false);
    
    131 135
             SelectFirst.init(ui, ui.getSelectFirstTableEntry(), SelectFirst.class);
    
    132 136
             SelectPrevious.init(ui, ui.getSelectPreviousTableEntry(), SelectPrevious.class);
    
    133 137
             SelectNext.init(ui, ui.getSelectNextTableEntry(), SelectNext.class);
    

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineUIModel.java
    ... ... @@ -22,8 +22,10 @@ package fr.ird.observe.client.ui.content.data.ll.observation;
    22 22
      * #L%
    
    23 23
      */
    
    24 24
     
    
    25
    +import fr.ird.observe.client.ObserveSwingApplicationContext;
    
    25 26
     import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel;
    
    26 27
     import fr.ird.observe.dto.data.ll.observation.BranchlineDto;
    
    28
    +import fr.ird.observe.navigation.model.select.ObserveSelectNode;
    
    27 29
     import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;
    
    28 30
     
    
    29 31
     import java.util.Date;
    
    ... ... @@ -47,6 +49,11 @@ public class BranchlineUIModel extends ContentSimpleUIModel<BranchlineDto> {
    47 49
             setAddMessageOnOpen(false);
    
    48 50
         }
    
    49 51
     
    
    52
    +    @Override
    
    53
    +    protected ObserveSelectNode<?> computeSelectNode() {
    
    54
    +        return ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityObsSet();
    
    55
    +    }
    
    56
    +
    
    50 57
         public BranchlineDto getBranchline() {
    
    51 58
             return branchlineDto;
    
    52 59
         }