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/04/09 19:28:13 UTC
[3/6] incubator-tinkerpop git commit: tweaks to ReferenceXXX.
tweaks to ReferenceXXX.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3cea684c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3cea684c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3cea684c
Branch: refs/heads/master
Commit: 3cea684c37dcbc1adae50fee1208a0d05e715cb4
Parents: 7c8e38c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Apr 8 21:13:06 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Apr 8 21:13:06 2015 -0600
----------------------------------------------------------------------
.../gremlin/structure/util/reference/ReferenceEdge.java | 2 +-
.../gremlin/structure/util/reference/ReferenceElement.java | 2 +-
.../gremlin/structure/util/reference/ReferenceFactory.java | 2 +-
.../gremlin/structure/util/reference/ReferenceProperty.java | 6 +++---
.../gremlin/structure/util/reference/ReferenceVertex.java | 2 +-
.../structure/util/reference/ReferenceVertexProperty.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3cea684c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceEdge.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceEdge.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceEdge.java
index 75d4b60..b86e1b0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceEdge.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceEdge.java
@@ -35,7 +35,7 @@ import java.util.Iterator;
public class ReferenceEdge extends ReferenceElement<Edge> {
private ReferenceEdge() {
- super();
+
}
public ReferenceEdge(final Edge edge) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3cea684c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceElement.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceElement.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceElement.java
index 1a179e4..6158a9d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceElement.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceElement.java
@@ -34,7 +34,7 @@ public abstract class ReferenceElement<E extends Element> implements Serializabl
protected Object id;
protected ReferenceElement() {
- this.id = null;
+
}
public ReferenceElement(final Element element) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3cea684c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceFactory.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceFactory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceFactory.java
index 5a8d1b1..bae34da 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceFactory.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceFactory.java
@@ -49,7 +49,7 @@ public class ReferenceFactory {
}
public static <V> ReferenceProperty<V> detach(final Property<V> property) {
- return property instanceof ReferenceProperty ? (ReferenceProperty<V>) property : new ReferenceProperty<>(property.key(), ReferenceFactory.detach(property.element()));
+ return property instanceof ReferenceProperty ? (ReferenceProperty) property : new ReferenceProperty<>(property);
}
public static ReferencePath detach(final Path path) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3cea684c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceProperty.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceProperty.java
index a0afa35..fae7442 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceProperty.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceProperty.java
@@ -40,9 +40,9 @@ public class ReferenceProperty<V> implements Attachable<Property<V>>, Serializab
}
- public ReferenceProperty(final String key, final ReferenceElement<?> element) {
- this.element = element;
- this.key = key;
+ public ReferenceProperty(final Property<V> property) {
+ this.element = ReferenceFactory.detach(property.element());
+ this.key = property.key();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3cea684c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertex.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertex.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertex.java
index 49c4d33..ae1f99c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertex.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertex.java
@@ -34,7 +34,7 @@ import java.util.Collections;
public class ReferenceVertex extends ReferenceElement<Vertex> {
private ReferenceVertex() {
- super();
+
}
public ReferenceVertex(final Vertex vertex) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3cea684c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertexProperty.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertexProperty.java
index 36128f8..7fa835e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertexProperty.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertexProperty.java
@@ -34,7 +34,7 @@ import java.util.Iterator;
public class ReferenceVertexProperty<V> extends ReferenceElement<VertexProperty> {
private ReferenceVertexProperty() {
- super();
+
}
public ReferenceVertexProperty(final VertexProperty vertexProperty) {