Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #445 #447

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue #445 #447

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions fastexcel-writer/src/main/java/org/dhatim/fastexcel/Table.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

import java.io.IOException;

public class Table{
public class Table {
int index;
private String name ;
private String name;
private String displayName;
private boolean totalsRowShown = false;
private Range range;
private String[] headers ;
private final Range range;
private final String[] headers;

private final TableStyleInfo styleInfo = new TableStyleInfo(this);

Expand Down Expand Up @@ -46,10 +46,12 @@ public TableStyleInfo styleInfo() {

public class TableStyleInfo {
private final Table table;
TableStyleInfo(Table table){

TableStyleInfo(Table table) {
this.table = table;
}
private String name ;

private String name;
private boolean showFirstColumn = false;
private boolean showLastColumn = false;
private boolean showRowStripes = true;
Expand Down Expand Up @@ -81,11 +83,11 @@ public TableStyleInfo setShowColumnStripes(boolean showColumnStripes) {
}

public void write(Writer w) throws IOException {
w.append("<tableStyleInfo name=\""+(name==null||"".equals(name)?"TableStyleMedium2":styleInfo.name)+"\" ");
w.append("showFirstColumn=\""+(showFirstColumn?1:0)+"\" ");
w.append("showLastColumn=\""+(showLastColumn?1:0)+"\" ");
w.append("showRowStripes=\""+(showRowStripes?1:0)+"\" ");
w.append("showColumnStripes=\""+(showColumnStripes?1:0)+"\"/>");
w.append("<tableStyleInfo name=\"" + (name == null || "".equals(name) ? "TableStyleMedium2" : styleInfo.name) + "\" ");
w.append("showFirstColumn=\"" + (showFirstColumn ? 1 : 0) + "\" ");
w.append("showLastColumn=\"" + (showLastColumn ? 1 : 0) + "\" ");
w.append("showRowStripes=\"" + (showRowStripes ? 1 : 0) + "\" ");
w.append("showColumnStripes=\"" + (showColumnStripes ? 1 : 0) + "\"/>");
w.append("</table>");
}
}
Expand All @@ -94,15 +96,15 @@ void write(Writer w) throws IOException {
w.append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>");
w.append("<table xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" ");
w.append("id=\"" + index + "\" ");
w.append("name=\""+(name==null||"".equals(name)?"Table"+index:name)+"\" ");
w.append("displayName=\"" + (displayName==null||"".equals(displayName)?"Table"+index:displayName) + "\" ");
w.append("name=\"" + (name == null || name.isEmpty() ? "Table" + index : XmlEscapeHelper.escape(name)) + "\" ");
w.append("displayName=\"" + (displayName == null || displayName.isEmpty() ? "Table" + index : XmlEscapeHelper.escape(displayName)) + "\" ");
w.append("ref=\"" + range.toString() + "\" ");
w.append("totalsRowShown=\"" + (totalsRowShown ? 1 : 0) + "\">");
w.append("<autoFilter ref=\"" + range.toString() + "\"/>");
int count = range.getRight() - range.getLeft() + 1;
w.append("<tableColumns count=\"" + count + "\">");
for (int i = 0; i < count; i++) {
w.append("<tableColumn id=\"" + (i + 1) + "\" name=\"" + headers[i] + "\"/>");
w.append("<tableColumn id=\"" + (i + 1) + "\" name=\"" + XmlEscapeHelper.escape(headers[i]) + "\"/>");
}
w.append("</tableColumns>");
styleInfo.write(w);
Expand Down