# HG changeset patch # User Matthias Bläsing # Date 1329516969 -3600 # Branch dbfixes # Node ID 8b5e4d9846b34799ba182d9bf5efa919010c506d # Parent d99a5c4879da8e6b1301bf72c31dca27c06dfbee Disable HTML-Rendering in column headers diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java --- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java @@ -50,6 +50,7 @@ import org.netbeans.modules.db.dataview.table.celleditor.DateTimePickerCellEditor; import org.netbeans.modules.db.dataview.table.celleditor.BooleanTableCellEditor; import java.awt.Color; +import java.awt.Component; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseEvent; @@ -61,15 +62,8 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.swing.JLabel; -import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.SwingUtilities; -import javax.swing.table.DefaultTableModel; -import javax.swing.table.JTableHeader; -import javax.swing.table.TableColumn; -import javax.swing.table.TableColumnModel; -import javax.swing.table.TableModel; +import javax.swing.*; +import javax.swing.table.*; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.JXTableHeader; import org.jdesktop.swingx.decorator.ColorHighlighter; @@ -81,6 +75,7 @@ import org.jdesktop.swingx.table.DatePickerCellEditor; import org.netbeans.modules.db.dataview.meta.DBColumn; import org.netbeans.modules.db.dataview.output.DataView; +import org.netbeans.modules.db.dataview.util.DataViewUtils; import org.netbeans.modules.db.dataview.util.DateType; import org.netbeans.modules.db.dataview.util.TimestampType; @@ -289,6 +284,24 @@ } @Override + protected TableCellRenderer createDefaultRenderer() { + final TableCellRenderer inner = super.createDefaultRenderer(); + TableCellRenderer result = new TableCellRenderer() { + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + StringBuilder sb = new StringBuilder(); + sb.append(""); + if(value != null) { + sb.append(DataViewUtils.escapeHTML(value.toString())); + } + sb.append(""); + return inner.getTableCellRendererComponent(table, sb.toString(), isSelected, hasFocus, row, column); + } + }; + return result; + } + + @Override public String getToolTipText(MouseEvent e) { return getColumnToolTipText(e); }