X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jxl%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjxl%2Fdao%2FJxlDaoSupport.java;h=dbd0793d9244e69aecfb8a9678b1a4fcfb7cede1;hb=12cfed09974f82584c66c460500b5b3a61789e7e;hp=015dc06be451661acf6b3739c48b9077f2a5d1f5;hpb=3a2d1d7c935065e5048232d9aa7c20b4b875e316;p=lgpl%2Fargeo-commons.git diff --git a/server/runtime/org.argeo.server.jxl/src/main/java/org/argeo/server/jxl/dao/JxlDaoSupport.java b/server/runtime/org.argeo.server.jxl/src/main/java/org/argeo/server/jxl/dao/JxlDaoSupport.java index 015dc06be..dbd0793d9 100644 --- a/server/runtime/org.argeo.server.jxl/src/main/java/org/argeo/server/jxl/dao/JxlDaoSupport.java +++ b/server/runtime/org.argeo.server.jxl/src/main/java/org/argeo/server/jxl/dao/JxlDaoSupport.java @@ -1,6 +1,7 @@ package org.argeo.server.jxl.dao; import java.io.InputStream; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -13,6 +14,7 @@ import jxl.FormulaCell; import jxl.JXLException; import jxl.Sheet; import jxl.Workbook; +import jxl.WorkbookSettings; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -45,6 +47,8 @@ public class JxlDaoSupport implements LightDaoSupport, ApplicationContextAware, private List workbooks = new ArrayList(); + private Integer charset = 0; + public void afterPropertiesSet() throws Exception { init(); } @@ -85,7 +89,9 @@ public class JxlDaoSupport implements LightDaoSupport, ApplicationContextAware, public void load(InputStream in, List references, Map> tempRefs) { try { - Workbook workbook = Workbook.getWorkbook(in); + WorkbookSettings workbookSettings = new WorkbookSettings(); + workbookSettings.setCharacterSet(charset); + Workbook workbook = Workbook.getWorkbook(in, workbookSettings); for (Sheet sheet : workbook.getSheets()) { loadSheet(sheet, references, tempRefs); } @@ -321,6 +327,18 @@ public class JxlDaoSupport implements LightDaoSupport, ApplicationContextAware, this.classLoader = classLoader; } + public List> getAdditionalClasses() { + return additionalClasses; + } + + public void setAdditionalClasses(List> additionalClasses) { + this.additionalClasses = additionalClasses; + } + + public void setCharset(Integer charset) { + this.charset = charset; + } + public static class Reference { private Object object; private String property;