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 - Tutti-commits

14 Mar 2013

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 visualisation quand libell?\195?\169 trop long

Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java
===================================================================

--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java	2013-03-14 16:14:31 UTC (rev 622)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java	2013-03-14 16:58:31 UTC (rev 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;
 
 /**
@@ -224,13 +225,11 @@
             String text = null;
             if (sampleCategory != null) {
                 C categoryValue = sampleCategory.getCategoryValue();
-                if (categoryValue == null) {
-                    text = "";
-                } else {
+                if (categoryValue != null) {
                     Float number = sampleCategory.getCategoryWeight();
                     Float computedNumber = sampleCategory.getComputedWeight();
 
-                    text = "<html>" + categoryDecorator.toString(categoryValue) + " /";
+                    text = "<html><span style='white-space: nowrap;'>" + categoryDecorator.toString(categoryValue) + " /";
 
                     if (sampleCategory.isSubSample()) {
                         text += "/";
@@ -253,16 +252,20 @@
                         text += "-";
                     }
 
-                    text += "</html>";
+                    text += "</span></html>";
                 }
             }
 
-            return delegate.getTableCellRendererComponent(table,
-                                                          text,
-                                                          isSelected,
-                                                          hasFocus,
-                                                          row,
-                                                          column);
+            JComponent result =
+                    (JComponent) delegate.getTableCellRendererComponent(table,
+                                                                      text,
+                                                                      isSelected,
+                                                                      hasFocus,
+                                                                      row,
+                                                                      column);
+            result.setToolTipText(text);
+
+            return result;
         }
     }
 }

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/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/operation/catches/species/frequency/FrequencyCellComponent.java	2013-03-14 16:58:31 UTC (rev 623)
@@ -93,6 +93,7 @@
             text = " - ";
         }
         setText(text);
+        setToolTipText(text);
     }
 
     public static TableCellRenderer newRender(Color computedDataColor) {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java	2013-03-14 16:14:31 UTC (rev 622)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java	2013-03-14 16:58:31 UTC (rev 623)
@@ -468,7 +468,7 @@
 
         Preconditions.checkNotNull(decorator);
 
-        DecoratorTableCellRenderer result = new DecoratorTableCellRenderer(decorator);
+        DecoratorTableCellRenderer result = new DecoratorTableCellRenderer(decorator, true);
         return result;
     }

    

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

kmorin＠users.forge.codelutin.com

tags

participants (1)