Fix package names ...

This commit is contained in:
Paulo Veiga 2011-07-27 21:01:54 -03:00
parent 665c070359
commit d4fefed545
15 changed files with 151 additions and 146 deletions

View File

@ -32,7 +32,7 @@
<id>jstd-maven-plugin google code repo</id>
<url>http://jstd-maven-plugin.googlecode.com/svn/maven2</url>
</repository>
</repositories>
</repositories>
<build>
<plugins>
@ -81,10 +81,13 @@
<filelist dir="${basedir}/src/main/javascript/" files="FixedDistanceBoard.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="BoardEntry.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="ModelCodeName.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="XMLMindmapSerializer_Pela.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="XMLMindmapSerializer_Beta.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="XMLMindmapSerializer_Pela.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="XMLMindmapSerializer_Beta.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="Beta2PelaMigrator.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="XMLMindmapSerializerFactory.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="XMLMindmapSerializerFactory.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="PersistanceManager.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="EditorProperties.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="IconGroup.js"/>
@ -134,23 +137,23 @@
<filelist dir="${basedir}/src/main/javascript/"
files="layoutManagers/boards/Board.js"/>
files="layout/boards/Board.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="layoutManagers/boards/freeMindBoards/Board.js"/>
files="layout/boards/freemind/Board.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="layoutManagers/boards/freeMindBoards/Entry.js"/>
files="layout/boards/freemind/Entry.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="layoutManagers/boards/freeMindBoards/CentralTopicBoard.js"/>
files="layout/boards/freemind/CentralTopicBoard.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="layoutManagers/boards/freeMindBoards/MainTopicBoard.js"/>
files="layout/boards/freemind/MainTopicBoard.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="layoutManagers/BaseLayoutManager.js"/>
files="layout/BaseLayoutManager.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="layoutManagers/OriginalLayoutManager.js"/>
files="layout/OriginalLayoutManager.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="layoutManagers/FreeMindLayoutManager.js"/>
files="layout/FreeMindLayoutManager.js"/>
<filelist dir="${basedir}/src/main/javascript/"
files="layoutManagers/LayoutManagerFactory.js"/>
files="layout/LayoutManagerFactory.js"/>
<filelist dir="${basedir}/src/main/javascript/" files="footer.js"/>
@ -254,15 +257,15 @@
<include>commands/freeMind/DragTopicCommand-min.js</include>
<include>commands/freeMind/ReconnectTopicCommand-min.js</include>
<include>layoutManagers/boards/Board-min.js</include>
<include>layoutManagers/boards/freeMindBoards/Board-min.js</include>
<include>layoutManagers/boards/freeMindBoards/Entry-min.js</include>
<include>layoutManagers/boards/freeMindBoards/CentralTopicBoard-min.js</include>
<include>layoutManagers/boards/freeMindBoards/MainTopicBoard-min.js</include>
<include>layoutManagers/BaseLayoutManager-min.js</include>
<include>layoutManagers/OriginalLayoutManager-min.js</include>
<include>layoutManagers/FreeMindLayoutManager-min.js</include>
<include>layoutManagers/LayoutManagerFactory-min.js</include>
<include>layout/boards/Board-min.js</include>
<include>layout/boards/freemind/Board-min.js</include>
<include>layout/boards/freemind/Entry-min.js</include>
<include>layout/boards/freemind/CentralTopicBoard-min.js</include>
<include>layout/boards/freemind/MainTopicBoard-min.js</include>
<include>layout/BaseLayoutManager-min.js</include>
<include>layout/OriginalLayoutManager-min.js</include>
<include>layout/FreeMindLayoutManager-min.js</include>
<include>layout/LayoutManagerFactory-min.js</include>
<include>footer-min.js</include>
@ -291,23 +294,23 @@
</configuration>
</plugin>
<!-- <plugin>
<groupId>com.google.jstestdriver</groupId>
<artifactId>maven-jstestdriver-plugin</artifactId>
<version>1.2.2-SNAPSHOT</version>
<executions>
<execution>
<id>run-tests</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<config>${basedir}/src/test/jsTestDriver.conf</config>
</configuration>
</execution>
</executions>
</plugin> -->
<!-- <plugin>
<groupId>com.google.jstestdriver</groupId>
<artifactId>maven-jstestdriver-plugin</artifactId>
<version>1.2.2-SNAPSHOT</version>
<executions>
<execution>
<id>run-tests</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<config>${basedir}/src/test/jsTestDriver.conf</config>
</configuration>
</execution>
</executions>
</plugin> -->
</plugins>
</build>
</project>

View File

@ -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();

View File

@ -25,4 +25,4 @@
var mindplot = {};
mindplot.util = {};
mindplot.commands = {};
mindplot.layoutManagers = {};
mindplot.layout = {};

View File

@ -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);
mindplot.layout.BaseLayoutManager.implement(new Events);
mindplot.layout.BaseLayoutManager.implement(new Options);

View File

@ -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.x<nodePos.x)))){
layoutManager._updateIndicatorShapes(this, mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_SHAPE_CHILD, pos);
layoutManager._updateIndicatorShapes(this, mindplot.layout.FreeMindLayoutManager.RECONNECT_SHAPE_CHILD, pos);
}else{
//is a sibling. if mouse in top half sibling goes above this one
if(pos.y<nodePos.y){
layoutManager._updateIndicatorShapes(this, mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_TOP);
layoutManager._updateIndicatorShapes(this, mindplot.layout.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_TOP);
}else{
//if mouse in bottom half sibling goes below this one
layoutManager._updateIndicatorShapes(this, mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_BOTTOM);
layoutManager._updateIndicatorShapes(this, mindplot.layout.FreeMindLayoutManager.RECONNECT_SHAPE_SIBLING_BOTTOM);
}
}
},
@ -518,7 +518,7 @@ mindplot.layoutManagers.FreeMindLayoutManager = mindplot.layoutManagers.BaseLayo
topic.get2DElement().appendChild(this._createSiblingShape);
var size = topic.getSize();
var position = topic.getPosition();
if(shape == mindplot.layoutManagers.FreeMindLayoutManager.RECONNECT_SHAPE_CHILD){
if(shape == mindplot.layout.FreeMindLayoutManager.RECONNECT_SHAPE_CHILD){
this._createChildShape.setSize(size.width/2, size.height);
var sign = mousePos?Math.sign(mousePos.x):Math.sign(position.x);
this._createChildShape.setPosition(sign>0?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";
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";

View File

@ -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"];
}
};

View File

@ -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";
mindplot.layout.OriginalLayoutManager.NAME = "OriginalLayoutManager";

View File

@ -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);

View File

@ -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

View File

@ -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:{
},

View File

@ -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;

View File

@ -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:{
},

View File

@ -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"];
}
};

View File

@ -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);

View File

@ -67,6 +67,8 @@
<module>web2d</module>
<module>core-js</module>
<module>mindplot</module>
<!--<module>wise-webapp</module>-->
<module>wise-doc</module>
</modules>
</project>