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

Fix i18n during import.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-10-09 08:49:51 -03:00
committed by Paulo Gustavo Veiga
parent a492521a10
commit dafe8eeb03
14 changed files with 1055 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
View File

@@ -126,7 +126,7 @@ public class ExporterFactory {
}
case FREEMIND: {
final FreemindExporter exporter = new FreemindExporter();
exporter.export(xml.getBytes(), output);
exporter.export(xml.getBytes("UTF-8"), output);
break;
}
default:

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

@@ -20,6 +20,7 @@ package com.wisemapping.exporter;
import com.wisemapping.importer.freemind.FreemindIconConverter;
import com.wisemapping.jaxb.wisemap.Note;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.ShapeStyle;
import com.wisemapping.util.JAXBUtils;
@@ -28,10 +29,17 @@ import com.wisemapping.jaxb.wisemap.RelationshipType;
import com.wisemapping.jaxb.wisemap.TopicType;
import com.wisemapping.jaxb.wisemap.Icon;
import org.jetbrains.annotations.NotNull;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import javax.xml.bind.JAXBException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import java.io.IOException;
import java.io.OutputStream;
import java.io.ByteArrayInputStream;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
import java.util.HashMap;
import java.util.List;
@@ -45,7 +53,6 @@ public class FreemindExporter
private static final String POSITION_RIGHT = "right";
private com.wisemapping.jaxb.freemind.ObjectFactory objectFactory;
private static final String EMPTY_FONT_STYLE = ";;;;;";
private Map<String, Node> nodesMap = null;
public void export(Mindmap map, OutputStream outputStream) throws ExportException {
@@ -65,7 +72,6 @@ public class FreemindExporter
final com.wisemapping.jaxb.freemind.Map freemindMap = objectFactory.createMap();
freemindMap.setVersion(FREE_MIND_VERSION);
final List<TopicType> topics = mindmapMap.getTopic();
// Isolated Topic does not exist in Freemind only take the center topic
@@ -88,7 +94,8 @@ public class FreemindExporter
setTopicPropertiesToNode(main, centerTopic, true);
addNodeFromTopic(centerTopic, main);
}
List<RelationshipType> relationships = mindmapMap.getRelationship();
final List<RelationshipType> relationships = mindmapMap.getRelationship();
for (RelationshipType relationship : relationships) {
Node srcNode = nodesMap.get(relationship.getSrcTopicId());
Node dstNode = nodesMap.get(relationship.getDestTopicId());
@@ -114,37 +121,57 @@ public class FreemindExporter
JAXBUtils.saveMap(freemindMap, outputStream);
} catch (JAXBException e) {
throw new ExportException(e);
} catch (UnsupportedEncodingException e) {
throw new ExportException(e);
} catch (SAXException e) {
throw new ExportException(e);
} catch (ParserConfigurationException e) {
throw new ExportException(e);
} catch (IOException e) {
throw new ExportException(e);
}
}
private void addNodeFromTopic(@NotNull final TopicType mainTopic, @NotNull final Node destNode) {
private void addNodeFromTopic(@NotNull final TopicType mainTopic, @NotNull final Node destNode) throws IOException, SAXException, ParserConfigurationException {
final List<TopicType> currentTopic = mainTopic.getTopic();
for (TopicType topicType : currentTopic) {
final Node newNode = objectFactory.createNode();
nodesMap.put(topicType.getId(), newNode);
setTopicPropertiesToNode(newNode, topicType, false);
destNode.getArrowlinkOrCloudOrEdge().add(newNode);
addNodeFromTopic(topicType, newNode);
final String position = topicType.getPosition();
if (position != null) {
String xPos = position.split(",")[0];
int x = Integer.valueOf(xPos);
newNode.setPOSITION((x < 0 ? POSITION_LEFT : POSITION_RIGHT));
} else {
newNode.setPOSITION(POSITION_LEFT);
}
}
}
private void setTopicPropertiesToNode(@NotNull com.wisemapping.jaxb.freemind.Node freemindNode, @NotNull com.wisemapping.jaxb.wisemap.TopicType mindmapTopic, boolean isRoot) {
private void setTopicPropertiesToNode(@NotNull com.wisemapping.jaxb.freemind.Node freemindNode, @NotNull com.wisemapping.jaxb.wisemap.TopicType mindmapTopic, boolean isRoot) throws IOException, SAXException, ParserConfigurationException {
freemindNode.setID("ID_" + mindmapTopic.getId());
String text = mindmapTopic.getTextAttr();
if (text == null || text.isEmpty()) {
text = mindmapTopic.getText();
}
freemindNode.setTEXT(text);
freemindNode.setBACKGROUNDCOLOR(mindmapTopic.getBgColor());
// Formated text have a different representation ....
if (!text.contains("\n")) {
freemindNode.setTEXT(text);
} else {
final Richcontent richcontent = buildRichContent(text, "NODE");
freemindNode.getArrowlinkOrCloudOrEdge().add(richcontent);
}
freemindNode.setBACKGROUNDCOLOR(mindmapTopic.getBgColor());
final String shape = mindmapTopic.getShape();
if (shape != null && !shape.isEmpty()) {
if (isRoot && !ShapeStyle.ROUNDED_RECTANGLE.getStyle().endsWith(shape) || !isRoot && !ShapeStyle.LINE.getStyle().endsWith(shape)) {
@@ -155,34 +182,49 @@ public class FreemindExporter
}
freemindNode.setSTYLE(style);
}
addIconNode(freemindNode, mindmapTopic);
addLinkNode(freemindNode, mindmapTopic);
addFontNode(freemindNode, mindmapTopic);
addEdgeNode(freemindNode, mindmapTopic);
addNote(freemindNode, mindmapTopic);
Boolean shrink = mindmapTopic.isShrink();
if (shrink != null && shrink)
freemindNode.setFOLDED(String.valueOf(shrink));
}
addIconNode(freemindNode, mindmapTopic);
addLinkNode(freemindNode, mindmapTopic);
addFontNode(freemindNode, mindmapTopic);
addEdgeNode(freemindNode, mindmapTopic);
addNote(freemindNode, mindmapTopic);
Boolean shrink = mindmapTopic.isShrink();
if (shrink != null && shrink)
freemindNode.setFOLDED(String.valueOf(shrink));
}
private void addNote(com.wisemapping.jaxb.freemind.Node freemindNode, com.wisemapping.jaxb.wisemap.TopicType mindmapTopic) {
if (mindmapTopic.getNote() != null) {
final Hook note = new Hook();
String textNote = mindmapTopic.getNote().getTextAttr();
if (textNote == null || textNote.isEmpty()) {
textNote = mindmapTopic.getNote().getText();
private Richcontent buildRichContent(final String text, final String type) throws ParserConfigurationException, SAXException, IOException {
final Richcontent richcontent = objectFactory.createRichcontent();
richcontent.setTYPE(type);
final StringBuilder htmlContent = new StringBuilder("<html><head></head><body>");
for (String line : text.split("\n")) {
htmlContent.append("<p>").append(line).append("</p>");
}
htmlContent.append("</body></html>");
DocumentBuilder db = getInstanceBuilder();
Document document = db.parse(new ByteArrayInputStream(htmlContent.toString().getBytes()));
richcontent.setHtml(document.getDocumentElement());
return richcontent;
}
private DocumentBuilder getInstanceBuilder() throws ParserConfigurationException {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
return dbf.newDocumentBuilder();
}
private void addNote(com.wisemapping.jaxb.freemind.Node fnode, com.wisemapping.jaxb.wisemap.TopicType mindmapTopic) throws IOException, SAXException, ParserConfigurationException {
final Note note = mindmapTopic.getNote();
if (note != null) {
final String noteStr = note.getText() != null ? note.getText() : note.getTextAttr();
if (noteStr != null) {
final Richcontent richcontent = buildRichContent(noteStr, "NOTE");
fnode.getArrowlinkOrCloudOrEdge().add(richcontent);
}
// @Todo: For some reason central topic nodes with CDATA seems not to be loaded in the JAXB model.
// Temporally excluding and continue ..
textNote = (textNote != null) ? textNote : "";
textNote = textNote.replaceAll("%0A", "\n");
note.setNAME("accessories/plugins/NodeNote.properties");
note.setText(textNote);
freemindNode.getArrowlinkOrCloudOrEdge().add(note);
}
}

2
wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
View File

@@ -84,8 +84,10 @@ public class TransformView extends AbstractView {
// Write the conversion content ...
final ServletOutputStream outputStream = response.getOutputStream();
if (exportFormat == ExportFormat.FREEMIND) {
response.setCharacterEncoding("iso-8859-1");
factory.export(properties, content, outputStream, null);
} else if (exportFormat == ExportFormat.WISEMAPPING) {
response.setCharacterEncoding("UTF-8");
final Object mindmap = viewMap.get("mindmap");
final StreamResult result = new StreamResult(outputStream);
jaxbMarshaller.marshal(mindmap, result);

12
wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java
View File

@@ -26,9 +26,7 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.*;
import java.util.HashMap;
import java.util.Map;
@@ -36,12 +34,12 @@ public class JAXBUtils {
private final static Map<String, JAXBContext> context = new HashMap<String, JAXBContext>();
public static Object getMapObject(@NotNull InputStream stream, @NotNull final String pakage) throws JAXBException {
public static Object getMapObject(@NotNull InputStream is, @NotNull final String pakage) throws JAXBException, UnsupportedEncodingException {
final JAXBContext context = getInstance(pakage);
final Unmarshaller unmarshaller = context.createUnmarshaller();
return unmarshaller.unmarshal(stream);
final Reader reader = new InputStreamReader(is, "UTF-8");
return unmarshaller.unmarshal(reader);
}
private static JAXBContext getInstance(@NotNull String pakage) throws JAXBException {
@@ -78,6 +76,8 @@ public class JAXBUtils {
final JAXBContext context = getInstance("com.wisemapping.jaxb.freemind");
final Marshaller marshaller = context.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
marshaller.setProperty(Marshaller.JAXB_ENCODING, "ASCII");
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
marshaller.marshal(map, out);
}
}

4
wise-webapp/src/main/webapp/WEB-INF/web.xml
View File

@@ -39,10 +39,6 @@
<param-name>encoding</param-name>
<param-value>UTF-8</param-value>
</init-param>
<init-param>
<param-name>forceEncoding</param-name>
<param-value>true</param-value>
</init-param>
</filter>
<filter>