Skip to content

Fallback to Table's Converters to format cell values #5

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

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

Fallback to Table's Converters to format cell values #5

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions src/org/vaadin/haijian/CSVExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ protected FileBuilder createFileBuilder(Container container) {
// TODO Auto-generated method stub
return new CSVFileBuilder(container);
}

@Override
protected FileBuilder createFileBuilder(Table table) {
return new CSVFileBuilder(table);
}

@Override
protected String getDownloadFileName() {
Expand Down
5 changes: 5 additions & 0 deletions src/org/vaadin/haijian/ExcelExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ public ExcelExporter(Container container) {
protected FileBuilder createFileBuilder(Container container) {
return new ExcelFileBuilder(container);
}

@Override
protected FileBuilder createFileBuilder(Table table) {
return new ExcelFileBuilder(table);
}

@Override
protected String getDownloadFileName() {
Expand Down
9 changes: 8 additions & 1 deletion src/org/vaadin/haijian/Exporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ public Exporter(Container container) {
}

public void setTableToBeExported(Table table) {
setContainerToBeExported(table.getContainerDataSource());
fileBuilder = createFileBuilder(table);
configureFileBuilderLocale();

setVisibleColumns(table.getVisibleColumns());
setHeader(table.getCaption());
for (Object column : table.getVisibleColumns()) {
Expand All @@ -58,6 +60,10 @@ public void setTableToBeExported(Table table) {

public void setContainerToBeExported(Container container) {
fileBuilder = createFileBuilder(container);
configureFileBuilderLocale();
}

protected void configureFileBuilderLocale() {
if (locale != null) {
fileBuilder.setLocale(locale);
}
Expand Down Expand Up @@ -87,6 +93,7 @@ public void setDateFormat(String dateFormat){
}

protected abstract FileBuilder createFileBuilder(Container container);
protected abstract FileBuilder createFileBuilder(Table table);

protected abstract String getDownloadFileName();

Expand Down
5 changes: 5 additions & 0 deletions src/org/vaadin/haijian/PdfExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ public PdfExporter(Container container) {
protected FileBuilder createFileBuilder(Container container) {
return new PdfFileBuilder(container);
}

@Override
protected FileBuilder createFileBuilder(Table table) {
return new PdfFileBuilder(table);
}

@Override
protected String getDownloadFileName() {
Expand Down
19 changes: 12 additions & 7 deletions src/org/vaadin/haijian/filegenerator/CSVFileBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.itextpdf.text.Rectangle;
import com.itextpdf.text.pdf.PdfPCell;
import com.vaadin.data.Container;
import com.vaadin.ui.Table;

public class CSVFileBuilder extends FileBuilder {
private FileWriter writer;
Expand All @@ -18,6 +19,10 @@ public class CSVFileBuilder extends FileBuilder {
public CSVFileBuilder(Container container) {
super(container);
}

public CSVFileBuilder(Table table) {
super(table);
}

@Override
protected void resetContent() {
Expand All @@ -31,17 +36,17 @@ protected void resetContent() {
}

@Override
protected void buildCell(Object value) {
protected void buildCell(Object modelValue, Object presentationValue) {
try {
if(value == null){
if(modelValue == null){
writer.append("");
}else if(value instanceof Calendar){
Calendar calendar = (Calendar) value;
}else if(modelValue instanceof Calendar){
Calendar calendar = (Calendar) modelValue;
writer.append(formatDate(calendar.getTime()));
}else if(value instanceof Date){
writer.append(formatDate((Date) value));
}else if(modelValue instanceof Date){
writer.append(formatDate((Date) modelValue));
}else {
writer.append(value.toString());
writer.append(presentationValue.toString());
}
} catch (IOException e) {
e.printStackTrace();
Expand Down
29 changes: 17 additions & 12 deletions src/org/vaadin/haijian/filegenerator/ExcelFileBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.apache.poi.ss.util.CellRangeAddress;

import com.vaadin.data.Container;
import com.vaadin.ui.Table;

public class ExcelFileBuilder extends FileBuilder {
private static final String DATE_CELL_STYLE = "m/d/yy h:mm";
Expand All @@ -32,6 +33,10 @@ public class ExcelFileBuilder extends FileBuilder {
public ExcelFileBuilder(Container container) {
super(container);
}

public ExcelFileBuilder(Table table) {
super(table);
}

public void setDateCellStyle(String style) {
CreationHelper createHelper = workbook.getCreationHelper();
Expand Down Expand Up @@ -69,31 +74,31 @@ protected void onNewCell() {
}

@Override
protected void buildCell(Object value) {
if (value == null) {
protected void buildCell(Object modelValue, Object presentationValue) {
if (modelValue == null) {
cell.setCellType(Cell.CELL_TYPE_BLANK);
} else if (value instanceof Boolean) {
cell.setCellValue((Boolean) value);
} else if (modelValue instanceof Boolean) {
cell.setCellValue((Boolean) modelValue);
cell.setCellType(Cell.CELL_TYPE_BOOLEAN);
} else if (value instanceof Date) {
cell.setCellValue(formatDate((Date) value));
} else if (modelValue instanceof Date) {
cell.setCellValue(formatDate((Date) modelValue));
cell.setCellType(Cell.CELL_TYPE_STRING);
} else if (value instanceof Calendar) {
Calendar calendar = (Calendar) value;
} else if (modelValue instanceof Calendar) {
Calendar calendar = (Calendar) modelValue;
cell.setCellValue(calendar.getTime());
cell.setCellType(Cell.CELL_TYPE_STRING);
} else if (value instanceof Double) {
cell.setCellValue((Double) value);
} else if (modelValue instanceof Double) {
cell.setCellValue((Double) modelValue);
cell.setCellType(Cell.CELL_TYPE_NUMERIC);
} else {
cell.setCellValue(value.toString());
cell.setCellValue(presentationValue.toString());
cell.setCellType(Cell.CELL_TYPE_STRING);
}
}

@Override
protected void buildColumnHeaderCell(String header) {
buildCell(header);
buildCell(header, header);
cell.setCellStyle(getBoldStyle());
}

Expand Down
36 changes: 33 additions & 3 deletions src/org/vaadin/haijian/filegenerator/FileBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@

import com.vaadin.data.Container;
import com.vaadin.data.Property;
import com.vaadin.data.util.converter.Converter;
import com.vaadin.ui.Table;

public abstract class FileBuilder implements Serializable {
protected File file;
public Container container;
public Table table;
private Object[] visibleColumns;
private Map<Object, String> columnHeaderMap;
private String header;
Expand All @@ -27,8 +30,17 @@ public FileBuilder() {
}

public FileBuilder(Container container) {
setContainer(container);
setContainer(container);
}

public FileBuilder(Table table) {
setTable(table);
}

public void setTable(Table table) {
this.table = table;
setContainer(table.getContainerDataSource());
}

public void setContainer(Container container) {
this.container = container;
Expand Down Expand Up @@ -118,8 +130,17 @@ private void buildRow(Object itemId) {
for (Object propertyId : visibleColumns) {
Property<?> property = container.getContainerProperty(itemId,
propertyId);

Object modelValue = property != null ? property.getValue() : null;
Object presentationValue = modelValue;

Converter<String, Object> converter = table != null ? table.getConverter(propertyId) : null;
if (converter != null && modelValue != null) {
presentationValue = converter.convertToPresentation(property.getValue(), locale);
}

onNewCell();
buildCell(property == null ? null : property.getValue());
buildCell(modelValue, presentationValue);
}
}

Expand All @@ -131,7 +152,16 @@ protected void onNewCell() {

}

protected abstract void buildCell(Object value);

/**
* Build the cell, with the provided value. If the implementation supports formatting specific
* classes, it should attempt to use modelValue. If modelValue has an unknown classes, it
* should rely on presentationValue, that will use Table's converters if available.
*
* @param modelValue The model value
* @param presentationValue The presentation value, using the table converter if available.
*/
protected abstract void buildCell(Object modelValue, Object presentationValue);

protected void buildFooter() {
// TODO Auto-generated method stub
Expand Down
19 changes: 12 additions & 7 deletions src/org/vaadin/haijian/filegenerator/PdfFileBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.itextpdf.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfWriter;
import com.vaadin.data.Container;
import com.vaadin.ui.Table;

public class PdfFileBuilder extends FileBuilder {
private Document document;
Expand All @@ -30,6 +31,10 @@ public PdfFileBuilder(Container container) {
super(container);
}

public PdfFileBuilder(Table table) {
super(table);
}

@Override
protected void buildHeader() {
if (getHeader() != null) {
Expand All @@ -54,17 +59,17 @@ protected void buildColumnHeaderCell(String header) {
}

@Override
protected void buildCell(Object value) {
protected void buildCell(Object modelValue, Object presentationValue) {
PdfPCell cell;
if(value == null){
if(modelValue == null){
cell = new PdfPCell(new Phrase(""));
}else if(value instanceof Calendar){
Calendar calendar = (Calendar) value;
}else if(modelValue instanceof Calendar){
Calendar calendar = (Calendar) modelValue;
cell = new PdfPCell(new Phrase(formatDate(calendar.getTime())));
}else if(value instanceof Date){
cell = new PdfPCell(new Phrase(formatDate((Date) value)));
}else if(modelValue instanceof Date){
cell = new PdfPCell(new Phrase(formatDate((Date) modelValue)));
}else {
cell = new PdfPCell(new Phrase(value.toString()));
cell = new PdfPCell(new Phrase(presentationValue.toString()));
}

if (!withBorder) {
Expand Down