zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix parser error on export.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-11-01 00:14:21 -03:00
parent dafe8eeb03
commit e5e2e86fce
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
View File

@@ -207,7 +207,8 @@ public class FreemindExporter
htmlContent.append("</body></html>");
DocumentBuilder db = getInstanceBuilder();
Document document = db.parse(new ByteArrayInputStream(htmlContent.toString().getBytes()));
byte[] bytes = htmlContent.toString().getBytes("UTF-8");
Document document = db.parse(new ByteArrayInputStream(bytes), "UTF-8");
richcontent.setHtml(document.getDocumentElement());
return richcontent;
}

8
wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
View File

@@ -119,6 +119,12 @@ public class FreemindImporter
final String version = freemindMap.getVersion();
if (version != null) {
// Is freemind mindmap ?
if (version.charAt(0) != '0') {
throw new ImporterException("Mindmap is not a FreeMind document. Document type info " + version);
}
final VersionNumber mapVersion = new VersionNumber(version);
if (SUPPORTED_FREEMIND_VERSION.isGreaterThan(mapVersion)) {
throw new ImporterException("FreeMind version " + mapVersion.getVersion() + " is not supported.");
@@ -408,7 +414,7 @@ public class FreemindImporter
if (depth == 1) {
final String side = freeChild.getPOSITION();
x = x * (side!=null && POSITION_LEFT.equals(side) ? -1 : 1);
x = x * (side != null && POSITION_LEFT.equals(side) ? -1 : 1);
} else {
final Coord coord = Coord.parse(wiseParent.getPosition());
x = x * (coord.isOnLeftSide() ? -1 : 1);