Freemind import - Supporting collapsed nodes

2024-11-25 15:37:56 +01:00 · 2011-01-11 14:36:33 -03:00 · 2011-01-11 14:36:33 -03:00 · 67d2954f9e
commit 67d2954f9e
parent c1989c4562
10 changed files with 1213 additions and 951 deletions
--- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
@ -322,6 +322,10 @@ public class FreemindImporter
        mindmapTopic.setPosition( position+","+200 * orderPosition);
        String fontStyle = generateFontStyle(freemindNode,null);
        mindmapTopic.setFontStyle(fontStyle);
+        Boolean folded = Boolean.valueOf(freemindNode.getFOLDED());
+        if(folded){
+            mindmapTopic.setShrink(folded);
+        }
    }

    private String generateFontStyle(Node node,Font font)
--- a/wise-webapp/src/main/java/com/wisemapping/xml/mindmap.xsd
+++ b/wise-webapp/src/main/java/com/wisemapping/xml/mindmap.xsd
@ -8,8 +8,10 @@
        <xsd:complexType>
            <xsd:sequence>
                <xsd:element ref="topic" minOccurs="1" maxOccurs='unbounded'/>
+                <xsd:element ref="relationship" minOccurs="0" maxOccurs='unbounded'/>
            </xsd:sequence>
            <xsd:attribute name="name" type="xsd:string"/>
+            <xsd:attribute name="version" type="xsd:string"/>
        </xsd:complexType>
    </xsd:element>

@ -30,6 +32,8 @@
        <xsd:attribute name="order" type="xsd:int"/>
        <xsd:attribute name="position" type="xsd:string"/>
        <xsd:attribute name="central" type="xsd:boolean"/>
+        <xsd:attribute name="id" type="xsd:string" use="optional"/>
+        <xsd:attribute name="shrink" type="xsd:boolean"/>
    </xsd:complexType>

    <xsd:complexType name="icon">
@ -46,4 +50,15 @@
        <xsd:attribute name="text" type="xsd:string"/>
    </xsd:complexType>

+    <xsd:element name="relationship" type="relationshipType"/>
+    <xsd:complexType name="relationshipType">
+        <xsd:attribute name="id" type="xsd:string"/>
+        <xsd:attribute name="srcTopicId" type="xsd:string"/>
+        <xsd:attribute name="destTopicId" type="xsd:string"/>
+        <xsd:attribute name="lineType" type="xsd:string"/>
+        <xsd:attribute name="srcCtrlPoint" type="xsd:string"/>
+        <xsd:attribute name="destCtrlPoint" type="xsd:string"/>
+        <xsd:attribute name="endArrow" type="xsd:boolean"/>
+    </xsd:complexType>
+
 </xsd:schema>
--- a/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Icon.java
+++ b/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/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.11.01 at 09:40:11 PM ART
+// Generated on: 2011.01.11 at 02:17:09 PM ART 
 //


--- a/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Link.java
+++ b/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Link.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.11.01 at 09:40:11 PM ART
+// Generated on: 2011.01.11 at 02:17:09 PM ART 
 //


@ -42,8 +23,8 @@ import javax.xml.bind.annotation.XmlType;
 * &lt;complexType name="link">
 *   &lt;complexContent>
 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="order" type="{http://www.w3.org/2001/XMLSchema}string" />
 *       &lt;attribute name="url" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="order" type="{http://www.w3.org/2001/XMLSchema}string" />
 *     &lt;/restriction>
 *   &lt;/complexContent>
 * &lt;/complexType>
@ -55,34 +36,10 @@ import javax.xml.bind.annotation.XmlType;
@XmlType(name = "link")
 public class Link {

-    @XmlAttribute
-    protected String order;
    @XmlAttribute
    protected String url;
-
-    /**
-     * Gets the value of the order property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getOrder() {
-        return order;
-    }
-
-    /**
-     * Sets the value of the order property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setOrder(String value) {
-        this.order = value;
-    }
+    @XmlAttribute
+    protected String order;

    /**
     * Gets the value of the url property.
@ -108,4 +65,28 @@ public class Link {
        this.url = value;
    }

+    /**
+     * Gets the value of the order property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getOrder() {
+        return order;
+    }
+
+    /**
+     * Sets the value of the order property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOrder(String value) {
+        this.order = value;
+    }
+
 }
--- a/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Map.java
+++ b/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/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.11.01 at 09:40:11 PM ART
+// Generated on: 2011.01.11 at 02:17:09 PM ART 
 //


@ -48,8 +29,10 @@ import javax.xml.bind.annotation.XmlType;
 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
 *       &lt;sequence>
 *         &lt;element ref="{}topic" maxOccurs="unbounded"/>
+ *         &lt;element ref="{}relationship" maxOccurs="unbounded" minOccurs="0"/>
 *       &lt;/sequence>
 *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string" />
 *     &lt;/restriction>
 *   &lt;/complexContent>
 * &lt;/complexType>
@ -59,15 +42,19 @@ import javax.xml.bind.annotation.XmlType;
 */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
-    "topic"
+    "topic",
+    "relationship"
 })
@XmlRootElement(name = "map")
 public class Map {

    @XmlElement(required = true)
    protected List<TopicType> topic;
+    protected List<RelationshipType> relationship;
    @XmlAttribute
    protected String name;
+    @XmlAttribute
+    protected String version;

    /**
     * Gets the value of the topic property.
@ -98,6 +85,35 @@ public class Map {
        return this.topic;
    }

+    /**
+     * Gets the value of the relationship 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 relationship property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRelationship().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link RelationshipType }
+     * 
+     * 
+     */
+    public List<RelationshipType> getRelationship() {
+        if (relationship == null) {
+            relationship = new ArrayList<RelationshipType>();
+        }
+        return this.relationship;
+    }
+
    /**
     * Gets the value of the name property.
     * 
@ -122,4 +138,28 @@ public class Map {
        this.name = value;
    }

+    /**
+     * Gets the value of the version property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Sets the value of the version property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVersion(String value) {
+        this.version = value;
+    }
+
 }
--- a/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Note.java
+++ b/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/Note.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:28:06 PM ART 
+// Generated on: 2011.01.11 at 02:17:09 PM ART 
 //


--- a/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/ObjectFactory.java
+++ b/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/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:28:06 PM ART
+// Generated on: 2011.01.11 at 02:17:09 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.mindmap package. 
 * <p>An ObjectFactory allows you to programatically 
 * construct new instances of the Java representation 
 * for XML content. The Java representation of XML 
@ -51,28 +32,21 @@ import javax.xml.namespace.QName;
 public class ObjectFactory {

    private final static QName _Topic_QNAME = new QName("", "topic");
+    private final static QName _Relationship_QNAME = new QName("", "relationship");

    /**
-     * 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.mindmap
     * 
     */
    public ObjectFactory() {
    }

    /**
-     * Create an instance of {@link Link }
+     * Create an instance of {@link RelationshipType }
     * 
     */
-    public Link createLink() {
-        return new Link();
-    }
-
-    /**
-     * Create an instance of {@link Icon }
-     *
-     */
-    public Icon createIcon() {
-        return new Icon();
+    public RelationshipType createRelationshipType() {
+        return new RelationshipType();
    }

    /**
@ -83,6 +57,14 @@ public class ObjectFactory {
        return new Map();
    }

+    /**
+     * Create an instance of {@link Link }
+     * 
+     */
+    public Link createLink() {
+        return new Link();
+    }
+
    /**
     * Create an instance of {@link TopicType }
     * 
@ -99,6 +81,14 @@ public class ObjectFactory {
        return new Note();
    }

+    /**
+     * Create an instance of {@link Icon }
+     * 
+     */
+    public Icon createIcon() {
+        return new Icon();
+    }
+
    /**
     * Create an instance of {@link JAXBElement }{@code <}{@link TopicType }{@code >}}
     * 
@ -108,4 +98,13 @@ public class ObjectFactory {
        return new JAXBElement<TopicType>(_Topic_QNAME, TopicType.class, null, value);
    }

+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link RelationshipType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "", name = "relationship")
+    public JAXBElement<RelationshipType> createRelationship(RelationshipType value) {
+        return new JAXBElement<RelationshipType>(_Relationship_QNAME, RelationshipType.class, null, value);
+    }
+
 }
--- a/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/RelationshipType.java
+++ b/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/RelationshipType.java
@ -0,0 +1,227 @@
+//
+// 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.11 at 02:17:09 PM ART 
+//
+
+
+package com.wisemapping.xml.mindmap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for relationshipType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="relationshipType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="srcTopicId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="destTopicId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="lineType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="srcCtrlPoint" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="destCtrlPoint" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="endArrow" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "relationshipType")
+public class RelationshipType {
+
+    @XmlAttribute
+    protected String id;
+    @XmlAttribute
+    protected String srcTopicId;
+    @XmlAttribute
+    protected String destTopicId;
+    @XmlAttribute
+    protected String lineType;
+    @XmlAttribute
+    protected String srcCtrlPoint;
+    @XmlAttribute
+    protected String destCtrlPoint;
+    @XmlAttribute
+    protected Boolean endArrow;
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setId(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the srcTopicId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSrcTopicId() {
+        return srcTopicId;
+    }
+
+    /**
+     * Sets the value of the srcTopicId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSrcTopicId(String value) {
+        this.srcTopicId = value;
+    }
+
+    /**
+     * Gets the value of the destTopicId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDestTopicId() {
+        return destTopicId;
+    }
+
+    /**
+     * Sets the value of the destTopicId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDestTopicId(String value) {
+        this.destTopicId = value;
+    }
+
+    /**
+     * Gets the value of the lineType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getLineType() {
+        return lineType;
+    }
+
+    /**
+     * Sets the value of the lineType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLineType(String value) {
+        this.lineType = value;
+    }
+
+    /**
+     * Gets the value of the srcCtrlPoint property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSrcCtrlPoint() {
+        return srcCtrlPoint;
+    }
+
+    /**
+     * Sets the value of the srcCtrlPoint property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSrcCtrlPoint(String value) {
+        this.srcCtrlPoint = value;
+    }
+
+    /**
+     * Gets the value of the destCtrlPoint property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDestCtrlPoint() {
+        return destCtrlPoint;
+    }
+
+    /**
+     * Sets the value of the destCtrlPoint property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDestCtrlPoint(String value) {
+        this.destCtrlPoint = value;
+    }
+
+    /**
+     * Gets the value of the endArrow property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isEndArrow() {
+        return endArrow;
+    }
+
+    /**
+     * Sets the value of the endArrow property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setEndArrow(Boolean value) {
+        this.endArrow = value;
+    }
+
+}
--- a/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/TopicType.java
+++ b/wise-webapp/src/main/java/com/wisemapping/xml/mindmap/TopicType.java
@ -1,38 +1,19 @@
-/*
-* 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.11.01 at 09:40:11 PM ART
+// Generated on: 2011.01.11 at 02:17:09 PM ART 
 //


 package com.wisemapping.xml.mindmap;

+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.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;


 /**
@ -50,14 +31,16 @@ import java.util.List;
 *         &lt;element name="note" type="{}note" minOccurs="0"/>
 *         &lt;element ref="{}topic" maxOccurs="unbounded" minOccurs="0"/>
 *       &lt;/sequence>
+ *       &lt;attribute name="text" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="shape" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}string" />
 *       &lt;attribute name="bgColor" type="{http://www.w3.org/2001/XMLSchema}string" />
 *       &lt;attribute name="brColor" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="central" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}string" />
 *       &lt;attribute name="order" type="{http://www.w3.org/2001/XMLSchema}int" />
 *       &lt;attribute name="position" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="shape" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="text" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="central" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="shrink" type="{http://www.w3.org/2001/XMLSchema}boolean" />
 *     &lt;/restriction>
 *   &lt;/complexContent>
 * &lt;/complexType>
@ -79,21 +62,25 @@ public class TopicType {
    protected Note note;
    protected List<TopicType> topic;
    @XmlAttribute
+    protected String text;
+    @XmlAttribute
+    protected String shape;
+    @XmlAttribute
+    protected String fontStyle;
+    @XmlAttribute
    protected String bgColor;
    @XmlAttribute
    protected String brColor;
    @XmlAttribute
-    protected Boolean central;
-    @XmlAttribute
-    protected String fontStyle;
-    @XmlAttribute
    protected Integer order;
    @XmlAttribute
    protected String position;
    @XmlAttribute
-    protected String shape;
+    protected Boolean central;
    @XmlAttribute
-    protected String text;
+    protected String id;
+    @XmlAttribute
+    protected Boolean shrink;

    /**
     * Gets the value of the icon property.
@ -201,6 +188,78 @@ public class TopicType {
        return this.topic;
    }

+    /**
+     * Gets the value of the text property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getText() {
+        return text;
+    }
+
+    /**
+     * Sets the value of the text property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setText(String value) {
+        this.text = value;
+    }
+
+    /**
+     * Gets the value of the shape property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getShape() {
+        return shape;
+    }
+
+    /**
+     * Sets the value of the shape property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setShape(String value) {
+        this.shape = value;
+    }
+
+    /**
+     * Gets the value of the fontStyle property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFontStyle() {
+        return fontStyle;
+    }
+
+    /**
+     * Sets the value of the fontStyle property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFontStyle(String value) {
+        this.fontStyle = value;
+    }
+
    /**
     * Gets the value of the bgColor property.
     * 
@ -249,54 +308,6 @@ public class TopicType {
        this.brColor = value;
    }

-    /**
-     * Gets the value of the central property.
-     *
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *
-     */
-    public Boolean isCentral() {
-        return central;
-    }
-
-    /**
-     * Sets the value of the central property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *
-     */
-    public void setCentral(Boolean value) {
-        this.central = value;
-    }
-
-    /**
-     * Gets the value of the fontStyle property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getFontStyle() {
-        return fontStyle;
-    }
-
-    /**
-     * Sets the value of the fontStyle property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setFontStyle(String value) {
-        this.fontStyle = value;
-    }
-
    /**
     * Gets the value of the order property.
     * 
@ -346,52 +357,75 @@ public class TopicType {
    }

    /**
-     * Gets the value of the shape property.
+     * Gets the value of the central property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isCentral() {
+        return central;
+    }
+
+    /**
+     * Sets the value of the central property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setCentral(Boolean value) {
+        this.central = value;
+    }
+
+    /**
+     * Gets the value of the id property.
     * 
     * @return
     *     possible object is
     *     {@link String }
     *     
     */
-    public String getShape() {
-        return shape;
+    public String getId() {
+        return id;
    }

    /**
-     * Sets the value of the shape property.
+     * Sets the value of the id property.
     * 
     * @param value
     *     allowed object is
     *     {@link String }
     *     
     */
-    public void setShape(String value) {
-        this.shape = value;
+    public void setId(String value) {
+        this.id = value;
    }

    /**
-     * Gets the value of the text property.
+     * Gets the value of the shrink property.
     * 
     * @return
     *     possible object is
-     *     {@link String }
+     *     {@link Boolean }
     *     
     */
-    public String getText() {
-        return text;
+    public Boolean isShrink() {
+        return shrink;
    }

    /**
-     * Sets the value of the text property.
+     * Sets the value of the shrink property.
     * 
     * @param value
     *     allowed object is
-     *     {@link String }
+     *     {@link Boolean }
     *     
     */
-    public void setText(String value) {
-        this.text = value;
+    public void setShrink(Boolean value) {
+        this.shrink = value;
    }

 }
-
--- a/wise-webapp/src/main/resources/mindmap.xsd
+++ b/wise-webapp/src/main/resources/mindmap.xsd
@ -2,12 +2,10 @@
 <xsd:schema
        attributeFormDefault="unqualified"
        elementFormDefault="qualified"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.wisemapping.org/mindmap"
-        xmlns="http://www.wisemapping.org/mindmap">
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-    <xsd:element name="map" type="mapType"/>
-
-    <xsd:complexType name="mapType">
+    <xsd:element name="map">
+        <xsd:complexType>
            <xsd:sequence>
                <xsd:element ref="topic" minOccurs="1" maxOccurs='unbounded'/>
                <xsd:element ref="relationship" minOccurs="0" maxOccurs='unbounded'/>
@ -15,6 +13,7 @@
            <xsd:attribute name="name" type="xsd:string"/>
            <xsd:attribute name="version" type="xsd:string"/>
        </xsd:complexType>
+    </xsd:element>

    <xsd:element name="topic" type="topicType"/>

@ -33,7 +32,8 @@
        <xsd:attribute name="order" type="xsd:int"/>
        <xsd:attribute name="position" type="xsd:string"/>
        <xsd:attribute name="central" type="xsd:boolean"/>
-        <xsd:attribute name="id" type="xsd:ID" use="optional"/>
+        <xsd:attribute name="id" type="xsd:string" use="optional"/>
+        <xsd:attribute name="shrink" type="xsd:boolean"/>
    </xsd:complexType>

    <xsd:complexType name="icon">
@ -52,9 +52,9 @@

    <xsd:element name="relationship" type="relationshipType"/>
    <xsd:complexType name="relationshipType">
-        <xsd:attribute name="id" type="xsd:ID"/>
-        <xsd:attribute name="srcTopicId" type="xsd:ID"/>
-        <xsd:attribute name="destTopicId" type="xsd:ID"/>
+        <xsd:attribute name="id" type="xsd:string"/>
+        <xsd:attribute name="srcTopicId" type="xsd:string"/>
+        <xsd:attribute name="destTopicId" type="xsd:string"/>
        <xsd:attribute name="lineType" type="xsd:string"/>
        <xsd:attribute name="srcCtrlPoint" type="xsd:string"/>
        <xsd:attribute name="destCtrlPoint" type="xsd:string"/>