You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by st...@apache.org on 2004/09/09 17:43:23 UTC
cvs commit: jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype NodeDefImpl.java PropertyDefImpl.java
stefan 2004/09/09 08:43:23
Modified: proposals/jcrri/src/org/apache/slide/jcr/core/nodetype
NodeDefImpl.java PropertyDefImpl.java
Log:
jcrri: refactoring of PropertyDef & NodeDef interfaces
Revision Changes Path
1.11 +3 -79 jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/NodeDefImpl.java
Index: NodeDefImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/NodeDefImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NodeDefImpl.java 30 Aug 2004 16:15:16 -0000 1.10
+++ NodeDefImpl.java 9 Sep 2004 15:43:23 -0000 1.11
@@ -17,7 +17,6 @@
import org.apache.log4j.Logger;
import org.apache.slide.jcr.core.NamespaceResolver;
-import org.apache.slide.jcr.core.NoPrefixDeclaredException;
import org.apache.slide.jcr.core.QName;
import javax.jcr.nodetype.NoSuchNodeTypeException;
@@ -30,14 +29,10 @@
* @author Stefan Guggisberg
* @version $Revision$, $Date$
*/
-public class NodeDefImpl implements NodeDef {
+public class NodeDefImpl extends ItemDefImpl implements NodeDef {
private static Logger log = Logger.getLogger(NodeDefImpl.class);
- private final NodeTypeManagerImpl ntMgr;
- // namespace resolver used to translate qualified names to JCR names
- private final NamespaceResolver nsResolver;
-
private final ChildNodeDef nodeDef;
@@ -49,13 +44,8 @@
* @param nsResolver namespace resolver
*/
NodeDefImpl(ChildNodeDef nodeDef, NodeTypeManagerImpl ntMgr, NamespaceResolver nsResolver) {
+ super(nodeDef, ntMgr, nsResolver);
this.nodeDef = nodeDef;
- this.ntMgr = ntMgr;
- this.nsResolver = nsResolver;
- }
-
- public QName getQName() {
- return nodeDef.getName();
}
public ChildNodeDef unwrap() {
@@ -64,37 +54,6 @@
//--------------------------------------------------------------< NodeDef >
/**
- * @see NodeDef#getDeclaringNodeType
- */
- public NodeType getDeclaringNodeType() {
- try {
- return ntMgr.getNodeType(nodeDef.getDeclaringNodeType());
- } catch (NoSuchNodeTypeException e) {
- // should never get here
- log.error("declaring node type does not exist", e);
- return null;
- }
- }
-
- /**
- * @see NodeDef#getName
- */
- public String getName() {
- QName name = nodeDef.getName();
- if (name == null) {
- return null;
- }
- try {
- return name.toJCRName(nsResolver);
- } catch (NoPrefixDeclaredException npde) {
- // should never get here
- log.error("encountered unregistered namespace in node name", npde);
- // not correct, but an acceptable fallback
- return nodeDef.getName().toString();
- }
- }
-
- /**
* @see NodeDef#getDefaultPrimaryType
*/
public NodeType getDefaultPrimaryType() {
@@ -134,41 +93,6 @@
log.error("required node type does not exist", e);
return new NodeType[0];
}
- }
-
- /**
- * @see NodeDef#getOnParentVersion
- */
- public int getOnParentVersion() {
- return nodeDef.getOnParentVersion();
- }
-
- /**
- * @see NodeDef#isAutoCreate
- */
- public boolean isAutoCreate() {
- return nodeDef.isAutoCreate();
- }
-
- /**
- * @see NodeDef#isPrimaryItem
- */
- public boolean isPrimaryItem() {
- return nodeDef.isPrimaryItem();
- }
-
- /**
- * @see NodeDef#isProtected
- */
- public boolean isProtected() {
- return nodeDef.isProtected();
- }
-
- /**
- * @see NodeDef#isMandatory
- */
- public boolean isMandatory() {
- return nodeDef.isMandatory();
}
/**
1.11 +3 -82 jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/PropertyDefImpl.java
Index: PropertyDefImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/PropertyDefImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PropertyDefImpl.java 30 Aug 2004 16:15:16 -0000 1.10
+++ PropertyDefImpl.java 9 Sep 2004 15:43:23 -0000 1.11
@@ -18,13 +18,9 @@
import org.apache.log4j.Logger;
import org.apache.slide.jcr.core.InternalValue;
import org.apache.slide.jcr.core.NamespaceResolver;
-import org.apache.slide.jcr.core.NoPrefixDeclaredException;
-import org.apache.slide.jcr.core.QName;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.PropertyDef;
/**
@@ -33,14 +29,10 @@
* @author Stefan Guggisberg
* @version $Revision$, $Date$
*/
-public class PropertyDefImpl implements PropertyDef {
+public class PropertyDefImpl extends ItemDefImpl implements PropertyDef {
private static Logger log = Logger.getLogger(PropertyDefImpl.class);
- private final NodeTypeManagerImpl ntMgr;
- // namespace resolver used to translate qualified names to JCR names
- private final NamespaceResolver nsResolver;
-
private final PropDef propDef;
@@ -52,13 +44,8 @@
* @param nsResolver namespace resolver
*/
PropertyDefImpl(PropDef propDef, NodeTypeManagerImpl ntMgr, NamespaceResolver nsResolver) {
+ super(propDef, ntMgr, nsResolver);
this.propDef = propDef;
- this.ntMgr = ntMgr;
- this.nsResolver = nsResolver;
- }
-
- public QName getQName() {
- return propDef.getName();
}
public PropDef unwrap() {
@@ -67,19 +54,6 @@
//----------------------------------------------------------< PropertyDef >
/**
- * @see PropertyDef#getDeclaringNodeType
- */
- public NodeType getDeclaringNodeType() {
- try {
- return ntMgr.getNodeType(propDef.getDeclaringNodeType());
- } catch (NoSuchNodeTypeException e) {
- // should never get here
- log.error("declaring node type does not exist", e);
- return null;
- }
- }
-
- /**
* @see PropertyDef#getDefaultValues
*/
public Value[] getDefaultValues() {
@@ -102,31 +76,6 @@
}
/**
- * @see PropertyDef#getName
- */
- public String getName() {
- QName name = propDef.getName();
- if (name == null) {
- return null;
- }
- try {
- return name.toJCRName(nsResolver);
- } catch (NoPrefixDeclaredException npde) {
- // should never get here
- log.error("encountered unregistered namespace in property name", npde);
- // not correct, but an acceptable fallback
- return propDef.getName().toString();
- }
- }
-
- /**
- * @see PropertyDef#getOnParentVersion()
- */
- public int getOnParentVersion() {
- return propDef.getOnParentVersion();
- }
-
- /**
* @see PropertyDef#getRequiredType
*/
public int getRequiredType() {
@@ -142,34 +91,6 @@
} else {
return propDef.getValueConstraint().getDefinition();
}
- }
-
- /**
- * @see PropertyDef#isAutoCreate
- */
- public boolean isAutoCreate() {
- return propDef.isAutoCreate();
- }
-
- /**
- * @see PropertyDef#isMandatory
- */
- public boolean isMandatory() {
- return propDef.isMandatory();
- }
-
- /**
- * @see PropertyDef#isPrimaryItem
- */
- public boolean isPrimaryItem() {
- return propDef.isPrimaryItem();
- }
-
- /**
- * @see PropertyDef#isProtected
- */
- public boolean isProtected() {
- return propDef.isProtected();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org