You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2010/10/14 14:39:57 UTC
svn commit: r1022494 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java
Author: stefan
Date: Thu Oct 14 12:39:57 2010
New Revision: 1022494
URL: http://svn.apache.org/viewvc?rev=1022494&view=rev
Log:
JCR-2785: EffectiveNodeType#getNamedNodeDefs returns array QItemDefinition instead of QNodeDefinition
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java?rev=1022494&r1=1022493&r2=1022494&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java Thu Oct 14 12:39:57 2010
@@ -353,7 +353,7 @@ public class EffectiveNodeType implement
return defs.toArray(new QNodeDefinition[defs.size()]);
}
- public QItemDefinition[] getNamedNodeDefs() {
+ public QNodeDefinition[] getNamedNodeDefs() {
if (namedItemDefs.size() == 0) {
return QNodeDefinition.EMPTY_ARRAY;
}
@@ -371,7 +371,7 @@ public class EffectiveNodeType implement
return defs.toArray(new QNodeDefinition[defs.size()]);
}
- public QItemDefinition[] getNamedNodeDefs(Name name) {
+ public QNodeDefinition[] getNamedNodeDefs(Name name) {
List<QItemDefinition> list = namedItemDefs.get(name);
if (list == null || list.size() == 0) {
return QNodeDefinition.EMPTY_ARRAY;
@@ -914,9 +914,9 @@ public class EffectiveNodeType implement
* as there might be multiple definitions with the same name and we
* don't know which one is applicable, we check all of them
*/
- QItemDefinition[] defs = getNamedNodeDefs(name);
+ QNodeDefinition[] defs = getNamedNodeDefs(name);
if (defs != null) {
- for (QItemDefinition def : defs) {
+ for (QNodeDefinition def : defs) {
if (def.isMandatory()) {
throw new ConstraintViolationException("can't remove mandatory node");
}