branch feature/6115_ajout_RTP updated (6945e03 -> b3909af)
This is an automated email from the git hooks/post-receive script. New change to branch feature/6115_ajout_RTP in repository tutti. See http://git.codelutin.com/tutti.git from 6945e03 repasser les dialog au dessus de l'editeur (refs #6115) new b3909af ajout des valuers des rtp en tooltip (refs #6115) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b3909af5dfec38afacb61a62a552fe6cdaac3de6 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 19 17:54:00 2016 +0100 ajout des valuers des rtp en tooltip (refs #6115) Summary of changes: .../java/fr/ifremer/tutti/service/DecoratorService.java | 2 ++ .../ui/swing/content/protocol/EditProtocolUIHandler.java | 7 +++++-- .../ui/swing/content/protocol/rtp/RtpCellRenderer.java | 13 +++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 b3909af5dfec38afacb61a62a552fe6cdaac3de6 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 19 17:54:00 2016 +0100 ajout des valuers des rtp en tooltip (refs #6115) --- .../java/fr/ifremer/tutti/service/DecoratorService.java | 2 ++ .../ui/swing/content/protocol/EditProtocolUIHandler.java | 7 +++++-- .../ui/swing/content/protocol/rtp/RtpCellRenderer.java | 13 +++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java index 83e45d2..77c3f6a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java @@ -30,6 +30,7 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; +import fr.ifremer.tutti.persistence.entities.protocol.Rtp; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -117,6 +118,7 @@ public class DecoratorService extends AbstractTuttiService { registerTuttiDecorator(TuttiLocation.class, "${label}$s#${name}$s", SEPARATOR, " - "); registerTuttiDecorator(Cruise.class, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(TuttiProtocol.class, "${name}$s", SEPARATOR, " - "); + registerTuttiDecorator(Rtp.class, "${a}$s#${b}$s", SEPARATOR, " - "); registerDecorator(new FishingOperationDecorator()); registerTuttiDecorator(FishingOperation.class, FILE_NAME_COMPATIBLE, "${stationNumber}$s#${fishingOperationNumber}$s#${multirigAggregation}$s#${gearShootingStartDate}$td%4$tm%4$tY", SEPARATOR, "-"); registerTuttiDecorator(Gear.class, "${label}$s#${name}$s", SEPARATOR, " - "); 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 4b21d16..a84bb87 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 @@ -37,6 +37,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; +import fr.ifremer.tutti.persistence.entities.protocol.Rtp; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; @@ -340,6 +341,8 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI this.ui.getBenthosComboBox().reset(); this.ui.getCaracteristicMappingComboBox().reset(); + Decorator<Rtp> rtpDecorator = getDecorator(Rtp.class, null); + { // create species table model @@ -387,7 +390,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFY_SAMPLE_ENABLED, table); addColumnToModel(columnModel, RtpCellEditor.newEditor(ui), - new RtpCellRenderer(), + new RtpCellRenderer(rtpDecorator), EditProtocolSpeciesTableModel.USE_RTP); initTable(table, @@ -452,7 +455,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addColumnToModel(columnModel, RtpCellEditor.newEditor(ui), - new RtpCellRenderer(), + new RtpCellRenderer(rtpDecorator), EditProtocolSpeciesTableModel.USE_RTP); initTable(table, 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 323d51f..c922a5f 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,10 +1,12 @@ 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; @@ -38,7 +40,10 @@ public class RtpCellRenderer extends DefaultTableCellRenderer { private Font selectedFont; - public RtpCellRenderer() { + private Decorator<Rtp> decorator; + + public RtpCellRenderer(Decorator<Rtp> decorator) { + this.decorator = decorator; setHorizontalAlignment(CENTER); setIcon(SwingUtil.createActionIcon("edit-attachment")); this.withoutRtp = n("tutti.editRtp.withoutRtp.tip"); @@ -78,7 +83,11 @@ public class RtpCellRenderer extends DefaultTableCellRenderer { } else { - toolTipTextValue = t(withRtp); + toolTipTextValue = decorator.toString(rowModel.getRtpMale()) + + " // " + + decorator.toString(rowModel.getRtpFemale()) + + " // " + + decorator.toString(rowModel.getRtpUndefined()); textValue = t(withRtp); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm