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

r1063 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 12:24:19 +0200 (Fri, 31 May 2013) New Revision: 1063 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1063 Log: fixes #2546 [ERGO] - Parcourt des tableaux bloqu?\195?\169 sur certains champs non ?\195?\169ditables Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java 2013-05-31 10:08:57 UTC (rev 1062) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToNextEditableRowAction.java 2013-05-31 10:24:19 UTC (rev 1063) @@ -57,15 +57,22 @@ int currentRow = getSelectedRow(); int currentColumn = getSelectedColumn(); - if (isCellEditable(currentRow, currentColumn)) { - if (log.isDebugEnabled()) { - log.debug("Move to next row editable cell " + - getCellCoordinate(currentRow, currentColumn)); - } + if (log.isDebugEnabled()) { + log.debug("Move to next row editable cell " + + getCellCoordinate(currentRow, currentColumn)); + } + + int rowCount = getRowCount(); + + while (currentRow < rowCount) { + + // go to next cell currentRow++; + boolean canSelect = true; - boolean canSelect = true; - if (currentRow >= getRowCount()) { + // select next cell + if (currentRow >= rowCount) { + if (log.isDebugEnabled()) { log.debug("No next row"); } @@ -76,16 +83,19 @@ } else { canSelect = false; } + } else { + canSelect = isCellEditable(currentRow, currentColumn); } if (canSelect) { doSelectCell(currentRow, currentColumn); - } - } else { - if (log.isDebugEnabled()) { - log.debug("Cell not editable at " + - getCellCoordinate(currentRow, currentColumn)); + break; + } else { + if (log.isDebugEnabled()) { + log.debug("Cell not editable at " + + getCellCoordinate(currentRow, currentColumn)); + } } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java 2013-05-31 10:08:57 UTC (rev 1062) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/MoveToPreviousEditableRowAction.java 2013-05-31 10:24:19 UTC (rev 1063) @@ -58,25 +58,29 @@ int currentRow = getSelectedRow(); int currentColumn = getSelectedColumn(); - if (isCellEditable(currentRow, currentColumn)) { - if (log.isDebugEnabled()) { - log.debug("Move to previous row editable cell " + - getCellCoordinate(currentRow, currentColumn)); - } + if (log.isDebugEnabled()) { + log.debug("Move to previous row editable cell " + + getCellCoordinate(currentRow, currentColumn)); + } + + int rowCount = getRowCount(); + + while (currentRow > 0) { + + // go to next cell currentRow--; + boolean canSelect = isCellEditable(currentRow, currentColumn); - if (currentRow < 0) { + if (canSelect) { + doSelectCell(currentRow, currentColumn); + + break; + } else { if (log.isDebugEnabled()) { - log.debug("No previous row"); + log.debug("Cell not editable at " + + getCellCoordinate(currentRow, currentColumn)); } - } else { - doSelectCell(currentRow, currentColumn); } - } else { - if (log.isDebugEnabled()) { - log.debug("Cell not editable at " + - getCellCoordinate(currentRow, currentColumn)); - } } } }

1 0

r1062 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos species
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 12:08:57 +0200 (Fri, 31 May 2013) New Revision: 1062 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1062 Log: fixes #2544 [ESPECE] - Cat?\195?\169gorisation de lot impossible apr?\195?\168s suppression des mensurations 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/species/SpeciesBatchUIHandler.java 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-05-31 09:45:22 UTC (rev 1061) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-31 10:08:57 UTC (rev 1062) @@ -859,6 +859,7 @@ row.setComputedNumber(totalNumber); row.getFinestCategory().setOnlyOneFrequency(onlyOneFrequency); + recomputeBatchActionEnable(); } public void saveRows(Iterable<BenthosBatchRowModel> rows) { 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-05-31 09:45:22 UTC (rev 1061) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-31 10:08:57 UTC (rev 1062) @@ -865,6 +865,7 @@ row.setComputedNumber(totalNumber); row.getFinestCategory().setOnlyOneFrequency(onlyOneFrequency); + recomputeBatchActionEnable(); } public void saveRows(Iterable<SpeciesBatchRowModel> rows) {

1 0

r1061 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content: cruise operation operation/catches
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 11:45:22 +0200 (Fri, 31 May 2013) New Revision: 1061 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1061 Log: fixes #2543 [ERGO] - Pi?\195?\168ces jointes : Ecran en mode modification en cas d'ajout / suppression des pi?\195?\168ces jointes Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-31 09:25:00 UTC (rev 1060) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-31 09:45:22 UTC (rev 1061) @@ -54,6 +54,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; +import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -308,6 +309,13 @@ } @Override + protected Set<String> getPropertiesToIgnore() { + Set<String> result = super.getPropertiesToIgnore(); + result.add(EditCruiseUIModel.PROPERTY_ATTACHMENT); + return result; + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); @@ -340,5 +348,4 @@ String name = model.getGeneratedCampaignName(); model.setName(name); } - } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-05-31 09:25:00 UTC (rev 1060) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-05-31 09:45:22 UTC (rev 1061) @@ -66,6 +66,7 @@ import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -353,6 +354,13 @@ } @Override + protected Set<String> getPropertiesToIgnore() { + Set<String> result = super.getPropertiesToIgnore(); + result.add(EditFishingOperationUIModel.PROPERTY_ATTACHMENT); + return result; + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { 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-05-31 09:25:00 UTC (rev 1060) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-05-31 09:45:22 UTC (rev 1061) @@ -171,7 +171,8 @@ EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_INERT_COMPUTED_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT, + EditCatchesUIModel.PROPERTY_ATTACHMENT )); return result; }

1 0

r1060 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service/pupitri resources/i18n
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 11:25:00 +0200 (Fri, 31 May 2013) New Revision: 1060 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1060 Log: fixes #2329 [IMPORT PUPITRI] ne garder que les deux derniers fichiers importer Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-05-31 08:18:06 UTC (rev 1059) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-05-31 09:25:00 UTC (rev 1060) @@ -65,7 +65,10 @@ import java.io.File; import java.io.IOException; import java.io.Reader; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Set; @@ -149,7 +152,9 @@ attachment.setObjectType(AttachementObjectTypeEnum.CATCH_BATCH); attachment.setObjectId(Integer.valueOf(catchBatch.getId())); attachment.setName(f.getName()); - attachment.setComment("import pupitri"); + String date = DateFormat.getDateTimeInstance().format(new Date()); + String comment = _("tutti.service.pupitri.import.attachment.comment", date); + attachment.setComment(comment); persistenceService.createAttachment(attachment, f); } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-31 08:18:06 UTC (rev 1059) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-31 09:25:00 UTC (rev 1060) @@ -163,6 +163,7 @@ tutti.service.protocol.import.species.error= tutti.service.protocol.import.taxonUsed.error= tutti.service.pupitri.export.species.error= +tutti.service.pupitri.import.attachment.comment= tutti.service.pupitri.import.carrousel.error= tutti.service.pupitri.import.trunk.error= tutti.service.referential.export.gear.error= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-31 08:18:06 UTC (rev 1059) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-31 09:25:00 UTC (rev 1060) @@ -133,6 +133,7 @@ tutti.service.protocol.import.species.error=Erreur lors de l'import des espèces du protocole %1s du fichier %2s tutti.service.protocol.import.taxonUsed.error=Le taxon référent d'id %s est déjà utilisé tutti.service.pupitri.export.species.error=Erreur lors de l'export des espèces pour Pupitri dans le fichier %s +tutti.service.pupitri.import.attachment.comment=Import Pupitri du %s tutti.service.pupitri.import.carrousel.error=Erreur lors de l'import du fichier de carrousel %2s pour le trait %1s tutti.service.pupitri.import.trunk.error=Erreur lors de l'import du fichier de trémie %2s pour le trait %1s tutti.service.referential.export.gear.error=Erreur lors de l'export des engins dans le fichier %s

1 0

r1059 - trunk/tutti-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 31 May '13

31 May '13

Author: kmorin Date: 2013-05-31 10:18:06 +0200 (Fri, 31 May 2013) New Revision: 1059 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1059 Log: fixes #2540 [CAPTURE] intitul?\195?\169 de la colonne "Nombre" : modifier en ""Tailles/Poids ou Nombre" Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 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-05-30 20:24:51 UTC (rev 1058) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-31 08:18:06 UTC (rev 1059) @@ -364,8 +364,8 @@ tutti.editBenthosBatch.table.header.ageCategory.tip=Age des individus dans le lot (pour les coquilles St Jacques) tutti.editBenthosBatch.table.header.comment=Commentaire tutti.editBenthosBatch.table.header.comment.tip=Commentaire sur la ligne -tutti.editBenthosBatch.table.header.computedNumber=Nombre -tutti.editBenthosBatch.table.header.computedNumber.tip=Nombre d'individus dans le lot +tutti.editBenthosBatch.table.header.computedNumber=Tailles/Poids ou Nombre +tutti.editBenthosBatch.table.header.computedNumber.tip=Tailles/Poids ou Nombre d'individus dans le lot tutti.editBenthosBatch.table.header.file=Pièces jointes tutti.editBenthosBatch.table.header.file.tip=Pièces jointes associées à la ligne tutti.editBenthosBatch.table.header.maturityCategory=Maturité @@ -881,7 +881,7 @@ tutti.editSpeciesBatch.split.weightNotNull.title=Poids sous-échantillonné non nul tutti.editSpeciesBatch.table.header.ageCategory=Age (kg) tutti.editSpeciesBatch.table.header.comment=Commentaire -tutti.editSpeciesBatch.table.header.computedNumber=Nombre +tutti.editSpeciesBatch.table.header.computedNumber=Tailles/Poids ou Nombre tutti.editSpeciesBatch.table.header.file=Pièces jointes tutti.editSpeciesBatch.table.header.maturityCategory=Maturité (kg) tutti.editSpeciesBatch.table.header.sexCategory=Sexe (kg)

1 0

r1058 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content java/fr/ifremer/tutti/ui/swing/util/action resources/i18n resources/icons
by tchemit＠users.forge.codelutin.com 30 May '13

30 May '13

Author: tchemit Date: 2013-05-30 22:24:51 +0200 (Thu, 30 May 2013) New Revision: 1058 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1058 Log: fixes #2509: [TECH] le nom du logiciel sera ALLEGRO CAMPAGNE Added: trunk/tutti-ui-swing/src/main/resources/icons/allegro_32.png trunk/tutti-ui-swing/src/main/resources/icons/allegro_about.png Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 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/MainUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-05-30 20:24:51 UTC (rev 1058) @@ -31,6 +31,7 @@ #mainFrame { title: "tutti.main.title.applicationName"; defaultCloseOperation: {JFrame.DO_NOTHING_ON_CLOSE}; + iconImage:{SwingUtil.createImageIcon("allegro_32.png").getImage()}; } #menuFile { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-05-30 20:24:51 UTC (rev 1058) @@ -491,7 +491,9 @@ String title = getSelectedCruiseTitle(); - ui.setTitle("Tutti - v " + getConfig().getVersion() + " [ " + title + " ]"); + ui.setTitle(_("tutti.main.title.application", + getConfig().getVersion(), + title)); } protected String getSelectedCruiseTitle() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-05-30 20:24:51 UTC (rev 1058) @@ -37,7 +37,6 @@ import jaxx.runtime.swing.AboutPanel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.updater.ApplicationInfo; import org.nuiton.util.updater.ApplicationUpdater; @@ -107,10 +106,7 @@ about = null; - ApplicationConfig applicationConfig = - getContext().getConfig().getApplicationConfig(); - - String iconPath = applicationConfig.getOption("application.icon.path"); + String iconPath = "/icons/allegro_about.png"; String name = "tutti"; String licensePath = "META-INF/" + name + "-LICENSE.txt"; String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-05-30 20:24:51 UTC (rev 1058) @@ -86,6 +86,9 @@ } protected void showAction(AbstractTuttiAction action) { + ui.setTitle(_("tutti.main.title.action", + getConfig().getVersion(), + action.getActionDescription())); ui.getGlobalActionLabel().setText( _("tutti.message.action.running", action.getActionDescription())); Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-30 20:24:51 UTC (rev 1058) @@ -1129,7 +1129,9 @@ tutti.main.menu.help= tutti.main.menu.help.mnemonic= tutti.main.menu.help.tip= -tutti.main.title.applicationName= +tutti.main.title.action=Allegro Campagne - v %s [%s] +tutti.main.title.application=Allegro Campagne - v %s [%s] +tutti.main.title.applicationName=Tutti tutti.main.title.noSelectedCruise= tutti.main.title.noSelectedProgram= tutti.main.title.noSelectedProtocol= 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-05-30 19:50:25 UTC (rev 1057) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-30 20:24:51 UTC (rev 1058) @@ -1090,6 +1090,8 @@ tutti.main.menu.help=Aide tutti.main.menu.help.mnemonic=A tutti.main.menu.help.tip=Aide +tutti.main.title.action=Allegro Campagne - v %s [%s] +tutti.main.title.application=Allegro Campagne - v %s [%s] tutti.main.title.applicationName=Tutti tutti.main.title.noSelectedCruise=Pas de campagne sélectionné tutti.main.title.noSelectedProgram=Pas de série de campagne sélectionné Added: trunk/tutti-ui-swing/src/main/resources/icons/allegro_32.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/allegro_32.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/tutti-ui-swing/src/main/resources/icons/allegro_about.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/allegro_about.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1057 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com 30 May '13

30 May '13

Author: tchemit Date: 2013-05-30 21:50:25 +0200 (Thu, 30 May 2013) New Revision: 1057 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1057 Log: fixes #2538: [EXPORT GENERIQUE] c'est ti donc pourquoi que les lignes sont r?\195?\169p?\195?\169t?\195?\169es dans la table species ? Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-30 16:10:16 UTC (rev 1056) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-30 19:50:25 UTC (rev 1057) @@ -623,7 +623,7 @@ SpeciesExportModel speciesModel; - final Set<SpeciesExportRow> speciesToExport = Sets.newHashSet(); + final Map<String, SpeciesExportRow> speciesToExport = Maps.newTreeMap(); TuttiCsvUtil.TuttiRepeatableExport<SurveyExportRow> surveyExport; @@ -755,15 +755,20 @@ } public void addSpecies(Species species) { - Species fullSpecies = speciesById.get(species.getId()); - SpeciesExportRow row = new SpeciesExportRow(); - row.setSpecies(fullSpecies); - speciesToExport.add(row); + String speciesId = species.getId(); + if (!speciesToExport.containsKey(speciesId)) { + + // not treated species, add a new row + Species fullSpecies = speciesById.get(speciesId); + SpeciesExportRow row = new SpeciesExportRow(); + row.setSpecies(fullSpecies); + speciesToExport.put(speciesId, row); + } } public List<SpeciesExportRow> getSpeciesToExport() { List<SpeciesExportRow> result = - Lists.newArrayList(speciesToExport); + Lists.newArrayList(speciesToExport.values()); Collections.sort(result, new Comparator<SpeciesExportRow>() { @Override

1 0

Build failed in Jenkins: tutti #867
by admin+hudson＠codelutin.com 30 May '13

30 May '13

See <http://ci.nuiton.org/jenkins/job/tutti/867/changes> Changes: [Kevin Morin] revert some commited files [Kevin Morin] fixes #2470 [CAPTURE] modification des caractéristiques du trait non pris en compte dans les identifiants affichés ------------------------------------------ [...truncated 315 lines...] <I18nBundleEntry@c9b8aa90, locale:fr_FR, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config_fr_FR.properties> 2013-05-30 17:46:48,944 4775 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@50f5db13, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config, size:3> <I18nBundleEntry@f421d43e, locale:en_GB, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config_en_GB.properties> 2013-05-30 17:46:48,945 4776 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@3d01e5eb, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils, size:1> <I18nBundleEntry@b447fcc5, locale:en_GB, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils_en_GB.properties> 2013-05-30 17:46:48,945 4776 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@3d01e5eb, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils, size:2> <I18nBundleEntry@89ded317, locale:fr_FR, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils_fr_FR.properties> 2013-05-30 17:46:48,945 4776 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@3d01e5eb, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils, size:3> <I18nBundleEntry@1b56fe57, locale:es_ES, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils_es_ES.properties> 2013-05-30 17:46:48,945 4776 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@479dc697, bundlePrefix:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…,> size:1> <I18nBundleEntry@89a839b5, locale:en_GB, scope FULL, path:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…>> 2013-05-30 17:46:48,946 4777 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@479dc697, bundlePrefix:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…,> size:2> <I18nBundleEntry@5f3f1007, locale:fr_FR, scope FULL, path:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…>> 2013-05-30 17:46:48,946 4777 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@4759083c, bundlePrefix:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/classe…,> size:1> <I18nBundleEntry@56537c39, locale:fr_FR, scope FULL, path:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/classe…>> 2013-05-30 17:46:48,946 4777 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@4759083c, bundlePrefix:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/classe…,> size:2> <I18nBundleEntry@80bca5e7, locale:en_GB, scope FULL, path:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/classe…>> 2013-05-30 17:46:48,947 4778 [main] INFO org.nuiton.i18n.init.I18nInitializer - 6 bundle(s) found, in 16 file(s). 2013-05-30 17:46:48,947 4778 [main] INFO org.nuiton.i18n.I18nStore - 6 bundle(s) found, [16 file(s)]. 2013-05-30 17:46:48,951 4782 [main] INFO org.nuiton.i18n.I18nLanguage - Encoding UTF-8 will be used to load files 2013-05-30 17:46:48,960 4791 [main] INFO org.nuiton.i18n.I18nStore - I18nLanguage <locale: en_GB, nbStences:351>, nbEntries: 6, nbSentences: 351. 2013-05-30 17:46:48,961 4792 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.DecoratorService@1cafc935 Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.285 sec Running fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportServiceTest 2013-05-30 17:46:48,982 4813 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@10e47408 2013-05-30 17:46:48,996 4827 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export species to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,013 4844 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol - fr.ifremer.tutti.service.protocol.SpeciesRow > [null] , will create a new default one. 2013-05-30 17:46:49,072 4903 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@10e47408 2013-05-30 17:46:49,074 4905 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@cf9091c 2013-05-30 17:46:49,130 4961 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@cf9091c 2013-05-30 17:46:49,133 4964 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@49392dd5 2013-05-30 17:46:49,133 4964 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export all caracteristics to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,139 4970 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@49392dd5 2013-05-30 17:46:49,141 4972 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@28b51c44 2013-05-30 17:46:49,148 4979 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will import protocol [null] species from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,156 4987 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.service.protocol.SpeciesRow - fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol > [null] , will create a new default one. 2013-05-30 17:46:49,160 4991 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@28b51c44 2013-05-30 17:46:49,162 4993 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3a315883 2013-05-30 17:46:49,216 5047 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3a315883 2013-05-30 17:46:49,220 5051 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@61e7e602 2013-05-30 17:46:49,220 5051 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export benthos to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,224 5055 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@61e7e602 2013-05-30 17:46:49,226 5057 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3fadbf85 2013-05-30 17:46:49,227 5058 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will import protocol [null] species from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,230 5061 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3fadbf85 2013-05-30 17:46:49,233 5064 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@27f8d56c 2013-05-30 17:46:49,233 5064 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export all caracteristics to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,235 5066 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@27f8d56c 2013-05-30 17:46:49,238 5069 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@4183b9f4 2013-05-30 17:46:49,238 5069 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will import protocol caracteristic from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-05-30 17:46:49,260 5091 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@4183b9f4 Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.294 sec Running fr.ifremer.tutti.service.referential.TuttiReferentialImportExportServiceTest 2013-05-30 17:46:49,264 5095 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.referential.TuttiReferentialImportExportServiceTest 2013-05-30 17:46:49,265 5096 [main] INFO org.nuiton.util.config.ApplicationConfig - Loading configuration file (classpath) : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/test-c…> 2013-05-30 17:46:49,266 5097 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS, test [class fr.ifremer.tutti.service.referential.TuttiReferentialImportExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.01 sec Running fr.ifremer.tutti.service.export.TuttiExportServiceTest 2013-05-30 17:46:49,286 5117 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.TuttiExportServiceTest 2013-05-30 17:46:49,291 5122 [main] INFO org.nuiton.util.config.ApplicationConfig - Loading configuration file (classpath) : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/test-c…> 2013-05-30 17:46:49,293 5124 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/test/dbCG…,> test [class fr.ifremer.tutti.service.export.TuttiExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.022 sec Results : Tests run: 22, Failures: 0, Errors: 0, Skipped: 4 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ tutti-service --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti-service --- [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ tutti-service --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-service/2.3-rc-3-SNAPSHOT/tutti-service-2.3-rc-3-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-service/2.3-rc-3-SNAPSHOT/tutti-service-2.3-rc-3-SNAPSHOT.pom [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 2.3-rc-3-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target> [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.5.21:generate (default) @ tutti-ui-swing --- [INFO] use project compile scope class-path [INFO] Detects 41 modified jaxx file(s). [INFO] Generated 41 file(s) in 23.957s [INFO] [INFO] --- jaxx-maven-plugin:2.5.21:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Merge help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/fil…> [INFO] No keys to add. [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/fil…> [INFO] No keys to add. [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserJava (scan-sources) @ tutti-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] --- i18n-maven-plugin:2.5.1:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] [INFO] --- i18n-maven-plugin:2.5.1:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle en_GB contains 1388/1388 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- i18n-maven-plugin:2.5.1:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 11 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/i18n/…> [INFO] collected 11 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/i18n/…> [INFO] [INFO] --- i18n-maven-plugin:2.5.1:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle en_GB contains 1675/1836 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ tutti-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ tutti-ui-swing --- Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-c… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-u… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/metafacade… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/metaf… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Writing bundled third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 90 resources [INFO] Copying 4 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 312 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/class…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[275,43] [deprecation] getSelectedValues() in JList has been deprecated [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[84,53] error: cannot find symbol [ERROR] symbol: method getFishingOperationTitle(FishingOperation) location: class EditFishingOperationAction <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[86,23] error: method loadCatchBatch in class EditFishingOperationAction cannot be applied to given types; [INFO] 3 errors [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [6.112s] [INFO] Tutti :: Persistence .............................. SUCCESS [21.269s] [INFO] Tutti :: Service .................................. SUCCESS [10.797s] [INFO] Tutti :: UI ....................................... FAILURE [39.369s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1:19.089s [INFO] Finished at: Thu May 30 17:47:29 CEST 2013 [INFO] Final Memory: 69M/217M [INFO] ------------------------------------------------------------------------ [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-service/2.3-rc-3-SNAPSHOT/tutti-service-2.3-rc-3-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-service/2.3-rc-3-SNAPSHOT/tutti-service-2.3-rc-3-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-ui-swing/2.3-rc-3-SNAPSHOT/tutti-ui-swing-2.3-rc-3-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-ui-swing/2.3-rc-3-SNAPSHOT/tutti-ui-swing-2.3-rc-3-SNAPSHOT-third-party.properties [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-05-30_17-46-05/archive/fr.ifremer/tutti/2.3-rc-3-SNAPSHOT/tutti-2.3-rc-3-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target/tutti-2.3-rc-3-SNAPS…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-05-30_17-46-05/archive/fr.ifremer/tutti/2.3-rc-3-SNAPSHOT/tutti-2.3-rc-3-SNAPSHOT-site_fr.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-persistence/2.3-rc-3-SNAPSHOT/tutti-persistence-2.3-rc-3-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-05-30_17-46-05/archive/fr.ifremer.tutti/tutti-persistence/2.3-rc-3-SNAPSHOT/tutti-persistence-2.3-rc-3-SNAPSHOT.jar Waiting for Jenkins to finish collecting data mavenExecutionResult exceptions not empty message : Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-ui-swing: Compilation failure cause : Compilation failure Stack trace : org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-ui-swing: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:722) Caused by: org.apache.maven.plugin.CompilationFailureException: Compilation failure at org.apache.maven.plugin.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:729) at org.apache.maven.plugin.CompilerMojo.execute(CompilerMojo.java:128) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) ... 27 more Sending e-mails to: tutti-commits(a)list.forge.codelutin.com kmorin(a)codelutin.com channel stopped

1 2

Build failed in Jenkins: tutti » Tutti :: UI #867
by admin+hudson＠codelutin.com 30 May '13

30 May '13

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/867/…> Changes: [Kevin Morin] revert some commited files [Kevin Morin] fixes #2470 [CAPTURE] modification des caractéristiques du trait non pris en compte dans les identifiants affichés ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 2.3-rc-3-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.5.21:generate (default) @ tutti-ui-swing --- [INFO] use project compile scope class-path [INFO] Detects 41 modified jaxx file(s). [INFO] Generated 41 file(s) in 23.957s [INFO] [INFO] --- jaxx-maven-plugin:2.5.21:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Merge help ids to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] No keys to add. [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] No keys to add. [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserJava (scan-sources) @ tutti-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:2.5.1:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] --- i18n-maven-plugin:2.5.1:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] [INFO] --- i18n-maven-plugin:2.5.1:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle en_GB contains 1388/1388 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- i18n-maven-plugin:2.5.1:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 11 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] collected 11 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] [INFO] --- i18n-maven-plugin:2.5.1:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle en_GB contains 1675/1836 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ tutti-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ tutti-ui-swing --- Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-c… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-u… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/metafacade… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/metaf… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Writing bundled third-party file to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 90 resources [INFO] Copying 4 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 312 source files to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[275,43] [deprecation] getSelectedValues() in JList has been deprecated [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[84,53] error: cannot find symbol [ERROR] symbol: method getFishingOperationTitle(FishingOperation) location: class EditFishingOperationAction <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[86,23] error: method loadCatchBatch in class EditFishingOperationAction cannot be applied to given types; [INFO] 3 errors [INFO] -------------------------------------------------------------

1 2

r1056 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches
by kmorin＠users.forge.codelutin.com 30 May '13

30 May '13

Author: kmorin Date: 2013-05-30 18:10:16 +0200 (Thu, 30 May 2013) New Revision: 1056 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1056 Log: fix failed build Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-05-30 15:47:02 UTC (rev 1055) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-05-30 16:10:16 UTC (rev 1056) @@ -81,9 +81,7 @@ FishingOperation operation = getModel().getFishingOperation(); - String fishingOperationText = getEditAction().getFishingOperationTitle(operation); - - getEditAction().loadCatchBatch(operation, fishingOperationText, true); + getEditAction().loadCatchBatch(operation, true); } } \ No newline at end of file

1 0