From tchemit@users.forge.codelutin.com Tue Apr 23 08:12:46 2013 From: tchemit@users.forge.codelutin.com To: tutti-commits@list.forge.codelutin.com Subject: [Tutti-commits] r860 - in trunk: tutti-persistence/src/main/resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics tutti-ui-swing/src/main/resources/i18n Date: Tue, 23 Apr 2013 08:12:46 +0200 Message-ID: <20130423061246.C7B2D15F11@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6050234581021243428==" --===============6050234581021243428== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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/caracter= istics/CaracteristicMapCellComponent.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properti= es Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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=3D :fishingOperationId + AND s.batch IS NULL ORDER BY s.creationDate ]]> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/c= aracteristics/CaracteristicMapCellComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracte= ristics/CaracteristicMapCellComponent.java 2013-04-22 19:49:42 UTC (rev 859) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracte= ristics/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; =20 +import static org.nuiton.i18n.I18n._; + /** * @author kmorin * @since 1.4 @@ -92,16 +96,29 @@ } =20 public void setToolTipText(CaracteristicMap map) { - String tooltipText =3D null; + StringBuilder builder =3D new StringBuilder(); if (map !=3D null) { - tooltipText =3D "

"); + builder.append(_("tutti.caracteristicMapEditor.none.tip")); + builder.append("
" + caracteristicDecorator.toString(ca= racteristic) + - " : " + valueDecorator.toString(map.get(carac= teristic)) + "
"); + builder.append(caracteristicDecorator.toString(caracteristic= )); + builder.append(" : "); + Serializable bean =3D map.get(caracteristic); + if (bean instanceof CaracteristicQualitativeValue) { + builder.append(valueDecorator.toString(bean)); + } else { + builder.append(bean); + } + builder.append("

"); } - setToolTipText(tooltipText); + setToolTipText(builder.toString()); } =20 public static TableCellRenderer newRender(TuttiUIContext context) { Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.p= roperties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert= ies 2013-04-22 19:49:42 UTC (rev 859) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert= ies 2013-04-23 06:12:46 UTC (rev 860) @@ -28,6 +28,7 @@ tutti.attachmentEditor.field.file=3DFichier tutti.attachmentEditor.field.fileComment=3DCommentaire tutti.attachmentEditor.field.fileName=3DNom +tutti.caracteristicMapEditor.none.tip=3DPas de caract=C3=A9ristiques tutti.attachmentEditor.none.tip=3DPas de pi=C3=A8ce-jointes tutti.attachmentEditor.saveAttachment.button=3DEnregistrer tutti.attachmentEditor.saveAttachment.fail.message=3DUne erreur est survenue= lors de la sauvegarde du fichier. --===============6050234581021243428==--