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

Fix freeming import issue with fonts.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2011-03-27 14:44:09 -03:00
parent 334c9820b3
commit 308250ab73
4 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import com.wisemapping.xml.freemind.Node;
import com.wisemapping.xml.mindmap.RelationshipType;
import com.wisemapping.xml.mindmap.TopicType;
import com.wisemapping.xml.mindmap.Link;
import org.jetbrains.annotations.NotNull;
import org.w3c.dom.*;
import javax.xml.bind.JAXBException;
@@ -421,23 +422,23 @@ public class FreemindImporter
boolean hasBold = Boolean.parseBoolean(font.getBOLD());
fontStyle.append(hasBold ? BOLD : null);
fontStyle.append(hasBold ? BOLD : "");
fontStyle.append(";");
boolean hasItalic = Boolean.parseBoolean(font.getITALIC());
fontStyle.append(hasItalic ? ITALIC : null);
fontStyle.append(hasItalic ? ITALIC : "");
fontStyle.append(";");
}
return fontStyle.toString();
}
private String fixFontName(Font font) {
String fontName = com.wisemapping.model.Font.ARIAL.getFontName(); // Default Font
private @NotNull String fixFontName(@NotNull Font font) {
String result = com.wisemapping.model.Font.ARIAL.getFontName(); // Default Font
if (com.wisemapping.model.Font.isValidFont(font.getNAME())) {
fontName = font.getNAME();
result = font.getNAME();
}
return fontName;
return result;
}
private String getShapeFormFromNode(Node node) {

5
wise-webapp/src/main/java/com/wisemapping/model/Font.java
View File

@@ -18,6 +18,8 @@
package com.wisemapping.model;
import org.jetbrains.annotations.NotNull;
public enum Font {
VERDANA("Verdana"),
@@ -37,7 +39,7 @@ public enum Font {
return fontName;
}
public static boolean isValidFont(String font) {
public static boolean isValidFont(@NotNull String font) {
boolean isValid = false;
try {
if (font != null) {
@@ -45,6 +47,7 @@ public enum Font {
}
}
catch (IllegalArgumentException ignote) {
// Ignore ...
}
return isValid;