Skip to content
Snippets Groups Projects
Commit d41cf32b authored by Tobias Moebert's avatar Tobias Moebert
Browse files

+ [AttributeList] added a static method to create an AttributeList from the... 

+ [AttributeList] added a static method to create an AttributeList from the description provided by a Widget or Interpreter
- [Widget] removed obsolete elements from the attribute description
# [Discoverer] updated to make use of AttributeList.fromAttributeDescription()
parent e032d5eb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dist/contactJS.js
+ 24
− 30
View file @ d41cf32b
......@@ -1132,7 +1132,6 @@ define('attributeList',['abstractList', 'attribute'], function(AbstractList, Att
/**
* @class
* @classdesc This class represents a list for Attribute.
* @requires Attribute~Attribute
* @extends AbstractList
* @constructs AttributeList
*/
......@@ -1147,6 +1146,25 @@ define('attributeList',['abstractList', 'attribute'], function(AbstractList, Att
AttributeList.prototype = Object.create(AbstractList.prototype);
AttributeList.prototype.constructor = AttributeList;
/**
* Create an AttributeList from the description by a Widget or Interpreter.
*
* @param {Discoverer} discoverer
* @param {Array} attributeDescription
* @returns {AttributeList}
*/
AttributeList.fromAttributeDescription = function(discoverer, attributeDescription) {
var theAttributeList = new AttributeList();
for(var attributeDescriptionIndex in attributeDescription) {
theAttributeList.put(discoverer.buildAttribute(
attributeDescription[attributeDescriptionIndex].name,
attributeDescription[attributeDescriptionIndex].type,
attributeDescription[attributeDescriptionIndex].parameterList,
true));
}
return theAttributeList;
};
/**
* Adds the specified item to the itemList.
*
......@@ -2907,18 +2925,14 @@ define('widget',['MathUuid', 'callback', 'callbackList', 'attribute', 'attribute
{
"name":"",
"type":"",
'parameterList': [],
"value":"",
"timestamp":""
"value":""
}
],
const: [
{
"name":"",
"type":"",
'parameterList': [],
"value":"",
"timestamp":""
"value":""
}
]
};
......@@ -5400,13 +5414,7 @@ define('discoverer',['attributeList', 'attribute', 'translation', 'parameter', '
//if a Widget can satisfy the Attribute, register it and subscribe the Aggregator
//create temporary OutAttributeList
var tempWidgetOutList = new AttributeList();
for(var tempOutAttributeIndex in theWidget.inOut.out) {
var name = theWidget.inOut.out[tempOutAttributeIndex].name;
var type = theWidget.inOut.out[tempOutAttributeIndex].type;
var parameterList = theWidget.inOut.out[tempOutAttributeIndex].parameterList;
tempWidgetOutList.put(this.buildAttribute(name, type, parameterList, true));
}
var tempWidgetOutList = AttributeList.fromAttributeDescription(this, theWidget.inOut.out);
for(var tempOutAttribute = 0; tempOutAttribute < tempWidgetOutList.size(); tempOutAttribute++) {
if (theUnsatisfiedAttribute.equalsTypeOf(tempWidgetOutList.getItems()[tempOutAttribute])) {
console.log("Discoverer: I have found an unregistered Widget \"" + theWidget.name + "\".");
......@@ -5442,23 +5450,9 @@ define('discoverer',['attributeList', 'attribute', 'translation', 'parameter', '
//if an interpreter can satisfy the Attribute, check if the inAttributes are satisfied
//create temporary outAttributeList
var tempOutList = new AttributeList();
for (var interpreterOutAttributeIndex in theInterpreter.inOut.out) {
var outName = theInterpreter.inOut.out[interpreterOutAttributeIndex].name;
var outType = theInterpreter.inOut.out[interpreterOutAttributeIndex].type;
var outParameterList = theInterpreter.inOut.out[interpreterOutAttributeIndex].parameterList;
tempOutList.put(this.buildAttribute(outName, outType, outParameterList, true));
}
var tempOutList = AttributeList.fromAttributeDescription(this, theInterpreter.inOut.out);
//create temporary inAttributeList
var tempInList = new AttributeList();
for (var interpreterInAttributeIndex in theInterpreter.inOut.in) {
var inName = theInterpreter.inOut.in[interpreterInAttributeIndex].name;
var inType = theInterpreter.inOut.in[interpreterInAttributeIndex].type;
var inParameterList = theInterpreter.inOut.in[interpreterInAttributeIndex].parameterList;
var tempInAttribute = this.buildAttribute(inName, inType, inParameterList, true);
tempInList.put(tempInAttribute);
}
var tempInList = AttributeList.fromAttributeDescription(this, theInterpreter.inOut.in);
for (var tempOutAttribute = 0; tempOutAttribute < tempOutList.size(); tempOutAttribute++) {
if (theUnsatisfiedAttribute.equalsTypeOf(tempOutList.getItems()[tempOutAttribute])) {
......
js/modules/attribute/attributeList.js
+ 20
− 1
View file @ d41cf32b
......@@ -6,7 +6,6 @@ define(['abstractList', 'attribute'], function(AbstractList, Attribute) {
/**
* @class
* @classdesc This class represents a list for Attribute.
* @requires Attribute~Attribute
* @extends AbstractList
* @constructs AttributeList
*/
......@@ -21,6 +20,26 @@ define(['abstractList', 'attribute'], function(AbstractList, Attribute) {
AttributeList.prototype = Object.create(AbstractList.prototype);
AttributeList.prototype.constructor = AttributeList;
/**
* Create an AttributeList from the description provided by a Widget or Interpreter.
*
* @static
* @param {Discoverer} discoverer
* @param {Array} attributeDescription
* @returns {AttributeList}
*/
AttributeList.fromAttributeDescription = function(discoverer, attributeDescription) {
var theAttributeList = new AttributeList();
for(var attributeDescriptionIndex in attributeDescription) {
theAttributeList.put(discoverer.buildAttribute(
attributeDescription[attributeDescriptionIndex].name,
attributeDescription[attributeDescriptionIndex].type,
attributeDescription[attributeDescriptionIndex].parameterList,
true));
}
return theAttributeList;
};
/**
* Adds the specified item to the itemList.
*
......
js/modules/discoverer/discoverer.js
+ 4
− 24
View file @ d41cf32b
......@@ -329,7 +329,6 @@ define(['attributeList', 'attribute', 'translation', 'parameter', 'parameterList
*/
Discoverer.prototype.getComponentsForUnsatisfiedAttributes = function(aggregatorId, unsatisfiedAttributes, all, componentTypes){
//Discoverer gets a list of attributes to satisfy
console.log('Discoverer: I need to satisfy the following attributes: '+unsatisfiedAttributes.getItems()+' .' );
//look at all the already registered components
......@@ -426,13 +425,8 @@ define(['attributeList', 'attribute', 'translation', 'parameter', 'parameterList
//if a Widget can satisfy the Attribute, register it and subscribe the Aggregator
//create temporary OutAttributeList
var tempWidgetOutList = new AttributeList();
for(var tempOutAttributeIndex in theWidget.inOut.out) {
var name = theWidget.inOut.out[tempOutAttributeIndex].name;
var type = theWidget.inOut.out[tempOutAttributeIndex].type;
var parameterList = theWidget.inOut.out[tempOutAttributeIndex].parameterList;
tempWidgetOutList.put(this.buildAttribute(name, type, parameterList, true));
}
var tempWidgetOutList = AttributeList.fromAttributeDescription(this, theWidget.inOut.out);
for(var tempOutAttribute = 0; tempOutAttribute < tempWidgetOutList.size(); tempOutAttribute++) {
if (theUnsatisfiedAttribute.equalsTypeOf(tempWidgetOutList.getItems()[tempOutAttribute])) {
console.log("Discoverer: I have found an unregistered Widget \"" + theWidget.name + "\".");
......@@ -468,23 +462,9 @@ define(['attributeList', 'attribute', 'translation', 'parameter', 'parameterList
//if an interpreter can satisfy the Attribute, check if the inAttributes are satisfied
//create temporary outAttributeList
var tempOutList = new AttributeList();
for (var interpreterOutAttributeIndex in theInterpreter.inOut.out) {
var outName = theInterpreter.inOut.out[interpreterOutAttributeIndex].name;
var outType = theInterpreter.inOut.out[interpreterOutAttributeIndex].type;
var outParameterList = theInterpreter.inOut.out[interpreterOutAttributeIndex].parameterList;
tempOutList.put(this.buildAttribute(outName, outType, outParameterList, true));
}
var tempOutList = AttributeList.fromAttributeDescription(this, theInterpreter.inOut.out);
//create temporary inAttributeList
var tempInList = new AttributeList();
for (var interpreterInAttributeIndex in theInterpreter.inOut.in) {
var inName = theInterpreter.inOut.in[interpreterInAttributeIndex].name;
var inType = theInterpreter.inOut.in[interpreterInAttributeIndex].type;
var inParameterList = theInterpreter.inOut.in[interpreterInAttributeIndex].parameterList;
var tempInAttribute = this.buildAttribute(inName, inType, inParameterList, true);
tempInList.put(tempInAttribute);
}
var tempInList = AttributeList.fromAttributeDescription(this, theInterpreter.inOut.in);
for (var tempOutAttribute = 0; tempOutAttribute < tempOutList.size(); tempOutAttribute++) {
if (theUnsatisfiedAttribute.equalsTypeOf(tempOutList.getItems()[tempOutAttribute])) {
......
js/modules/widget/widget.js
+ 2
− 6
View file @ d41cf32b
......@@ -17,18 +17,14 @@ define(['MathUuid', 'callback', 'callbackList', 'attribute', 'attributeList', 'c
{
"name":"",
"type":"",
'parameterList': [],
"value":"",
"timestamp":""
"value":""
}
],
const: [
{
"name":"",
"type":"",
'parameterList': [],
"value":"",
"timestamp":""
"value":""
}
]
};
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment