fix NPE

mikekucera · mikekucera · commit d715f8a68a22 · 2024-09-20T15:15:43.000-04:00
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/heatmap/table/ColumnHeaderVerticalRenderer.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/heatmap/table/ColumnHeaderVerticalRenderer.java
@@ -102,6 +102,7 @@ public ColumnHeaderVerticalRenderer() {
 		
 		barPanel = new JPanel();
 		barPanel.setPreferredSize(new Dimension(verticalLabel.getWidth(), 5));
+		barPanel.setMaximumSize(new Dimension(1000, 5));
 		
 		add(barPanel, BorderLayout.NORTH);
 		add(verticalLabel, BorderLayout.CENTER);
@@ -114,7 +115,6 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
 		var expressionName = value.toString();
 		
 		setVerticalText(expressionName);
-		
 		setToolTipText(getToolTipText(model, col, expressionName));
 		
 		barPanel.setBackground(getBarColor(model, col));
@@ -132,8 +132,10 @@ private String abbreviate(String value) {
 	
 	private String getToolTipText(HeatMapTableModel model, int col, String expressionName) {
 		var pheno = model.getHighlight(col);
-		var compress = model.getCompress();
+		if(pheno == null)
+			return "<html><b>Expression: </b>" + expressionName + "</html>";
 		
+ 		var compress = model.getCompress();
 		var sb = new StringBuilder("<html>");
 		
 		if(compress.isDataSet()) {
@@ -196,13 +198,14 @@ private Color getBackgroundColor(HeatMapTableModel model, int col) {
 	
 	
 	private Color getBarColor(HeatMapTableModel model, int col) {
-		var pheno = model.getHighlight(col);
-		var compress = model.getCompress();
 		var defcolor = defaultColor.darker();
 		
+		var pheno = model.getHighlight(col);
 		if(pheno == null)
 			return defcolor;
 		
+		var compress = model.getCompress();
+		
 		if(compress.isDataSet()) {
 			if(model.getEnrichmentMap().isCommonExpressionValues()) {
 				var selectedDataSets = model.getDataSetsInCurrentSelection();
