Freemind import adding Notes and richText support

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

@@ -19,6 +19,7 @@
 
 package com.wisemapping.importer.freemind;
 
+import com.sun.org.apache.xerces.internal.dom.TextImpl;
 import com.wisemapping.importer.Importer;
 import com.wisemapping.importer.ImporterException;
 import com.wisemapping.model.MindMap;
@@ -26,8 +27,10 @@ import com.wisemapping.model.ShapeStyle;
 import com.wisemapping.model.MindMapNative;
 import com.wisemapping.util.JAXBUtils;
 import com.wisemapping.xml.freemind.*;
+import com.wisemapping.xml.freemind.Node;
 import com.wisemapping.xml.mindmap.TopicType;
 import com.wisemapping.xml.mindmap.Link;
+import org.w3c.dom.*;
 
 import javax.xml.bind.JAXBException;
 import java.io.InputStream;
@@ -222,7 +225,83 @@ public class FreemindImporter
                     currentTopic.setNote(mindmapNote);
                 }
             }
+            else if (freemindNode instanceof Richcontent)
+            {
+                final Richcontent content = (Richcontent) freemindNode;
+                final String type = content.getTYPE();
+
+                if(type.equals("NODE")){
+                    final String text = getText(content);
+                    text.replaceAll("\n","");
+                    text.trim();
+                    currentTopic.setText(text);
                 }
+                else{
+                    String text = getRichContent(content);
+                    final com.wisemapping.xml.mindmap.Note mindmapNote = new com.wisemapping.xml.mindmap.Note();
+                    text = text!= null ? text.replaceAll("\n","%0A") : EMPTY_NOTE;
+                    mindmapNote.setText(text);
+                    currentTopic.setNote(mindmapNote);
+
+                }
+            }
+        }
+    }
+
+    private String getRichContent(Richcontent content) {
+        String result = null;
+        List<Element> elementList = content.getHtml().getAny();
+
+        Element body = null;
+        for(Element elem : elementList){
+            if(elem.getNodeName().equals("body")){
+                body = elem;
+                break;
+            }
+        }
+        if(body != null){
+            result = body.getTextContent();
+        }
+        return result;
+    }
+
+    private String getText(Richcontent content) {
+        String result = "";
+        List<Element> elementList = content.getHtml().getAny();
+
+        Element body = null;
+        for(Element elem : elementList){
+            if(elem.getNodeName().equals("body")){
+                body = elem;
+                break;
+            }
+        }
+        if(body != null){
+            String textNode = buildTextFromChildren(body);
+            if(textNode!= null)
+                result = textNode.trim();
+
+        }
+        return result;
+    }
+
+    private  String buildTextFromChildren(org.w3c.dom.Node body) {
+        StringBuilder text = new StringBuilder();
+        NodeList childNodes = body.getChildNodes();
+        for(int i=0; i< childNodes.getLength(); i++){
+            org.w3c.dom.Node child = childNodes.item(i);
+            if(child instanceof TextImpl){
+                text.append(" ");
+                text.append(child.getTextContent());
+            }
+            else{
+                String textElem = buildTextFromChildren(child);
+                if(textElem!=null && !textElem.equals("")){
+                    text.append(textElem);
+                }
+            }
+        }
+        return text.toString();
     }
 
     private void setNodePropertiesToTopic( com.wisemapping.xml.mindmap.TopicType mindmapTopic,com.wisemapping.xml.freemind.Node freemindNode)

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Arrowlink.java

@@ -1,27 +1,8 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* $Id: file 64488 2006-03-10 17:32:09Z paulo $
-*/
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.08.27 at 09:24:17 PM ART 
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
 //
 
 

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Cloud.java

@@ -1,27 +1,8 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* $Id: file 64488 2006-03-10 17:32:09Z paulo $
-*/
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.08.27 at 09:24:17 PM ART 
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
 //
 
 

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Edge.java

@@ -1,27 +1,8 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* $Id: file 64488 2006-03-10 17:32:09Z paulo $
-*/
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.08.27 at 09:24:17 PM ART 
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
 //
 
 

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Font.java

@@ -1,27 +1,8 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* $Id: file 64488 2006-03-10 17:32:09Z paulo $
-*/
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.08.27 at 09:24:17 PM ART 
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
 //
 
 

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Hook.java

@@ -1,27 +1,8 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* $Id: file 64488 2006-03-10 17:32:09Z paulo $
-*/
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.08.27 at 09:24:17 PM ART 
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
 //
 
 

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Html.java

@@ -0,0 +1,79 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;any processContents='skip' maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "any"
+})
+@XmlRootElement(name = "html")
+public class Html {
+
+    @XmlAnyElement
+    protected List<Element> any;
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Element }
+     * 
+     * 
+     */
+    public List<Element> getAny() {
+        if (any == null) {
+            any = new ArrayList<Element>();
+        }
+        return this.any;
+    }
+
+}

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Icon.java

@@ -1,27 +1,8 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* $Id: file 64488 2006-03-10 17:32:09Z paulo $
-*/
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.08.27 at 09:24:17 PM ART 
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
 //
 
 

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Map.java

@@ -1,27 +1,8 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* $Id: file 64488 2006-03-10 17:32:09Z paulo $
-*/
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.08.27 at 09:24:17 PM ART 
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
 //
 
 

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Node.java

@@ -1,27 +1,8 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* $Id: file 64488 2006-03-10 17:32:09Z paulo $
-*/
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.08.27 at 09:24:17 PM ART 
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
 //
 
 
@@ -37,6 +18,7 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlID;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -59,11 +41,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  *         &lt;element ref="{}hook"/>
  *         &lt;element ref="{}icon"/>
  *         &lt;element ref="{}node"/>
+ *         &lt;element ref="{}richcontent"/>
  *       &lt;/choice>
  *       &lt;attribute name="BACKGROUND_COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="CREATED" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       &lt;attribute name="ENCRYPTED_CONTENT" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="FOLDED">
  *         &lt;simpleType>
  *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -72,10 +53,8 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  *           &lt;/restriction>
  *         &lt;/simpleType>
  *       &lt;/attribute>
- *       &lt;attribute name="HGAP" type="{http://www.w3.org/2001/XMLSchema}integer" />
  *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
  *       &lt;attribute name="LINK" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="MODIFIED" type="{http://www.w3.org/2001/XMLSchema}integer" />
  *       &lt;attribute name="POSITION">
  *         &lt;simpleType>
  *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -86,8 +65,12 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  *       &lt;/attribute>
  *       &lt;attribute name="STYLE" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       &lt;attribute name="TEXT" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="CREATED" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="MODIFIED" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="HGAP" type="{http://www.w3.org/2001/XMLSchema}integer" />
  *       &lt;attribute name="VGAP" type="{http://www.w3.org/2001/XMLSchema}integer" />
  *       &lt;attribute name="VSHIFT" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="ENCRYPTED_CONTENT" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     &lt;/restriction>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -103,45 +86,47 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 public class Node {
 
     @XmlElements({
-        @XmlElement(name = "cloud", type = Cloud.class),
         @XmlElement(name = "icon", type = Icon.class),
-        @XmlElement(name = "arrowlink", type = Arrowlink.class),
-        @XmlElement(name = "edge", type = Edge.class),
-        @XmlElement(name = "font", type = Font.class),
         @XmlElement(name = "node", type = Node.class),
-        @XmlElement(name = "hook", type = Hook.class)
+        @XmlElement(name = "edge", type = Edge.class),
+        @XmlElement(name = "arrowlink", type = Arrowlink.class),
+        @XmlElement(name = "font", type = Font.class),
+        @XmlElement(name = "hook", type = Hook.class),
+        @XmlElement(name = "richcontent", type = Richcontent.class),
+        @XmlElement(name = "cloud", type = Cloud.class)
     })
     protected List<Object> arrowlinkOrCloudOrEdge;
     @XmlAttribute(name = "BACKGROUND_COLOR")
     protected String backgroundcolor;
     @XmlAttribute(name = "COLOR")
     protected String color;
-    @XmlAttribute(name = "CREATED")
-    protected BigInteger created;
-    @XmlAttribute(name = "ENCRYPTED_CONTENT")
-    protected String encryptedcontent;
     @XmlAttribute(name = "FOLDED")
     protected String folded;
-    @XmlAttribute(name = "HGAP")
-    protected BigInteger hgap;
     @XmlAttribute(name = "ID")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     @XmlID
+    @XmlSchemaType(name = "ID")
     protected String id;
     @XmlAttribute(name = "LINK")
     protected String link;
-    @XmlAttribute(name = "MODIFIED")
-    protected BigInteger modified;
     @XmlAttribute(name = "POSITION")
     protected String position;
     @XmlAttribute(name = "STYLE")
     protected String style;
     @XmlAttribute(name = "TEXT", required = true)
     protected String text;
+    @XmlAttribute(name = "CREATED")
+    protected BigInteger created;
+    @XmlAttribute(name = "MODIFIED")
+    protected BigInteger modified;
+    @XmlAttribute(name = "HGAP")
+    protected BigInteger hgap;
     @XmlAttribute(name = "VGAP")
     protected BigInteger vgap;
     @XmlAttribute(name = "VSHIFT")
     protected BigInteger vshift;
+    @XmlAttribute(name = "ENCRYPTED_CONTENT")
+    protected String encryptedcontent;
 
     /**
      * Gets the value of the arrowlinkOrCloudOrEdge property.
@@ -161,13 +146,14 @@ public class Node {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Cloud }
      * {@link Icon }
-     * {@link Arrowlink }
-     * {@link Edge }
-     * {@link Font }
      * {@link Node }
+     * {@link Edge }
+     * {@link Arrowlink }
+     * {@link Font }
      * {@link Hook }
+     * {@link Richcontent }
+     * {@link Cloud }
      * 
      * 
      */
@@ -226,54 +212,6 @@ public class Node {
         this.color = value;
     }
 
-    /**
-     * Gets the value of the created property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getCREATED() {
-        return created;
-    }
-
-    /**
-     * Sets the value of the created property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setCREATED(BigInteger value) {
-        this.created = value;
-    }
-
-    /**
-     * Gets the value of the encryptedcontent property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getENCRYPTEDCONTENT() {
-        return encryptedcontent;
-    }
-
-    /**
-     * Sets the value of the encryptedcontent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setENCRYPTEDCONTENT(String value) {
-        this.encryptedcontent = value;
-    }
-
     /**
      * Gets the value of the folded property.
      * 
@@ -298,30 +236,6 @@ public class Node {
         this.folded = value;
     }
 
-    /**
-     * Gets the value of the hgap property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getHGAP() {
-        return hgap;
-    }
-
-    /**
-     * Sets the value of the hgap property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setHGAP(BigInteger value) {
-        this.hgap = value;
-    }
-
     /**
      * Gets the value of the id property.
      * 
@@ -370,30 +284,6 @@ public class Node {
         this.link = value;
     }
 
-    /**
-     * Gets the value of the modified property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getMODIFIED() {
-        return modified;
-    }
-
-    /**
-     * Sets the value of the modified property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setMODIFIED(BigInteger value) {
-        this.modified = value;
-    }
-
     /**
      * Gets the value of the position property.
      * 
@@ -466,6 +356,78 @@ public class Node {
         this.text = value;
     }
 
+    /**
+     * Gets the value of the created property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getCREATED() {
+        return created;
+    }
+
+    /**
+     * Sets the value of the created property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setCREATED(BigInteger value) {
+        this.created = value;
+    }
+
+    /**
+     * Gets the value of the modified property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getMODIFIED() {
+        return modified;
+    }
+
+    /**
+     * Sets the value of the modified property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setMODIFIED(BigInteger value) {
+        this.modified = value;
+    }
+
+    /**
+     * Gets the value of the hgap property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getHGAP() {
+        return hgap;
+    }
+
+    /**
+     * Sets the value of the hgap property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setHGAP(BigInteger value) {
+        this.hgap = value;
+    }
+
     /**
      * Gets the value of the vgap property.
      * 
@@ -514,4 +476,28 @@ public class Node {
         this.vshift = value;
     }
 
+    /**
+     * Gets the value of the encryptedcontent property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getENCRYPTEDCONTENT() {
+        return encryptedcontent;
+    }
+
+    /**
+     * Sets the value of the encryptedcontent property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setENCRYPTEDCONTENT(String value) {
+        this.encryptedcontent = value;
+    }
+
 }

wise-webapp/src/main/java/com/wisemapping/xml/freemind/ObjectFactory.java

@@ -1,27 +1,8 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* $Id: file 64488 2006-03-10 17:32:09Z paulo $
-*/
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.03.26 at 10:38:46 PM ART
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
 //
 
 
@@ -36,7 +17,7 @@ import javax.xml.namespace.QName;
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the generated package.
+ * generated in the com.wisemapping.xml.freemind package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -53,36 +34,12 @@ public class ObjectFactory {
     private final static QName _Text_QNAME = new QName("", "text");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: generated
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.wisemapping.xml.freemind
      * 
      */
     public ObjectFactory() {
     }
 
-    /**
-     * Create an instance of {@link Arrowlink }
-     *
-     */
-    public Arrowlink createArrowlink() {
-        return new Arrowlink();
-    }
-
-    /**
-     * Create an instance of {@link Map }
-     *
-     */
-    public Map createMap() {
-        return new Map();
-    }
-
-    /**
-     * Create an instance of {@link Icon }
-     *
-     */
-    public Icon createIcon() {
-        return new Icon();
-    }
-
     /**
      * Create an instance of {@link Cloud }
      * 
@@ -92,19 +49,11 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link Font }
+     * Create an instance of {@link Richcontent }
      * 
      */
-    public Font createFont() {
+    public Richcontent createRichcontent() {
-        return new Font();
+        return new Richcontent();
-    }
-
-    /**
-     * Create an instance of {@link Parameters }
-     *
-     */
-    public Parameters createParameters() {
-        return new Parameters();
     }
 
     /**
@@ -115,6 +64,22 @@ public class ObjectFactory {
         return new Hook();
     }
 
+    /**
+     * Create an instance of {@link Arrowlink }
+     * 
+     */
+    public Arrowlink createArrowlink() {
+        return new Arrowlink();
+    }
+
+    /**
+     * Create an instance of {@link Parameters }
+     * 
+     */
+    public Parameters createParameters() {
+        return new Parameters();
+    }
+
     /**
      * Create an instance of {@link Edge }
      * 
@@ -123,6 +88,14 @@ public class ObjectFactory {
         return new Edge();
     }
 
+    /**
+     * Create an instance of {@link Html }
+     * 
+     */
+    public Html createHtml() {
+        return new Html();
+    }
+
     /**
      * Create an instance of {@link Node }
      * 
@@ -131,6 +104,30 @@ public class ObjectFactory {
         return new Node();
     }
 
+    /**
+     * Create an instance of {@link Icon }
+     * 
+     */
+    public Icon createIcon() {
+        return new Icon();
+    }
+
+    /**
+     * Create an instance of {@link Map }
+     * 
+     */
+    public Map createMap() {
+        return new Map();
+    }
+
+    /**
+     * Create an instance of {@link Font }
+     * 
+     */
+    public Font createFont() {
+        return new Font();
+    }
+
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Parameters.java

@@ -1,27 +1,8 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*       http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* $Id: file 64488 2006-03-10 17:32:09Z paulo $
-*/
-
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.0 in JDK 1.6 
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2007.08.27 at 09:24:17 PM ART 
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
 //
 
 

wise-webapp/src/main/java/com/wisemapping/xml/freemind/Richcontent.java

@@ -0,0 +1,106 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.10 at 02:12:59 PM ART 
+//
+
+
+package com.wisemapping.xml.freemind;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{}html"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="TYPE" use="required">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             &lt;enumeration value="NODE"/>
+ *             &lt;enumeration value="NOTE"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "html"
+})
+@XmlRootElement(name = "richcontent")
+public class Richcontent {
+
+    @XmlElement(required = true)
+    protected Html html;
+    @XmlAttribute(name = "TYPE", required = true)
+    protected String type;
+
+    /**
+     * Gets the value of the html property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Html }
+     *     
+     */
+    public Html getHtml() {
+        return html;
+    }
+
+    /**
+     * Sets the value of the html property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Html }
+     *     
+     */
+    public void setHtml(Html value) {
+        this.html = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTYPE() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTYPE(String value) {
+        this.type = value;
+    }
+
+}

wise-webapp/src/main/java/com/wisemapping/xml/freemind_0_9_0.xsd

@@ -74,6 +74,33 @@
         </xs:complexType>
     </xs:element>
 
+    <xs:element name='html'>
+        <xs:complexType>
+            <xs:sequence>
+                <!--Anything that is valid XML, but should be http://www.w3.org/1999/xhtml -->
+                <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name='richcontent'>
+        <xs:complexType>
+            <!-- And contains XHTML as unique child:-->
+            <xs:sequence>
+                <xs:element ref='html' minOccurs='1' maxOccurs='1'/>
+            </xs:sequence>
+            <!--Currently, only NODE or NOTE is allowed.-->
+            <xs:attribute name='TYPE' use='required'>
+                <xs:simpleType>
+                    <xs:restriction base='xs:string'>
+                        <xs:enumeration value='NODE'/>
+                        <xs:enumeration value='NOTE'/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
     <xs:element name='map'>
         <xs:complexType>
             <xs:sequence>
@@ -93,6 +120,8 @@
                 <xs:element ref='hook'/>
                 <xs:element ref='icon'/>
                 <xs:element ref='node'/>
+                <!-- For nodes with extended formatting content or for notes to nodes. -->
+                <xs:element ref='richcontent'/>
             </xs:choice>
             <xs:attribute name='BACKGROUND_COLOR' type='xs:string' use='optional'/>
             <xs:attribute name='COLOR' type='xs:string' use='optional'/>