Changeset 7649

Timestamp:

Mar 14, 2019, 7:52:48 AM (4 years ago)

Author:

Nicklas Nordborg

Message:

References #2160: Table exporter should support exporting to Excel files

Added support for Excel to the MultiFormatter and BooleanFormatter.

Location:

trunk/src

Files:

• clients/web/net/sf/basedb/clients/web/plugins/XlsxTemplate.java (modified) (1 diff)
• core/net/sf/basedb/util/excel/ExcelValue.java (modified) (10 diffs)
• core/net/sf/basedb/util/formatter/BooleanFormatter.java (modified) (4 diffs)
• core/net/sf/basedb/util/formatter/MultiFormatter.java (modified) (5 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/XlsxTemplate.java

@@ -188 +188 @@
       ev = ExcelValue.asString(ep.formatter.format(data));
     }
-    if (ev == null) ev = ExcelValue.EMPTY_CELL;
+    if (ev == null) ev = ExcelValue.emptyCell();
     ev.writeTo(cell, styleCreator);
   }

trunk/src/core/net/sf/basedb/util/excel/ExcelValue.java

@@ -20 +20 @@
 {
 
+  // Some static cells
+  private static final ExcelValue<Void> EMPTY_CELL = new BlankValue<>();
+  private static final ExcelValue<Boolean> TRUE = new BooleanValue(true); 
+  private static final ExcelValue<Boolean> FALSE = new BooleanValue(false);
+  
   /**
     This creates a blank cell.
   */
-  public static final ExcelValue<Void> EMPTY_CELL = new BlankValue<>();
+  @SuppressWarnings("unchecked")
+  public static final <T> ExcelValue<T> emptyCell()
+  {
+    return (ExcelValue<T>)EMPTY_CELL;
+  }
   
   /**
@@ -30 +39 @@
   public static ExcelValue<String> asString(String value)
   {
+    if (value == null) return emptyCell();
     return new StringValue(value);
   }
@@ -40 +50 @@
   public static ExcelValue<Date> asDate(Date value, String javaFormat)
   {
+    if (value == null) return emptyCell();
     if (javaFormat == null) javaFormat = "yyyy-MM-dd";
     return new DateValue(value, javaFormat);
@@ -53 +64 @@
   public static ExcelValue<Date> asTimestamp(Date value, String javaFormat)
   {
+    if (value == null) return emptyCell();
     if (javaFormat == null) javaFormat = "yyyy-MM-dd HH:mm:ss";
     return new DateValue(value, javaFormat);
@@ -64 +76 @@
   public static final ExcelValue<Number> asInt(Number value)
   {
+    if (value == null) return emptyCell();
     return new IntValue(value);
   }
@@ -74 +87 @@
   public static final ExcelValue<Number> asNumber(Number value, int numDecimals)
   {
+    if (value == null) return emptyCell();
     return new NumericValue(value, numberFormat(numDecimals));
   }
@@ -82 +96 @@
   public static final ExcelValue<Number> asNumber(Number value, String format)
   {
+    if (value == null) return emptyCell();
     return new NumericValue(value, format);
+  }
+  
+  /**
+    Create a numeric cell value with boolean format.
+  */
+  public static final ExcelValue<Boolean> asBoolean(Boolean value)
+  {
+    if (value == null) return emptyCell();
+    return value ? TRUE : FALSE;
   }
   
@@ -206 +230 @@
     public void writeTo(Cell cell, CellStyleCreator styleCreator) 
     {
-      if (value == null) 
-      {
-        EMPTY_CELL.writeTo(cell, styleCreator);
-      }
-      else
-      {
-        cell.setCellValue(value.doubleValue());
-      }
+      cell.setCellValue(value.doubleValue());
       cell.setCellStyle(styleCreator.getIntCellStyle());
-    }
-    
-  }
-
+    }   
+  }
   
   /**
@@ -234 +249 @@
     public void writeTo(Cell cell, CellStyleCreator styleCreator) 
     {
-      if (value == null) 
-      {
-        EMPTY_CELL.writeTo(cell, styleCreator);
-      }
-      else
-      {
-        cell.setCellValue(value.doubleValue());
-      }
+      cell.setCellValue(value.doubleValue());
       if (format != null)
       {
@@ -249 +257 @@
   }
   
+  /**
+    Represents a cell with a numeric value. 
+  */
+  static class BooleanValue
+    extends ExcelValue<Boolean>
+  {
+    BooleanValue(boolean value)
+    {
+      super(value, "BOOLEAN");
+    }
+    
+    @Override
+    public void writeTo(Cell cell, CellStyleCreator styleCreator) 
+    {
+      cell.setCellValue(value ? 1 : 0);
+      cell.setCellStyle(styleCreator.getCellStyle(format));
+    }
+  }
+
 }

trunk/src/core/net/sf/basedb/util/formatter/BooleanFormatter.java

@@ -23 +23 @@
 
 import net.sf.basedb.util.Values;
+import net.sf.basedb.util.excel.ExcelFormatter;
+import net.sf.basedb.util.excel.ExcelValue;
 
 /**
   Formats a boolean value. It is possible to select between yes/no, true/false, and 1/0
-  mappings.
+  mappings. 
 
   @author nicklas
@@ -33 +35 @@
 */
 public class BooleanFormatter
-  implements Formatter<Boolean>
+  implements Formatter<Boolean>, ExcelFormatter<Boolean, Boolean>
 {
 
@@ -63 +65 @@
   // -------------------------------------------
   
+  /**
+    @since 3.15
+  */
+  @Override
+  public ExcelValue<Boolean> toExcelValue(Boolean value) 
+  {
+    return ExcelValue.asBoolean(value);
+  }
+
   /**
     Enum for holding the various types of boolean output.
@@ -97 +108 @@
     }
   }
+
 }

trunk/src/core/net/sf/basedb/util/formatter/MultiFormatter.java

@@ -25 +25 @@
 import java.util.Map;
 
+import net.sf.basedb.util.excel.ExcelFormatter;
+import net.sf.basedb.util.excel.ExcelValue;
+
 
 /**
@@ -38 +41 @@
 */
 public class MultiFormatter
-  implements Formatter<Object>
+  implements Formatter<Object>, ExcelFormatter<Object, Object>
 {
 
@@ -88 +91 @@
   {
     if (value == null) return "";
+    Formatter<Object> f = getFormatter(value);
+    return f.format(value);
+  }
+  @Override
+  public Number parseString(String value)
+  {
+    throw new UnsupportedOperationException("parseString");
+  }
+  // -------------------------------------------
+
+  private Formatter<Object> getFormatter(Object value)
+  {
     Class<?> c = value.getClass();
     Formatter<Object> f = formatter;
@@ -114 +129 @@
       if (decideOnFirst) formatter = f;
     }
-    return f.format(value);
+    return f;
   }
-  @Override
-  public Number parseString(String value)
-  {
-    throw new UnsupportedOperationException("parseString");
-  }
-  // -------------------------------------------
-
+  
   /**
     Register a formatter for the specified class.
@@ -133 +142 @@
     formatters.put((Class)clazz, (Formatter)formatter);
   }
+
+  @SuppressWarnings({ "rawtypes", "unchecked" })
+  @Override
+  public ExcelValue<Object> toExcelValue(Object value) 
+  {
+    if (value == null) return null;
+    Formatter<Object> f = getFormatter(value);
+    ExcelValue ev = null;
+    if (f instanceof ExcelFormatter)
+    {
+      ExcelFormatter ef = (ExcelFormatter)f;
+      ev = ef.toExcelValue(value);
+    }
+    else
+    {
+      ev = ExcelValue.asString(f.format(value));
+    }
+    return ev;
+  }
 }