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

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 Oct. 1, 2013

Oct. 1, 2013

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 Oct. 1, 2013

Oct. 1, 2013

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 Oct. 1, 2013

Oct. 1, 2013

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

r1257 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com Sept. 30, 2013

Sept. 30, 2013

Author: tchemit Date: 2013-09-30 20:19:54 +0200 (Mon, 30 Sep 2013) New Revision: 1257 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1257 Log: fix test Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-09-30 17:52:20 UTC (rev 1256) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-09-30 18:19:54 UTC (rev 1257) @@ -740,7 +740,10 @@ boolean withGear = source.getGear() != null; - Short gearRankOrder = withGear ? source.getGear().getRankOrder() : 0; + Short gearRankOrder = null; + if (withGear) { + gearRankOrder = source.getGear().getRankOrder(); + } if (gearRankOrder == null) { gearRankOrder = 1; @@ -931,8 +934,8 @@ // GearUseFeatures.Gear if (!withGear) { gearUseFeatures.setGear(null); - gearUseFeatures.setRankOrder((short)0); - } else { + gearUseFeatures.setRankOrder((short) 0); + } else { gearUseFeatures.setGear(load(GearImpl.class, source.getGear().getIdAsInt())); gearUseFeatures.setRankOrder(gearRankOrder); }

1 0

[ANN] - Tutti 2.6 released
by forge.codelutin.com Release Notification Sept. 30, 2013

Sept. 30, 2013

The Tutti team is pleased to announce the tutti-2.6 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o [CAPTURES] - Ajouter une décimale aux poids (4 décimales pour les poids en kg et une décimale pour les grammes) Issue: 3312. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] - Mise à jour de la base de données : pas de vérification au lancement Issue: 3317. Thanks to Tony Chemit. Resolved by tchemit. o [EXPORT GENERIQUE] Ne pas bloquer l'export en cas de problème sur l'élévation Issue: 3313. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] pouvoir modifier la valeur de la catégorisation d'un lot Issue: 3315. Thanks to Tony Chemit. Resolved by tchemit. o [ESPECES] Catégorisation des lots : on ne peut plus ajouter une catégorie une fois la catégorisation effectuée Issue: 3316. Thanks to Tony Chemit. Resolved by tchemit. o [EXPORT GENERIQUE] erreur à l'export si pas d'engin affecté sur l'opération Issue: 3314. Thanks to Tony Chemit. Resolved by tchemit. o [MENSURATION] ajouter bouton "réinitialiser" dans l'écran pour effacer toutes les classes de tailles et les nombres Issue: 3318. Thanks to Tony Chemit. Resolved by tchemit. o [ERGO] créer et continuer : mieux gérer l'écran entre quantification d'un lot et catégorisation Issue: 3322. Thanks to Vincent BADTS. Resolved by tchemit. o [MENSURATION] - Renseigner le champ "Type de mesure" à la saisie des mensuration avec la valeur du lot frère Issue: 3329. Thanks to Tony Chemit. Resolved by tchemit. o [PROTOCOLE] tableau espèces : impossible de sélectionner plusieurs lignes d'espèces pour supprimer Issue: 3327. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] gestion des poids dans le tableau Issue: 3330. Thanks to Tony Chemit. Resolved by tchemit. o [EXPORT SUMATRA] le nombre d'individus dans la capture est faux Issue: 2908. Thanks to Vincent BADTS. Resolved by tchemit. o [MENSURATION] Pouvoir choisir un PSFM de classe de taille non renseigné au niveau du protocole Issue: 3332. Thanks to Tony Chemit. Resolved by tchemit. o [ERGO] Permettre à l'utilisateur d'ordonner les attributs à afficher, et pas seulement le premier à afficher Issue: 3335. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [CAMPAGNE] l'option pour ajouter/modifier les caractéristiques des engins pro associés à la campagne n'est plus accessible via le clic droit Issue: 3356. Thanks to Vincent BADTS. Resolved by tchemit. o [MENSURATION] Mauvais rafraichissement des valeurs dans le tableau des espèces Issue: 3360. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] la catégorisation proposée à la création d'un lot ne tient pas compte du protocole Issue: 3324. Thanks to Vincent BADTS. Resolved by tchemit. o [PROTOCOLE] Gestion des caractéristiques "Classe de taille" sur les imports de protocole Issue: 3325. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] Mauvais enregistrement de la valeur "A Confirmer" dans les onglets Espéces et Benthos Issue: 3340. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] manque l'unité "kg" sur onglet "Résumé" boite "Capture" (poids total, poids total vrac etc.) Issue: 3341. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] harmoniser les racourcis Alt+C pour créer et continuer dans espéces et mensuration (actuellment Alt + E dans mensuration) Issue: 3344. Thanks to Vincent BADTS. Resolved by tchemit. o [PROTOCOLE] erreur si on ajoute, dans le protocole, une caractéristique à observer pour les observations individuelle Issue: 3384. Thanks to Vincent BADTS. Resolved by tchemit. Changes: o [TECH] Updates jaxx to 2.5.27 Issue: 3359. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Updates nuiton-decorator to 3.0-alpha-2 Issue: 3392. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Updates eugene to 2.7.2 Issue: 3400. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1256 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Sept. 30, 2013

Sept. 30, 2013

Author: maven-release Date: 2013-09-30 19:52:20 +0200 (Mon, 30 Sep 2013) New Revision: 1256 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1256 Log: [maven-release-plugin] prepare for next development iteration 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-09-30 17:52:14 UTC (rev 1255) +++ trunk/pom.xml 2013-09-30 17:52:20 UTC (rev 1256) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6</version> + <version>2.7-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.6</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.6 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.6 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-09-30 17:52:14 UTC (rev 1255) +++ trunk/tutti-persistence/pom.xml 2013-09-30 17:52:20 UTC (rev 1256) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6</version> + <version>2.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-09-30 17:52:14 UTC (rev 1255) +++ trunk/tutti-service/pom.xml 2013-09-30 17:52:20 UTC (rev 1256) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6</version> + <version>2.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-30 17:52:14 UTC (rev 1255) +++ trunk/tutti-ui-swing/pom.xml 2013-09-30 17:52:20 UTC (rev 1256) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6</version> + <version>2.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1255 - tags
by maven-release＠users.forge.codelutin.com Sept. 30, 2013

Sept. 30, 2013

Author: maven-release Date: 2013-09-30 19:52:14 +0200 (Mon, 30 Sep 2013) New Revision: 1255 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1255 Log: [maven-release-plugin] copy for tag tutti-2.6 Added: tags/tutti-2.6/

1 0

r1254 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Sept. 30, 2013

Sept. 30, 2013

Author: maven-release Date: 2013-09-30 19:52:08 +0200 (Mon, 30 Sep 2013) New Revision: 1254 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1254 Log: [maven-release-plugin] prepare release tutti-2.6 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-09-30 17:50:19 UTC (rev 1253) +++ trunk/pom.xml 2013-09-30 17:52:08 UTC (rev 1254) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</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</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 </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 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-09-30 17:50:19 UTC (rev 1253) +++ trunk/tutti-persistence/pom.xml 2013-09-30 17:52:08 UTC (rev 1254) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-09-30 17:50:19 UTC (rev 1253) +++ trunk/tutti-service/pom.xml 2013-09-30 17:52:08 UTC (rev 1254) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-30 17:50:19 UTC (rev 1253) +++ trunk/tutti-ui-swing/pom.xml 2013-09-30 17:52:08 UTC (rev 1254) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1253 - trunk/tutti-ui-swing
by tchemit＠users.forge.codelutin.com Sept. 30, 2013

Sept. 30, 2013

Author: tchemit Date: 2013-09-30 19:50:19 +0200 (Mon, 30 Sep 2013) New Revision: 1253 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1253 Log: optimize dependencies Modified: trunk/tutti-ui-swing/pom.xml Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-30 17:43:36 UTC (rev 1252) +++ trunk/tutti-ui-swing/pom.xml 2013-09-30 17:50:19 UTC (rev 1253) @@ -126,6 +126,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency>

1 0

r1252 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by tchemit＠users.forge.codelutin.com Sept. 30, 2013

Sept. 30, 2013

Author: tchemit Date: 2013-09-30 19:43:36 +0200 (Mon, 30 Sep 2013) New Revision: 1252 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1252 Log: refs #3333: [CAMPAGNE] pouvoir ajouter plusieur engins professionnels de m?\195?\170me type ?\195?\160 une campagne Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 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/EditGearCaracteristicsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ViewGearCaracteristicsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-09-30 16:23:08 UTC (rev 1251) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-09-30 17:43:36 UTC (rev 1252) @@ -76,6 +76,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.type.IntegerType; +import org.hibernate.type.ShortType; import org.hibernate.type.StringType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataRetrievalFailureException; @@ -334,12 +335,25 @@ Preconditions.checkNotNull(gear); Preconditions.checkNotNull(gear.getId(), "Gear 'id' must not be null or empty"); + short rankOrder; + + if (gear.getRankOrder() == null) { + rankOrder = 1; + } else { + rankOrder = gear.getRankOrder(); + } + + if (log.isInfoEnabled()) { + log.info("Get caracteristic for gear " + gear.getIdAsInt() + " - " + rankOrder); + } + CaracteristicMap result = new CaracteristicMap(); Iterator<GearPhysicalMeasurement> list = queryListTyped( "gearCaracteristics", "cruiseId", IntegerType.INSTANCE, cruise.getIdAsInt(), - "gearId", IntegerType.INSTANCE, gear.getIdAsInt()); + "gearId", IntegerType.INSTANCE, gear.getIdAsInt(), + "rankOrder", ShortType.INSTANCE, rankOrder); while (list.hasNext()) { GearPhysicalMeasurement measurement = list.next(); @@ -379,6 +393,14 @@ Preconditions.checkNotNull(gear); Preconditions.checkNotNull(gear.getId(), "Gear 'id' must not be null or empty"); + short rankOrder; + + if (gear.getRankOrder() == null) { + rankOrder = 1; + } else { + rankOrder = gear.getRankOrder(); + } + ScientificCruise scientificCruise = scientificCruiseDao.load(cruise.getIdAsInt()); if (scientificCruise == null) { throw new DataRetrievalFailureException("Could not retrieve cruise with id=" + cruise.getId()); @@ -390,7 +412,15 @@ List<Integer> measurementsToRemove = Lists.newArrayList(); - GearPhysicalFeatures gpf = gearPhysicalFeaturesDao.getGearPhysicalfeatures(fishingTrip, gear.getIdAsInt(), true); + if (log.isInfoEnabled()) { + log.info("Save caracteristic for gear " + gear.getIdAsInt() + " - " + rankOrder); + } + GearPhysicalFeatures gpf = gearPhysicalFeaturesDao.getGearPhysicalfeatures( + fishingTrip, + gear.getIdAsInt(), + rankOrder, + true); + if (gpf.getGearPhysicalMeasurements() != null) { for (GearPhysicalMeasurement measurement : gpf.getGearPhysicalMeasurements()) { Integer pmfmId = measurement.getPmfm().getId(); Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-09-30 16:23:08 UTC (rev 1251) +++ trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-09-30 17:43:36 UTC (rev 1252) @@ -202,11 +202,12 @@ LEFT OUTER JOIN gpf.gearPhysicalMeasurements gpm WHERE sc.id = :cruiseId - AND - gpf.gear.id = :gearId + AND gpf.gear.id = :gearId + AND gpf.rankOrder = :rankOrder ]]> <query-param name="cruiseId" type="java.lang.Integer"/> <query-param name="gearId" type="java.lang.Integer"/> + <query-param name="rankOrder" type="java.lang.Short"/> </query> <query cacheable="true" name="allCruiseSecondaryVessels"> 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-09-30 16:23:08 UTC (rev 1251) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-09-30 17:43:36 UTC (rev 1252) @@ -40,17 +40,14 @@ import fr.ifremer.tutti.ui.swing.util.CloseableUI; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.swing.editor.bean.BeanDoubleListModel; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; import javax.swing.JComponent; import javax.swing.JList; import javax.swing.JPopupMenu; import javax.swing.JSeparator; -import javax.swing.ListCellRenderer; import javax.swing.SwingUtilities; import java.awt.Point; import java.awt.Rectangle; @@ -326,19 +323,6 @@ gearPopupMenu.add(ui.getViewGearCaracteristicsItem(), 0); gearPopupMenu.add(ui.getEditGearCaracteristicsItem(), 0); -// DecoratorService decoratorService = -// context.getDecoratorService(); -// Decorator<Gear> decorator = getDecorator(Gear.class, DecoratorService.GEAR_WITH_RANK_ORDER); -// ListCellRenderer cellRenderer = ui.getGearList().getSelectedList().getCellRenderer(); -// ui.getGearList().getSelectedList().setCellRenderer(new DecoratorListCellRenderer(cellRenderer, decorator) { -// -// @Override -// protected Object decorateValue(Object value, int index) { -// Object result = super.decorateValue(value, index); -// return index + " - " + result; -// } -// }); - initBeanList(ui.getHeadOfMissionList(), users, model.getHeadOfMission()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditGearCaracteristicsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditGearCaracteristicsAction.java 2013-09-30 16:23:08 UTC (rev 1251) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditGearCaracteristicsAction.java 2013-09-30 17:43:36 UTC (rev 1252) @@ -25,8 +25,11 @@ */ import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author kmorin <kmorin(a)codelutin.com> @@ -34,6 +37,10 @@ */ public class EditGearCaracteristicsAction extends AbstractTuttiAction<EditCruiseUIModel, EditCruiseUI, EditCruiseUIHandler> { + /** Logger. */ + private static final Log log = + LogFactory.getLog(EditGearCaracteristicsAction.class); + protected final PersistenceService persistenceService; public EditGearCaracteristicsAction(EditCruiseUIHandler handler) { @@ -48,6 +55,10 @@ Gear gear = getUI().getContextValue(Gear.class); gear = persistenceService.getGearWithCaracteristics(gear, getDataContext().getCruise()); + + if (log.isInfoEnabled()) { + log.info("Will edit gear " + decorate(gear, DecoratorService.GEAR_WITH_RANK_ORDER)); + } editor.getModel().setGear(gear); getUI().getMainPanelLayout().setSelected(EditCruiseUIHandler.GEAR_CARACTERISTICS_CARD); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ViewGearCaracteristicsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ViewGearCaracteristicsAction.java 2013-09-30 16:23:08 UTC (rev 1251) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ViewGearCaracteristicsAction.java 2013-09-30 17:43:36 UTC (rev 1252) @@ -25,8 +25,11 @@ */ import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author kmorin <kmorin(a)codelutin.com> @@ -34,6 +37,10 @@ */ public class ViewGearCaracteristicsAction extends AbstractTuttiAction<EditCruiseUIModel, EditCruiseUI, EditCruiseUIHandler> { + /** Logger. */ + private static final Log log = + LogFactory.getLog(ViewGearCaracteristicsAction.class); + protected final PersistenceService persistenceService; public ViewGearCaracteristicsAction(EditCruiseUIHandler handler) { @@ -48,6 +55,11 @@ Gear gear = getUI().getContextValue(Gear.class); gear = persistenceService.getGearWithCaracteristics(gear, getDataContext().getCruise()); + + if (log.isInfoEnabled()) { + log.info("Will view gear " + decorate(gear, DecoratorService.GEAR_WITH_RANK_ORDER)); + } + editor.getModel().setGear(gear); getUI().getMainPanelLayout().setSelected(EditCruiseUIHandler.GEAR_CARACTERISTICS_CARD); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-09-30 16:23:08 UTC (rev 1251) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-09-30 17:43:36 UTC (rev 1252) @@ -450,6 +450,8 @@ TuttiLocation subStrata = bean.getSubStrata(); TuttiLocation location = bean.getLocation(); + PersistenceService persistenceService = getContext().getPersistenceService(); + Cruise cruise = bean.getCruise(); if (cruise != null) { @@ -457,7 +459,8 @@ // add a equals on id + rankOrder List<Gear> gears = Lists.newArrayList(); for (Gear gear : cruise.getGear()) { - gears.add(Gears.newGearWithRankOrder(gear)); + Gear gearWithCaracteristics = persistenceService.getGearWithCaracteristics(gear, cruise); + gears.add(Gears.newGearWithRankOrder(gearWithCaracteristics)); } ui.getGearComboBox().setData(gears); } @@ -500,7 +503,7 @@ if (objectId != null) { List<Attachment> attachments = - getContext().getPersistenceService().getAllAttachments( + persistenceService.getAllAttachments( editFishingOperationUIModel.getObjectType(), objectId); 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-09-30 16:23:08 UTC (rev 1251) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-09-30 17:43:36 UTC (rev 1252) @@ -26,18 +26,20 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Gear; -import fr.ifremer.tutti.persistence.entities.referential.Gears; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.service.TuttiCsvUtil; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.operation.fishing.AbstractCaracteristicTabUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.GearUseFeatureTabUIModel; @@ -54,19 +56,26 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXDatePicker; +import org.nuiton.csv.ValueFormatter; +import org.nuiton.decorator.Decorator; import javax.swing.JButton; +import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JTabbedPane; import java.awt.Color; import java.awt.Component; import java.awt.event.ActionEvent; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.io.Serializable; import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -259,16 +268,69 @@ "Could not find cruise in ui context"); ui.getMultirigAggregationField().setEnabled(cruise.getMultirigNumber() != 1); - // add a equals on id + rankOrder - List<Gear> gears = Lists.newArrayList(); - for (Gear gear : cruise.getGear()) { - gears.add(Gears.newGearWithRankOrder(gear)); - } initBeanFilterableComboBox(ui.getGearComboBox(), - gears, + Lists.<Gear>newArrayList(), null, DecoratorService.GEAR_WITH_RANK_ORDER); + final JComboBox combobox = ui.getGearComboBox().getCombobox(); + combobox.addItemListener(new ItemListener() { + + Map<Gear, String> tips = Maps.newHashMap(); + + public void itemStateChanged(ItemEvent e) { + Object item = e.getItem(); + if (e.getStateChange() == ItemEvent.SELECTED) { + if (log.isInfoEnabled()) { + log.info("itemStateChanged selected " + item + " - " + (item != null ? item.getClass() : null)); + } + + JComponent jC = (JComponent) combobox.getEditor().getEditorComponent(); + String toolTipText; + + if (item == null) { + toolTipText = ""; + } else { + + Gear gear = (Gear) item; + + if (tips.containsKey(gear)) { + + toolTipText = tips.get(gear); + } else { + + Decorator<Caracteristic> decorator = getDecorator(Caracteristic.class, DecoratorService.CARACTERISTIC_WITH_UNIT); + ValueFormatter<Serializable> caracteristicValueFormatter = TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER; + StringBuilder sb = new StringBuilder("<html><body>"); + if (gear.getCaracteristics() != null && !gear.getCaracteristics().isEmpty() ) { + + // got some caracteristics + sb.append("<ul>"); + for (Map.Entry<Caracteristic, Serializable> entry : gear.getCaracteristics().entrySet()) { + Caracteristic key = entry.getKey(); + String keyStr = decorator.toString(key); + Serializable value = entry.getValue(); + String valueStr = caracteristicValueFormatter.format(value); + sb.append("<li><strong>").append(keyStr).append("</strong> :"); + sb.append(valueStr).append("</li>"); + } + sb.append("</ul>"); + } else { + + sb.append("<i>").append("Pas de caractéristiques").append("</i>"); + } + sb.append("</body></html>"); + + toolTipText = sb.toString(); + tips.put(gear, toolTipText); + } + } + + jC.setToolTipText(toolTipText); + } + } + }); + Program program = getDataContext().getProgram(); Preconditions.checkNotNull(program, "Could not find program in ui context");

1 0