From d62d4af76691c791125568914c24a7f5e43367c7 Mon Sep 17 00:00:00 2001 From: Paulo Veiga Date: Thu, 1 Dec 2011 18:07:19 -0300 Subject: [PATCH] Move layout files in order to reflethe final layout structure. --- mindplot/pom.xml | 32 ++++++++++++------- mindplot/src/main/javascript/MainTopic.js | 4 ++- mindplot/src/main/javascript/Topic.js | 3 ++ mindplot/src/main/javascript/header.js | 2 ++ .../javascript/layout/BaseLayoutManager.js | 18 +++++++++++ .../layout/FreeMindLayoutManager.js | 18 +++++++++++ .../javascript/layout/LayoutManagerFactory.js | 18 +++++++++++ .../layout/OriginalLayoutManager.js | 4 +-- .../main/javascript/layout/boards/Board.js | 2 -- .../{ => layout/boards/original}/Board.js | 6 ++-- .../boards/original}/BoardEntry.js | 2 +- .../boards/original}/CentralTopicBoard.js | 8 ++--- .../boards/original}/FixedDistanceBoard.js | 26 ++++++++------- .../boards/original}/MainTopicBoard.js | 10 +++--- .../boards/original}/VariableDistanceBoard.js | 6 ++-- 15 files changed, 113 insertions(+), 46 deletions(-) rename mindplot/src/main/javascript/{ => layout/boards/original}/Board.js (91%) rename mindplot/src/main/javascript/{ => layout/boards/original}/BoardEntry.js (95%) rename mindplot/src/main/javascript/{ => layout/boards/original}/CentralTopicBoard.js (89%) rename mindplot/src/main/javascript/{ => layout/boards/original}/FixedDistanceBoard.js (91%) rename mindplot/src/main/javascript/{ => layout/boards/original}/MainTopicBoard.js (91%) rename mindplot/src/main/javascript/{ => layout/boards/original}/VariableDistanceBoard.js (94%) diff --git a/mindplot/pom.xml b/mindplot/pom.xml index f976cda6..7a992c0e 100644 --- a/mindplot/pom.xml +++ b/mindplot/pom.xml @@ -84,9 +84,18 @@ - - - + + + + + + + @@ -94,10 +103,9 @@ - - - + @@ -152,21 +160,21 @@ - + - + - + - + - + - + = 0) { // It's at right. - result = topicPosition.x + halfTargetWidth + mindplot.FixedDistanceBoard.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE; + result = topicPosition.x + halfTargetWidth + mindplot.layout.boards.original.FixedDistanceBoard.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE; } else { - result = topicPosition.x - (halfTargetWidth + mindplot.FixedDistanceBoard.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE); + result = topicPosition.x - (halfTargetWidth + mindplot.layout.boards.original.FixedDistanceBoard.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE); } return result; }, @@ -140,13 +140,13 @@ mindplot.FixedDistanceBoard = new Class({ var topicBoardHeight = topicBoard.getHeight(); - height += topicBoardHeight + mindplot.FixedDistanceBoard.INTER_TOPIC_DISTANCE; + height += topicBoardHeight + mindplot.layout.boards.original.FixedDistanceBoard.INTER_TOPIC_DISTANCE; } } } else { var topic = this._topic; - height = topic.getSize().height + mindplot.FixedDistanceBoard.INTER_TOPIC_DISTANCE; + height = topic.getSize().height + mindplot.layout.boards.original.FixedDistanceBoard.INTER_TOPIC_DISTANCE; } var oldHeight = this._height; @@ -193,7 +193,7 @@ mindplot.FixedDistanceBoard = new Class({ var topicBoard = this._layoutManager.getTopicBoardForTopic(currentTopic); var topicBoardHeight = topicBoard.getHeight(); - upperLimit = lowerLimit + topicBoardHeight + mindplot.FixedDistanceBoard.INTER_TOPIC_DISTANCE; + upperLimit = lowerLimit + topicBoardHeight + mindplot.layout.boards.original.FixedDistanceBoard.INTER_TOPIC_DISTANCE; e.setUpperLimit(upperLimit); lowerLimit = upperLimit; @@ -277,8 +277,10 @@ mindplot.FixedDistanceBoard = new Class({ return result; } -}) - ; -mindplot.FixedDistanceBoard.INTER_TOPIC_DISTANCE = 6; -mindplot.FixedDistanceBoard.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE = 60; +}); + +mindplot.layout.boards.original.FixedDistanceBoard.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE = 60; +mindplot.layout.boards.original.FixedDistanceBoard.INTER_TOPIC_DISTANCE = 6; + + diff --git a/mindplot/src/main/javascript/MainTopicBoard.js b/mindplot/src/main/javascript/layout/boards/original/MainTopicBoard.js similarity index 91% rename from mindplot/src/main/javascript/MainTopicBoard.js rename to mindplot/src/main/javascript/layout/boards/original/MainTopicBoard.js index 368cafc8..0a529ce0 100644 --- a/mindplot/src/main/javascript/MainTopicBoard.js +++ b/mindplot/src/main/javascript/layout/boards/original/MainTopicBoard.js @@ -16,8 +16,8 @@ * limitations under the License. */ -mindplot.MainTopicBoard = new Class({ - Extends:mindplot.Board, +mindplot.layout.boards.original.MainTopicBoard = new Class({ + Extends:mindplot.layout.boards.original.Board, initialize:function(topic, layoutManager) { this._layoutManager = layoutManager; this._topic = topic; @@ -29,7 +29,7 @@ mindplot.MainTopicBoard = new Class({ _getBoard: function() { if (!$defined(this._board)) { var topic = this._topic; - this._board = new mindplot.FixedDistanceBoard(mindplot.MainTopicBoard.DEFAULT_MAIN_TOPIC_HEIGHT, topic, this._layoutManager); + this._board = new mindplot.layout.boards.original.FixedDistanceBoard(mindplot.MainTopic.DEFAULT_MAIN_TOPIC_HEIGHT, topic, this._layoutManager); } return this._board; }, @@ -124,6 +124,4 @@ mindplot.MainTopicBoard = new Class({ mindplot.EventBus.instance.fireEvent(mindplot.EventBus.events.NodeRepositionateEvent, [connectedTopic]); } } -}); - -mindplot.MainTopicBoard.DEFAULT_MAIN_TOPIC_HEIGHT = 18; +}); \ No newline at end of file diff --git a/mindplot/src/main/javascript/VariableDistanceBoard.js b/mindplot/src/main/javascript/layout/boards/original/VariableDistanceBoard.js similarity index 94% rename from mindplot/src/main/javascript/VariableDistanceBoard.js rename to mindplot/src/main/javascript/layout/boards/original/VariableDistanceBoard.js index b3b5b099..418e1de2 100644 --- a/mindplot/src/main/javascript/VariableDistanceBoard.js +++ b/mindplot/src/main/javascript/layout/boards/original/VariableDistanceBoard.js @@ -16,8 +16,8 @@ * limitations under the License. */ -mindplot.VariableDistanceBoard = new Class({ - Extends: mindplot.Board, +mindplot.layout.boards.original.VariableDistanceBoard = new Class({ + Extends: mindplot.layout.boards.original.Board, initialize: function(defaultHeight, referencePoint) { this.parent(defaultHeight, referencePoint); var zeroEntryCoordinate = referencePoint.y; @@ -66,7 +66,7 @@ mindplot.VariableDistanceBoard = new Class({ }, createBoardEntry:function(lowerLimit, upperLimit, order) { - return new mindplot.BoardEntry(lowerLimit, upperLimit, order); + return new mindplot.layout.boards.original.BoardEntry(lowerLimit, upperLimit, order); }, updateReferencePoint:function(position) {