This is an automated email from the git hooks/post-receive script. New commit to branch feature/8151 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit bea7da08db3faf8fa80a6c5bd2e77a20f0e6e2df Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 22 15:10:35 2016 +0100 ajout d'un renderer de poids qui affiche le bon nombre de decimales (fixes #8151) --- .../fr/ifremer/tutti/service/TuttiDataContext.java | 2 +- .../frequency/SpeciesFrequencyUIHandler.java | 22 +++++++++++++--------- .../ui/swing/util/AbstractTuttiUIHandler.java | 15 +++++++++++++-- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java index 1306dae..4bb9c05 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java @@ -557,7 +557,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { List<IndividualObservationBatch> allIndividualObservationBatchsForFishingOperation = service.getAllIndividualObservationBatchsForFishingOperation(operationId); - allIndividualObservationBatchsForFishingOperation.forEach( + allIndividualObservationBatchsForFishingOperation.stream().filter(obs -> obs.getSize() != null).forEach( obs -> cruiseSamplingCache.increment(operation, obs.getSpecies(), (CaracteristicQualitativeValue) obs.getCaracteristics().get(service.getSexCaracteristic()), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index b3be925..93c1bc2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -97,8 +97,8 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JSplitPane; +import javax.swing.JTable; import javax.swing.JTextField; -import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.event.TableModelEvent; import javax.swing.table.TableCellRenderer; @@ -1221,16 +1221,20 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci { // RTP computed Weight Color computedDataColor = getConfig().getColorComputedWeights(); - TableCellRenderer renderer = (table1, value, isSelected, hasFocus, row, column) -> { - Component result = table1.getDefaultRenderer(Number.class).getTableCellRendererComponent(table1, value, isSelected, hasFocus, row, column); - if (result instanceof JLabel) { - JLabel jLabel = (JLabel) result; - jLabel.setHorizontalTextPosition(SwingConstants.RIGHT); - jLabel.setForeground(computedDataColor); - jLabel.setFont(jLabel.getFont().deriveFont(Font.ITALIC)); + TableCellRenderer renderer = new TableCellRenderer() { + TableCellRenderer delegate = newWeightCellRenderer(table.getDefaultRenderer(Number.class), weightUnit); + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + Component result = delegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + if (result instanceof JLabel) { + JLabel jLabel = (JLabel) result; + jLabel.setForeground(computedDataColor); + jLabel.setFont(jLabel.getFont().deriveFont(Font.ITALIC)); + } + return result; } - return result; }; addColumnToModel(columnModel, diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java index e86c9be..87b30b0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java @@ -649,8 +649,7 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend editor.getNumberEditor().getTextField().setBorder(new LineBorder(Color.GRAY, 2)); editor.getNumberEditor().setNumberPattern(weightUnit.getNumberEditorPattern()); - TableCellRenderer renderer = - newNumberCellRenderer(table.getDefaultRenderer(Number.class)); + TableCellRenderer renderer = newWeightCellRenderer(table.getDefaultRenderer(Number.class), weightUnit); return addColumnToModel(model, editor, renderer, identifier, weightUnit); } @@ -682,4 +681,16 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend return col; } + protected TableCellRenderer newWeightCellRenderer( TableCellRenderer delegate, WeightUnit weightUnit) { + return (table, value, isSelected, hasFocus, row, column) -> { + Component result = delegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + if(result instanceof JLabel) { + JLabel jLabel = (JLabel)result; + jLabel.setHorizontalTextPosition(4); + jLabel.setText(weightUnit.renderWeight((Float) value)); + } + + return result; + }; + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.