zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep fixing issues.

Browse Source
This commit is contained in:
Paulo Veiga
2011-09-09 02:22:44 -03:00
parent 0c216778e5
commit 2a4d96151b
15 changed files with 157 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mindplot/src/main/javascript/collaboration/CollaborationManager.js
View File

@@ -22,21 +22,12 @@ mindplot.collaboration.CollaborationManager = new Class({
this.collaborativeModelReady = null;
},
isCollaborationFrameworkAvailable : function() {
return (typeof goog != "undefined") && (typeof goog.collab != "undefined");
},
setCollaborativeFramework : function(framework) {
this._collaborativeFramework = framework;
this.collaborativeModelReady = true;
},
isCollaborativeFrameworkReady:function() {
return this.collaborativeModelReady;
},
buildWiseModel: function() {
return this._collaborativeFramework.buildWiseModel();
buildMindmap: function() {
return this._collaborativeFramework.buildMindmap();
},
getCollaborativeFramework:function() {

35
mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeFramework.js
View File

@@ -1,5 +1,6 @@
mindplot.collaboration.framework.AbstractCollaborativeFramework = new Class({
initialize: function(model, collaborativeModelFactory) {
initialize: function(model, collaborativeModelFactory)
{
this._collaborativeModelFactory = collaborativeModelFactory;
if (!$defined(model)) {
model = this._buildInitialCollaborativeModel();
@@ -12,38 +13,26 @@ mindplot.collaboration.framework.AbstractCollaborativeFramework = new Class({
return this._model;
},
buildWiseModel : function() {
var cmindMap = this.getModel();
var mindmap = new mindplot.model.Mindmap();
var branches = cmindMap.getBranches();
branches.forEach(function(branch) {
var type = branch.getType();
var id = branch.getId();
var node = mindmap.createNode(type, id);
node.setText(branch.getText());
var position = branch.getPosition();
node.setPosition(position.x, position.y);
var children = branch.getChildren();
children.forEach(function(child) {
var node2 = new mindplot.model.NodeModel(child.getType(), mindmap, child.getId());
node2.setText(child.getText());
var pos = child.getPosition();
node2.setPosition(pos.x, pos.y);
node._appendChild(node2);
});
mindmap.addBranch(node);
}.bind(this));
return mindmap;
buildMindmap : function() {
var cmind = this.getModel();
var mmind = new mindplot.model.Mindmap();
cmind.copyTo(mmind);
return mmind;
},
_buildInitialCollaborativeModel: function() {
var mindmap = this._collaborativeModelFactory.buildMindMap();
var centralTopic = mindmap.createNode(mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE);
mindmap.addBranch(centralTopic, true);
this.addMindmap(mindmap);
return mindmap;
},
addMindmap:function(model) {
throw "method to implement";
},
_findTopic : function(topics, id) {

9
mindplot/src/main/javascript/collaboration/framework/brix/BrixCollaborativeModelFactory.js
View File

@@ -21,10 +21,15 @@ mindplot.collaboration.framework.brix.BrixCollaborativeModelFactory = new Class(
initialize:function(brixFramework) {
this._brixFramework = brixFramework;
},
buildMindMap:function() {
return new mindplot.collaboration.framework.brix.model.Mindmap(null, this._brixFramework);
var mindmap = new mindplot.collaboration.framework.brix.model.Mindmap(this._brixFramework);
var node = mindmap.createNode(mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE, 0);
mindmap.addBranch(node);
return mindmap;
},
buildCollaborativeModelFor:function(model) {
return new mindplot.collaboration.framework.brix.model.Mindmap(model, this._brixFramework);
return new mindplot.collaboration.framework.brix.model.Mindmap(this._brixFramework, model);
}
});

15
mindplot/src/main/javascript/collaboration/framework/brix/BrixFramework.js
View File

@@ -24,35 +24,38 @@ mindplot.collaboration.framework.brix.BrixFramework = new Class({
var cModel = null;
var root = this.getBrixModel().getRoot();
if (!root.isEmpty()) {
cModel = collaborativeModelFactory.buildCollaborativeModelFor(root.get("mindmap"));
var brixMap = root.get("mindmap");
cModel = collaborativeModelFactory.buildCollaborativeModelFor(brixMap);
}
this.parent(cModel, collaborativeModelFactory);
},
addMindmap:function(model) {
var root = this.getBrixModel().getRoot();
root.put("mindmap", model);
},
getBrixModel:function() {
return this._app.getModel();
},
buildWiseModel: function() {
return this.parent();
}
});
instanciated = false;
mindplot.collaboration.framework.brix.BrixFramework.init = function(onload) {
$assert(onload, "load function can not be null");
if ((typeof isGoogleBrix != "undefined") && !instanciated) {
instanciated = true;
if (!instanciated) {
var app = new goog.collab.CollaborativeApp();
mindplot.collaboration.framework.brix.BrixFramework.buildMenu(app);
app.start();
app.addListener('modelLoad', function(model) {
var framework = new mindplot.collaboration.framework.brix.BrixFramework(model, app);
mindplot.collaboration.CollaborationManager.getInstance().setCollaborativeFramework(framework);
onload();
}.bind(this));
instanciated = true;
}
};

47
mindplot/src/main/javascript/collaboration/framework/brix/model/Mindmap.js
View File

@@ -17,21 +17,33 @@
*/
mindplot.collaboration.framework.brix.model.Mindmap = new Class({
Extends:mindplot.model.IMindmap,
initialize:function(brixModel, brixFramework) {
this._brixModel = brixModel;
initialize:function(brixFramework, brixModel) {
$assert(brixFramework, 'brixFramework can not be null');
this._brixFramework = brixFramework;
if (!$defined(this._brixModel)) {
if (!$defined(brixModel)) {
this._brixModel = this._createBrixModel();
} else {
var branches = this._brixModel.get("branches");
for (var i = 0; i < branches.size(); i++) {
var node = branches.get(i);
var nodeModel = new mindplot.collaboration.framework.brix.model.NodeModel(node, this._brixFramework, null, this);
this.addBranch(nodeModel, false);
}
this._brixModel = brixModel;
}
},
getVersion: function() {
return this._brixModel.get('version');
},
setVersion: function(value) {
this._brixModel.put('version', value);
},
getDescription: function() {
return this._brixModel.get('description');
},
setDescription: function(value) {
this._brixModel.put('description', value);
},
_createBrixModel:function() {
var model = this._brixFramework.getBrixModel().create("Map");
var branches = this._brixFramework.getBrixModel().create("List");
@@ -47,11 +59,12 @@ mindplot.collaboration.framework.brix.model.Mindmap = new Class({
getBranches : function() {
var result = [];
var branches = this._brixModel.get("branches");
for (var i = 0; i < branches.size(); i++) {
result.push();
var node = branches.get(i);
var nodeModel = new mindplot.collaboration.framework.brix.model.NodeModel(this._brixFramework, node, this);
result.push(nodeModel);
}
return result;
},
addBranch : function(nodeModel) {
@@ -63,12 +76,11 @@ mindplot.collaboration.framework.brix.model.Mindmap = new Class({
removeBranch : function(nodeModel) {
$assert(nodeModel, "nodeModel can not be null");
var branches = this._brixModel.get("branches");
branches.remove(nodeModel.getBrixModel());
var brixModel = nodeModel.getBrixModel();
branches.remove(brixModel);
},
connect : function(parent, child) {
this.parent(parent, child);
// Remove from the branch ...
var branches = this._brixModel.get("branches");
var childIndex = null;
@@ -84,7 +96,8 @@ mindplot.collaboration.framework.brix.model.Mindmap = new Class({
},
createNode : function(type, id) {
return mindplot.collaboration.framework.brix.model.NodeModel.create(this._brixFramework, type, id, this);
return mindplot.collaboration.framework.brix.model.NodeModel.create(this._brixFramework, this, type, id);
}
}
);
);

53
mindplot/src/main/javascript/collaboration/framework/brix/model/NodeModel.js
View File

@@ -18,14 +18,13 @@
mindplot.collaboration.framework.brix.model.NodeModel = new Class({
Extends: mindplot.model.INodeModel,
initialize : function(brixModel, brixFramework, mindmap) {
$assert(brixModel, "brixModel can not null");
initialize : function(brixFramework, brixModel, mindmap) {
$assert(brixFramework, "brixFramework can not null");
$assert(brixModel, "brixModel can not null");
this.parent(mindmap);
this._brixModel = brixModel;
this._brixFramework = brixFramework;
this._injectSetAndGet();
this._addBrixListeners();
},
@@ -44,12 +43,24 @@ mindplot.collaboration.framework.brix.model.NodeModel = new Class({
actionDispatcher[funName](this.getId(), value);
}.bind(this));
this._brixModel.get("children").addListener("valuesAdded", this._childAddedListener.bind(this));
var children = this._brixModel.get("children");
children.addListener("valuesAdded", this._childAddedListener.bind(this));
},
getChildren : function() {
var result = [];
var children = this._brixModel.get("children");
for (var i = 0; i < children.size(); i++) {
var node = children.get(i);
var nodeModel = new mindplot.collaboration.framework.brix.model.NodeModel(this._brixFramework, node, this);
result.push(nodeModel);
}
return result;
},
_childAddedListener:function(event) {
var newValue = event.getValues().get(0);
var cmodel = new mindplot.collaboration.framework.brix.model.NodeModel(newValue, this._brixFramework, null, this.getMindmap());
var cmodel = new mindplot.collaboration.framework.brix.model.NodeModel(this._brixFramework, newValue, this.getMindmap());
this._appendChild(cmodel, false);
var model = new mindplot.model.NodeModel(newValue.get("type"), designer.getMindmap(), newValue.get("id"));
@@ -62,13 +73,41 @@ mindplot.collaboration.framework.brix.model.NodeModel = new Class({
getBrixModel:function() {
return this._brixModel;
},
putProperty : function(key, value) {
$defined(key, 'key can not be null');
this._brixModel.put(key, value);
},
getProperty : function(key) {
$defined(key, 'key can not be null');
return this._brixModel.get(key);
},
getPropertiesKeys : function() {
return this._brixModel.getKeys();
},
connectTo : function(parent) {
var mindmap = this.getMindmap();
mindmap.connect(parent, this);
// @Todo: This must be persited ?Ummm...
this._parent = parent;
}
});
mindplot.collaboration.framework.brix.model.NodeModel.create = function(brixFramework, type, id, mindmap) {
mindplot.collaboration.framework.brix.model.NodeModel.create = function(brixFramework, mindmap, type, id) {
$assert(brixFramework, 'brixFramework can not be null');
$assert(mindmap, 'mindmap can not be null');
$assert(type, 'type can not be null');
$assert($defined(id), 'id can not be null');
var brixModel = brixFramework.getBrixModel().create("Map");
brixModel.put("type", type);
brixModel.put("id", this._id); // @todo...
brixModel.put("id", this._id);
var children = brixFramework.getBrixModel().create("List");
brixModel.put("children", children);