Author: kmorin Date: 2013-05-21 17:43:00 +0200 (Tue, 21 May 2013) New Revision: 972 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/972 Log: fixes #2467 [MESNURATIONS] Indication de la ligne active Added: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Added: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java (rev 0) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingServiceTest.java 2013-05-21 15:43:00 UTC (rev 972) @@ -0,0 +1,8 @@ +package fr.ifremer.tutti.service.catches; + +/** + * @author kmorin <kmorin@codelutin.com> + * @since x.x + */ +public class TuttiWeightComputingServiceTest { +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-21 14:58:05 UTC (rev 971) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-21 15:43:00 UTC (rev 972) @@ -131,9 +131,6 @@ // add new row to cache Float lengthStep = newValue.getLengthStep(); - Preconditions.checkNotNull(lengthStep, - "can't add a null lengthStep row"); - float roundLenghtValue = uiModel.getLengthStep(lengthStep); if (!rowCache.containsKey(roundLenghtValue)) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-21 14:58:05 UTC (rev 971) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-21 15:43:00 UTC (rev 972) @@ -38,10 +38,12 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent.FrequencyCellEditor; import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -49,10 +51,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.HighlightPredicate; +import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.JComponent; -import javax.swing.JTextField; +import javax.swing.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; @@ -299,6 +302,19 @@ } @Override + protected void addHighlighters(JXTable table) { + super.addHighlighters(table); + // highlight only the species column if the row is selected + Highlighter selectedHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( + new HighlightPredicate.AndHighlightPredicate( + HighlightPredicate.IS_SELECTED, + new HighlightPredicate.IdentifierHighlightPredicate(SpeciesFrequencyTableModel.LENGTH_STEP)), + UIManager.getColor("Table[Enabled+Selected].textBackground")); + + table.addHighlighter(selectedHighlighter); + } + + @Override protected JComponent getComponentToFocus() { return getUI().getLengthStepCaracteristicComboBox(); }