Implement table renderers the proper way.

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/heatmap/table/HeatMapCellRenderer.java

@@ -20,7 +20,8 @@
 import org.baderlab.csplugins.enrichmentmap.model.EMDataSet;
 import org.baderlab.csplugins.enrichmentmap.model.Transform;
 
-public class HeatMapCellRenderer implements TableCellRenderer {
+@SuppressWarnings("serial")
+public class HeatMapCellRenderer extends JLabel implements TableCellRenderer {
 
 	private final Map<Pair<EMDataSet,Transform>,Optional<DataSetColorRange>> colorRanges = new HashMap<>();
 	private final static DecimalFormat format = new DecimalFormat("###.##");
@@ -29,29 +30,30 @@ public class HeatMapCellRenderer implements TableCellRenderer {
 
 	@Override
 	public JLabel getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int col) {
-		JLabel label = new JLabel();
-		label.setOpaque(true); //MUST do this for background to show up.
+		setOpaque(true); //MUST do this for background to show up.
 
 		if(value instanceof Number) {
 			double d = ((Number)value).doubleValue();
 
 			HeatMapTableModel model = (HeatMapTableModel) table.getModel();
 			Color color = getColorFor(model, col, d);
-			label.setBackground(color);
+			setBackground(color);
 			Border border = BorderFactory.createMatteBorder(1, 1, 1, 1, isSelected ? table.getSelectionForeground() : color);
-			label.setBorder(border);
+			setBorder(border);
 
 			String text = getText(d);
-			label.setToolTipText(text);
+			setToolTipText(text);
 
 			if(showValue && Double.isFinite(d)) {
-				label.setText(text);
-				label.setFont(new Font((UIManager.getFont("TableHeader.font")).getName(), Font.PLAIN, (UIManager.getFont("TableHeader.font")).getSize()-2));
-	      	   	label.setHorizontalAlignment(SwingConstants.RIGHT);
+				setText(text);
+				setFont(new Font((UIManager.getFont("TableHeader.font")).getName(), Font.PLAIN, (UIManager.getFont("TableHeader.font")).getSize()-2));
+	      	   	setHorizontalAlignment(SwingConstants.RIGHT);
 			}
+		} else {
+			setText("");
 		}
 
-		return label;
+		return this;
 	}
 
 

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/heatmap/table/RankValueRenderer.java

@@ -4,9 +4,7 @@
 import java.awt.Component;
 import java.text.DecimalFormat;
 
-import javax.swing.JLabel;
 import javax.swing.JTable;
-import javax.swing.UIManager;
 import javax.swing.table.DefaultTableCellRenderer;
 
 import org.baderlab.csplugins.enrichmentmap.view.heatmap.ExportTXTTask;
@@ -19,25 +17,19 @@ public class RankValueRenderer extends DefaultTableCellRenderer {
 
 	@Override
 	public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int col) {
+		super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, col);
+		
 		if(value instanceof RankValue) {
 			RankValue rankValue = (RankValue) value;
-			
-			JLabel label = new JLabel(ExportTXTTask.getRankText(format, rankValue));
+			setText(ExportTXTTask.getRankText(format, rankValue));
 
 			if (rankValue.isSignificant()) {
-				label.setBackground(SIGNIFICANT_COLOR);
-				label.setOpaque(true);
-//				label.setFont(new Font((UIManager.getFont("TableHeader.font")).getName(), Font.BOLD, (UIManager.getFont("TableHeader.font")).getSize() + 2));
-				label.setFont(UIManager.getFont("TableHeader.font"));
-			} else {
-				label.setBackground(this.getBackground());
-				label.setForeground(UIManager.getColor("TableHeader.foreground"));
-				label.setFont(UIManager.getFont("TableHeader.font"));
+				setBackground(SIGNIFICANT_COLOR);
+				setOpaque(true);
 			}
-			
-			return label;
 		}
-		return new JLabel();
+		
+		return this;
 	}
 
 }