Merge pull request #405 from SynBioDex/develop

Develop
SynBioDex · Nov 14, 2016 · ee54f45 · ee54f45
2 parents edfcc04 + 9247d90
commit ee54f45
Show file tree

Hide file tree

Showing 118 changed files with 12,617 additions and 688 deletions.
diff --git a/core2/src/main/java/org/sbolstandard/core2/ComponentDefinition.java b/core2/src/main/java/org/sbolstandard/core2/ComponentDefinition.java
@@ -881,8 +881,10 @@ public Set<SequenceAnnotation> getSequenceAnnotations() {
 	private void getSuccessorComponents(HashMap<Component,Set<Component>> successorMap,
 			Component component, Set<Component> visited) throws SBOLValidationException {
 		if (visited.contains(component)) {
-			//throw new SBOLValidationException("Cycle in sequence constraints");
-			throw new SBOLValidationException("sbol-10605", component);
+			// TODO: cycle detected.  This needs to be handled better.
+			throw new SBOLValidationException("Cycle in sequence constraints");
+			//throw new SBOLValidationException("sbol-10605", component);
+			//return;
 		}
 		visited.add(component);
 		for (SequenceConstraint sc : this.getSequenceConstraints()) {

diff --git a/core2/src/main/java/org/sbolstandard/core2/SBOLReader.java b/core2/src/main/java/org/sbolstandard/core2/SBOLReader.java