From e67b2ba50b59e5385ca39cc0bfd528b9ef097949 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Mon, 27 Feb 2012 19:25:14 -0300 Subject: [PATCH] Fix commands calling super class constructor. --- .../commands/AddFeatureToTopicCommand.js | 1 + .../commands/AddRelationshipCommand.js | 3 +- .../javascript/commands/AddTopicCommand.js | 2 + .../commands/ChangeFeatureToTopicCommand.js | 1 + .../main/javascript/commands/DeleteCommand.js | 1 + .../javascript/commands/DragTopicCommand.js | 3 +- .../commands/GenericFunctionCommand.js | 2 +- .../commands/MoveControlPointCommand.js | 2 +- .../commands/RemoveFeatureFromTopicCommand.js | 1 + .../com/wisemapping/test/freemind/pepe.xml | 49 ------------------- 10 files changed, 12 insertions(+), 53 deletions(-) delete mode 100644 wise-webapp/src/test/java/com/wisemapping/test/freemind/pepe.xml diff --git a/mindplot/src/main/javascript/commands/AddFeatureToTopicCommand.js b/mindplot/src/main/javascript/commands/AddFeatureToTopicCommand.js index ee649d7d..b23d8490 100644 --- a/mindplot/src/main/javascript/commands/AddFeatureToTopicCommand.js +++ b/mindplot/src/main/javascript/commands/AddFeatureToTopicCommand.js @@ -24,6 +24,7 @@ mindplot.commands.AddFeatureToTopicCommand = new Class({ $assert(featureType, 'featureType can not be null'); $assert(attributes, 'attributes can not be null'); + this.parent(); this._topicId = topicId; this._featureType = featureType; this._attributes = attributes; diff --git a/mindplot/src/main/javascript/commands/AddRelationshipCommand.js b/mindplot/src/main/javascript/commands/AddRelationshipCommand.js index 6a61212a..72825571 100644 --- a/mindplot/src/main/javascript/commands/AddRelationshipCommand.js +++ b/mindplot/src/main/javascript/commands/AddRelationshipCommand.js @@ -19,8 +19,9 @@ mindplot.commands.AddRelationshipCommand = new Class({ Extends:mindplot.Command, initialize: function(model) { $assert(model, 'Relationship model can not be null'); + + this.parent(); this._model = model; - this._id = mindplot.Command._nextUUID(); }, execute: function(commandContext) { var relationship = commandContext.createRelationship(this._model); diff --git a/mindplot/src/main/javascript/commands/AddTopicCommand.js b/mindplot/src/main/javascript/commands/AddTopicCommand.js index 3f916f02..2923c30c 100644 --- a/mindplot/src/main/javascript/commands/AddTopicCommand.js +++ b/mindplot/src/main/javascript/commands/AddTopicCommand.js @@ -21,6 +21,8 @@ mindplot.commands.AddTopicCommand = new Class( Extends:mindplot.Command, initialize: function(model, parentTopicId, animated) { $assert(model, 'Model can not be null'); + + this.parent(); this._model = model; this._parentId = parentTopicId; this._id = mindplot.Command._nextUUID(); diff --git a/mindplot/src/main/javascript/commands/ChangeFeatureToTopicCommand.js b/mindplot/src/main/javascript/commands/ChangeFeatureToTopicCommand.js index 0923b3ed..694a616d 100644 --- a/mindplot/src/main/javascript/commands/ChangeFeatureToTopicCommand.js +++ b/mindplot/src/main/javascript/commands/ChangeFeatureToTopicCommand.js @@ -23,6 +23,7 @@ mindplot.commands.ChangeFeatureToTopicCommand = new Class({ $assert($defined(featureId), 'featureId can not be null'); $assert($defined(attributes), 'attributes can not be null'); + this.parent(); this._topicId = topicId; this._featureId = featureId; this._attributes = attributes; diff --git a/mindplot/src/main/javascript/commands/DeleteCommand.js b/mindplot/src/main/javascript/commands/DeleteCommand.js index 650168f6..7e0c4a6f 100644 --- a/mindplot/src/main/javascript/commands/DeleteCommand.js +++ b/mindplot/src/main/javascript/commands/DeleteCommand.js @@ -21,6 +21,7 @@ mindplot.commands.DeleteCommand = new Class({ initialize: function(topicIds, relIds) { $assert($defined(topicIds), 'topicIds can not be null'); + this.parent(); this._relIds = relIds; this._topicIds = topicIds; this._deletedTopicModels = []; diff --git a/mindplot/src/main/javascript/commands/DragTopicCommand.js b/mindplot/src/main/javascript/commands/DragTopicCommand.js index e6d73c7c..1ff47023 100644 --- a/mindplot/src/main/javascript/commands/DragTopicCommand.js +++ b/mindplot/src/main/javascript/commands/DragTopicCommand.js @@ -25,6 +25,7 @@ mindplot.commands.DragTopicCommand = new Class({ if ($defined(parentTopic)) this._parentId = parentTopic.getId(); + this.parent(); this._position = position; this._order = order; this._id = mindplot.Command._nextUUID(); @@ -58,7 +59,7 @@ mindplot.commands.DragTopicCommand = new Class({ // Set position ... topic.setPosition(this._position); } else { - $assert("Illegal commnad state exception."); + $assert("Illegal command state exception."); } // Finally, connect topic ... diff --git a/mindplot/src/main/javascript/commands/GenericFunctionCommand.js b/mindplot/src/main/javascript/commands/GenericFunctionCommand.js index 41e9ea4c..f8dd4eb2 100644 --- a/mindplot/src/main/javascript/commands/GenericFunctionCommand.js +++ b/mindplot/src/main/javascript/commands/GenericFunctionCommand.js @@ -22,11 +22,11 @@ mindplot.commands.GenericFunctionCommand = new Class({ $assert(commandFunc, "commandFunc must be defined"); $assert($defined(topicsIds), "topicsIds must be defined"); + this.parent(); this._value = value; this._topicsIds = topicsIds; this._commandFunc = commandFunc; this._oldValues = []; - this._id = mindplot.Command._nextUUID(); }, execute: function(commandContext) { diff --git a/mindplot/src/main/javascript/commands/MoveControlPointCommand.js b/mindplot/src/main/javascript/commands/MoveControlPointCommand.js index d640dfd4..c8e799c8 100644 --- a/mindplot/src/main/javascript/commands/MoveControlPointCommand.js +++ b/mindplot/src/main/javascript/commands/MoveControlPointCommand.js @@ -21,6 +21,7 @@ mindplot.commands.MoveControlPointCommand = new Class({ $assert(ctrlPointController, 'line can not be null'); $assert($defined(point), 'point can not be null'); + this.parent(); this._ctrlPointControler = ctrlPointController; this._line = ctrlPointController._line; this._controlPoint = this._ctrlPointControler.getControlPoint(point).clone(); @@ -36,7 +37,6 @@ mindplot.commands.MoveControlPointCommand = new Class({ this._endPoint = this._line.getLine().getTo().clone(); break; } - this._id = mindplot.Command._nextUUID(); this._point = point; }, diff --git a/mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js b/mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js index 0f0a52f5..3ebfe9d5 100644 --- a/mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js +++ b/mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js @@ -22,6 +22,7 @@ mindplot.commands.RemoveFeatureFromTopicCommand = new Class({ $assert($defined(topicId), 'topicId can not be null'); $assert(featureId, 'iconModel can not be null'); + this.parent(); this._topicId = topicId; this._featureId = featureId; this._oldFeature = null; diff --git a/wise-webapp/src/test/java/com/wisemapping/test/freemind/pepe.xml b/wise-webapp/src/test/java/com/wisemapping/test/freemind/pepe.xml deleted file mode 100644 index 4d83d907..00000000 --- a/wise-webapp/src/test/java/com/wisemapping/test/freemind/pepe.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -