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/content/data/table/ContentTableUIHandler.java
    ... ... @@ -116,6 +116,7 @@ public class ContentTableUIHandler<D extends DataDto, C extends DataDto, U exten
    116 116 
         }
    117 117
    118 118 
         protected void onTableModelChanged() {
    119 
    +        ui.getSelectToolbar().setVisible(getTableModel().getRowCount()>1);
    119 120 
         }
    120 121
    121 122 
         @Override

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIInitializer.java
    ... ... @@ -40,6 +40,7 @@ import javax.swing.SwingUtilities;
    40 40 
     import javax.swing.table.DefaultTableCellRenderer;
    41 41 
     import java.awt.Component;
    42 42 
     import java.awt.FocusTraversalPolicy;
    43 
    +import java.util.Objects;
    43 44
    44 45 
     /**
    45 46 
      * To initialize ui.
    ... ... @@ -83,7 +84,7 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e
    83 84 
                 UIHelper.setLayerUI(ui.getExtraZone(), ui.getBlockLayerUI());
    84 85 
             }
    85 86 
             // layer pour dispatcher le focus entre le tableau et l'éditeurt
    86 
    -        UIHelper.getLayer(ui.getTableScrollPane()).setUI(new ContentTableNavigationLayerUI(ui));
    87 
    +        Objects.requireNonNull(UIHelper.getLayer(ui.getTableScrollPane())).setUI(new ContentTableNavigationLayerUI(ui));
    87 88 
             // on ajoute un layer pour bloquer l'édition des entrées si nécessaire et redispatcher le focus
    88 89 
             UIHelper.setLayerUI(ui.getEditor(), ui.getEditorBlockLayerUI());
    89 90
    ... ... @@ -94,8 +95,6 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e
    94 95 
             tableModel.addPropertyChangeListener(ContentTableUITableModel.SELECTED_ROW_PROPERTY,
    95 96 
                                                  evt -> this.onSelectedItemChanged((Integer) evt.getNewValue()));
    96 97
    97 
    -//        getModel().getStates().addPropertyChangeListener(ContentTableUIModelStates.PROPERTY_SHOW_DATA, evt -> onShowDataChanged((Boolean) evt.getNewValue()));
    98 
    -
    99 98 
             ui.getSelectFirstTableEntry().setEnabled(false);
    100 99 
             ui.getSelectPreviousTableEntry().setEnabled(false);
    101 100 
             ui.getSelectNextTableEntry().setEnabled(false);

    • —
    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.