You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/05/01 17:52:36 UTC

[05/50] [abbrv] incubator-tinkerpop git commit: users can not double name a step with as().

users can not double name a step with as().


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7a657fd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7a657fd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7a657fd8

Branch: refs/heads/variables
Commit: 7a657fd84557bad693f1ce6b0fe5dcde1517c96e
Parents: 970f24d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Apr 28 13:03:15 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Apr 28 13:03:15 2015 -0600

----------------------------------------------------------------------
 .../gremlin/process/traversal/dsl/graph/GraphTraversal.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7a657fd8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 1e63986..9d80328 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -470,7 +470,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
     }
 
     public default GraphTraversal<S, E> has(final String key, final Object value) {
-        return this.has(key,new P<?>[]{value instanceof P ? (P)value : P.eq(value)});
+        return this.has(key, new P<?>[]{value instanceof P ? (P) value : P.eq(value)});
     }
 
     public default GraphTraversal<S, E> has(final T accessor, final P<?> predicate) {
@@ -707,6 +707,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
 
     public default GraphTraversal<S, E> as(final String stepLabel) {
         if (this.asAdmin().getSteps().size() == 0) this.asAdmin().addStep(new StartStep<>(this.asAdmin()));
+        if (this.asAdmin().getEndStep().getLabel().isPresent())
+            throw new IllegalStateException("The previous step has already been labeled: " + this.asAdmin().getEndStep());
         this.asAdmin().getEndStep().setLabel(stepLabel);
         return this;
     }