jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r427148 - in /jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core: HierarchyManager.java HierarchyManagerImpl.java WorkspaceImpl.java state/SessionItemStateManager.java
Date Mon, 31 Jul 2006 15:48:11 GMT
Author: stefan
Date: Mon Jul 31 08:48:10 2006
New Revision: 427148

URL: http://svn.apache.org/viewvc?rev=427148&view=rev
Log:
reverting changes of r425397

Modified:
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java?rev=427148&r1=427147&r2=427148&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java
(original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java
Mon Jul 31 08:48:10 2006
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.core;
 
-import org.apache.jackrabbit.core.state.ItemState;
 import org.apache.jackrabbit.name.Path;
 import org.apache.jackrabbit.name.QName;
 
@@ -105,22 +104,4 @@
      */
     boolean isAncestor(NodeId nodeId, ItemId itemId)
             throws ItemNotFoundException, RepositoryException;
-
-    /**
-     * Returns the id of the root node of this hierarchy.
-     * @return the root node id.
-     */
-    NodeId getRootNodeId();
-
-    /**
-     * The hierarchy manager is notified when a state is overlaid
-     * @param state
-     */
-    void stateOverlaid(ItemState state);
-
-    /**
-     * The hierarchy manager is notified when a state is uncovered.
-     * @param state
-     */
-    void stateUncovered(ItemState state);
 }

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java?rev=427148&r1=427147&r2=427148&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java
Mon Jul 31 08:48:10 2006
@@ -510,19 +510,5 @@
             throw new RepositoryException(msg, ise);
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void stateOverlaid(ItemState state) {
-        // ignore
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void stateUncovered(ItemState state) {
-        // ignore
-    }
 }
 

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java?rev=427148&r1=427147&r2=427148&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java
Mon Jul 31 08:48:10 2006
@@ -95,7 +95,7 @@
      * (i.e. that is isolated from transient changes made through
      * the session).
      */
-    protected final HierarchyManager hierMgr;
+    protected final HierarchyManagerImpl hierMgr;
 
     /**
      * The <code>ObservationManager</code> instance for this session.

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java?rev=427148&r1=427147&r2=427148&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
(original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
Mon Jul 31 08:48:10 2006
@@ -59,12 +59,7 @@
     /**
      * Hierarchy manager
      */
-    private final HierarchyManager hierMgr;
-
-    /**
-     * the namespace resolver used by this session
-     */
-    private final NamespaceResolver nsResolver;
+    private CachingHierarchyManager hierMgr;
 
     /**
      * Creates a new <code>SessionItemStateManager</code> instance.
@@ -78,7 +73,6 @@
                                    NamespaceResolver nsResolver) {
 
         this.persistentStateMgr = persistentStateMgr;
-        this.nsResolver = nsResolver;
         // create transient item state manager
         transientStateMgr = new TransientItemStateManager();
         // create hierarchy manager that uses both transient and persistent state
@@ -413,7 +407,7 @@
                 new ZombieHierarchyManager(hierMgr.getRootNodeId(),
                         this,
                         transientStateMgr.getAttic(),
-                        nsResolver);
+                        hierMgr.getNamespaceResolver());
 
         // use an array of lists to group the descendants by relative depth;
         // the depth is used as array index



Mime
View raw message