Adding model update, model migrator, curved line support, relationship lines, remove of web-services classes

wise-webapp/src/main/webapp/css/editor.css

@@ -216,11 +216,11 @@ div#node {
 }
 
 div#font {
-    left: 619px; /*left:581px;*/
+    left: 656px; /*left:581px;*/
 }
 
 div#share {
-    left: 815px; /*left:777px;*/
+    left: 852px; /*left:777px;*/
 }
 
 div#saveButton {
@@ -311,6 +311,12 @@ div#topicLink {
     z-index: 4;
 }
 
+div#topicRelation {
+    background: url(../images/topic_link.png) no-repeat center top;
+    behavior: url(../css/iepngfix.htc);
+    z-index: 4;
+}
+
 div#topicNote {
     background-image: url(../images/note.png);
     behavior: url(../css/iepngfix.htc);

wise-webapp/src/main/webapp/js/editor.js

@@ -269,7 +269,7 @@ function afterMindpotLibraryLoading()
         designer.deleteCurrentNode();
     });
     var context = this;
-    var colorPicker1 = new MooRainbow('topicColor', {
+    /*var colorPicker1 = new MooRainbow('topicColor', {
         id: 'topicColor',
         imgPath: '../images/',
         startColor: [255, 255, 255],
@@ -298,12 +298,16 @@ function afterMindpotLibraryLoading()
         onComplete: function(color) {
             removeCurrentColorPicker.attempt(colorPicker2, context);
         }
-    });
+    });*/
     $('topicLink').addEvent('click', function(event) {
         designer.addLink2SelectedNode();
 
     });
 
+    $('topicRelation').addEvent('click', function(event) {
+        designer.addRelationShip2SelectedNode(event);
+    });
+
     $('topicNote').addEvent('click', function(event) {
         designer.addNote2SelectedNode();
 
@@ -318,7 +322,7 @@ function afterMindpotLibraryLoading()
         designer.setStyle2SelectedNode();
     });
 
-    var colorPicker3 = new MooRainbow('fontColor', {
+    /*var colorPicker3 = new MooRainbow('fontColor', {
         id: 'fontColor',
         imgPath: '../images/',
         startColor: [255, 255, 255],
@@ -332,7 +336,7 @@ function afterMindpotLibraryLoading()
         onComplete: function(color) {
             removeCurrentColorPicker.attempt(colorPicker3, context);
         }
-    });
+    });*/
 
     // Save event handler ....
     var saveButton = $('saveButton');
@@ -520,7 +524,6 @@ function buildMindmapDesigner()
     var container = $('mindplot');
 
     // Initialize Editor ...
-    var persistantManager = new mindplot.PersistanceManager(window.MapEditorService);
 
     var screenWidth = window.getWidth();
     var screenHeight = window.getHeight();
@@ -533,7 +536,7 @@ function buildMindmapDesigner()
     editorProperties.width = screenWidth;
     editorProperties.height = screenHeight;
 
-    designer = new mindplot.MindmapDesigner(editorProperties, container, persistantManager);
+    designer = new mindplot.MindmapDesigner(editorProperties, container);
     designer.loadFromXML(mapId, mapXml);
 
     // If a node has focus, focus can be move to another node using the keys.

wise-webapp/src/main/webapp/js/embedded.js

@@ -67,7 +67,6 @@ function buildMindmapDesigner()
     var container = $('mindplot');
 
     // Initialize Editor ...
-    var persistantManager = new mindplot.PersistanceManager(window.MapEditorService);
 
     var screenWidth = window.getWidth();
     var screenHeight = window.getHeight();
@@ -77,7 +76,7 @@ function buildMindmapDesigner()
     editorProperties.height = screenHeight;
     editorProperties.viewMode = true;
 
-    designer = new mindplot.MindmapDesigner(editorProperties, container, persistantManager);
+    designer = new mindplot.MindmapDesigner(editorProperties, container);
     designer.loadFromXML(mapId, mapXml);
 
     // If a node has focus, focus can be move to another node using the keys.

wise-webapp/src/main/webapp/jsp/footer.jsp

@@ -15,9 +15,10 @@
         </form>
     </div>
 </div>
+<%--
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
 </script>
 <script type="text/javascript">
     _uacct = "UA-2347723-1";
     urchinTracker();
-</script>
+</script>--%>

wise-webapp/src/main/webapp/jsp/header.jsp

@@ -1,3 +1,4 @@
+<%@page pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>

wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp

@@ -192,6 +192,9 @@
                 <div id="topicLink" class="button" title="<spring:message code="TOPIC_LINK"/>">
                     <div class="toolbarLabel"><p><spring:message code="LINK"/></p></div>
                 </div>
+                <div id="topicRelation" class="button" title="<spring:message code="TOPIC_RELATIONSHIP"/>">
+                    <div class="toolbarLabel"><p><spring:message code="TOPIC_RELATIONSHIP"/></p></div>
+                </div>
             </fieldset>
         </div>
         <div id="font" class="buttonContainer" title="Font Properties">
@@ -332,11 +335,11 @@
     <script type="text/javascript" src="../dwr/interface/MapEditorService.js"></script>
 </c:if>
 <script type="text/javascript" src="../js/editor.js"></script>
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+<%--<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
 </script>
 <script type="text/javascript">
     _uacct = "UA-2347723-1";
     urchinTracker();
-</script>
+</script>--%>
 </body>
 </html>

wise-webapp/src/main/webapp/jsp/template.jsp

@@ -1,4 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<%@page pageEncoding="UTF-8"%>
 <%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %>
 <%@ include file="/jsp/init.jsp" %>