Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormegumi.telles2013-09-06 03:19:46 +0000
committerRoberto E. Escobar2013-09-17 23:29:02 +0000
commitfd56354a8ee51c2a3d848af2837751fa8e5f1a7f (patch)
tree1c679bba945782fb34c15bab13f0b6189afbf6bd /plugins/org.eclipse.osee.orcs.rest
parent46b4f19063bd42368afd178eb90436381bc9582b (diff)
downloadorg.eclipse.osee-fd56354a8ee51c2a3d848af2837751fa8e5f1a7f.tar.gz
org.eclipse.osee-fd56354a8ee51c2a3d848af2837751fa8e5f1a7f.tar.xz
org.eclipse.osee-fd56354a8ee51c2a3d848af2837751fa8e5f1a7f.zip
feature[ats_7SNLZ]: Enable relation editing
Remove ArtifactBuilder Remove RelationContainer Remove GraphReadable Add Relation Walking capabilities to ArtifactReadable Add RelationEditing methods to TransactionBuilder Add RelationEditing integration tests Change ArtifactTransactionData to OrcsChangeSet Change-Id: I450352cd10b1ae038dabeef5ec4e727fc4ba8f3b
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.rest')
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java7
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/HtmlWriter.java4
2 files changed, 3 insertions, 8 deletions
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java
index f4fb5fc7a02..24e843e3d07 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ArtifactsResource.java
@@ -23,7 +23,6 @@ import org.eclipse.osee.framework.core.data.ResultSet;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.GraphReadable;
import org.eclipse.osee.orcs.search.QueryFactory;
/**
@@ -61,12 +60,10 @@ public class ArtifactsResource {
public String getAsHtml() throws OseeCoreException {
IOseeBranch branch = TokenFactory.createBranch(branchUuid, "");
QueryFactory factory = OrcsApplication.getOrcsApi().getQueryFactory(null);
- ResultSet<ArtifactReadable> results =
- factory.fromBranch(branch).andNameEquals(DEFAULT_HIERARCHY_ROOT_NAME).getResults();
+ ResultSet<ArtifactReadable> results = factory.fromBranch(branch).andNameEquals(DEFAULT_HIERARCHY_ROOT_NAME).getResults();
ArtifactReadable rootArtifact = results.getExactlyOne();
- GraphReadable graph = OrcsApplication.getOrcsApi().getGraph(null);
- ResultSet<ArtifactReadable> arts = graph.getChildren(rootArtifact);
+ ResultSet<ArtifactReadable> arts = rootArtifact.getChildren();
HtmlWriter writer = new HtmlWriter(uriInfo);
return writer.toHtml(arts);
}
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/HtmlWriter.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/HtmlWriter.java
index f4922ea71bb..44b78488e86 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/HtmlWriter.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/HtmlWriter.java
@@ -23,7 +23,6 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.data.AttributeReadable;
-import org.eclipse.osee.orcs.data.GraphReadable;
/**
* @author Roberto E. Escobar
@@ -100,8 +99,7 @@ public class HtmlWriter {
}
int count = 0;
- GraphReadable graph = OrcsApplication.getOrcsApi().getGraph(null);
- for (ArtifactReadable art : graph.getChildren(artifact)) {
+ for (ArtifactReadable art : artifact.getChildren()) {
URI uri1;
if (isAtEndOfPath(uriInfo.getPath(), "artifact")) {
uri1 = uriInfo.getAbsolutePathBuilder().path("{uuid}").build(art.getGuid());

Back to the top