From kmorin@users.forge.codelutin.com Thu Mar 14 17:58:31 2013 From: kmorin@users.forge.codelutin.com To: tutti-commits@list.forge.codelutin.com Subject: [Tutti-commits] r623 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: content/operation/catches/species content/operation/catches/species/frequency util/table Date: Thu, 14 Mar 2013 17:58:31 +0100 Message-ID: <20130314165831.94BAA15836@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2854224352503009458==" --===============2854224352503009458== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: kmorin Date: 2013-03-14 17:58:31 +0100 (Thu, 14 Mar 2013) New Revision: 623 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/623 Log: fixes #2054 [CAPTURE] - Tableau et largeur des colonnes - Mauvaise visualisat= ion quand libell?\195?\169 trop long Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera= tion/catches/species/SampleCategoryComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera= tion/catches/species/frequency/FrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/Ab= stractTuttiTableUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten= t/operation/catches/species/SampleCategoryComponent.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/content/oper= ation/catches/species/SampleCategoryComponent.java 2013-03-14 16:14:31 UTC (r= ev 622) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper= ation/catches/species/SampleCategoryComponent.java 2013-03-14 16:58:31 UTC (r= ev 623) @@ -44,6 +44,7 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.io.Serializable; +import javax.swing.JComponent; import jaxx.runtime.JAXXUtil; =20 /** @@ -224,13 +225,11 @@ String text =3D null; if (sampleCategory !=3D null) { C categoryValue =3D sampleCategory.getCategoryValue(); - if (categoryValue =3D=3D null) { - text =3D ""; - } else { + if (categoryValue !=3D null) { Float number =3D sampleCategory.getCategoryWeight(); Float computedNumber =3D sampleCategory.getComputedWeigh= t(); =20 - text =3D "" + categoryDecorator.toString(categoryV= alue) + " /"; + text =3D "" += categoryDecorator.toString(categoryValue) + " /"; =20 if (sampleCategory.isSubSample()) { text +=3D "/"; @@ -253,16 +252,20 @@ text +=3D "-"; } =20 - text +=3D ""; + text +=3D ""; } } =20 - return delegate.getTableCellRendererComponent(table, - text, - isSelected, - hasFocus, - row, - column); + JComponent result =3D + (JComponent) delegate.getTableCellRendererComponent(tabl= e, + text, + isSele= cted, + hasFoc= us, + row, + column= ); + result.setToolTipText(text); + + return result; } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten= t/operation/catches/species/frequency/FrequencyCellComponent.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/content/oper= ation/catches/species/frequency/FrequencyCellComponent.java 2013-03-14 16:14:= 31 UTC (rev 622) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper= ation/catches/species/frequency/FrequencyCellComponent.java 2013-03-14 16:58:= 31 UTC (rev 623) @@ -93,6 +93,7 @@ text =3D " - "; } setText(text); + setToolTipText(text); } =20 public static TableCellRenderer newRender(Color computedDataColor) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/t= able/AbstractTuttiTableUIHandler.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/table/A= bstractTuttiTableUIHandler.java 2013-03-14 16:14:31 UTC (rev 622) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/A= bstractTuttiTableUIHandler.java 2013-03-14 16:58:31 UTC (rev 623) @@ -468,7 +468,7 @@ =20 Preconditions.checkNotNull(decorator); =20 - DecoratorTableCellRenderer result =3D new DecoratorTableCellRenderer= (decorator); + DecoratorTableCellRenderer result =3D new DecoratorTableCellRenderer= (decorator, true); return result; } =20 --===============2854224352503009458==--