[Fudaa-svn-commit] SF.net SVN: fudaa:[8130] trunk/framework/ebli-1d/src/main/java/org/fudaa/ ebli/courbe

[<de...@us...>]

Revision: 8130
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8130&view=rev
Author:   deniger
Date:     2012-12-14 09:58:50 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
    trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java	2012-12-14 07:21:48 UTC (rev 8129)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxe.java	2012-12-14 09:58:50 UTC (rev 8130)
@@ -93,6 +93,7 @@
   protected boolean isTitreCentre_ = true;
   protected TickIterator reuseIterator_;
   protected Object key;
+  protected Object userObject;
 
   public EGAxe() {
     titre_ = "";
@@ -109,6 +110,14 @@
     return isDiscret_;
   }
 
+  public void setUserObject(Object userObject) {
+    this.userObject = userObject;
+  }
+
+  public Object getUserObject() {
+    return userObject;
+  }
+
   public CtuluRange getRange() {
     return range_ == null ? new CtuluRange() : new CtuluRange(range_);
   }
@@ -481,8 +490,6 @@
   public CtuluNumberFormatI getSpecificDetailFormat() {
     return specificDetailFormat_;
   }
-  
-  
 
   public boolean isTitreVisible() {
     return titreVisible_;
@@ -659,7 +666,7 @@
   }
 
   /**
-   * 
+   *
    * @param _specificFormat format used for tooltips.
    */
   public final void setSpecificDetailFormat(final CtuluNumberFormatI _specificFormat) {

Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java	2012-12-14 07:21:48 UTC (rev 8129)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableGraphePanel.java	2012-12-14 09:58:50 UTC (rev 8130)
@@ -35,6 +35,7 @@
 import org.fudaa.ctulu.CtuluDoubleParser;
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.editor.CtuluValueEditorI;
+import org.fudaa.ctulu.gui.CtuluCellDecorator;
 import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
 import org.fudaa.ctulu.gui.CtuluLibSwing;
 import org.fudaa.ctulu.gui.CtuluSelectionListTableModelUpdater;
@@ -430,26 +431,37 @@
       return false;
     }
   }
-  final TableCellRenderer renderer_ = new CtuluCellTextRenderer() {
+
+  public CtuluCellTextRenderer getDefaultRenderer() {
+    return renderer_;
+  }
+  
+  
+  
+  
+  final CtuluCellTextRenderer renderer_ = new CtuluCellTextRenderer() {
     @Override
     public Component getTableCellRendererComponent(JTable _table, Object _value, boolean _isSelected,
             boolean _hasFocus, int _row, int _column) {
+      setToolTipText(CtuluLibString.EMPTY_STRING);
       Component res = super.getTableCellRendererComponent(_table, _value, _isSelected, _hasFocus, _row, _column);
       if (_value != null) {
         boolean ok = getSpecTableModel().isPointDrawn(_row);
         res.setEnabled(ok);
-        setToolTipText(CtuluLibString.EMPTY_STRING);
         if (!ok && _column == 1) {
           setText(CtuluLibString.EMPTY_STRING);
         }
         SpecTableModel model = (SpecTableModel) _table.getModel();
-        if (_column == model.getXColIndex()) {
-          setToolTipText(model.getXDetailAsString(_row));
-        } else if (_column == model.getYColIndex()) {
-          setToolTipText(model.getYDetailAsString(_row));
+        //on modifie le tooltip que si non modifi\xE9 par le decorator eventuelle...
+        if (!CtuluLibString.EMPTY_STRING.equals(getToolTipText())) {
+          if (_column == model.getXColIndex()) {
+            setToolTipText(model.getXDetailAsString(_row));
+          } else if (_column == model.getYColIndex()) {
+            setToolTipText(model.getYDetailAsString(_row));
+          }
         }
       }
-      return res;
+      return this;
     }
 
     @Override

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.