# HG changeset patch
# User Matthias Bläsing <matthiasblaesing1@googlemail.com>
# Date 1329508404 -3600
# Branch dbfixes
# Node ID d99a5c4879da8e6b1301bf72c31dca27c06dfbee
# Parent  e2994eb17390d066157a4fe64bfc7df9d322f11b
Disable HTML-Rendering in cellrenderers for rendering resultset contents. Handles the tooltip case and the cell rendering.

diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/CellFocusCustomRenderer.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/CellFocusCustomRenderer.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/CellFocusCustomRenderer.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/CellFocusCustomRenderer.java
@@ -68,6 +68,7 @@
         } else {
             setBackground(table.getBackground());
         }
+        this.putClientProperty("html.disable", Boolean.TRUE);
         return this;
     }
 }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
@@ -125,7 +125,9 @@
         } else if (value instanceof Number) {
             return NUMNBER_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
         } else if (DataViewUtils.isSQLConstantString(value)) {
-            return DEFAULT_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+            Component c = DEFAULT_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+            setTableCellToolTip(c, value);
+            return c;
         } else if (value instanceof Boolean) {
             return BOOLEAN_RENDERER.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
         } else if (value instanceof Blob) {
@@ -203,11 +205,9 @@
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
         Component c = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
         c.setFont(new Font(c.getFont().getFamily(), Font.ITALIC, 9));
-        ((JLabel) c).setToolTipText(value.toString());
         if (!isSelected) {
             c.setForeground(Color.DARK_GRAY);
         }
-
         return c;
     }
 }