stefan 2004/07/09 09:48:34
Modified: proposals/jcrri/src/org/apache/slide/jcr/core/nodetype
NodeTypeDefStore.java NodeTypeRegistry.java
EffectiveNodeType.java
Log:
jcrri
Revision Changes Path
1.3 +0 -0
jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/NodeTypeDefStore.java
Index: NodeTypeDefStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/NodeTypeDefStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.7 +4 -4
jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/NodeTypeRegistry.java
Index: NodeTypeRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/NodeTypeRegistry.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NodeTypeRegistry.java 7 Jul 2004 16:06:40 -0000 1.6
+++ NodeTypeRegistry.java 9 Jul 2004 16:48:34 -0000 1.7
@@ -601,7 +601,7 @@
* @param ntName
* @return
*/
- synchronized EffectiveNodeType getEffectiveNodeType(QName ntName)
+ synchronized public EffectiveNodeType getEffectiveNodeType(QName ntName)
throws NoSuchNodeTypeException {
WeightedKey key = new WeightedKey(new QName[]{ntName});
if (entCache.contains(key)) {
@@ -615,7 +615,7 @@
* @param ntNames
* @return
*/
- synchronized EffectiveNodeType buildEffectiveNodeType(QName[] ntNames)
+ synchronized public EffectiveNodeType buildEffectiveNodeType(QName[] ntNames)
throws NodeTypeConflictException, NoSuchNodeTypeException {
// 1. make sure every single node type is registered
for (int i = 0; i < ntNames.length; i++) {
1.7 +46 -22
jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/EffectiveNodeType.java
Index: EffectiveNodeType.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/EffectiveNodeType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EffectiveNodeType.java 7 Jul 2004 16:06:29 -0000 1.6
+++ EffectiveNodeType.java 9 Jul 2004 16:48:34 -0000 1.7
@@ -155,7 +155,7 @@
return new EffectiveNodeType(ntReg);
}
- QName[] getMergedNodeTypes() {
+ public QName[] getMergedNodeTypes() {
return (QName[]) mergedNodeTypes.toArray(new QName[mergedNodeTypes.size()]);
}
@@ -167,26 +167,26 @@
return (QName[]) allNodeTypes.toArray(new QName[allNodeTypes.size()]);
}
- ItemDef[] getAllItemDefs() {
+ public ItemDef[] getAllItemDefs() {
ArrayList defs = new ArrayList(namedItemDefs.size() + unnamedItemDefs.size());
defs.addAll(namedItemDefs.values());
defs.addAll(unnamedItemDefs);
return (ItemDef[]) defs.toArray(new ItemDef[defs.size()]);
}
- ItemDef[] getNamedItemDefs() {
+ public ItemDef[] getNamedItemDefs() {
return (ItemDef[]) namedItemDefs.values().toArray(new
ItemDef[namedItemDefs.size()]);
}
- ItemDef[] getUnnamedItemDefs() {
+ public ItemDef[] getUnnamedItemDefs() {
return (ItemDef[]) unnamedItemDefs.toArray(new
ItemDef[unnamedItemDefs.size()]);
}
- boolean hasNamedItemDef(QName name) {
+ public boolean hasNamedItemDef(QName name) {
return namedItemDefs.containsKey(name);
}
- ItemDef getNamedItemDef(QName name) {
+ public ItemDef getNamedItemDef(QName name) {
return (ItemDef) namedItemDefs.get(name);
}
@@ -209,7 +209,7 @@
return (ChildNodeDef[]) defs.toArray(new ChildNodeDef[defs.size()]);
}
- ChildNodeDef[] getNamedNodeDefs() {
+ public ChildNodeDef[] getNamedNodeDefs() {
ArrayList defs = new ArrayList(namedItemDefs.size());
Iterator iter = namedItemDefs.values().iterator();
while (iter.hasNext()) {
@@ -221,7 +221,7 @@
return (ChildNodeDef[]) defs.toArray(new ChildNodeDef[defs.size()]);
}
- ChildNodeDef[] getUnnamedNodeDefs() {
+ public ChildNodeDef[] getUnnamedNodeDefs() {
ArrayList defs = new ArrayList(unnamedItemDefs.size());
Iterator iter = unnamedItemDefs.iterator();
while (iter.hasNext()) {
@@ -233,7 +233,7 @@
return (ChildNodeDef[]) defs.toArray(new ChildNodeDef[defs.size()]);
}
- ChildNodeDef[] getAutoCreateNodeDefs() {
+ public ChildNodeDef[] getAutoCreateNodeDefs() {
// since auto-create items must have a name,
// we're only searching the named item definitions
ArrayList defs = new ArrayList(namedItemDefs.size());
@@ -266,7 +266,7 @@
return (PropDef[]) defs.toArray(new PropDef[defs.size()]);
}
- PropDef[] getNamedPropDefs() {
+ public PropDef[] getNamedPropDefs() {
ArrayList defs = new ArrayList(namedItemDefs.size());
Iterator iter = namedItemDefs.values().iterator();
while (iter.hasNext()) {
@@ -278,7 +278,7 @@
return (PropDef[]) defs.toArray(new PropDef[defs.size()]);
}
- PropDef[] getUnnamedPropDefs() {
+ public PropDef[] getUnnamedPropDefs() {
ArrayList defs = new ArrayList(unnamedItemDefs.size());
Iterator iter = unnamedItemDefs.iterator();
while (iter.hasNext()) {
@@ -290,7 +290,7 @@
return (PropDef[]) defs.toArray(new PropDef[defs.size()]);
}
- PropDef[] getAutoCreatePropDefs() {
+ public PropDef[] getAutoCreatePropDefs() {
// since auto-create items must have a name,
// we're only searching the named item definitions
ArrayList defs = new ArrayList(namedItemDefs.size());
@@ -304,7 +304,7 @@
return (PropDef[]) defs.toArray(new PropDef[defs.size()]);
}
- PropDef[] getMandatoryPropDefs() {
+ public PropDef[] getMandatoryPropDefs() {
// since mandatory items must have a name,
// we're only searching the named item definitions
ArrayList defs = new ArrayList(namedItemDefs.size());
@@ -318,7 +318,7 @@
return (PropDef[]) defs.toArray(new PropDef[defs.size()]);
}
- ChildNodeDef[] getMandatoryNodeDefs() {
+ public ChildNodeDef[] getMandatoryNodeDefs() {
// since mandatory items must have a name,
// we're only searching the named item definitions
ArrayList defs = new ArrayList(namedItemDefs.size());
@@ -332,7 +332,7 @@
return (ChildNodeDef[]) defs.toArray(new ChildNodeDef[defs.size()]);
}
- boolean includesNodeType(QName nodeTypeName) {
+ public boolean includesNodeType(QName nodeTypeName) {
return allNodeTypes.contains(nodeTypeName);
}
@@ -344,7 +344,7 @@
* @throws ConstraintViolationException
* @throws ValueFormatException
*/
- static void checkSetPropertyValueConstraints(PropDef pd, InternalValue[] values)
+ public static void checkSetPropertyValueConstraints(PropDef pd, InternalValue[]
values)
throws ConstraintViolationException, ValueFormatException,
RepositoryException {
// check protected flag
if (pd.isProtected()) {
@@ -368,7 +368,12 @@
}
}
- void checkAddNodeConstraints(QName name)
+ /**
+ *
+ * @param name
+ * @throws ConstraintViolationException
+ */
+ public void checkAddNodeConstraints(QName name)
throws ConstraintViolationException {
ItemDef def = (ItemDef) namedItemDefs.get(name);
if (def == null) {
@@ -418,7 +423,14 @@
throw new ConstraintViolationException("no matching child node definition
found for " + name);
}
- void checkAddNodeConstraints(QName name, QName nodeTypeName)
+ /**
+ *
+ * @param name
+ * @param nodeTypeName
+ * @throws ConstraintViolationException
+ * @throws NoSuchNodeTypeException
+ */
+ public void checkAddNodeConstraints(QName name, QName nodeTypeName)
throws ConstraintViolationException, NoSuchNodeTypeException {
ItemDef def = (ItemDef) namedItemDefs.get(name);
if (def == null) {
@@ -455,7 +467,12 @@
throw new ConstraintViolationException("no matching child node definition
found for " + name);
}
- void checkRemoveItemConstraints(QName name) throws ConstraintViolationException
{
+ /**
+ *
+ * @param name
+ * @throws ConstraintViolationException
+ */
+ public void checkRemoveItemConstraints(QName name) throws
ConstraintViolationException {
ItemDef def = getNamedItemDef(name);
if (def != null) {
if (def.isMandatory()) {
@@ -467,7 +484,14 @@
}
}
- void checkRequiredPrimaryType(QName nodeTypeName, QName[] requiredPrimaryTypes)
+ /**
+ *
+ * @param nodeTypeName
+ * @param requiredPrimaryTypes
+ * @throws ConstraintViolationException
+ * @throws NoSuchNodeTypeException
+ */
+ public void checkRequiredPrimaryType(QName nodeTypeName, QName[]
requiredPrimaryTypes)
throws ConstraintViolationException, NoSuchNodeTypeException {
if (requiredPrimaryTypes == null) {
// no constraint
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
