You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2010/02/24 16:28:53 UTC
svn commit: r915819 - in
/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint:
DateConstraint.java NameConstraint.java PathConstraint.java
ReferenceConstraint.java ValueConstraint.java
Author: angela
Date: Wed Feb 24 15:28:52 2010
New Revision: 915819
URL: http://svn.apache.org/viewvc?rev=915819&view=rev
Log:
- add missing @Override annotation
- fix type in comment
- remove redundant throws clause
Modified:
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/DateConstraint.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/NameConstraint.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/PathConstraint.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ReferenceConstraint.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ValueConstraint.java
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/DateConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/DateConstraint.java?rev=915819&r1=915818&r2=915819&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/DateConstraint.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/DateConstraint.java Wed Feb 24 15:28:52 2010
@@ -67,7 +67,7 @@
} else {
upperLimit = DateValue.valueOf(matcher.group(3)).getDate();
}
- // group 4 is upepr inclusive/exclusive
+ // group 4 is upper inclusive/exclusive
s = matcher.group(4);
upperInclusive = s.equals("]");
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/NameConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/NameConstraint.java?rev=915819&r1=915818&r2=915819&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/NameConstraint.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/NameConstraint.java Wed Feb 24 15:28:52 2010
@@ -69,6 +69,7 @@
* @see ValueConstraint#getDefinition(NamePathResolver)
* @param resolver name-path resolver
*/
+ @Override
public String getDefinition(NamePathResolver resolver) {
try {
return resolver.getJCRName(name);
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/PathConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/PathConstraint.java?rev=915819&r1=915818&r2=915819&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/PathConstraint.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/PathConstraint.java Wed Feb 24 15:28:52 2010
@@ -44,9 +44,9 @@
private final Path path;
private final boolean deep;
- static PathConstraint create(String pathString) throws InvalidConstraintException {
+ static PathConstraint create(String pathString) {
// constraint format: String representation of an absolute or relative
- // Path object with optionally having a trailing wildcard
+ // Path object with optionally having a trailing wild card
if (WILDCARD.equals(pathString)) {
return new PathConstraint(pathString, PATH_FACTORY.getRootPath(), true);
} else {
@@ -65,14 +65,14 @@
throws InvalidConstraintException {
try {
// constraint format: absolute or relative path with optional
- // trailing wildcard
+ // trailing wild card
boolean deep = jcrPath.endsWith(JCR_WILDCARD);
Path path;
if (JCR_WILDCARD.equals(jcrPath)) {
path = PATH_FACTORY.getRootPath();
} else {
if (deep) {
- // trim trailing wildcard before building path
+ // trim trailing wild card before building path
jcrPath = jcrPath.substring(0, jcrPath.length() - JCR_WILDCARD.length());
}
path = resolver.getQPath(jcrPath);
@@ -93,7 +93,7 @@
}
}
- private PathConstraint(String pathString, Path path, boolean deep) throws InvalidConstraintException {
+ private PathConstraint(String pathString, Path path, boolean deep) {
super(pathString);
this.path = path;
this.deep = deep;
@@ -106,6 +106,7 @@
* @see ValueConstraint#getDefinition(NamePathResolver)
* @param resolver name-path resolver
*/
+ @Override
public String getDefinition(NamePathResolver resolver) {
try {
String p = resolver.getJCRPath(path);
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ReferenceConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ReferenceConstraint.java?rev=915819&r1=915818&r2=915819&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ReferenceConstraint.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ReferenceConstraint.java Wed Feb 24 15:28:52 2010
@@ -69,6 +69,7 @@
* @see ValueConstraint#getDefinition(NamePathResolver)
* @param resolver name-path resolver
*/
+ @Override
public String getDefinition(NamePathResolver resolver) {
try {
return resolver.getJCRName(ntName);
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ValueConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ValueConstraint.java?rev=915819&r1=915818&r2=915819&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ValueConstraint.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/constraint/ValueConstraint.java Wed Feb 24 15:28:52 2010
@@ -87,6 +87,7 @@
* @return the internal definition String
* @see Object#toString()
*/
+ @Override
public String toString() {
return getString();
}
@@ -94,6 +95,7 @@
/**
* @see Object#equals(Object)
*/
+ @Override
public boolean equals(Object other) {
return other == this
|| other instanceof ValueConstraint
@@ -106,6 +108,7 @@
* @return the hashCode of the definition String
* @see Object#hashCode()
*/
+ @Override
public int hashCode() {
return definition.hashCode();
}