MARMOTTA-611: provided access to all NodeSelection properties and fixed javadoc issues
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2e853e60 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2e853e60 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2e853e60 Branch: refs/heads/develop Commit: 2e853e602574ab967e64abef9ceb2b4f29241662 Parents: 10cec6e Author: Kai Schlegel <[email protected]> Authored: Thu May 7 10:47:58 2015 +0200 Committer: Kai Schlegel <[email protected]> Committed: Thu May 7 10:47:58 2015 +0200 ---------------------------------------------------------------------- .../model/selectors/FunctionSelector.java | 8 ++++++ .../ldpath/model/selectors/GroupedSelector.java | 4 +-- .../model/selectors/IntersectionSelector.java | 9 ++++--- .../ldpath/model/selectors/PathSelector.java | 8 +++--- .../model/selectors/PropertySelector.java | 8 ++++++ .../model/selectors/RecursivePathSelector.java | 26 +++++++++++++++++++- .../selectors/ReversePropertySelector.java | 7 ++++++ .../model/selectors/StringConstantSelector.java | 8 ++++++ .../ldpath/model/selectors/TestingSelector.java | 16 ++++++++++++ .../ldpath/model/selectors/UnionSelector.java | 8 +++--- 10 files changed, 87 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/2e853e60/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java index 83b6dbc..feee075 100644 --- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java +++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java @@ -101,6 +101,14 @@ public class FunctionSelector<Node> implements NodeSelector<Node> { } /** + * Getter for child NodeFunction + * @return child NodeFunction + */ + public NodeFunction<Collection<Node>, Node> getFunction() { + return function; + } + + /** * Return the name of the NodeSelector for registration in the selector registry * * @param backend http://git-wip-us.apache.org/repos/asf/marmotta/blob/2e853e60/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/GroupedSelector.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/GroupedSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/GroupedSelector.java index dc27225..587ccee 100644 --- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/GroupedSelector.java +++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/GroupedSelector.java @@ -79,8 +79,8 @@ public class GroupedSelector<Node> implements NodeSelector<Node> { } /** - * Getter for the child content NodeSelector - * @return the child content NodeSelector + * Getter for child content NodeSelector + * @return child content NodeSelector */ public NodeSelector<Node> getContent() { return content; http://git-wip-us.apache.org/repos/asf/marmotta/blob/2e853e60/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/IntersectionSelector.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/IntersectionSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/IntersectionSelector.java index e4c6957..86d95ed 100644 --- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/IntersectionSelector.java +++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/IntersectionSelector.java @@ -79,21 +79,22 @@ public class IntersectionSelector<Node> implements NodeSelector<Node> { } /** - * Getter for the left child node of the path selection. - * @return the left NodeSelector + * Getter for left child node of the intersection selection. + * @return left NodeSelector */ public NodeSelector<Node> getLeft() { return left; } /** - * Getter for the right child node of the path selection. - * @return the right NodeSelector + * Getter for right child node of the intersection selection. + * @return right NodeSelector */ public NodeSelector<Node> getRight() { return right; } + @Override public boolean equals(Object o) { if (this == o) return true; http://git-wip-us.apache.org/repos/asf/marmotta/blob/2e853e60/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PathSelector.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PathSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PathSelector.java index 5b200ce..3e6d199 100644 --- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PathSelector.java +++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PathSelector.java @@ -110,16 +110,16 @@ public class PathSelector<Node> implements NodeSelector<Node> { } /** - * Getter for the left child node of the path selection. - * @return the left NodeSelector + * Getter for left child node of the path selection. + * @return left NodeSelector */ public NodeSelector<Node> getLeft() { return left; } /** - * Getter for the right child node of the path selection. - * @return the right NodeSelector + * Getter for right child node of the path selection. + * @return right NodeSelector */ public NodeSelector<Node> getRight() { return right; http://git-wip-us.apache.org/repos/asf/marmotta/blob/2e853e60/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PropertySelector.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PropertySelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PropertySelector.java index 4cf334c..da0b07e 100644 --- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PropertySelector.java +++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/PropertySelector.java @@ -95,6 +95,14 @@ public class PropertySelector<Node> implements NodeSelector<Node> { } } + /** + * Getter for child property node + * @return child property node + */ + public Node getProperty() { + return property; + } + @Override public boolean equals(Object o) { if (this == o) return true; http://git-wip-us.apache.org/repos/asf/marmotta/blob/2e853e60/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java index b1863be..1019a5c 100644 --- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java +++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java @@ -114,7 +114,31 @@ public class RecursivePathSelector<Node> implements NodeSelector<Node> { return delegate.getName(nodeRDFBackend); } - /** + /** + * Getter for child delegate NodeSelector + * @return child delegate NodeSelector + */ + public NodeSelector<Node> getDelegate() { + return delegate; + } + + /** + * Getter for the number of minimum recursions + * @return number of minimum recursions + */ + public int getMinRecursions() { + return minRecursions; + } + + /** + * Getter for the number of maximumg recursions + * @return number of maximum recursions + */ + public int getMaxRecursions() { + return maxRecursions; + } + + /** * <code>(delegate)*</code> * @param delegate the delegate */ http://git-wip-us.apache.org/repos/asf/marmotta/blob/2e853e60/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/ReversePropertySelector.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/ReversePropertySelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/ReversePropertySelector.java index 2c61c4c..ba5086d 100644 --- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/ReversePropertySelector.java +++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/ReversePropertySelector.java @@ -88,6 +88,13 @@ public class ReversePropertySelector<Node> implements NodeSelector<Node> { return nodeRDFBackend.stringValue(property); } + /** + * Getter for child property node + * @return child property node + */ + public Node getProperty() { + return property; + } @Override public boolean equals(Object o) { http://git-wip-us.apache.org/repos/asf/marmotta/blob/2e853e60/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/StringConstantSelector.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/StringConstantSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/StringConstantSelector.java index 3c352b5..95a66f3 100644 --- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/StringConstantSelector.java +++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/StringConstantSelector.java @@ -79,6 +79,14 @@ public class StringConstantSelector<Node> implements NodeSelector<Node> { return constant; } + /** + * Getter for the constant value + * @return the constant value + */ + public String getConstant() { + return constant; + } + @Override public boolean equals(Object o) { if (this == o) return true; http://git-wip-us.apache.org/repos/asf/marmotta/blob/2e853e60/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/TestingSelector.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/TestingSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/TestingSelector.java index ca633e0..b1a5b49 100644 --- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/TestingSelector.java +++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/TestingSelector.java @@ -84,6 +84,22 @@ public class TestingSelector<Node> implements NodeSelector<Node> { } /** + * Getter for child delegate node + * @return child delegate NodeSelector + */ + public NodeSelector<Node> getDelegate() { + return delegate; + } + + /** + * Getter for child test node + * @return child NodeTest + */ + public NodeTest<Node> getTest() { + return test; + } + + /** * Return a name for this selector to be used as the name for the whole path if not explicitly * specified. In complex selector expressions, this is typically delegated to the first * occurrence of an atomic selector. http://git-wip-us.apache.org/repos/asf/marmotta/blob/2e853e60/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java index a59d01e..f6b7a05 100644 --- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java +++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java @@ -88,16 +88,16 @@ public class UnionSelector<Node> implements NodeSelector<Node> { } /** - * Getter for the left child node of the path selection. - * @return the left NodeSelector + * Getter for left child node of the union selection. + * @return left NodeSelector */ public NodeSelector<Node> getLeft() { return left; } /** - * Getter for the right child node of the path selection. - * @return the right NodeSelector + * Getter for right child node of the union selection. + * @return right NodeSelector */ public NodeSelector<Node> getRight() { return right;
