Author: kmorin Date: 2013-03-28 14:45:30 +0100 (Thu, 28 Mar 2013) New Revision: 700 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/700 Log: fixes #2106 [ESPECE] - saisie des mensurations : cliquer sur "simple d?\195?\169nombrement" alors qu'il y a des mensurations de saisie Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-03-28 12:54:20 UTC (rev 699) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-03-28 13:45:30 UTC (rev 700) @@ -184,9 +184,7 @@ protected boolean onTabChanged(int currentIndex, int newIndex) { ui.getCatchesCaracteristicsAttachmentsButton().onCloseUI(); ui.getSpeciesTabContent().getSpeciesBatchAttachmentsButton().onCloseUI(); - setSpeciesSelectedCard(EditCatchesUIHandler.MAIN_CARD); ui.getBenthosTabContent().getBenthosBatchAttachmentsButton().onCloseUI(); - setBenthosSelectedCard(EditCatchesUIHandler.MAIN_CARD); return super.onTabChanged(currentIndex, newIndex); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-03-28 12:54:20 UTC (rev 699) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-03-28 13:45:30 UTC (rev 700) @@ -235,7 +235,7 @@ #dataInFrequenciesWarningContainer { background: {new java.awt.Color(245, 218, 88)}; - visible: {!org.apache.commons.collections.CollectionUtils.isEmpty(model.getBatch().getFrequency())}; + visible: {model.getRowsInError().isEmpty()}; } #dataInFrequenciesWarning { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-03-28 12:54:20 UTC (rev 699) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2013-03-28 13:45:30 UTC (rev 700) @@ -28,6 +28,9 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; +import java.util.Collections; +import java.util.List; + /** * @author tchemit <chemit@codelutin.com> * @since 0.2 @@ -234,4 +237,10 @@ } return result; } + + // method with an argument for the binding + public boolean isOneRowValid(List<SpeciesFrequencyRowModel> frequencies) { + return isOneRowValid(); + } + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2013-03-28 12:54:20 UTC (rev 699) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2013-03-28 13:45:30 UTC (rev 700) @@ -25,6 +25,9 @@ * #L% */ +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; @@ -32,6 +35,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TabContentModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; +import org.apache.commons.lang3.ObjectUtils; import java.io.Serializable; import java.util.List; @@ -104,13 +108,8 @@ @Override public boolean isEmpty() { - boolean result = caracteristicMap == null; - if (!result) { - Set s = Sets.newHashSet(caracteristicMap.values()); - s.remove(null); - result = s.isEmpty(); - } - return result; + return caracteristicMap == null + || Iterables.all(caracteristicMap.values(), Predicates.isNull()); } @Override