You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/05/15 22:54:02 UTC
incubator-tinkerpop git commit: uncommented P.and(traveral) and
P.or(traversal) for @dkuppitz.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 04e45b304 -> 9e423d8f1
uncommented P.and(traveral) and P.or(traversal) for @dkuppitz.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9e423d8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9e423d8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9e423d8f
Branch: refs/heads/master
Commit: 9e423d8f18b17264c073b0a24186e152b7564cae
Parents: 04e45b3
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri May 15 14:53:57 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri May 15 14:53:57 2015 -0600
----------------------------------------------------------------------
.../src/main/java/org/apache/tinkerpop/gremlin/structure/P.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9e423d8f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
index 29da85c..e24f813 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
@@ -81,13 +81,13 @@ public class P<V> implements Predicate<V>, Serializable, Cloneable {
return new P<>(this.biPredicate.negate(), this.value);
}
- /*public P<V> and(final Traversal<?,?> traversal) {
+ public P<V> and(final Traversal<?,?> traversal) {
return this.and((Predicate)P.traversal(traversal));
}
public P<V> or(final Traversal<?,?> traversal) {
return this.or((Predicate)P.traversal(traversal));
- }*/
+ }
@Override
public P<V> and(final Predicate<? super V> predicate) {