diff --git a/mindplot/pom.xml b/mindplot/pom.xml index 29267e84..188b0503 100644 --- a/mindplot/pom.xml +++ b/mindplot/pom.xml @@ -32,7 +32,7 @@ jstd-maven-plugin google code repo http://jstd-maven-plugin.googlecode.com/svn/maven2 - + @@ -81,10 +81,13 @@ - - + + - + @@ -134,23 +137,23 @@ + files="layout/boards/Board.js"/> + files="layout/boards/freemind/Board.js"/> + files="layout/boards/freemind/Entry.js"/> + files="layout/boards/freemind/CentralTopicBoard.js"/> + files="layout/boards/freemind/MainTopicBoard.js"/> + files="layout/BaseLayoutManager.js"/> + files="layout/OriginalLayoutManager.js"/> + files="layout/FreeMindLayoutManager.js"/> + files="layout/LayoutManagerFactory.js"/> @@ -254,15 +257,15 @@ commands/freeMind/DragTopicCommand-min.js commands/freeMind/ReconnectTopicCommand-min.js - layoutManagers/boards/Board-min.js - layoutManagers/boards/freeMindBoards/Board-min.js - layoutManagers/boards/freeMindBoards/Entry-min.js - layoutManagers/boards/freeMindBoards/CentralTopicBoard-min.js - layoutManagers/boards/freeMindBoards/MainTopicBoard-min.js - layoutManagers/BaseLayoutManager-min.js - layoutManagers/OriginalLayoutManager-min.js - layoutManagers/FreeMindLayoutManager-min.js - layoutManagers/LayoutManagerFactory-min.js + layout/boards/Board-min.js + layout/boards/freemind/Board-min.js + layout/boards/freemind/Entry-min.js + layout/boards/freemind/CentralTopicBoard-min.js + layout/boards/freemind/MainTopicBoard-min.js + layout/BaseLayoutManager-min.js + layout/OriginalLayoutManager-min.js + layout/FreeMindLayoutManager-min.js + layout/LayoutManagerFactory-min.js footer-min.js @@ -291,23 +294,23 @@ - + diff --git a/mindplot/src/main/javascript/MindmapDesigner.js b/mindplot/src/main/javascript/MindmapDesigner.js index be751562..925ab0c0 100644 --- a/mindplot/src/main/javascript/MindmapDesigner.js +++ b/mindplot/src/main/javascript/MindmapDesigner.js @@ -42,9 +42,9 @@ mindplot.MindmapDesigner = new Class({ // Init layout managers ... this._topics = []; -// var layoutManagerClass = mindplot.layoutManagers.LayoutManagerFactory.getManagerByName(mindplot.EditorOptions.LayoutManager); +// var layoutManagerClass = mindplot.layout.LayoutManagerFactory.getManagerByName(mindplot.EditorOptions.LayoutManager); // this._layoutManager = new layoutManagerClass(this); - this._layoutManager = new mindplot.layoutManagers.OriginalLayoutManager(this); + this._layoutManager = new mindplot.layout.OriginalLayoutManager(this); // Register handlers.. this._registerEvents(); diff --git a/mindplot/src/main/javascript/header.js b/mindplot/src/main/javascript/header.js index f31b84c6..81710eeb 100644 --- a/mindplot/src/main/javascript/header.js +++ b/mindplot/src/main/javascript/header.js @@ -25,4 +25,4 @@ var mindplot = {}; mindplot.util = {}; mindplot.commands = {}; -mindplot.layoutManagers = {}; \ No newline at end of file +mindplot.layout = {}; \ No newline at end of file diff --git a/mindplot/src/main/javascript/layoutManagers/BaseLayoutManager.js b/mindplot/src/main/javascript/layout/BaseLayoutManager.js similarity index 85% rename from mindplot/src/main/javascript/layoutManagers/BaseLayoutManager.js rename to mindplot/src/main/javascript/layout/BaseLayoutManager.js index 6cc697eb..51067e5e 100644 --- a/mindplot/src/main/javascript/layoutManagers/BaseLayoutManager.js +++ b/mindplot/src/main/javascript/layout/BaseLayoutManager.js @@ -1,4 +1,4 @@ -mindplot.layoutManagers.BaseLayoutManager = new Class({ +mindplot.layout.BaseLayoutManager = new Class({ options: { @@ -55,10 +55,10 @@ mindplot.layoutManagers.BaseLayoutManager = new Class({ return board; }, _createMainTopicBoard:function(node){ - return new mindplot.layoutManagers.boards.Board(node, this); + return new mindplot.layout.boards.Board(node, this); }, _createCentralTopicBoard:function(node){ - return new mindplot.layoutManagers.boards.Board(node, this); + return new mindplot.layout.boards.Board(node, this); }, prepareNode:function(node, children){ @@ -77,11 +77,11 @@ mindplot.layoutManagers.BaseLayoutManager = new Class({ return type == mindplot.NodeModel.CENTRAL_TOPIC_TYPE; }, getClassName:function(){ - return mindplot.layoutManagers.BaseLayoutManager.NAME; + return mindplot.layout.BaseLayoutManager.NAME; } }); -mindplot.layoutManagers.BaseLayoutManager.NAME ="BaseLayoutManager"; +mindplot.layout.BaseLayoutManager.NAME ="BaseLayoutManager"; -mindplot.layoutManagers.BaseLayoutManager.implement(new Events); -mindplot.layoutManagers.BaseLayoutManager.implement(new Options); \ No newline at end of file +mindplot.layout.BaseLayoutManager.implement(new Events); +mindplot.layout.BaseLayoutManager.implement(new Options); \ No newline at end of file diff --git a/mindplot/src/main/javascript/layoutManagers/FreeMindLayoutManager.js b/mindplot/src/main/javascript/layout/FreeMindLayoutManager.js similarity index 95% rename from mindplot/src/main/javascript/layoutManagers/FreeMindLayoutManager.js rename to mindplot/src/main/javascript/layout/FreeMindLayoutManager.js index 3891b4fd..559a9905 100644 --- a/mindplot/src/main/javascript/layoutManagers/FreeMindLayoutManager.js +++ b/mindplot/src/main/javascript/layout/FreeMindLayoutManager.js @@ -1,4 +1,4 @@ -mindplot.layoutManagers.FreeMindLayoutManager = mindplot.layoutManagers.BaseLayoutManager.extend({ +mindplot.layout.FreeMindLayoutManager = mindplot.layout.BaseLayoutManager.extend({ options:{ }, @@ -224,13 +224,13 @@ mindplot.layoutManagers.FreeMindLayoutManager = mindplot.layoutManagers.BaseLayo }, getClassName:function(){ - return mindplot.layoutManagers.FreeMindLayoutManager.NAME; + return mindplot.layout.FreeMindLayoutManager.NAME; }, _createMainTopicBoard:function(node){ - return new mindplot.layoutManagers.boards.freeMindBoards.MainTopicBoard(node, this); + return new mindplot.layout.boards.freemind.MainTopicBoard(node, this); }, _createCentralTopicBoard:function(node){ - return new mindplot.layoutManagers.boards.freeMindBoards.CentralTopicBoard(node, this); + return new mindplot.layout.boards.freemind.CentralTopicBoard(node, this); } , _updateParentBoard:function(node, modifiedTopics){ @@ -271,7 +271,7 @@ mindplot.layoutManagers.FreeMindLayoutManager = mindplot.layoutManagers.BaseLayo this._addMoveHelper(node); }, _addMoveHelper:function(node){ - var moveShape = new mindplot.ActionIcon(node, mindplot.layoutManagers.FreeMindLayoutManager.MOVE_IMAGE_URL); + var moveShape = new mindplot.ActionIcon(node, mindplot.layout.FreeMindLayoutManager.MOVE_IMAGE_URL); moveShape.setCursor('move'); var positionate = function(node){ if(node.getId() == this.getNode().getId()){ @@ -333,7 +333,7 @@ mindplot.layoutManagers.FreeMindLayoutManager = mindplot.layoutManagers.BaseLayo this._mouseOutListeners.set(topics[i].getId(),outListener); } } - this._updateTopicsForReconnect(topic, mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_NODES_OPACITY); + this._updateTopicsForReconnect(topic, mindplot.layout.FreeMindLayoutManager.RECONNECT_NODES_OPACITY); var line = topic.getOutgoingLine(); if($defined(line)){ line.setVisibility(false); @@ -486,14 +486,14 @@ mindplot.layoutManagers.FreeMindLayoutManager = mindplot.layoutManagers.BaseLayo var nodePos = this.getPosition(); //if it is on the child half side, or it is central topic add it as child if(!this.areChildrenShrinked() && (layoutManager._isCentralTopic(this) || this.getParent()==null || ((Math.sign(nodePos.x)>0 && pos.x>nodePos.x) || (Math.sign(nodePos.x)<0 && pos.x0?size.width/2:0, 0); @@ -526,14 +526,14 @@ mindplot.layoutManagers.FreeMindLayoutManager = mindplot.layoutManagers.BaseLayo this._createSiblingShape.setVisibility(false); this._createShape = "Child"; this._targetNode = topic; - } else if(shape == mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_TOP){ + } else if(shape == mindplot.layout.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_TOP){ this._createSiblingShape.setSize(size.width,size.height/2); this._createSiblingShape.setPosition(0,0); this._createSiblingShape.setVisibility(true); this._createChildShape.setVisibility(false); this._createShape = "Sibling_top"; this._targetNode = topic; - }else if(shape == mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_BOTTOM){ + }else if(shape == mindplot.layout.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_BOTTOM){ this._createSiblingShape.setSize(size.width,size.height/2); this._createSiblingShape.setPosition(0,size.height/2); this._createSiblingShape.setVisibility(true); @@ -588,7 +588,7 @@ mindplot.layoutManagers.FreeMindLayoutManager = mindplot.layoutManagers.BaseLayo } else{ //if is an isolated topic, create entry and update margins. - entry = new mindplot.layoutManagers.boards.freeMindBoards.Entry(node, false); + entry = new mindplot.layout.boards.freemind.Entry(node, false); var board = this.getTopicBoardForTopic(node); var table = board._getTableForNode(null); if(table.length>0){ @@ -686,9 +686,9 @@ mindplot.layoutManagers.FreeMindLayoutManager = mindplot.layoutManagers.BaseLayo } }); -mindplot.layoutManagers.FreeMindLayoutManager.NAME ="FreeMindLayoutManager"; -mindplot.layoutManagers.FreeMindLayoutManager.MOVE_IMAGE_URL = "../images/move.png"; -mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_NODES_OPACITY = 0.4; -mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_SHAPE_CHILD = "child"; -mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_TOP = "top"; -mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_BOTTOM = "bottom"; \ No newline at end of file +mindplot.layout.FreeMindLayoutManager.NAME ="FreeMindLayoutManager"; +mindplot.layout.FreeMindLayoutManager.MOVE_IMAGE_URL = "../images/move.png"; +mindplot.layout.FreeMindLayoutManager.RECONNECT_NODES_OPACITY = 0.4; +mindplot.layout.FreeMindLayoutManager.RECONNECT_SHAPE_CHILD = "child"; +mindplot.layout.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_TOP = "top"; +mindplot.layout.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_BOTTOM = "bottom"; \ No newline at end of file diff --git a/mindplot/src/main/javascript/layout/LayoutManagerFactory.js b/mindplot/src/main/javascript/layout/LayoutManagerFactory.js new file mode 100644 index 00000000..d7e179cc --- /dev/null +++ b/mindplot/src/main/javascript/layout/LayoutManagerFactory.js @@ -0,0 +1,16 @@ +mindplot.layout.LayoutManagerFactory = {}; +mindplot.layout.LayoutManagerFactory.managers = { + OriginalLayoutManager:mindplot.layout.OriginalLayoutManager, + FreeMindLayoutManager:mindplot.layout.FreeMindLayoutManager +}; +mindplot.layout.LayoutManagerFactory.getManagerByName = function(name) { + var manager = mindplot.layout.LayoutManagerFactory.managers[name + "Manager"]; + if ($defined(manager)) { + return manager; + } + else { + return mindplot.layout.LayoutManagerFactory.managers["OriginalLayoutManager"]; + } +}; + + diff --git a/mindplot/src/main/javascript/layoutManagers/OriginalLayoutManager.js b/mindplot/src/main/javascript/layout/OriginalLayoutManager.js similarity index 82% rename from mindplot/src/main/javascript/layoutManagers/OriginalLayoutManager.js rename to mindplot/src/main/javascript/layout/OriginalLayoutManager.js index a2dce7bb..71e221c7 100644 --- a/mindplot/src/main/javascript/layoutManagers/OriginalLayoutManager.js +++ b/mindplot/src/main/javascript/layout/OriginalLayoutManager.js @@ -1,23 +1,23 @@ /* -* Copyright [2011] [wisemapping] -* -* Licensed under WiseMapping Public License, Version 1.0 (the "License"). -* It is basically the Apache License, Version 2.0 (the "License") plus the -* "powered by wisemapping" text requirement on every single page; -* you may not use this file except in compliance with the License. -* You may obtain a copy of the license at -* -* http://www.wisemapping.org/license -* -* 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. -*/ + * Copyright [2011] [wisemapping] + * + * Licensed under WiseMapping Public License, Version 1.0 (the "License"). + * It is basically the Apache License, Version 2.0 (the "License") plus the + * "powered by wisemapping" text requirement on every single page; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the license at + * + * http://www.wisemapping.org/license + * + * 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. + */ -mindplot.layoutManagers.OriginalLayoutManager = new Class({ - Extends:mindplot.layoutManagers.BaseLayoutManager, +mindplot.layout.OriginalLayoutManager = new Class({ + Extends:mindplot.layout.BaseLayoutManager, options:{ }, @@ -143,8 +143,8 @@ mindplot.layoutManagers.OriginalLayoutManager = new Class({ return new mindplot.CentralTopicBoard(node, this); }, getClassName:function() { - return mindplot.layoutManagers.OriginalLayoutManager.NAME; + return mindplot.layout.OriginalLayoutManager.NAME; } }); -mindplot.layoutManagers.OriginalLayoutManager.NAME = "OriginalLayoutManager"; \ No newline at end of file +mindplot.layout.OriginalLayoutManager.NAME = "OriginalLayoutManager"; \ No newline at end of file diff --git a/mindplot/src/main/javascript/layout/boards/Board.js b/mindplot/src/main/javascript/layout/boards/Board.js new file mode 100644 index 00000000..0848db7f --- /dev/null +++ b/mindplot/src/main/javascript/layout/boards/Board.js @@ -0,0 +1,36 @@ +mindplot.layout.boards = {}; + +mindplot.layout.boards.Board = new Class({ + + options: { + + }, + initialize: function(node, layoutManager, options) { + this.setOptions(options); + this._node = node; + this._layoutManager = layoutManager; + }, + getClassName:function() { + return mindplot.layout.boards.Board.NAME; + }, + removeTopicFromBoard:function(node, modifiedTopics) { + $assert(false, "no Board implementation found!"); + }, + addBranch:function(node, modifiedTopics) { + $assert(false, "no Board implementation found!"); + }, + updateChildrenPosition:function(node, modifiedTopics) { + $assert(false, "no Board implementation found!"); + }, + setNodeMarginTop:function(node, delta) { + $assert(false, "no Board implementation found!"); + }, + getNode:function() { + return this._node; + } +}); + +mindplot.layout.boards.Board.NAME = "Board"; + +mindplot.layout.boards.Board.implement(new Events); +mindplot.layout.boards.Board.implement(new Options); \ No newline at end of file diff --git a/mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/Board.js b/mindplot/src/main/javascript/layout/boards/freemind/Board.js similarity index 96% rename from mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/Board.js rename to mindplot/src/main/javascript/layout/boards/freemind/Board.js index ec4a39cf..b0e68959 100644 --- a/mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/Board.js +++ b/mindplot/src/main/javascript/layout/boards/freemind/Board.js @@ -1,6 +1,6 @@ -mindplot.layoutManagers.boards.freeMindBoards={}; +mindplot.layout.boards.freemind = {}; -mindplot.layoutManagers.boards.freeMindBoards.Board = mindplot.layoutManagers.boards.Board.extend({ +mindplot.layout.boards.freemind.Board = mindplot.layout.boards.Board.extend({ options:{ }, @@ -24,7 +24,7 @@ mindplot.layoutManagers.boards.freeMindBoards.Board = mindplot.layoutManagers.bo }, addBranch:function(node,modifiedTopics){ var pos = (this._layoutManager._isMovingNode?node.getPosition():node.getModel().getFinalPosition() || node.getPosition()); - var entry = new mindplot.layoutManagers.boards.freeMindBoards.Entry(node, !this._layoutManager._isMovingNode); + var entry = new mindplot.layout.boards.freemind.Entry(node, !this._layoutManager._isMovingNode); var result = this.findNewNodeEntryIndex(entry); // if creating a sibling or child diff --git a/mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/CentralTopicBoard.js b/mindplot/src/main/javascript/layout/boards/freemind/CentralTopicBoard.js similarity index 83% rename from mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/CentralTopicBoard.js rename to mindplot/src/main/javascript/layout/boards/freemind/CentralTopicBoard.js index 29926b1e..50b824ca 100644 --- a/mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/CentralTopicBoard.js +++ b/mindplot/src/main/javascript/layout/boards/freemind/CentralTopicBoard.js @@ -1,4 +1,4 @@ -mindplot.layoutManagers.boards.freeMindBoards.CentralTopicBoard = mindplot.layoutManagers.boards.freeMindBoards.Board.extend({ +mindplot.layout.boards.freemind.CentralTopicBoard = mindplot.layout.boards.freemind.Board.extend({ options:{ }, diff --git a/mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/Entry.js b/mindplot/src/main/javascript/layout/boards/freemind/Entry.js similarity index 97% rename from mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/Entry.js rename to mindplot/src/main/javascript/layout/boards/freemind/Entry.js index ea6d0564..cd1b069f 100644 --- a/mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/Entry.js +++ b/mindplot/src/main/javascript/layout/boards/freemind/Entry.js @@ -1,4 +1,4 @@ -mindplot.layoutManagers.boards.freeMindBoards.Entry = new Class({ +mindplot.layout.boards.freemind.Entry = new Class({ initialize:function(node, useFinalPosition){ this._node = node; this._DEFAULT_X_GAP = 30; diff --git a/mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/MainTopicBoard.js b/mindplot/src/main/javascript/layout/boards/freemind/MainTopicBoard.js similarity index 69% rename from mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/MainTopicBoard.js rename to mindplot/src/main/javascript/layout/boards/freemind/MainTopicBoard.js index 0b17f245..15f41392 100644 --- a/mindplot/src/main/javascript/layoutManagers/boards/freeMindBoards/MainTopicBoard.js +++ b/mindplot/src/main/javascript/layout/boards/freemind/MainTopicBoard.js @@ -1,4 +1,4 @@ -mindplot.layoutManagers.boards.freeMindBoards.MainTopicBoard = mindplot.layoutManagers.boards.freeMindBoards.Board.extend({ +mindplot.layout.boards.freemind.MainTopicBoard = mindplot.layout.boards.freemind.Board.extend({ options:{ }, diff --git a/mindplot/src/main/javascript/layoutManagers/LayoutManagerFactory.js b/mindplot/src/main/javascript/layoutManagers/LayoutManagerFactory.js deleted file mode 100644 index 5f865551..00000000 --- a/mindplot/src/main/javascript/layoutManagers/LayoutManagerFactory.js +++ /dev/null @@ -1,16 +0,0 @@ -mindplot.layoutManagers.LayoutManagerFactory = {}; -mindplot.layoutManagers.LayoutManagerFactory.managers = { - OriginalLayoutManager:mindplot.layoutManagers.OriginalLayoutManager, - FreeMindLayoutManager:mindplot.layoutManagers.FreeMindLayoutManager -}; -mindplot.layoutManagers.LayoutManagerFactory.getManagerByName = function(name){ - var manager = mindplot.layoutManagers.LayoutManagerFactory.managers[name+"Manager"]; - if($defined(manager)){ - return manager; - } - else{ - return mindplot.layoutManagers.LayoutManagerFactory.managers["OriginalLayoutManager"]; - } -}; - - diff --git a/mindplot/src/main/javascript/layoutManagers/boards/Board.js b/mindplot/src/main/javascript/layoutManagers/boards/Board.js deleted file mode 100644 index 92d2e649..00000000 --- a/mindplot/src/main/javascript/layoutManagers/boards/Board.js +++ /dev/null @@ -1,36 +0,0 @@ -mindplot.layoutManagers.boards={}; - -mindplot.layoutManagers.boards.Board = new Class({ - - options: { - - }, - initialize: function(node, layoutManager, options) { - this.setOptions(options); - this._node = node; - this._layoutManager = layoutManager; - }, - getClassName:function(){ - return mindplot.layoutManagers.boards.Board.NAME; - }, - removeTopicFromBoard:function(node, modifiedTopics){ - $assert(false, "no Board implementation found!"); - }, - addBranch:function(node, modifiedTopics){ - $assert(false, "no Board implementation found!"); - }, - updateChildrenPosition:function(node, modifiedTopics){ - $assert(false, "no Board implementation found!"); - }, - setNodeMarginTop:function(node, delta){ - $assert(false, "no Board implementation found!"); - }, - getNode:function(){ - return this._node; - } -}); - -mindplot.layoutManagers.boards.Board.NAME ="Board"; - -mindplot.layoutManagers.boards.Board.implement(new Events); -mindplot.layoutManagers.boards.Board.implement(new Options); \ No newline at end of file diff --git a/pom.xml b/pom.xml index b9eff0d3..3ae6b0b4 100644 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,8 @@ web2d core-js mindplot + + wise-doc