This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 80bf13b2f443abea30b874072e7848e6c3ed650d Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:17:35 2016 +0200 refs #1207 fource le charset à UTF8 --- .../java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java | 4 ++-- .../ui/fiscalControlExport/FiscalControlExportViewHandler.java | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java index d9f78d1..bf5e4f8 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/csv/AbstractLimaModel.java @@ -208,12 +208,12 @@ public abstract class AbstractLimaModel<E> extends AbstractImportModel<E> { } }; - protected static final String getFinancialStatementFullPath(FinancialStatement value) { + protected static String getFinancialStatementFullPath(FinancialStatement value) { String result = value.getMasterFinancialStatement() != null ? getFinancialStatementFullPath(value.getMasterFinancialStatement()) + "/" + value.getLabel() : value.getLabel(); return result; } - protected static final String getVatFullPath(VatStatement value) { + protected static String getVatFullPath(VatStatement value) { String result = value.getMasterVatStatement() != null ? getVatFullPath(value.getMasterVatStatement()) + "/" + value.getLabel() : value.getLabel(); return result; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportViewHandler.java index 4bcca2a..21381b5 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalControlExport/FiscalControlExportViewHandler.java @@ -41,15 +41,14 @@ import org.chorem.lima.ui.importexport.ImportExportWaitView; import org.chorem.lima.util.ErrorHelper; import org.jdesktop.swingx.painter.BusyPainter; -import javax.swing.JFileChooser; -import javax.swing.JOptionPane; -import javax.swing.SwingWorker; -import java.awt.Color; +import javax.swing.*; +import java.awt.*; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; +import java.nio.charset.Charset; import java.rmi.server.ExportException; import java.util.List; @@ -182,7 +181,7 @@ public class FiscalControlExportViewHandler { if (exportExceptions == null || exportExceptions.isEmpty()) { BufferedWriter out = null; try { - out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(exportFile))); + out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(exportFile), Charset.forName("UTF-8"))); out.write(exportResult.getExportData()); out.flush(); out.close(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.