October 2013 - Tutti-commits - mailman.cloud.codelutin.com

r1263 - tags
by maven-release＠users.forge.codelutin.com 01 Oct '13

01 Oct '13

Author: maven-release Date: 2013-10-01 14:57:37 +0200 (Tue, 01 Oct 2013) New Revision: 1263 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1263 Log: [maven-release-plugin] copy for tag tutti-2.6.1 Added: tags/tutti-2.6.1/

1 0

r1262 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 01 Oct '13

01 Oct '13

Author: maven-release Date: 2013-10-01 14:57:31 +0200 (Tue, 01 Oct 2013) New Revision: 1262 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1262 Log: [maven-release-plugin] prepare release tutti-2.6.1 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-01 12:43:32 UTC (rev 1261) +++ trunk/pom.xml 2013-10-01 12:57:31 UTC (rev 1262) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.1</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.6.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.6.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.6.1 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-10-01 12:43:32 UTC (rev 1261) +++ trunk/tutti-persistence/pom.xml 2013-10-01 12:57:31 UTC (rev 1262) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-10-01 12:43:32 UTC (rev 1261) +++ trunk/tutti-service/pom.xml 2013-10-01 12:57:31 UTC (rev 1262) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-10-01 12:43:32 UTC (rev 1261) +++ trunk/tutti-ui-swing/pom.xml 2013-10-01 12:57:31 UTC (rev 1262) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1261 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/home java/fr/ifremer/tutti/ui/swing/content/operation/catches resources/i18n
by tchemit＠users.forge.codelutin.com 01 Oct '13

01 Oct '13

Author: tchemit Date: 2013-10-01 14:43:32 +0200 (Tue, 01 Oct 2013) New Revision: 1261 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1261 Log: fixes #3338: [RAPPORT] ajouter sur onglet R?\195?\169sum?\195?\169 un bouton pour obtenir la composition de la capture Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java 2013-10-01 12:24:29 UTC (rev 1260) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java 2013-10-01 12:43:32 UTC (rev 1261) @@ -27,7 +27,8 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.sumatra.CatchesSumatraExportService; -import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; +import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -43,7 +44,7 @@ * @author kmorin <morin(a)codelutin.com> * @since 1.0 */ -public class ExportCruiseForSumatraAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { +public class ExportCruiseForSumatraAction extends AbstractMainUITuttiAction { /** Logger. */ private static final Log log = @@ -51,7 +52,7 @@ protected File file; - public ExportCruiseForSumatraAction(SelectCruiseUIHandler handler) { + public ExportCruiseForSumatraAction(MainUIHandler handler) { super(handler, false); } @@ -84,7 +85,7 @@ @Override public void doAction() throws Exception { - Cruise cruise = getModel().getCruise(); + Cruise cruise = getDataContext().getCruise(); Preconditions.checkNotNull(cruise); Preconditions.checkNotNull(file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-10-01 12:24:29 UTC (rev 1260) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-10-01 12:43:32 UTC (rev 1261) @@ -28,8 +28,9 @@ import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.catches.ExportCatchesReportService; +import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; +import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,7 +45,7 @@ * @author kmorin <morin(a)codelutin.com> * @since 1.0 */ -public class SendCruiseReportAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { +public class SendCruiseReportAction extends AbstractMainUITuttiAction { /** Logger. */ private static final Log log = @@ -52,7 +53,7 @@ protected File file; - public SendCruiseReportAction(SelectCruiseUIHandler handler) { + public SendCruiseReportAction(MainUIHandler handler) { super(handler, true); } @@ -63,7 +64,7 @@ if (doAction) { - Cruise cruise = getModel().getCruise(); + Cruise cruise = getDataContext().getCruise(); // choose file to export file = saveFile( "exportCruise-" + cruise.getName(), @@ -85,7 +86,7 @@ @Override public void doAction() throws Exception { - Cruise cruise = getModel().getCruise(); + Cruise cruise = getDataContext().getCruise(); Preconditions.checkNotNull(cruise); Preconditions.checkNotNull(file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-10-01 12:24:29 UTC (rev 1260) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-10-01 12:43:32 UTC (rev 1261) @@ -327,6 +327,23 @@ border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.individualObservation"))}; } +#sendCruiseReportButton { + actionIcon: email; + text: "tutti.selectCruise.action.sendCruiseReport"; + toolTipText: "tutti.selectCruise.action.sendCruiseReport.tip"; + _tuttiAction: {SendCruiseReportAction.class}; + _help: {"tutti.selectCruise.action.sendCruiseReport.help"}; +} + +#exportCruiseForSumatraButton { + actionIcon: export; + text: "tutti.selectCruise.action.exportCruiseForSumatra"; + toolTipText: "tutti.selectCruise.action.exportCruiseForSumatra.tip"; + _tuttiAction: {ExportCruiseForSumatraAction.class}; + _help: {"tutti.selectCruise.action.exportCruiseForSumatra.help"}; +} + + #saveButton { actionIcon: save; text: "tutti.editCatchBatch.action.saveCatchBatch"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-10-01 12:24:29 UTC (rev 1260) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-10-01 12:43:32 UTC (rev 1261) @@ -27,6 +27,9 @@ <import> fr.ifremer.tutti.ui.swing.TuttiHelpBroker + fr.ifremer.tutti.ui.swing.content.home.SendCruiseReportAction + fr.ifremer.tutti.ui.swing.content.home.ExportCruiseForSumatraAction + fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.CreateAccidentalBatchUI @@ -39,7 +42,6 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUI - fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.CreateSpeciesBatchUI @@ -47,6 +49,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment + fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI fr.ifremer.tutti.ui.swing.util.editor.TuttiComputedOrNotDataEditor org.jdesktop.swingx.JXTitledPanel @@ -112,6 +115,8 @@ <TuttiHelpBroker id='broker' constructorParams='"tutti.editCatchBatch.help"'/> <JToolBar id='catchesCaracteristicsTabToolBar'> + <JButton id='sendCruiseReportButton'/> + <JButton id='exportCruiseForSumatraButton'/> <ButtonAttachment id='catchesCaracteristicsAttachmentsButton' constructorParams='getHandler().getContext(), getModel()'/> </JToolBar> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-10-01 12:24:29 UTC (rev 1260) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-10-01 12:43:32 UTC (rev 1261) @@ -512,9 +512,15 @@ tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.species=Le Poids total VRAC saisi sur les espèces est supérieur de moins de %s%% au Poids total Vrac trié. tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title=Poids total VRAC peu différent du Poids total Vrac trié tutti.editCatchBatch.action.computeWeights.tip=Élever les poids +tutti.editCatchBatch.action.exportCruiseForSumatra=Sumatra +tutti.editCatchBatch.action.exportCruiseForSumatra.mnemonic=u +tutti.editCatchBatch.action.exportCruiseForSumatra.tip=Exporter la campagne sélectionnée pour Sumatra tutti.editCatchBatch.action.saveCatchBatch=Enregistrer tutti.editCatchBatch.action.saveCatchBatch.mnemonic=S tutti.editCatchBatch.action.saveCatchBatch.tip=Enregistrer la capture +tutti.editCatchBatch.action.sendCruiseReport=Envoyer +tutti.editCatchBatch.action.sendCruiseReport.mnemonic=E +tutti.editCatchBatch.action.sendCruiseReport.tip=Envoyer le rapport de la campagne tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch=La capture n'est pas valide et ne peut pas être enregistrée tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch=Des modifications sur la capture n'ont pas été enregistrées tutti.editCatchBatch.field.benthosTotalSampleSortedWeight=Poids VRAC trié

1 0

r1260 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: content/operation/catches/benthos content/operation/catches/species util
by tchemit＠users.forge.codelutin.com 01 Oct '13

01 Oct '13

Author: tchemit Date: 2013-10-01 14:24:29 +0200 (Tue, 01 Oct 2013) New Revision: 1260 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1260 Log: fixes #3405: [ESPECES] Cat?\195?\169gorisation des lots : on ne peut plus ajouter une cat?\195?\169gorie une fois la cat?\195?\169gorisation effectu?\195?\169e Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-10-01 10:31:41 UTC (rev 1259) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-10-01 12:24:29 UTC (rev 1260) @@ -601,17 +601,17 @@ @Override public BenthosBatch getChildBatchs(int index) { - return null; + return childBatch.get(index); } @Override public boolean isChildBatchsEmpty() { - return false; + return childBatch.isEmpty(); } @Override public int sizeChildBatchs() { - return 0; + return childBatch.size(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2013-10-01 10:31:41 UTC (rev 1259) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2013-10-01 12:24:29 UTC (rev 1260) @@ -24,12 +24,13 @@ * #L% */ +import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryColumnIdentifier; -import fr.ifremer.tutti.service.WeightUnit; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; import org.apache.commons.logging.Log; @@ -247,6 +248,49 @@ } /** + * Return the index of the next row that can be inserted as a child of the + * given row. + * + * @param row the parent row + * @return the index of the next row that can be inserted as a child of the + * given row + * @since 2.7 + */ + public final int getNextChildRowIndex(BenthosBatchRowModel row) { + + // get row index of the given row + int parentRowIndex = getRowIndex(row); + + // must find it + Preconditions.checkState(parentRowIndex != -1); + + int result = parentRowIndex; + + if (!row.isChildBatchsEmpty()) { + + // take his last child + BenthosBatchRowModel lastChild = + row.getChildBatch().get(row.sizeChildBatchs() - 1); + + // get the shell of this child (including himself) + Set<BenthosBatchRowModel> childs = Sets.newHashSet(); + childs.add(lastChild); + lastChild.collectShell(childs); + + // get row with max index + for (BenthosBatchRowModel child : childs) { + int childRowIndex = getRowIndex(child); + result = Math.max(childRowIndex, result); + } + } + + // result is the nex row + result++; + + return result; + } + + /** * Return the sample category id of a column or {@code null} if not on a * sample category column. * Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-10-01 10:31:41 UTC (rev 1259) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-10-01 12:24:29 UTC (rev 1260) @@ -1162,7 +1162,7 @@ BenthosBatchTableModel tableModel = getTableModel(); // get insert row index - int insertRow = tableModel.getRowIndex(parentBatch) + parentBatch.getChildBatch().size(); + int insertRow = tableModel.getNextChildRowIndex(parentBatch); // Create rows in batch table model List<BenthosBatchRowModel> newBatches = Lists.newArrayList(); @@ -1182,7 +1182,7 @@ recomputeRowValidState(newBatch); newBatches.add(newBatch); - tableModel.addNewRow(++insertRow, newBatch); + tableModel.addNewRow(insertRow++, newBatch); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-10-01 10:31:41 UTC (rev 1259) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-10-01 12:24:29 UTC (rev 1260) @@ -374,17 +374,17 @@ @Override public SpeciesBatch getChildBatchs(int index) { - return null; + return childBatch.get(index); } @Override public boolean isChildBatchsEmpty() { - return false; + return childBatch.isEmpty(); } @Override public int sizeChildBatchs() { - return 0; + return childBatch.size(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-10-01 10:31:41 UTC (rev 1259) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-10-01 12:24:29 UTC (rev 1260) @@ -24,12 +24,13 @@ * #L% */ +import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryColumnIdentifier; -import fr.ifremer.tutti.service.WeightUnit; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; import org.apache.commons.logging.Log; @@ -246,6 +247,49 @@ } /** + * Return the index of the next row that can be inserted as a child of the + * given row. + * + * @param row the parent row + * @return the index of the next row that can be inserted as a child of the + * given row + * @since 2.7 + */ + public final int getNextChildRowIndex(SpeciesBatchRowModel row) { + + // get row index of the given row + int parentRowIndex = getRowIndex(row); + + // must find it + Preconditions.checkState(getRowIndex(row) != -1); + + int result = parentRowIndex; + + if (!row.isChildBatchsEmpty()) { + + // take his last child + SpeciesBatchRowModel lastChild = + row.getChildBatch().get(row.sizeChildBatchs() - 1); + + // get the shell of this child (including himself) + Set<SpeciesBatchRowModel> childs = Sets.newHashSet(); + childs.add(lastChild); + lastChild.collectShell(childs); + + // get row with max index + for (SpeciesBatchRowModel child : childs) { + int childRowIndex = getRowIndex(child); + result = Math.max(childRowIndex, result); + } + } + + // result is the nex row + result++; + + return result; + } + + /** * Return the sample category id of a column or {@code null} if not on a * sample category column. * Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-10-01 10:31:41 UTC (rev 1259) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-10-01 12:24:29 UTC (rev 1260) @@ -1165,7 +1165,7 @@ SpeciesBatchTableModel tableModel = getTableModel(); // get insert row index - int insertRow = tableModel.getRowIndex(parentBatch) + parentBatch.getChildBatch().size(); + int insertRow = tableModel.getNextChildRowIndex(parentBatch); // Create rows in batch table model List<SpeciesBatchRowModel> newBatches = Lists.newArrayList(); @@ -1185,7 +1185,7 @@ recomputeRowValidState(newBatch); newBatches.add(newBatch); - tableModel.addNewRow(++insertRow, newBatch); + tableModel.addNewRow(insertRow++, newBatch); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-10-01 10:31:41 UTC (rev 1259) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-10-01 12:24:29 UTC (rev 1260) @@ -400,7 +400,7 @@ JXTable source = (JXTable) e.getSource(); int[] selectedRows = source.getSelectedRows(); -// int[] selectedColumns = source.getSelectedColumns(); + int[] selectedColumns = source.getSelectedColumns(); // get the row index at this point int rowIndex = source.rowAtPoint(p); @@ -435,12 +435,12 @@ source.setRowSelectionInterval(rowIndex, rowIndex); } -// // select column (could empty selection) -// if (columnIndex == -1) { -// source.clearSelection(); -// } else if (!ArrayUtils.contains(selectedColumns, columnIndex)) { -// source.setColumnSelectionInterval(columnIndex, columnIndex); -// } + // select column (could empty selection) + if (columnIndex == -1) { + source.clearSelection(); + } else if (!ArrayUtils.contains(selectedColumns, columnIndex)) { + source.setColumnSelectionInterval(columnIndex, columnIndex); + } if (rightClick) {

1 0

r1259 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol
by tchemit＠users.forge.codelutin.com 01 Oct '13

01 Oct '13

Author: tchemit Date: 2013-10-01 12:31:41 +0200 (Tue, 01 Oct 2013) New Revision: 1259 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1259 Log: fixes #3402: [PROPTOCOLE] erreur ?\195?\160 l'import des esp?\195?\168ces fixes #3403: [PROPTOCOLE] erreur ?\195?\160 l'import du benthos Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-10-01 09:52:31 UTC (rev 1258) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-10-01 10:31:41 UTC (rev 1259) @@ -537,10 +537,12 @@ @Override public List<Integer> parse(String value) throws ParseException { - String[] split = value.split("\\s*\\|\\s*"); List<Integer> result = Lists.newArrayList(); - for (String string : split) { - result.add(Integer.valueOf(string)); + if (StringUtils.isNotBlank(value)) { + String[] split = value.split("\\s*\\|\\s*"); + for (String string : split) { + result.add(Integer.valueOf(string)); + } } return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-10-01 09:52:31 UTC (rev 1258) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-10-01 10:31:41 UTC (rev 1259) @@ -241,6 +241,10 @@ } } + if (model.getLengthClassesPmfmId()==null) { + model.setLengthClassesPmfmId(Lists.<String>newArrayList()); + } + SwingValidator validator = ui.getValidator(); listenValidatorValid(validator, model); @@ -507,7 +511,9 @@ String lengthStepPmfmId = speciesProtocol.getLengthStepPmfmId(); Caracteristic lengthStepPmfm = allCaracteristic.get(lengthStepPmfmId); - if (lengthStepPmfmId != null && !model.containsLengthClassesPmfmId(lengthStepPmfmId)) { + if (lengthStepPmfmId != null && + !lengthClassesPmfmId.contains(lengthStepPmfm) && + !model.containsLengthClassesPmfmId(lengthStepPmfmId)) { if (log.isInfoEnabled()) { log.info("Found a new lengthStep pmfm: " + lengthStepPmfmId); }

1 0

r1258 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches
by tchemit＠users.forge.codelutin.com 01 Oct '13

01 Oct '13

Author: tchemit Date: 2013-10-01 11:52:31 +0200 (Tue, 01 Oct 2013) New Revision: 1258 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1258 Log: fixes #3401: [CAPTURE] gestion des poids dans le tableau (ne fonctionne pas pour le benthos) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2013-09-30 18:19:54 UTC (rev 1257) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2013-10-01 09:52:31 UTC (rev 1258) @@ -311,7 +311,7 @@ benthosFrequencyFunction); } - if (!(speciesToSave.isEmpty() && speciesToSave.isEmpty())) { + if (!(speciesToSave.isEmpty() && benthosToSave.isEmpty())) { // save modified batches

1 0