Consolidate on preferred getExcelWriter override (#881)

labkey-jeckels · web-flow · commit c99237aef9b9 · 2025-05-03T15:02:49.000-07:00
diff --git a/ms2/src/org/labkey/ms2/compare/SpectraCountQueryView.java b/ms2/src/org/labkey/ms2/compare/SpectraCountQueryView.java
@@ -36,6 +36,7 @@
 import org.springframework.validation.BindException;
 
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * User: jeckels
@@ -70,9 +71,9 @@ protected TableInfo createTable()
     }
 
     @Override
-    public ExcelWriter getExcelWriter(ExcelWriter.ExcelDocumentType docType) throws IOException
+    public ExcelWriter getExcelWriter(ExcelWriter.ExcelDocumentType docType, @Nullable Map<String, String> renameColumnMap) throws IOException
     {
-        ExcelWriter result = super.getExcelWriter(docType);
+        ExcelWriter result = super.getExcelWriter(docType, renameColumnMap);
         String header = getExportHeader();
         if (header != null)
         {

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`	`import org.springframework.validation.BindException;`
`37`	`37`
`38`	`38`	`import java.io.IOException;`
	`39`	`+import java.util.Map;`
`39`	`40`
`40`	`41`	`/**`
`41`	`42`	`* User: jeckels`
`@@ -70,9 +71,9 @@ protected TableInfo createTable()`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`@Override`
`73`		`- public ExcelWriter getExcelWriter(ExcelWriter.ExcelDocumentType docType) throws IOException`
	`74`	`+ public ExcelWriter getExcelWriter(ExcelWriter.ExcelDocumentType docType, @Nullable Map<String, String> renameColumnMap) throws IOException`
`74`	`75`	`{`
`75`		`- ExcelWriter result = super.getExcelWriter(docType);`
	`76`	`+ ExcelWriter result = super.getExcelWriter(docType, renameColumnMap);`
`76`	`77`	`String header = getExportHeader();`
`77`	`78`	`if (header != null)`
`78`	`79`	`{`