BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-12 02:02:16 +10:00
Code Issues Packages Projects Releases Wiki Activity

use UTF-8

Browse Source
This commit is contained in:
bancika
2012-03-10 01:14:01 +00:00
parent 61937d6d42
commit ae99ce2702
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/ProjectFileManager.java
+8 -3
View File
@@ -6,6 +6,10 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@@ -21,7 +25,6 @@ import org.diylc.appframework.simplemq.MessageDispatcher;
import org.diylc.common.Display; import org.diylc.common.Display;
import org.diylc.common.EventType; import org.diylc.common.EventType;
import org.diylc.common.Orientation; import org.diylc.common.Orientation;
import org.diylc.components.AbstractComponent;
import org.diylc.components.AbstractLeadedComponent; import org.diylc.components.AbstractLeadedComponent;
import org.diylc.components.AbstractTransparentComponent; import org.diylc.components.AbstractTransparentComponent;
import org.diylc.components.boards.AbstractBoard; import org.diylc.components.boards.AbstractBoard;
@@ -107,7 +110,8 @@ public class ProjectFileManager {
} }
FileOutputStream fos; FileOutputStream fos;
fos = new FileOutputStream(fileName); fos = new FileOutputStream(fileName);
xStream.toXML(project, fos); Writer writer = new OutputStreamWriter(fos, "UTF-8");
xStream.toXML(project, writer);
fos.close(); fos.close();
if (!isBackup) { if (!isBackup) {
this.currentFileName = fileName; this.currentFileName = fileName;
@@ -536,7 +540,8 @@ public class ProjectFileManager {
Project project; Project project;
FileInputStream fis = new FileInputStream(fileName); FileInputStream fis = new FileInputStream(fileName);
try { try {
project = (Project) xStream.fromXML(fis); Reader reader = new InputStreamReader(fis, "UTF-8");
project = (Project) xStream.fromXML(reader);
} catch (Exception e) { } catch (Exception e) {
LOG.warn("Could not open with the new xStream, trying the old one"); LOG.warn("Could not open with the new xStream, trying the old one");
fis.close(); fis.close();