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 2009/05/28 13:07:17 UTC
svn commit: r779563 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ConstraintBuilder.java
Author: angela
Date: Thu May 28 11:07:16 2009
New Revision: 779563
URL: http://svn.apache.org/viewvc?rev=779563&view=rev
Log:
JCR-1609 resolve TODO and add comment
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ConstraintBuilder.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ConstraintBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ConstraintBuilder.java?rev=779563&r1=779562&r2=779563&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ConstraintBuilder.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ConstraintBuilder.java Thu May 28 11:07:16 2009
@@ -246,8 +246,10 @@
public Object visit(NodeNameImpl node, Object data) throws Exception {
Value staticValue = (Value) data;
switch (staticValue.getType()) {
+ // STRING, PATH and URI may be convertable to a NAME -> check
case PropertyType.STRING:
case PropertyType.PATH:
+ case PropertyType.URI:
// make sure static value is valid NAME
try {
vf.createValue(staticValue.getString(), PropertyType.NAME);
@@ -257,14 +259,14 @@
" cannot be converted into STRING");
}
break;
+ // the following types cannot be converted to NAME
case PropertyType.DATE:
case PropertyType.DOUBLE:
- // TODO case PropertyType.DECIMAL: // JCR-1609
+ case PropertyType.DECIMAL:
case PropertyType.LONG:
case PropertyType.BOOLEAN:
case PropertyType.REFERENCE:
- // TODO case PropertyType.WEAKREFERENCE: // JCR-1609
- // TODO case PropertyType.URI // JCR-1609
+ case PropertyType.WEAKREFERENCE:
throw new InvalidQueryException(staticValue.getString() +
" cannot be converted into a NAME value");
}