ZhouXY108
/
wisemapping-open-source
mirror of https://github.com/wisemapping/wisemapping-open-source.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor improvement to change freemind change if the background color was defined.

main
Paulo Gustavo Veiga 2012-09-29 17:38:51 -03:00
parent c37b632ac9
commit 4f1bb45fc2
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distribution/package-bin.sh
View File

@ -9,7 +9,8 @@ BASE_DIR=`pwd`
TARGET_DIR=$BASE_DIR/target TARGET_DIR=$BASE_DIR/target
JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION
WISE_WEBAPP_DIR=$JETTY_DIR/webapps/wisemapping WISE_WEBAPP_DIR=$JETTY_DIR/webapps/wisemapping
JETTY_DIST_DIR=jetty-distribution-8.1.4.v20120524 JETTY_VERSION=8.1.5.v20120716
JETTY_DIST_DIR=jetty-distribution-${JETTY_VERSION}
JETTY_ZIP=${JETTY_DIST_DIR}.zip JETTY_ZIP=${JETTY_DIST_DIR}.zip
# Clean ... # Clean ...
@ -24,7 +25,7 @@ mvn -o -f $BASE_DIR/../pom.xml package -Dmaven.test.skip=true
if [ ! -f ./target/${JETTY_ZIP} ] if [ ! -f ./target/${JETTY_ZIP} ]
then then
echo "Download Jetty" echo "Download Jetty"
wget http://download.eclipse.org/jetty/8.1.4.v20120524/dist/jetty-distribution-8.1.4.v20120524.zip -P $TARGET_DIR wget http://download.eclipse.org/jetty/${JETTY_VERSION}/dist/${JETTY_ZIP} -P $TARGET_DIR
fi fi
echo "Unzip Jetty ...:" echo "Unzip Jetty ...:"

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

@ -150,10 +150,7 @@ public class FreemindImporter
addRelationships(mindmapMap); addRelationships(mindmapMap);
JAXBUtils.saveMap(mindmapMap, baos); JAXBUtils.saveMap(mindmapMap, baos);
wiseXml = new String(baos.toByteArray(), UTF_8_CHARSET); wiseXml = new String(baos.toByteArray(), UTF_8_CHARSET);
result.setXmlStr(wiseXml); result.setXmlStr(wiseXml);
result.setTitle(mapName); result.setTitle(mapName);
result.setDescription(description); result.setDescription(description);
@ -625,10 +622,16 @@ public class FreemindImporter
String getShapeFormFromNode(@NotNull Node node) { String getShapeFormFromNode(@NotNull Node node) {
String result = node.getSTYLE(); String result = node.getSTYLE();
// In freemind a node without style is a line // In freemind a node without style is a line
if ("bubble".equals(result)) { if ("bubble".equals(result))
{
result = ShapeStyle.ROUNDED_RECTANGLE.getStyle(); result = ShapeStyle.ROUNDED_RECTANGLE.getStyle();
} else { } else {
result = ShapeStyle.LINE.getStyle(); if(node.getBACKGROUNDCOLOR()!=null){
// This the node has background color defined. It's better to change the default shape.
result = ShapeStyle.RECTANGLE.getStyle();
} else {
result = ShapeStyle.LINE.getStyle();
}
} }
return result; return result;
} }