Merge pull request #29 from stjohnb/correctly-detect-date-formatted-cells

Correctly detect date formatted cells

Author: monitorjbl

src/main/java/com/monitorjbl/xlsx/StreamingReader.java

@@ -129,6 +129,18 @@ private void handleEvent(XMLEvent event) throws SAXException {
         } else {
           currentCell.setType("n");
         }
+
+        Attribute style = startElement.getAttributeByName(new QName("s"));
+
+        if(style != null){
+          String indexStr = style.getValue();
+          try{
+            int index = Integer.parseInt(indexStr);
+            currentCell.setCellStyle(stylesTable.getStyleAt(index));
+          } catch(NumberFormatException nfe) {
+            log.warn("Ignoring invalid style index {}", indexStr);
+          }
+        }
       }
 
       // Clear contents cache

src/main/java/com/monitorjbl/xlsx/impl/StreamingCell.java

@@ -25,6 +25,7 @@ public class StreamingCell implements Cell {
   private Short numericFormatIndex;
   private String type;
   private Row row;
+  private CellStyle cellStyle;
 
   public StreamingCell(int columnIndex, int rowIndex) {
     this.columnIndex = columnIndex;
@@ -75,6 +76,11 @@ public void setRow(Row row) {
     this.row = row;
   }
 
+  @Override
+  public void setCellStyle(CellStyle cellStyle) {
+    this.cellStyle = cellStyle;
+  }
+
   /* Supported */
 
   /**
@@ -176,6 +182,17 @@ public Date getDateCellValue() {
     return rawContents == null ? null : HSSFDateUtil.getJavaDate(getNumericCellValue());
   }
 
+  /**
+   * Returns the style of the cell
+   *
+   * @return the style of the cell
+   */
+  @Override
+  public CellStyle getCellStyle() {
+    return this.cellStyle;
+  }
+
+
   /* Not supported */
 
   /**
@@ -298,22 +315,6 @@ public byte getErrorCellValue() {
     throw new NotSupportedException();
   }
 
-  /**
-   * Not supported
-   */
-  @Override
-  public void setCellStyle(CellStyle style) {
-    throw new NotSupportedException();
-  }
-
-  /**
-   * Not supported
-   */
-  @Override
-  public CellStyle getCellStyle() {
-    throw new NotSupportedException();
-  }
-
   /**
    * Not supported
    */

src/test/java/com/monitorjbl/xlsx/StreamingReaderTest.java

@@ -2,6 +2,7 @@
 
 import com.monitorjbl.xlsx.exceptions.MissingSheetException;
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.DateUtil;
 import org.apache.poi.ss.usermodel.Row;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -86,6 +87,7 @@ public void testTypes() throws Exception {
       assertEquals(Cell.CELL_TYPE_NUMERIC, row.get(1).getCellType());
       assertEquals("date", row.get(0).getStringCellValue());
       assertEquals(df.parse("1/1/2014"), row.get(1).getDateCellValue());
+      assertTrue(DateUtil.isCellDateFormatted(row.get(1)));
 
       row = obj.get(5);
       assertEquals(7, row.size());