[GitHub] matthiasblaesing closed pull request #254: [NETBEANS-68] Fix NULL handling after fix in 1d362fa77521762a9af99792620414086b868f76

[GitBox <gi...@apache.org>]

matthiasblaesing closed pull request #254: [NETBEANS-68] Fix NULL handling after fix in 1d362fa77521762a9af99792620414086b868f76
URL: https://github.com/apache/incubator-netbeans/pull/254
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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
index 781a31eb5..d8843f074 100644
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
@@ -170,7 +170,7 @@ protected void setDefaultCellRenderers() {
         setDefaultRenderer(Object.class, new ResultSetCellRenderer());
         setDefaultRenderer(String.class, new ResultSetCellRenderer());
         setDefaultRenderer(Number.class, new ResultSetCellRenderer());
-        setDefaultRenderer(Boolean.class, new BooleanCellRenderer());
+        setDefaultRenderer(Boolean.class, new ResultSetCellRenderer());
         setDefaultRenderer(java.sql.Date.class, new ResultSetCellRenderer(ResultSetCellRenderer.Date_TO_STRING));
         setDefaultRenderer(java.sql.Time.class, new ResultSetCellRenderer(ResultSetCellRenderer.TIME_TO_STRING));
         setDefaultRenderer(java.sql.Timestamp.class, new ResultSetCellRenderer(ResultSetCellRenderer.DATETIME_TO_STRING));
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
index 110a54d5a..7a1edc988 100644
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetTableCellEditor.java
@@ -91,7 +91,7 @@ public ResultSetTableCellEditor(final JCheckBox checkBox) {
             @Override
             public void setValue(Object value) {
                 val = value;
-                checkBox.setSelected((value != null) ? ((Boolean) value) : false);
+                checkBox.setSelected((value instanceof Boolean) ? ((Boolean) value) : false);
             }
 
             @Override


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services