Merge pull request #98 from whicken/master

Implement getCachedFormulaResultTypeEnum. Some comments are now out o…

Author: monitorjbl

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

@@ -282,19 +282,27 @@ public String getCellFormula() {
    */
   @Override
   public int getCachedFormulaResultType() {
+    return getCachedFormulaResultTypeEnum().getCode();
+  }
+
+  /**
+   * Not supported
+   */
+  @Override
+  public CellType getCachedFormulaResultTypeEnum() {
     if (type != null && "str".equals(type)) {
       if(contents == null || cachedFormulaResultType == null) {
-        return CELL_TYPE_BLANK;
+        return CellType.BLANK;
       } else if("n".equals(cachedFormulaResultType)) {
-        return CELL_TYPE_NUMERIC;
+        return CellType.NUMERIC;
       } else if("s".equals(cachedFormulaResultType) || "inlineStr".equals(cachedFormulaResultType)) {
-        return CELL_TYPE_STRING;
+        return CellType.STRING;
       } else if("str".equals(cachedFormulaResultType)) {
-        return CELL_TYPE_FORMULA;
+        return CellType.FORMULA;
       } else if("b".equals(cachedFormulaResultType)) {
-        return CELL_TYPE_BOOLEAN;
+        return CellType.BOOLEAN;
       } else if("e".equals(cachedFormulaResultType)) {
-        return CELL_TYPE_ERROR;
+        return CellType.ERROR;
       } else {
         throw new UnsupportedOperationException("Unsupported cell type '" + cachedFormulaResultType + "'");
       }
@@ -304,14 +312,6 @@ public int getCachedFormulaResultType() {
     }
   }
 
-  /**
-   * Not supported
-   */
-  @Override
-  public CellType getCachedFormulaResultTypeEnum() {
-    throw new NotSupportedException();
-  }
-
   /* Not supported */
 
   /**