Skip to content

Commit

Permalink
Maven Version set to 1.1.0, EC to 2.7.1, updated submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lomilar
Lomilar committed Mar 15, 2019
1 parent b9a1a37 commit da671a7
Show file tree
Hide file tree
Showing 17 changed files with 1,969 additions and 1,566 deletions.
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<groupId>org.cassproject</groupId>
<artifactId>cass</artifactId>
<packaging>war</packaging>
<version>1.0.10</version>
<version>1.1.0</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ec-version>2.7.0</ec-version>
<ec-version>2.7.1</ec-version>
<ew-version>5.15.1</ew-version>
</properties>

Expand Down
573 changes: 387 additions & 186 deletions src/main/js/cass.js
View file

Large diffs are not rendered by default.

2,371 changes: 1,186 additions & 1,185 deletions src/main/js/cass.min.js
View file

Large diffs are not rendered by default.

42 changes: 34 additions & 8 deletions src/main/js/cass/cass.competency.js
View file

Large diffs are not rendered by default.

12 changes: 3 additions & 9 deletions src/main/js/cass/cass.import.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -974,17 +974,10 @@ CSVImport = stjs.extend(CSVImport, null, [], function(constructor, prototype) {
* @static
*/
constructor.transformId = function(oldId, newObject, selectedServer, repo) {
if (oldId == null || oldId == "" || oldId.indexOf("http") == -1)
if (oldId == null || oldId == "" || oldId.toLowerCase().indexOf("http") == -1)
newObject.assignId(selectedServer, oldId);
else {
if (EcCompetency.getBlocking(oldId) == null)
newObject.id = oldId;
else {
if (repo == null || repo.selectedServer.indexOf(selectedServer) != -1)
newObject.generateId(selectedServer);
else
newObject.generateShortId(selectedServer);
}
newObject.id = oldId;
}
};
/**
Expand Down Expand Up @@ -1070,6 +1063,7 @@ CSVImport = stjs.extend(CSVImport, null, [], function(constructor, prototype) {
if ((CSVImport.importCsvLookup)[tabularData[i][idIndex]] == null)
(CSVImport.importCsvLookup)[tabularData[i][idIndex]] = competency.shortId();
}
(CSVImport.importCsvLookup)[competency.getName()] = competency.shortId();
for (var idx = 0; idx < tabularData[i].length; idx++) {
var name = colNames[idx];
if (name == null || name.trim() == "" || name.startsWith("@") || name.indexOf(".") != -1 || tabularData[i][idx].trim() == "" || idx == nameIndex || idx == descriptionIndex || idx == scopeIndex || idx == idIndex) {
Expand Down
148 changes: 145 additions & 3 deletions src/main/js/cass/cass.rollup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2116,6 +2116,148 @@ PapDependencyDefinitions = stjs.extend(PapDependencyDefinitions, null, [], funct
this.dependencyDefinitionMap = dependencyDefinitionMap;
};
}, {dependencyDefinitionMap: {name: "Map", arguments: [null, "PapDependencyDefinitionBase"]}}, {});
var EcFrameworkGraph = function() {
EcDirectedGraph.call(this);
this.metaVerticies = new Object();
this.metaEdges = new Object();
};
EcFrameworkGraph = stjs.extend(EcFrameworkGraph, EcDirectedGraph, [], function(constructor, prototype) {
prototype.metaVerticies = null;
prototype.metaEdges = null;
prototype.addFramework = function(framework, repo, success, failure) {
var me = this;
repo.multiget(framework.competency.concat(framework.relation), function(data) {
var competencyTemplate = new EcCompetency();
var alignmentTemplate = new EcAlignment();
for (var i = 0; i < data.length; i++) {
var d = data[i];
if (d.isAny(competencyTemplate.getTypes())) {
var c = EcCompetency.getBlocking(d.id);
me.addCompetency(c);
me.addToMetaStateArray(me.getMetaStateCompetency(c), "framework", framework);
} else if (d.isAny(alignmentTemplate.getTypes())) {
var alignment = EcAlignment.getBlocking(d.id);
me.addRelation(alignment);
me.addToMetaStateArray(me.getMetaStateAlignment(alignment), "framework", framework);
}
}
success();
}, failure);
};
prototype.processAssertionsBoolean = function(assertions, success, failure) {
var me = this;
var eah = new EcAsyncHelper();
eah.each(assertions, function(assertion, done) {
var competency = EcCompetency.getBlocking(assertion.competency);
if (!me.containsVertex(competency)) {
done();
return;
}
assertion.getNegativeAsync(function(negative) {
me.processAssertionsBooleanPerAssertion(assertion, negative, competency, done, new Array());
}, eah.failWithCallback(failure, done));
}, function(strings) {
success();
});
};
prototype.processAssertionsBooleanPerAssertion = function(assertion, negative, competency, done, visited) {
var me = this;
if (EcArray.has(visited, competency)) {
done();
return;
}
visited.push(competency);
if (negative) {
var metaState = this.getMetaStateCompetency(competency);
this.addToMetaStateArray(metaState, "negativeAssertion", assertion);
new EcAsyncHelper().each(me.getOutEdges(competency), function(alignment, callback0) {
if (alignment.relationType == Relation.NARROWS)
me.processAssertionsBooleanPerAssertion(assertion, negative, EcCompetency.getBlocking(alignment.target), callback0, visited);
else if (alignment.relationType == Relation.IS_EQUIVALENT_TO)
me.processAssertionsBooleanPerAssertion(assertion, negative, EcCompetency.getBlocking(alignment.target), callback0, visited);
else
callback0();
}, function(strings) {
new EcAsyncHelper().each(me.getInEdges(competency), function(alignment, callback0) {
if (alignment.relationType == Relation.REQUIRES)
me.processAssertionsBooleanPerAssertion(assertion, negative, EcCompetency.getBlocking(alignment.source), callback0, visited);
else if (alignment.relationType == Relation.IS_EQUIVALENT_TO)
me.processAssertionsBooleanPerAssertion(assertion, negative, EcCompetency.getBlocking(alignment.source), callback0, visited);
else
callback0();
}, function(strings) {
done();
});
});
} else {
var metaState = this.getMetaStateCompetency(competency);
this.addToMetaStateArray(metaState, "positiveAssertion", assertion);
new EcAsyncHelper().each(me.getInEdges(competency), function(alignment, callback0) {
if (alignment.relationType == Relation.NARROWS)
me.processAssertionsBooleanPerAssertion(assertion, negative, EcCompetency.getBlocking(alignment.source), callback0, visited);
else if (alignment.relationType == Relation.IS_EQUIVALENT_TO)
me.processAssertionsBooleanPerAssertion(assertion, negative, EcCompetency.getBlocking(alignment.source), callback0, visited);
else
callback0();
}, function(strings) {
new EcAsyncHelper().each(me.getOutEdges(competency), function(alignment, callback0) {
if (alignment.relationType == Relation.REQUIRES)
me.processAssertionsBooleanPerAssertion(assertion, negative, EcCompetency.getBlocking(alignment.target), callback0, visited);
else if (alignment.relationType == Relation.IS_EQUIVALENT_TO)
me.processAssertionsBooleanPerAssertion(assertion, negative, EcCompetency.getBlocking(alignment.target), callback0, visited);
else
callback0();
}, function(strings) {
done();
});
});
}
};
prototype.addToMetaStateArray = function(metaState, key, value) {
if (metaState == null)
return;
if ((metaState)[key] == null)
(metaState)[key] = new Array();
((metaState)[key]).push(value);
};
prototype.getMetaStateCompetency = function(c) {
if (this.containsVertex(c) == false)
return null;
if (this.metaVerticies[c.shortId()] == null)
this.metaVerticies[c.shortId()] = new Object();
return this.metaVerticies[c.shortId()];
};
prototype.getMetaStateAlignment = function(a) {
if (this.containsEdge(a) == false)
return null;
if (this.metaEdges[a.shortId()] == null)
this.metaEdges[a.shortId()] = new Object();
return this.metaEdges[a.shortId()];
};
prototype.addCompetency = function(competency) {
if (competency == null)
return false;
return this.addVertex(competency);
};
prototype.addRelation = function(alignment) {
if (alignment == null)
return false;
var source = EcCompetency.getBlocking(alignment.source);
var target = EcCompetency.getBlocking(alignment.target);
if (source == null || target == null)
return false;
return this.addEdge(alignment, source, target);
};
prototype.addHyperEdge = function(edge, vertices) {
throw new RuntimeException("Don't do this.");
};
prototype.getEdgeType = function(edge) {
return edge.relationType;
};
prototype.getDefaultEdgeType = function() {
return EcAlignment.NARROWS;
};
}, {metaVerticies: {name: "Map", arguments: [null, "Object"]}, metaEdges: {name: "Map", arguments: [null, "Object"]}, edges: {name: "Array", arguments: [{name: "Triple", arguments: ["V", "V", "E"]}]}, verticies: {name: "Array", arguments: ["V"]}}, {});
var NodePacketGraph = function() {
this.nodePacketList = new Array();
this.nodePacketMap = {};
Expand Down Expand Up @@ -3768,6 +3910,8 @@ CombinatorAssertionProcessor = stjs.extend(CombinatorAssertionProcessor, Asserti
if (ep.context != null && ep.context.relation != null)
for (var i = 0; i < ep.context.relation.length; i++) {
var a = EcAlignment.getBlocking(ep.context.relation[i]);
if (a == null)
continue;
if ((relationLookup)[a.source] == null)
(relationLookup)[a.source] = new Array();
((relationLookup)[a.source]).push(a);
Expand Down Expand Up @@ -3945,9 +4089,7 @@ FrameworkCollapser = stjs.extend(FrameworkCollapser, null, [], function(construc
var fc = this;
repo.multiget(this.buildFrameworkUrlLookups(), function(rlda) {
fc.continueFrameworkCollapse(rlda);
}, fc.failureCallback, function(rlda) {
fc.continueFrameworkCollapse(rlda);
});
}, fc.failureCallback);
}
};
}, {framework: "EcFramework", competencyArray: {name: "Array", arguments: ["EcCompetency"]}, competencyNodeMap: {name: "Map", arguments: [null, "Node"]}, relationArray: {name: "Array", arguments: ["EcAlignment"]}, frameworkNodeGraph: "NodeGraph", collapsedFrameworkNodePacketGraph: "NodePacketGraph", successCallback: {name: "Callback2", arguments: [null, "NodePacketGraph"]}, failureCallback: {name: "Callback1", arguments: [null]}}, {});
Expand Down
14 changes: 9 additions & 5 deletions src/main/js/cass/ebac.repository.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1110,13 +1110,17 @@ EcRepository = stjs.extend(EcRepository, null, [], function(constructor, prototy
return;
}
(EcRepository.cache)[originalUrl] = d;
if (d.id != null)
(EcRepository.cache)[d.id] = d;
if (d != null) {
if (d.id != null)
(EcRepository.cache)[d.id] = d;
}
}, function(s) {
var d = EcRepository.findBlocking(originalUrl, s, new Object(), 0);
(EcRepository.cache)[originalUrl] = d;
if (d.id != null)
(EcRepository.cache)[d.id] = d;
if (d != null) {
if (d.id != null)
(EcRepository.cache)[d.id] = d;
}
});
EcRemote.async = oldAsync;
var result = (EcRepository.cache)[originalUrl];
Expand Down Expand Up @@ -1503,7 +1507,7 @@ EcRepository = stjs.extend(EcRepository, null, [], function(constructor, prototy
* @memberOf EcRepository
* @method multiget
*/
prototype.multiget = function(urls, success, failure, cachedValues) {
prototype.multiget = function(urls, success, failure) {
if (urls == null || urls.length == 0) {
if (failure != null) {
failure("");
Expand Down
Loading

0 comments on commit da671a7

Please sign in to comment.