This is an automated email from the git hooks/post-receive script. New commit to branch feature/6115_ajout_RTP in repository tutti. See http://git.codelutin.com/tutti.git commit 9be85329479f9cb2f4f744d258b6f527ff7f3194 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 19 11:51:31 2016 +0100 correction renderer (refs #6115) --- .../swing/content/protocol/rtp/RtpCellEditor.java | 3 --- .../content/protocol/rtp/RtpCellRenderer.java | 24 ++++++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellEditor.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellEditor.java index bf76dad..cf700b5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellEditor.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellEditor.java @@ -1,6 +1,5 @@ package fr.ifremer.tutti.ui.swing.content.protocol.rtp; -import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesTableModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; @@ -66,8 +65,6 @@ public class RtpCellEditor extends AbstractCellEditor implements TableCellEditor rowIndex = row; columnIndex = column; - EditProtocolSpeciesRowModel model = tableModel.getEntry(row); - editorButton.init(tableModel, row); return editorButton; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java index a924aef..09c4961 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java @@ -1,6 +1,10 @@ package fr.ifremer.tutti.ui.swing.content.protocol.rtp; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesTableModel; import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; import javax.swing.JTable; @@ -19,6 +23,9 @@ import static org.nuiton.i18n.I18n.t; */ public class RtpCellRenderer extends DefaultTableCellRenderer { + /** Logger. */ + private static final Log log = LogFactory.getLog(RtpCellRenderer.class); + public static final String TEXT_PATTERN = "<html><body>%s</body></html>"; private static final long serialVersionUID = 1L; @@ -27,7 +34,7 @@ public class RtpCellRenderer extends DefaultTableCellRenderer { private final String withRtp; - private Font defaulfFont; + private Font defaultFont; private Font selectedFont; @@ -51,12 +58,17 @@ public class RtpCellRenderer extends DefaultTableCellRenderer { int row, int column) { - if (defaulfFont == null) { - defaulfFont = UIManager.getFont("Table.font"); - selectedFont = defaulfFont.deriveFont(Font.BOLD); + if (defaultFont == null) { + defaultFont = UIManager.getFont("Table.font"); + selectedFont = defaultFont.deriveFont(Font.BOLD); } - boolean useRtp = (boolean) value; + EditProtocolSpeciesRowModel rowModel = ((EditProtocolSpeciesTableModel) table.getModel()).getEntry(row); + + boolean useRtp = rowModel.isUseRtp(); + if (log.isInfoEnabled()) { + log.info("useRtp " + useRtp); + } String toolTipTextValue; String textValue; @@ -83,7 +95,7 @@ public class RtpCellRenderer extends DefaultTableCellRenderer { if (isSelected) { setFont(selectedFont); } else { - setFont(defaulfFont); + setFont(defaultFont); } return this; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.