Author: tchemit Date: 2013-10-07 11:06:38 +0200 (Mon, 07 Oct 2013) New Revision: 1276 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1276 Log: refs #3331: [ERGO] - Lisibilit?\195?\169 des tableaux (captures, protocole) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-10-04 12:42:44 UTC (rev 1275) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-10-07 09:06:38 UTC (rev 1276) @@ -39,12 +39,14 @@ import javax.swing.AbstractCellEditor; import javax.swing.JTable; +import javax.swing.UIManager; import javax.swing.border.LineBorder; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Color; import java.awt.Component; +import java.awt.Font; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -67,6 +69,10 @@ private static final Log log = LogFactory.getLog(BenthosFrequencyCellComponent.class); + private Font defaulfFont; + + private Font selectedFont; + public BenthosFrequencyCellComponent(Color computedDataColor) { setHorizontalAlignment(CENTER); setIcon(SwingUtil.createActionIcon("show-frequency")); @@ -93,6 +99,33 @@ setToolTipText(text); } + @Override + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + + if (defaulfFont == null) { + defaulfFont = UIManager.getFont("Table.font"); + selectedFont = defaulfFont.deriveFont(Font.BOLD); + } + + Component result = super.getTableCellRendererComponent(table, + value, + isSelected, + hasFocus, + row, + column); + if (isSelected) { + result.setFont(selectedFont); + } else { + result.setFont(defaulfFont); + } + return result; + } + public static TableCellRenderer newRender(Color computedDataColor) { return new FrequencyCellRenderer(computedDataColor); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-10-04 12:42:44 UTC (rev 1275) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-10-07 09:06:38 UTC (rev 1276) @@ -39,12 +39,14 @@ import javax.swing.AbstractCellEditor; import javax.swing.JTable; +import javax.swing.UIManager; import javax.swing.border.LineBorder; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Color; import java.awt.Component; +import java.awt.Font; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -67,6 +69,10 @@ private static final Log log = LogFactory.getLog(SpeciesFrequencyCellComponent.class); + private Font defaulfFont; + + private Font selectedFont; + public SpeciesFrequencyCellComponent(Color computedDataColor) { setHorizontalAlignment(CENTER); setIcon(SwingUtil.createActionIcon("show-frequency")); @@ -93,6 +99,33 @@ setToolTipText(text); } + @Override + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + + if (defaulfFont == null) { + defaulfFont = UIManager.getFont("Table.font"); + selectedFont = defaulfFont.deriveFont(Font.BOLD); + } + + Component result = super.getTableCellRendererComponent(table, + value, + isSelected, + hasFocus, + row, + column); + if (isSelected) { + result.setFont(selectedFont); + } else { + result.setFont(defaulfFont); + } + return result; + } + public static TableCellRenderer newRender(Color computedDataColor) { return new FrequencyCellRenderer(computedDataColor); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java 2013-10-04 12:42:44 UTC (rev 1275) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java 2013-10-07 09:06:38 UTC (rev 1276) @@ -31,7 +31,9 @@ import javax.swing.JComponent; import javax.swing.JTable; +import javax.swing.UIManager; import javax.swing.table.DefaultTableCellRenderer; +import java.awt.Font; import java.util.List; import static org.nuiton.i18n.I18n._; @@ -54,6 +56,10 @@ private final Decorator<Attachment> decorator; + private Font defaulfFont; + + private Font selectedFont; + public static AttachmentCellRenderer newRender(Decorator<Attachment> decorator) { return new AttachmentCellRenderer(decorator); } @@ -78,6 +84,11 @@ int row, int column) { + if (defaulfFont == null) { + defaulfFont = UIManager.getFont("Table.font"); + selectedFont = defaulfFont.deriveFont(Font.BOLD); + } + List<Attachment> attachments = (List<Attachment>) value; String toolTipTextValue; @@ -105,6 +116,12 @@ setToolTipText(toolTipTextValue); setBackground(null); + if (isSelected) { + setFont(selectedFont); + } else { + setFont(defaulfFont); + } + return this; } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java 2013-10-04 12:42:44 UTC (rev 1275) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java 2013-10-07 09:06:38 UTC (rev 1276) @@ -29,7 +29,9 @@ import javax.swing.JComponent; import javax.swing.JTable; +import javax.swing.UIManager; import javax.swing.table.DefaultTableCellRenderer; +import java.awt.Font; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; @@ -48,6 +50,11 @@ private final String noneText; + protected Font defaulfFont; + + protected Font selectedFont; + + public static CommentCellRenderer newRender() { return new CommentCellRenderer(); } @@ -93,6 +100,17 @@ setToolTipText(toolTipTextValue); setBackground(null); + if (defaulfFont == null) { + defaulfFont = UIManager.getFont("Table.font"); + selectedFont = defaulfFont.deriveFont(Font.BOLD); + } + + if (isSelected) { + setFont(selectedFont); + } else { + setFont(defaulfFont); + } + return this; } }