Author: tchemit Date: 2013-04-23 08:12:46 +0200 (Tue, 23 Apr 2013) New Revision: 860 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/860 Log: - fix accidental batch loading (was loading individual observation too) - fix caracteristicmapcell component tooltip Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-04-22 19:49:42 UTC (rev 859) +++ trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-04-23 06:12:46 UTC (rev 860) @@ -330,6 +330,7 @@ SampleImpl s WHERE s.fishingOperation.id= :fishingOperationId + AND s.batch IS NULL ORDER BY s.creationDate ]]> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-04-22 19:49:42 UTC (rev 859) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-04-23 06:12:46 UTC (rev 860) @@ -31,6 +31,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import jaxx.runtime.SwingUtil; +import org.apache.commons.collections.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.decorator.Decorator; @@ -48,7 +49,10 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.io.Serializable; +import static org.nuiton.i18n.I18n._; + /** * @author kmorin <kmorin@codelutin.com> * @since 1.4 @@ -92,16 +96,29 @@ } public void setToolTipText(CaracteristicMap map) { - String tooltipText = null; + StringBuilder builder = new StringBuilder(); if (map != null) { - tooltipText = "<html><ul>"; + builder.append("<html><ul>"); + if (MapUtils.isEmpty(map)) { + builder.append("<li>"); + builder.append(_("tutti.caracteristicMapEditor.none.tip")); + builder.append("</li>"); + } for (Caracteristic caracteristic : map.keySet()) { - tooltipText += "<li>" + caracteristicDecorator.toString(caracteristic) + - " : " + valueDecorator.toString(map.get(caracteristic)) + "</li>"; + builder.append("<li>"); + builder.append(caracteristicDecorator.toString(caracteristic)); + builder.append(" : "); + Serializable bean = map.get(caracteristic); + if (bean instanceof CaracteristicQualitativeValue) { + builder.append(valueDecorator.toString(bean)); + } else { + builder.append(bean); + } + builder.append("</li>"); } - tooltipText += "</ul></html>"; + builder.append("</ul></html>"); } - setToolTipText(tooltipText); + setToolTipText(builder.toString()); } public static TableCellRenderer newRender(TuttiUIContext context) { 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-04-22 19:49:42 UTC (rev 859) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-23 06:12:46 UTC (rev 860) @@ -28,6 +28,7 @@ tutti.attachmentEditor.field.file=Fichier tutti.attachmentEditor.field.fileComment=Commentaire tutti.attachmentEditor.field.fileName=Nom +tutti.caracteristicMapEditor.none.tip=Pas de caractéristiques tutti.attachmentEditor.none.tip=Pas de pièce-jointes tutti.attachmentEditor.saveAttachment.button=Enregistrer tutti.attachmentEditor.saveAttachment.fail.message=Une erreur est survenue lors de la sauvegarde du fichier.