Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 0 additions & 120 deletions src/js/schema/idGenerator.js

This file was deleted.

10 changes: 2 additions & 8 deletions src/js/schema/nodeType.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ var propertySpec = require("./propertySpec.js");
var edgeSpec = require("./edgeSpec.js");
var constants = require("./constants.js");

function NodeType(name, idGeneratorPattern, description, propertySpecMap, edgeSpecMap, traitSpan, traitSequence, traitSpanContainer, spanType) {
function NodeType(name, description, propertySpecMap, edgeSpecMap, traitSpan, traitSequence, traitSpanContainer, spanType) {
this.name = name;
this.idGeneratorPattern = idGeneratorPattern;
this.description = description;
this.propertySpecMap = propertySpecMap;
this.edgeSpecMap = edgeSpecMap;
Expand All @@ -26,7 +25,6 @@ function NodeTypeBuilder() {

NodeTypeBuilder.prototype.withParent = function(parent) {
this.withName(parent.name);
this.withIdGeneratorPattern(parent.idGeneratorPattern);
this.withDescription(parent.description);
this.traitSpan = parent.traitSpan;
this.traitSequence = parent.traitSequence;
Expand Down Expand Up @@ -68,10 +66,6 @@ NodeTypeBuilder.prototype.withName = function(name) {
return this;
};

NodeTypeBuilder.prototype.withIdGeneratorPattern = function(pattern) {
this.idGeneratorPattern = pattern;
};

NodeTypeBuilder.prototype.withDescription = function(description) {
this.description = description;
return this;
Expand Down Expand Up @@ -147,7 +141,7 @@ NodeTypeBuilder.prototype.build = function() {
if (this.name === undefined) {
throw Error("No name supplied for NodeType.");
}
return new NodeType(this.name, this.idGeneratorPattern, this.description, Object.freeze(this.propertySpecMap), Object.freeze(this.edgeSpecMap),
return new NodeType(this.name, this.description, Object.freeze(this.propertySpecMap), Object.freeze(this.edgeSpecMap),
this.traitSpan, this.traitSequence, this.traitSpanContainer, this.spanType);
};

Expand Down
4 changes: 0 additions & 4 deletions src/js/schema/xml.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
var schema = require("./schema.js");
var sax = require("sax");
var print = require("util").print;
var idGenerator = require("./idGenerator.js");
var constants = require("./constants.js");
var Q = require('q');

Expand Down Expand Up @@ -68,9 +67,6 @@ function doParse(readableStream, locator) {
break;
case "nodeType":
nodeBuilder = schemaBuilder.createNodeTypeBuilder().withName(tag.attributes.name.value);
var pattern = tag.attributes.idGenerator.value;
var nodeIdGenerator = idGenerator.parse(pattern);
nodeBuilder.withIdGeneratorPattern(nodeIdGenerator);
break;
case "span":
nodeBuilder.asSpan();
Expand Down
52 changes: 0 additions & 52 deletions test/idGenerator-test.js

This file was deleted.