You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2012/08/09 15:24:36 UTC
svn commit: r1371201 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
Author: jukka
Date: Thu Aug 9 13:24:36 2012
New Revision: 1371201
URL: http://svn.apache.org/viewvc?rev=1371201&view=rev
Log:
OAK-66: JCR Node Type Management
Enable queries by mixin type. Proper type resolution still a TODO.
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java?rev=1371201&r1=1371200&r2=1371201&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java Thu Aug 9 13:24:36 2012
@@ -18,6 +18,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
+import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.oak.api.CoreValue;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -126,6 +127,14 @@ public class SelectorImpl extends Source
if (nodeTypeName.equals(v.getString())) {
return true;
}
+ PropertyState m = tree.getProperty(JcrConstants.JCR_MIXINTYPES);
+ if (m != null) {
+ for (CoreValue value : m.getValues()) {
+ if (nodeTypeName.equals(value.getString())) {
+ return true;
+ }
+ }
+ }
}
}