Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cf387649 by Tony Chemit at 2020-12-13T00:04:23+01:00 clean code - - - - - 60857167 by Tony Chemit at 2020-12-13T00:04:47+01:00 Boutons de navigation devraient avoir disparu - Closes #1648 - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIInitializer.java 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 } protected void onTableModelChanged() { + ui.getSelectToolbar().setVisible(getTableModel().getRowCount()>1); } @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; import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; import java.awt.FocusTraversalPolicy; +import java.util.Objects; /** * To initialize ui. @@ -83,7 +84,7 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e UIHelper.setLayerUI(ui.getExtraZone(), ui.getBlockLayerUI()); } // layer pour dispatcher le focus entre le tableau et l'éditeurt - UIHelper.getLayer(ui.getTableScrollPane()).setUI(new ContentTableNavigationLayerUI(ui)); + Objects.requireNonNull(UIHelper.getLayer(ui.getTableScrollPane())).setUI(new ContentTableNavigationLayerUI(ui)); // on ajoute un layer pour bloquer l'édition des entrées si nécessaire et redispatcher le focus UIHelper.setLayerUI(ui.getEditor(), ui.getEditorBlockLayerUI()); @@ -94,8 +95,6 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e tableModel.addPropertyChangeListener(ContentTableUITableModel.SELECTED_ROW_PROPERTY, evt -> this.onSelectedItemChanged((Integer) evt.getNewValue())); -// getModel().getStates().addPropertyChangeListener(ContentTableUIModelStates.PROPERTY_SHOW_DATA, evt -> onShowDataChanged((Boolean) evt.getNewValue())); - ui.getSelectFirstTableEntry().setEnabled(false); ui.getSelectPreviousTableEntry().setEnabled(false); ui.getSelectNextTableEntry().setEnabled(false); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72e4001bc515a4869391cea61... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72e4001bc515a4869391cea61... You're receiving this email because of your account on gitlab.com.