You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2005/02/07 17:55:21 UTC
svn commit: r151727 - in
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core:
state/NodeState.java version/HistoryRootNodeState.java
version/VersionHistoryNodeState.java version/VersionLabelsNodeState.java
virtual/VirtualNodeState.java
Author: tripod
Date: Mon Feb 7 08:55:19 2005
New Revision: 151727
URL: http://svn.apache.org/viewcvs?view=rev&rev=151727
Log:
- protect constructors of ChildNodeEntry and PropertyEntry
Modified:
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/NodeState.java
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/HistoryRootNodeState.java
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryNodeState.java
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionLabelsNodeState.java
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/VirtualNodeState.java
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/NodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/NodeState.java?view=diff&r1=151726&r2=151727
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/NodeState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/NodeState.java Mon Feb 7 08:55:19 2005
@@ -777,8 +777,7 @@
private int hash = 0;
- // @todo constructor should not be public!
- public PropertyEntry(QName propName) {
+ protected PropertyEntry(QName propName) {
super(propName);
}
@@ -817,8 +816,7 @@
private int index; // 1-based index for same-name siblings
private String uuid;
- // @todo constructor should not be public!
- public ChildNodeEntry(QName nodeName, String uuid, int index) {
+ protected ChildNodeEntry(QName nodeName, String uuid, int index) {
super(nodeName);
if (uuid == null) {
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/HistoryRootNodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/HistoryRootNodeState.java?view=diff&r1=151726&r2=151727
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/HistoryRootNodeState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/HistoryRootNodeState.java Mon Feb 7 08:55:19 2005
@@ -84,7 +84,7 @@
try {
if (index <= 1) {
InternalVersionHistory hist = vm.getVersionHistory(nodeName.getLocalName());
- return new ChildNodeEntry(nodeName, hist.getId(), 1);
+ return createChildNodeEntry(nodeName, hist.getId(), 1);
}
} catch (RepositoryException e) {
// ignore
@@ -103,7 +103,7 @@
while (iter.hasNext()) {
String id = (String) iter.next();
QName name = new QName(NamespaceRegistryImpl.NS_DEFAULT_URI, id);
- list.add(new ChildNodeEntry(name, id, 1));
+ list.add(createChildNodeEntry(name, id, 1));
}
return list;
} catch (RepositoryException e) {
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryNodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryNodeState.java?view=diff&r1=151726&r2=151727
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryNodeState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryNodeState.java Mon Feb 7 08:55:19 2005
@@ -80,7 +80,7 @@
if (index <= 1) {
InternalVersion v = vh.getVersion(nodeName);
if (v!=null) {
- return new ChildNodeEntry(nodeName, v.getId(), 1);
+ return createChildNodeEntry(nodeName, v.getId(), 1);
}
}
} catch (RepositoryException e) {
@@ -97,7 +97,7 @@
Iterator iter = vh.getVersions();
while (iter.hasNext()) {
InternalVersion v = (InternalVersion) iter.next();
- list.add(new ChildNodeEntry(v.getName(), v.getId(), 1));
+ list.add(createChildNodeEntry(v.getName(), v.getId(), 1));
}
return list;
}
@@ -109,7 +109,7 @@
List list = new ArrayList(super.getChildNodeEntries(uuid));
InternalVersion v = vh.getVersion(uuid);
if (v!=null) {
- list.add(new ChildNodeEntry(v.getName(), uuid, 1));
+ list.add(createChildNodeEntry(v.getName(), uuid, 1));
}
return list;
}
@@ -122,7 +122,7 @@
try {
InternalVersion v = vh.getVersion(nodeName);
if (v!=null) {
- list.add(new ChildNodeEntry(nodeName, v.getId(), 1));
+ list.add(createChildNodeEntry(nodeName, v.getId(), 1));
}
} catch (RepositoryException e) {
// ignore
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionLabelsNodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionLabelsNodeState.java?view=diff&r1=151726&r2=151727
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionLabelsNodeState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionLabelsNodeState.java Mon Feb 7 08:55:19 2005
@@ -80,7 +80,7 @@
return super.getPropertyEntry(propName);
}
if (hasPropertyEntry(propName)) {
- return new NodeState.PropertyEntry(propName);
+ return createPropertyEntry(propName);
}
return null;
}
@@ -91,7 +91,7 @@
while (iter.hasNext()) {
InternalVersion v = (InternalVersion) iter.next();
if (v.getLabels().length>0) {
- list.add(new PropertyEntry(v.getName()));
+ list.add(createPropertyEntry(v.getName()));
}
}
return list;
@@ -141,4 +141,5 @@
}
throw new NoSuchItemStateException(name.toString());
}
+
}
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/VirtualNodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/VirtualNodeState.java?view=diff&r1=151726&r2=151727
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/VirtualNodeState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/VirtualNodeState.java Mon Feb 7 08:55:19 2005
@@ -185,4 +185,45 @@
setMixinTypeNames(set);
setPropertyValues(ItemImpl.PROPNAME_MIXINTYPES, PropertyType.NAME, values);
}
+
+ /**
+ * Creates a new VirtualChildNodeEntry
+ * @param nodeName
+ * @param uuid
+ * @param index
+ * @return
+ */
+ protected VirtualChildNodeEntry createChildNodeEntry(QName nodeName, String uuid, int index) {
+ return new VirtualChildNodeEntry(nodeName, uuid, index);
+ }
+
+ /**
+ * Creates a new VirtualPropertyEntry
+ * @param name
+ * @return
+ */
+ protected VirtualPropertyEntry createPropertyEntry(QName name) {
+ return new VirtualPropertyEntry(name);
+ }
+
+ /**
+ * Overload NodeState.ChildNodeEntry in order to create own ones.
+ */
+ public class VirtualChildNodeEntry extends NodeState.ChildNodeEntry {
+
+ protected VirtualChildNodeEntry(QName nodeName, String uuid, int index) {
+ super(nodeName, uuid, index);
+ }
+
+ }
+
+ /**
+ * Overload NodeState.PropertyEntry in order to create own ones.
+ */
+ public class VirtualPropertyEntry extends NodeState.PropertyEntry {
+
+ protected VirtualPropertyEntry(QName propName) {
+ super(propName);
+ }
+ }
}