You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/05/15 16:36:16 UTC
svn commit: r656682 - in /jackrabbit/trunk/jackrabbit-core/src:
main/java/org/apache/jackrabbit/core/
main/java/org/apache/jackrabbit/core/observation/
main/java/org/apache/jackrabbit/core/query/lucene/
main/java/org/apache/jackrabbit/core/state/ test/...
Author: jukka
Date: Thu May 15 07:36:15 2008
New Revision: 656682
URL: http://svn.apache.org/viewvc?rev=656682&view=rev
Log:
JCR-1603: Remove getSafeJCRPath methods in HierarchyManagerImpl
- Removed unused methods and related dependencies
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ZombieHierarchyManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/CachingHierarchyManagerTest.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java Thu May 15 07:36:15 2008
@@ -26,7 +26,6 @@
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.Path;
import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException;
-import org.apache.jackrabbit.spi.commons.conversion.PathResolver;
import org.apache.jackrabbit.spi.commons.name.PathBuilder;
import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl;
import org.apache.jackrabbit.spi.commons.name.PathMap;
@@ -97,12 +96,10 @@
*
* @param rootNodeId root node id
* @param provider item state manager
- * @param resolver namespace resolver
*/
public CachingHierarchyManager(NodeId rootNodeId,
- ItemStateManager provider,
- PathResolver resolver) {
- super(rootNodeId, provider, resolver);
+ ItemStateManager provider) {
+ super(rootNodeId, provider);
upperLimit = DEFAULT_UPPER_LIMIT;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java Thu May 15 07:36:15 2008
@@ -64,59 +64,16 @@
static final int RETURN_PROPERTY = 2;
static final int RETURN_ANY = (RETURN_NODE | RETURN_PROPERTY);
- /**
- * Path resolver for outputting user-friendly paths in error messages.
- */
- protected final PathResolver resolver;
-
public HierarchyManagerImpl(NodeId rootNodeId,
- ItemStateManager provider,
- PathResolver resolver) {
+ ItemStateManager provider) {
this.rootNodeId = rootNodeId;
this.provider = provider;
- this.resolver = resolver;
}
public NodeId getRootNodeId() {
return rootNodeId;
}
- //-------------------------------------------------< misc. helper methods >
-
- /**
- * Failsafe conversion of internal <code>Path</code> to JCR path for use in
- * error messages etc.
- *
- * @param path path to convert
- * @return JCR path
- */
- public String safeGetJCRPath(Path path) {
- try {
- return resolver.getJCRPath(path);
- } catch (NamespaceException e) {
- log.error("failed to convert {} to a JCR path", path);
- // return string representation of internal path as a fallback
- return path.toString();
- }
- }
-
- /**
- * Failsafe translation of internal <code>ItemId</code> to JCR path for use
- * in error messages etc.
- *
- * @param id id to translate
- * @return JCR path
- */
- public String safeGetJCRPath(ItemId id) {
- try {
- return safeGetJCRPath(getPath(id));
- } catch (RepositoryException re) {
- log.error(id + ": failed to determine path to");
- // return string representation if id as a fallback
- return id.toString();
- }
- }
-
//-------------------------------------------------------< implementation >
/**
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java Thu May 15 07:36:15 2008
@@ -233,8 +233,8 @@
}
if (excludedNodeId != null) {
- HierarchyManagerImpl hmgr = new HierarchyManagerImpl(
- rootNodeId, itemMgr, nsReg.getPathResolver());
+ HierarchyManagerImpl hmgr =
+ new HierarchyManagerImpl(rootNodeId, itemMgr);
excludePath = hmgr.getPath(excludedNodeId);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java Thu May 15 07:36:15 2008
@@ -297,7 +297,7 @@
*/
protected SessionItemStateManager createSessionItemStateManager(LocalItemStateManager manager) {
return new SessionItemStateManager(
- rep.getRootNodeId(), manager, this, rep.getNodeTypeRegistry());
+ rep.getRootNodeId(), manager, rep.getNodeTypeRegistry());
}
/**
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java Thu May 15 07:36:15 2008
@@ -126,8 +126,8 @@
this.wspConfig = wspConfig;
this.rep = rep;
this.stateMgr = createItemStateManager(stateMgr);
- this.hierMgr = new CachingHierarchyManager(
- rep.getRootNodeId(), this.stateMgr, session);
+ this.hierMgr =
+ new CachingHierarchyManager(rep.getRootNodeId(), this.stateMgr);
this.stateMgr.addListener(hierMgr);
this.session = session;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ZombieHierarchyManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ZombieHierarchyManager.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ZombieHierarchyManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ZombieHierarchyManager.java Thu May 15 07:36:15 2008
@@ -42,7 +42,7 @@
public ZombieHierarchyManager(HierarchyManagerImpl parent,
ItemStateManager provider,
ItemStateManager attic) {
- super(parent.getRootNodeId(), provider, parent.resolver);
+ super(parent.getRootNodeId(), provider);
this.attic = attic;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java Thu May 15 07:36:15 2008
@@ -60,11 +60,8 @@
*/
ChangeLogBasedHierarchyMgr(NodeId rootNodeId,
ItemStateManager manager,
- ChangeLog changes,
- PathResolver resolver) {
- super(rootNodeId,
- new ChangeLogItemStateManager(manager, changes),
- resolver);
+ ChangeLog changes) {
+ super(rootNodeId, new ChangeLogItemStateManager(manager, changes));
zombieHierMgr = new ZombieHierarchyManager(
this, provider, new AtticItemStateManager(changes));
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java Thu May 15 07:36:15 2008
@@ -122,8 +122,8 @@
// create a hierarchy manager, that is based on the ChangeLog and
// the ItemStateProvider
// todo use CachingHierarchyManager ?
- ChangeLogBasedHierarchyMgr hmgr = new ChangeLogBasedHierarchyMgr(
- rootNodeId, stateMgr, changes, session);
+ ChangeLogBasedHierarchyMgr hmgr =
+ new ChangeLogBasedHierarchyMgr(rootNodeId, stateMgr, changes);
/**
* Important:
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java Thu May 15 07:36:15 2008
@@ -20,8 +20,6 @@
import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException;
import org.apache.jackrabbit.spi.commons.conversion.NameResolver;
import org.apache.jackrabbit.spi.commons.conversion.ParsingNameResolver;
-import org.apache.jackrabbit.spi.commons.conversion.PathResolver;
-import org.apache.jackrabbit.spi.commons.conversion.ParsingPathResolver;
import org.apache.jackrabbit.core.state.ItemStateManager;
import org.apache.jackrabbit.core.state.NodeState;
import org.apache.jackrabbit.core.state.ItemStateException;
@@ -34,7 +32,6 @@
import org.apache.jackrabbit.core.query.QueryHandlerContext;
import org.apache.jackrabbit.core.value.InternalValue;
import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl;
-import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.util.ISO9075;
import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver;
@@ -106,11 +103,7 @@
*/
public void init(Element config, QueryHandlerContext context, NamespaceMappings nsMappings) throws Exception {
ism = context.getItemStateManager();
- NameResolver nameResolver = new ParsingNameResolver(NameFactoryImpl.getInstance(),
- context.getNamespaceRegistry());
- PathResolver pathResolver = new ParsingPathResolver(PathFactoryImpl.getInstance(),
- nameResolver);
- hmgr = new HierarchyManagerImpl(context.getRootId(), ism, pathResolver);
+ hmgr = new HierarchyManagerImpl(context.getRootId(), ism);
NamespaceResolver nsResolver = new AdditionalNamespaceResolver(getNamespaces(config));
resolver = new ParsingNameResolver(NameFactoryImpl.getInstance(), nsResolver);
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java Thu May 15 07:36:15 2008
@@ -230,7 +230,7 @@
throws RepositoryException {
HierarchyManager hmgr = new HierarchyManagerImpl(
- RepositoryImpl.ROOT_NODE_ID, sharedItemMgr, session);
+ RepositoryImpl.ROOT_NODE_ID, sharedItemMgr);
JQOM2LuceneQueryBuilder builder = new JQOM2LuceneQueryBuilder(
qomTree, session, sharedItemMgr, hmgr, nsMappings, analyzer,
propReg, synonymProvider, bindVariableValues, version);
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java Thu May 15 07:36:15 2008
@@ -208,9 +208,8 @@
SynonymProvider synonymProvider,
IndexFormatVersion indexFormatVersion)
throws RepositoryException {
-
HierarchyManager hmgr = new HierarchyManagerImpl(
- RepositoryImpl.ROOT_NODE_ID, sharedItemMgr, session);
+ RepositoryImpl.ROOT_NODE_ID, sharedItemMgr);
LuceneQueryBuilder builder = new LuceneQueryBuilder(
root, session, sharedItemMgr, hmgr, nsMappings,
analyzer, propReg, synonymProvider, indexFormatVersion);
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java Thu May 15 07:36:15 2008
@@ -94,12 +94,10 @@
*
* @param rootNodeId the root node id
* @param stateMgr the local item state manager
- * @param resolver path resolver for outputting user-friendly paths
* @param ntReg node type registry
*/
public SessionItemStateManager(NodeId rootNodeId,
LocalItemStateManager stateMgr,
- PathResolver resolver,
NodeTypeRegistry ntReg) {
transientStore = new ItemStateMap();
atticStore = new ItemStateMap();
@@ -108,7 +106,7 @@
stateMgr.addListener(this);
// create hierarchy manager that uses both transient and persistent state
- hierMgr = new CachingHierarchyManager(rootNodeId, this, resolver);
+ hierMgr = new CachingHierarchyManager(rootNodeId, this);
addListener(hierMgr);
this.ntReg = ntReg;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/CachingHierarchyManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/CachingHierarchyManagerTest.java?rev=656682&r1=656681&r2=656682&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/CachingHierarchyManagerTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/CachingHierarchyManagerTest.java Thu May 15 07:36:15 2008
@@ -48,7 +48,7 @@
*/
public void testResolveNodePath() throws Exception {
StaticItemStateManager ism = new StaticItemStateManager();
- cache = new CachingHierarchyManager(ism.getRootNodeId(), ism, null);
+ cache = new CachingHierarchyManager(ism.getRootNodeId(), ism);
ism.setContainer(cache);
ism.addNode(ism.getRoot(), "a");
ism.addNode(ism.getRoot(), "b");
@@ -82,7 +82,7 @@
*/
public void testResolveNodePropertyPath() throws Exception {
StaticItemStateManager ism = new StaticItemStateManager();
- cache = new CachingHierarchyManager(ism.getRootNodeId(), ism, null);
+ cache = new CachingHierarchyManager(ism.getRootNodeId(), ism);
ism.setContainer(cache);
NodeState a = ism.addNode(ism.getRoot(), "a");
NodeState b = ism.addNode(a, "b");
@@ -133,7 +133,7 @@
*/
public void testAddSNS() throws Exception {
StaticItemStateManager ism = new StaticItemStateManager();
- cache = new CachingHierarchyManager(ism.getRootNodeId(), ism, null);
+ cache = new CachingHierarchyManager(ism.getRootNodeId(), ism);
ism.setContainer(cache);
NodeState a = ism.addNode(ism.getRoot(), "a");
NodeState b1 = ism.addNode(a, "b");
@@ -152,7 +152,7 @@
*/
public void testCloneAndRemove() throws Exception {
StaticItemStateManager ism = new StaticItemStateManager();
- cache = new CachingHierarchyManager(ism.getRootNodeId(), ism, null);
+ cache = new CachingHierarchyManager(ism.getRootNodeId(), ism);
ism.setContainer(cache);
NodeState a1 = ism.addNode(ism.getRoot(), "a1");
NodeState a2 = ism.addNode(ism.getRoot(), "a2");
@@ -179,7 +179,7 @@
*/
public void testCloneAndAddChildAndMove() throws Exception {
StaticItemStateManager ism = new StaticItemStateManager();
- cache = new CachingHierarchyManager(ism.getRootNodeId(), ism, null);
+ cache = new CachingHierarchyManager(ism.getRootNodeId(), ism);
ism.setContainer(cache);
NodeState a1 = ism.addNode(ism.getRoot(), "a1");
NodeState a2 = ism.addNode(ism.getRoot(), "a2");
@@ -207,7 +207,7 @@
*/
public void testMove() throws Exception {
StaticItemStateManager ism = new StaticItemStateManager();
- cache = new CachingHierarchyManager(ism.getRootNodeId(), ism, null);
+ cache = new CachingHierarchyManager(ism.getRootNodeId(), ism);
ism.setContainer(cache);
NodeState a1 = ism.addNode(ism.getRoot(), "a1");
NodeState a2 = ism.addNode(ism.getRoot(), "a2");
@@ -224,7 +224,7 @@
*/
public void testOrderBefore() throws Exception {
StaticItemStateManager ism = new StaticItemStateManager();
- cache = new CachingHierarchyManager(ism.getRootNodeId(), ism, null);
+ cache = new CachingHierarchyManager(ism.getRootNodeId(), ism);
ism.setContainer(cache);
NodeState a = ism.addNode(ism.getRoot(), "a");
NodeState b1 = ism.addNode(a, "b");
@@ -243,7 +243,7 @@
*/
public void testRemove() throws Exception {
StaticItemStateManager ism = new StaticItemStateManager();
- cache = new CachingHierarchyManager(ism.getRootNodeId(), ism, null);
+ cache = new CachingHierarchyManager(ism.getRootNodeId(), ism);
ism.setContainer(cache);
NodeState a = ism.addNode(ism.getRoot(), "a");
NodeState b = ism.addNode(a, "b");
@@ -260,7 +260,7 @@
*/
public void testRemoveSNS() throws Exception {
StaticItemStateManager ism = new StaticItemStateManager();
- cache = new CachingHierarchyManager(ism.getRootNodeId(), ism, null);
+ cache = new CachingHierarchyManager(ism.getRootNodeId(), ism);
ism.setContainer(cache);
NodeState a = ism.addNode(ism.getRoot(), "a");
NodeState b1 = ism.addNode(a, "b");
@@ -278,7 +278,7 @@
*/
public void testRemoveSNSWithCachedPath() throws Exception {
StaticItemStateManager ism = new StaticItemStateManager();
- cache = new CachingHierarchyManager(ism.getRootNodeId(), ism, null);
+ cache = new CachingHierarchyManager(ism.getRootNodeId(), ism);
ism.setContainer(cache);
NodeState a = ism.addNode(ism.getRoot(), "a");
NodeState b1 = ism.addNode(a, "b");
@@ -296,7 +296,7 @@
*/
public void testRename() throws Exception {
StaticItemStateManager ism = new StaticItemStateManager();
- cache = new CachingHierarchyManager(ism.getRootNodeId(), ism, null);
+ cache = new CachingHierarchyManager(ism.getRootNodeId(), ism);
ism.setContainer(cache);
NodeState a1 = ism.addNode(ism.getRoot(), "a1");
NodeState b1 = ism.addNode(a1, "b");