From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 16 Jul 2019 10:27:05 +0000 (+0100)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~124
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7d26c9b146fca4d60af1a85366437d4aae54196a;hp=1a9aca287814e1c2dc203df964ca81522b963a65;p=jalview.git

Merge branch 'develop' into Jalview-JS/develop
---

diff --git a/src/jalview/fts/core/DecimalFormatTableCellRenderer.java b/src/jalview/fts/core/DecimalFormatTableCellRenderer.java
index 8a8e7ab..2453742 100644
--- a/src/jalview/fts/core/DecimalFormatTableCellRenderer.java
+++ b/src/jalview/fts/core/DecimalFormatTableCellRenderer.java
@@ -61,16 +61,15 @@ public class DecimalFormatTableCellRenderer extends DefaultTableCellRenderer
     super.setHorizontalAlignment(JLabel.RIGHT);
   }
 
+  /**
+   * Adapts the default method to ensure that double values are formatted for
+   * display
+   */
   @Override
   public Component getTableCellRendererComponent(JTable table, Object value,
           boolean isSelected, boolean hasFocus, int row, int column)
   {
-    if (value == null)
-    {
-      return null;
-    }
-
-    value = formatter.format(value);
+    value = value == null ? "" : formatter.format(value);
 
     return super.getTableCellRendererComponent(table, value, isSelected,
             hasFocus, row, column);