This is an automated email from the git hooks/post-receive script. New commit to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git commit f1b29ce6ba2f02c866567e2c6435cbc9f5be16c4 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 26 16:35:25 2016 +0100 use lanbdas where possible --- .../frequency/SpeciesFrequencyUIHandler.java | 159 +++++++++------------ 1 file changed, 64 insertions(+), 95 deletions(-) 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 41fec5d..ac7f38d 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 @@ -25,7 +25,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderEvent; import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderMeasureRecord; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -97,8 +96,6 @@ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -153,26 +150,19 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci SpeciesFrequencyRowModel.PROPERTY_NUMBER, SpeciesFrequencyRowModel.PROPERTY_WEIGHT); - this.feedReaderListener = new FeedReaderListener() { + this.feedReaderListener = event -> { - @Override - public void recordRead(FeedReaderEvent event) { - - final FeedReaderMeasureRecord record = event.getRecord(); + final FeedReaderMeasureRecord record = event.getRecord(); - SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { - if (!getModel().isSimpleCountingMode()) { + SwingUtilities.invokeLater( + () -> { + if (!getModel().isSimpleCountingMode()) { - // can try to consume value - consumeFeedRecord(record); - } - } + // can try to consume value + consumeFeedRecord(record); } - ); - } + } + ); }; } @@ -195,8 +185,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci public boolean isRowValid(SpeciesFrequencyRowModel row) { SpeciesFrequencyUIModel model = getModel(); - boolean valid = model.isRowValid(row); - return valid; + return model.isRowValid(row); } @@ -270,25 +259,16 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci this.ui.setContextValue(model); // listen when ichtyometer is connected or not and adjust the listener - getContext().addPropertyChangeListener(TuttiUIContext.PROPERTY_ICHTYOMETER_CONNECTED, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - boolean connected = (boolean) evt.getNewValue(); - - if (connected && SpeciesFrequencyUIHandler.this.frequencyEditor != null) { + getContext().addPropertyChangeListener(TuttiUIContext.PROPERTY_ICHTYOMETER_CONNECTED, evt -> { + boolean connected = (boolean) evt.getNewValue(); - // listen when itchtyometer is connected and this ui is showing - listenItchtyometer(); - } + if (connected && SpeciesFrequencyUIHandler.this.frequencyEditor != null) { - SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { - updateLogVisibility(); - } - }); + // listen when itchtyometer is connected and this ui is showing + listenItchtyometer(); } + + SwingUtilities.invokeLater(this::updateLogVisibility); }); } @@ -338,71 +318,59 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci }); // when lengthStepCaracteristic changed, let's updates all row with the new value - model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Caracteristic newValue = (Caracteristic) evt.getNewValue(); - // get step from the pmfm - float step = getStep(newValue); - getModel().setStep(step); - getModel().setDataSetIntervalWidth(step); - frequenciesChart.getXYPlot().getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step == 1f)); - if (CollectionUtils.isNotEmpty(getModel().getRows())) { - for (SpeciesFrequencyRowModel rowModel : getModel().getRows()) { - rowModel.setLengthStepCaracteristic(newValue); - recomputeRowValidState(rowModel); - } + model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, evt -> { + Caracteristic newValue = (Caracteristic) evt.getNewValue(); + // get step from the pmfm + float step1 = getStep(newValue); + getModel().setStep(step1); + getModel().setDataSetIntervalWidth(step1); + frequenciesChart.getXYPlot().getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step1 == 1f)); + averageWeightsChart.getXYPlot().getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step1 == 1f)); + if (CollectionUtils.isNotEmpty(getModel().getRows())) { + for (SpeciesFrequencyRowModel rowModel : getModel().getRows()) { + rowModel.setLengthStepCaracteristic(newValue); + recomputeRowValidState(rowModel); } - SpeciesFrequencyUIHandler.this.ui.getValidator().doValidate(); } + SpeciesFrequencyUIHandler.this.ui.getValidator().doValidate(); }); // when lengthStepCaracteristicUnit changed, let's updates the label of some fields - model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { + model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, evt -> { - String unit = (String) evt.getNewValue(); + String unit = (String) evt.getNewValue(); - if (unit == null) { + if (unit == null) { - unit = t("tutti.editSpeciesFrequencies.unkownStepUnit"); - } + unit = t("tutti.editSpeciesFrequencies.unkownStepUnit"); + } - getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep"), unit)); - getUI().getMinStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep.tip"), unit)); + getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep"), unit)); + getUI().getMinStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep.tip"), unit)); - getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep"), unit)); - getUI().getMaxStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep.tip"), unit)); + getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep"), unit)); + getUI().getMaxStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep.tip"), unit)); - getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep"), unit)); - getUI().getRafaleStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep.tip"), unit)); + getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep"), unit)); + getUI().getRafaleStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep.tip"), unit)); - TableColumnExt column = (TableColumnExt) getUI().getTable().getColumn(SpeciesFrequencyTableModel.LENGTH_STEP); - column.setHeaderValue(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); - column.setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); - } + TableColumnExt column = (TableColumnExt) getUI().getTable().getColumn(SpeciesFrequencyTableModel.LENGTH_STEP); + column.setHeaderValue(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); + column.setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); }); // when configuration mode change, let's focus the best component (see http://forge.codelutin.com/issues/4035) - model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_FREQUENCIES_CONFIGURATION_MODE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - final FrequencyConfigurationMode newValue = (FrequencyConfigurationMode) evt.getNewValue(); - SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { - JComponent componentToFocus = getComponentToFocus(newValue); - if (componentToFocus != null) { - componentToFocus.grabFocus(); - } - updateLogVisibility(); - } + model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_FREQUENCIES_CONFIGURATION_MODE, evt -> { + final FrequencyConfigurationMode newValue = (FrequencyConfigurationMode) evt.getNewValue(); + SwingUtilities.invokeLater( + () -> { + JComponent componentToFocus = getComponentToFocus(newValue); + if (componentToFocus != null) { + componentToFocus.grabFocus(); } - ); - } + updateLogVisibility(); + } + ); }); model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_USE_RTP, evt -> { @@ -639,17 +607,18 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci mode = FrequencyConfigurationMode.SIMPLE_COUNTING; } } - } - if (log.isDebugEnabled()) { - log.debug("Will edit batch row: " + speciesBatch + " with " + rows.size() + " frequency"); - } + if (log.isDebugEnabled()) { + log.debug("Will edit batch row: " + speciesBatch + " with " + rows.size() + " frequency"); + } - Integer number = speciesBatch.getNumber(); - if (number != null && rows.isEmpty()) { - mode = FrequencyConfigurationMode.SIMPLE_COUNTING; - model.setSimpleCount(number); + Integer number = speciesBatch.getNumber(); + if (number != null && rows.isEmpty()) { + mode = FrequencyConfigurationMode.SIMPLE_COUNTING; + model.setSimpleCount(number); + } } + // make sure configuration mode will be rebound model.setConfigurationMode(null); model.setConfigurationMode(mode); @@ -860,7 +829,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci // create log table model SpeciesFrequencyLogsTableModel logTableModel = new SpeciesFrequencyLogsTableModel(logColumnModel); - logTableModel.setRows(new ArrayList<SpeciesFrequencyLogRowModel>()); + logTableModel.setRows(new ArrayList<>()); logTable.setModel(logTableModel); logTable.setColumnModel(logColumnModel); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.