This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit ee3499057b3a9c47533b921de1190b4bc33680f0 Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 20 12:12:46 2016 +0100 modif de l'icone des rtp + mise en forme du tooltip + highlighter (refs #6115) --- .../content/protocol/EditProtocolUIHandler.java | 32 +++++++++++++++++++-- .../ui/swing/content/protocol/rtp/RtpButton.java | 2 +- .../content/protocol/rtp/RtpCellRenderer.java | 18 ++++-------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 +- .../src/main/resources/icons/action-edit-rtp.png | Bin 0 -> 543 bytes .../src/main/resources/icons/action-next.png | Bin 349 -> 395 bytes .../src/main/resources/icons/action-previous.png | Bin 345 -> 389 bytes 8 files changed, 40 insertions(+), 16 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index a84bb87..0bf72e6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -53,6 +53,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesAbleBatchRowHe import fr.ifremer.tutti.ui.swing.content.protocol.rtp.RtpCellEditor; import fr.ifremer.tutti.ui.swing.content.protocol.rtp.RtpCellRenderer; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.swing.editor.bean.BeanDoubleListModel; @@ -65,9 +66,13 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; +import org.jdesktop.swingx.decorator.ComponentAdapter; +import org.jdesktop.swingx.decorator.HighlightPredicate; +import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.jdesktop.swingx.table.TableColumnExt; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.jaxx.application.swing.util.CloseableUI; import javax.swing.JComboBox; @@ -84,6 +89,7 @@ import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.JTableHeader; import javax.swing.table.TableColumnModel; +import java.awt.Color; import java.awt.Component; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -390,12 +396,13 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFY_SAMPLE_ENABLED, table); addColumnToModel(columnModel, RtpCellEditor.newEditor(ui), - new RtpCellRenderer(rtpDecorator), + new RtpCellRenderer(), EditProtocolSpeciesTableModel.USE_RTP); initTable(table, columnModel, speciesColumn, + EditProtocolSpeciesTableModel.USE_RTP, speciesRows, new ListSelectionListener() { @@ -455,12 +462,13 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addColumnToModel(columnModel, RtpCellEditor.newEditor(ui), - new RtpCellRenderer(rtpDecorator), + new RtpCellRenderer(), EditProtocolSpeciesTableModel.USE_RTP); initTable(table, columnModel, speciesColumn, + EditProtocolSpeciesTableModel.USE_RTP, benthosRows, new ListSelectionListener() { @@ -970,6 +978,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI protected void initTable(final JXTable table, DefaultTableColumnModelExt columnModel, TableColumnExt speciesColumn, + ColumnIdentifier rtpIdentifier, List<EditProtocolSpeciesRowModel> rows, ListSelectionListener selectionListener) { @@ -984,6 +993,9 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI tableHeader.setReorderingAllowed(false); addHighlighters(table); + if (rtpIdentifier != null) { + addRtpHighlighter(table, rtpIdentifier); + } // always scroll to selected row SwingUtil.scrollToTableSelection(table); @@ -1049,6 +1061,22 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI tableModel.setRows(rows); } + protected void addRtpHighlighter(JXTable table, ColumnIdentifier identifier) { + Color cellWithValueColor = getConfig().getColorCellWithValue(); + + Highlighter commentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( + new HighlightPredicate.AndHighlightPredicate( + new HighlightPredicate.IdentifierHighlightPredicate(identifier), + // for not null value + new HighlightPredicate() { + @Override + public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { + return (boolean) adapter.getValue(); + } + }), cellWithValueColor); + table.addHighlighter(commentHighlighter); + } + protected EditProtocolOperationFieldsRowModel createOperationFieldRow(String property, String column) { EditProtocolOperationFieldsRowModel newRow = new EditProtocolOperationFieldsRowModel(); newRow.addPropertyChangeListener(new PropertyChangeListener() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java index 96bc1f0..090d589 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java @@ -26,7 +26,7 @@ public class RtpButton extends JToggleButton { public RtpButton(final EditProtocolUI ui) { - setIcon(SwingUtil.createActionIcon("edit-attachment")); + setIcon(SwingUtil.createActionIcon("edit-rtp")); setText(t("tutti.editRtp.button")); setToolTipText(t("tutti.editRtp.button.tip")); 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 c922a5f..55f8355 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,12 +1,10 @@ package fr.ifremer.tutti.ui.swing.content.protocol.rtp; -import fr.ifremer.tutti.persistence.entities.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 org.nuiton.decorator.Decorator; import javax.swing.JComponent; import javax.swing.JTable; @@ -40,12 +38,9 @@ public class RtpCellRenderer extends DefaultTableCellRenderer { private Font selectedFont; - private Decorator<Rtp> decorator; - - public RtpCellRenderer(Decorator<Rtp> decorator) { - this.decorator = decorator; + public RtpCellRenderer() { setHorizontalAlignment(CENTER); - setIcon(SwingUtil.createActionIcon("edit-attachment")); + setIcon(SwingUtil.createActionIcon("edit-rtp")); this.withoutRtp = n("tutti.editRtp.withoutRtp.tip"); this.withRtp = n("tutti.editRtp.withRtp.tip"); } @@ -83,11 +78,10 @@ public class RtpCellRenderer extends DefaultTableCellRenderer { } else { - toolTipTextValue = decorator.toString(rowModel.getRtpMale()) - + " // " - + decorator.toString(rowModel.getRtpFemale()) - + " // " - + decorator.toString(rowModel.getRtpUndefined()); + toolTipTextValue = t("tutti.editRtp.tooltip", + rowModel.getRtpMale().getA(), rowModel.getRtpMale().getB(), + rowModel.getRtpFemale().getA(), rowModel.getRtpFemale().getB(), + rowModel.getRtpUndefined().getA(), rowModel.getRtpUndefined().getB()); textValue = t(withRtp); } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 6eb1384..917c711 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1155,6 +1155,7 @@ tutti.editRtp.field.rtpUndefinedB= tutti.editRtp.field.rtpUndefinedB.tip= tutti.editRtp.malePanel= tutti.editRtp.simpleText= +tutti.editRtp.tooltip= tutti.editRtp.undefinedPanel= tutti.editRtp.withRtp.tip= tutti.editRtp.withoutRtp.tip= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index ef8fe9b..5cbaa21 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1097,7 +1097,8 @@ tutti.editRtp.field.rtpUndefinedA=A tutti.editRtp.field.rtpUndefinedA.tip=Paramètre A tutti.editRtp.field.rtpUndefinedB=B tutti.editRtp.field.rtpUndefinedB.tip=Paramètre B -tutti.editRtp.malePanel=Male +tutti.editRtp.malePanel=Mâle +tutti.editRtp.tooltip=<ul><li><strong>Mâle \:</strong> <em>a \: </em>%1$s - <em>b \: </em>%2$s</li><li><strong>Femelle \:</strong> <em>a \: </em>%1$s - <em>b \: </em>%2$s</li><li><strong>Inconnu \:</strong> <em>a \: </em>%1$s - <em>b \: </em>%2$s</li></ul> tutti.editRtp.undefinedPanel=Sexe inconnu tutti.editRtp.withRtp.tip=RTP renseignés tutti.editRtp.withoutRtp.tip=RTP non renseignés diff --git a/tutti-ui-swing/src/main/resources/icons/action-edit-rtp.png b/tutti-ui-swing/src/main/resources/icons/action-edit-rtp.png new file mode 100644 index 0000000..701a60a Binary files /dev/null and b/tutti-ui-swing/src/main/resources/icons/action-edit-rtp.png differ diff --git a/tutti-ui-swing/src/main/resources/icons/action-next.png b/tutti-ui-swing/src/main/resources/icons/action-next.png index b1a1819..e252606 100644 Binary files a/tutti-ui-swing/src/main/resources/icons/action-next.png and b/tutti-ui-swing/src/main/resources/icons/action-next.png differ diff --git a/tutti-ui-swing/src/main/resources/icons/action-previous.png b/tutti-ui-swing/src/main/resources/icons/action-previous.png index 5dc6967..18f9cc1 100644 Binary files a/tutti-ui-swing/src/main/resources/icons/action-previous.png and b/tutti-ui-swing/src/main/resources/icons/action-previous.png differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.