Merge pull request #447 from meiMingle/fix_issue_445

Fix issue #445

Author: ochedru

fastexcel-writer/src/main/java/org/dhatim/fastexcel/Table.java

@@ -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);
 
@@ -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;
@@ -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>");
         }
     }
@@ -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);