From jackrabbit-commits-return-447-apmail-incubator-jackrabbit-commits-archive=www.apache.org@incubator.apache.org Thu Mar 03 13:29:09 2005
Return-Path: <jackrabbit-commits-return-447-apmail-incubator-jackrabbit-commits-archive=www.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org
Received: (qmail 22346 invoked from network); 3 Mar 2005 13:29:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 3 Mar 2005 13:29:09 -0000
Received: (qmail 27218 invoked by uid 500); 3 Mar 2005 13:29:09 -0000
Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jackrabbit-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jackrabbit-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jackrabbit-commits@incubator.apache.org>
List-Id: <jackrabbit-commits.incubator.apache.org>
Reply-To: jackrabbit-dev@incubator.apache.org
Delivered-To: mailing list jackrabbit-commits@incubator.apache.org
Received: (qmail 27205 invoked by uid 500); 3 Mar 2005 13:29:09 -0000
Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org
Received: (qmail 27200 invoked by uid 99); 3 Mar 2005 13:29:09 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 03 Mar 2005 05:29:08 -0800
Received: (qmail 22327 invoked by uid 65534); 3 Mar 2005 13:29:07 -0000
Message-ID: <20050303132907.22325.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Thu, 03 Mar 2005 13:29:07 -0000
Subject: svn commit: r156036 - in
 incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core:
 ItemImpl.java WorkspaceImpl.java state/SessionItemStateManager.java
 state/SharedItemStateManager.java
To: jackrabbit-cvs@incubator.apache.org
From: stefan@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: stefan
Date: Thu Mar  3 05:29:04 2005
New Revision: 156036

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D156036
Log:
trivial changes only (typos & formatting)

Modified:
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl=
.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Workspac=
eImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Se=
ssionItemStateManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Sh=
aredItemStateManager.java

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/It=
emImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/ItemImpl.java?view=3Ddiff&r1=3D156035&r2=3D156036
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl=
.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl=
.java Thu Mar  3 05:29:04 2005
@@ -435,8 +435,9 @@
         return removed;
     }
=20
-    private void validateTransientItems(Iterator dirtyIter, Iterator remov=
erIter)
-            throws AccessDeniedException, ConstraintViolationException, Re=
positoryException {
+    private void validateTransientItems(Iterator dirtyIter, Iterator remov=
edIter)
+            throws AccessDeniedException, ConstraintViolationException,
+            RepositoryException {
         /**
          * the following validations/checks are performed on transient ite=
ms:
          *
@@ -607,8 +608,8 @@
         }
=20
         // walk through list of removed transient items and check REMOVE p=
ermission
-        while (removerIter.hasNext()) {
-            ItemState itemState =3D (ItemState) removerIter.next();
+        while (removedIter.hasNext()) {
+            ItemState itemState =3D (ItemState) removedIter.next();
             ItemId id =3D itemState.getId();
             // check WRITE permission
             if (!accessMgr.isGranted(id, AccessManager.REMOVE)) {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Wo=
rkspaceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/WorkspaceImpl.java?view=3Ddiff&r1=3D156035&r2=3D1560=
36
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Workspac=
eImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Workspac=
eImpl.java Thu Mar  3 05:29:04 2005
@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.core;
=20
 import org.apache.jackrabbit.core.config.WorkspaceConfig;
-import org.apache.jackrabbit.core.security.AccessManager;
 import org.apache.jackrabbit.core.nodetype.ChildNodeDef;
 import org.apache.jackrabbit.core.nodetype.EffectiveNodeType;
 import org.apache.jackrabbit.core.nodetype.NodeDefId;
@@ -25,7 +24,9 @@
 import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
 import org.apache.jackrabbit.core.nodetype.PropDef;
 import org.apache.jackrabbit.core.nodetype.PropDefId;
+import org.apache.jackrabbit.core.observation.ObservationManagerImpl;
 import org.apache.jackrabbit.core.search.QueryManagerImpl;
+import org.apache.jackrabbit.core.security.AccessManager;
 import org.apache.jackrabbit.core.state.ItemStateException;
 import org.apache.jackrabbit.core.state.ItemStateManager;
 import org.apache.jackrabbit.core.state.NoSuchItemStateException;
@@ -36,7 +37,6 @@
 import org.apache.jackrabbit.core.state.UpdatableItemStateManager;
 import org.apache.jackrabbit.core.util.uuid.UUID;
 import org.apache.jackrabbit.core.xml.ImportHandler;
-import org.apache.jackrabbit.core.observation.ObservationManagerImpl;
 import org.apache.log4j.Logger;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -943,6 +943,7 @@
=20
     /**
      * Returns the ObservationManagerImpl for this workspace instance.
+     *
      * @return the ObservationManagerImpl for this workspace instance.
      */
     public synchronized ObservationManagerImpl getObservationManagerImpl()

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/st=
ate/SessionItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/state/SessionItemStateManager.java?view=3Ddiff&r1=3D=
156035&r2=3D156036
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Se=
ssionItemStateManager.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Se=
ssionItemStateManager.java Thu Mar  3 05:29:04 2005
@@ -16,14 +16,27 @@
  */
 package org.apache.jackrabbit.core.state;
=20
-import org.apache.jackrabbit.core.*;
+import org.apache.jackrabbit.core.CachingHierarchyManager;
+import org.apache.jackrabbit.core.Constants;
+import org.apache.jackrabbit.core.HierarchyManager;
+import org.apache.jackrabbit.core.HierarchyManagerImpl;
+import org.apache.jackrabbit.core.ItemId;
+import org.apache.jackrabbit.core.MalformedPathException;
+import org.apache.jackrabbit.core.NamespaceResolver;
+import org.apache.jackrabbit.core.NodeId;
+import org.apache.jackrabbit.core.Path;
+import org.apache.jackrabbit.core.QName;
 import org.apache.log4j.Logger;
=20
 import javax.jcr.InvalidItemStateException;
 import javax.jcr.ItemNotFoundException;
 import javax.jcr.RepositoryException;
 import java.io.PrintStream;
-import java.util.*;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Random;
+import java.util.TreeMap;
=20
 /**
  * <code>SessionItemStateManager</code> ...

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/st=
ate/SharedItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/state/SharedItemStateManager.java?view=3Ddiff&r1=3D1=
56035&r2=3D156036
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Sh=
aredItemStateManager.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Sh=
aredItemStateManager.java Thu Mar  3 05:29:04 2005
@@ -16,19 +16,24 @@
  */
 package org.apache.jackrabbit.core.state;
=20
-import org.apache.jackrabbit.core.*;
-import org.apache.jackrabbit.core.virtual.VirtualItemStateProvider;
-import org.apache.jackrabbit.core.observation.ObservationManagerImpl;
-import org.apache.jackrabbit.core.observation.EventStateCollection;
+import org.apache.jackrabbit.core.Constants;
+import org.apache.jackrabbit.core.InternalValue;
+import org.apache.jackrabbit.core.ItemId;
+import org.apache.jackrabbit.core.NodeId;
+import org.apache.jackrabbit.core.PropertyId;
+import org.apache.jackrabbit.core.QName;
 import org.apache.jackrabbit.core.nodetype.NodeDefId;
 import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
 import org.apache.jackrabbit.core.nodetype.PropDefId;
+import org.apache.jackrabbit.core.observation.EventStateCollection;
+import org.apache.jackrabbit.core.observation.ObservationManagerImpl;
+import org.apache.jackrabbit.core.virtual.VirtualItemStateProvider;
 import org.apache.log4j.Logger;
=20
 import javax.jcr.PropertyType;
 import javax.jcr.nodetype.NoSuchNodeTypeException;
 import java.io.PrintStream;
-import java.util.*;
+import java.util.Iterator;
=20
 /**
  * Shared <code>ItemStateManager</code>. Caches objects returned from a
@@ -107,8 +112,8 @@
         NodeState rootState =3D createInstance(rootNodeUUID, Constants.REP=
_ROOT, null);
=20
         // @todo FIXME need to manually setup root node by creating mandat=
ory jcr:primaryType property
-        NodeDefId nodeDefId =3D null;
-        PropDefId propDefId =3D null;
+        NodeDefId nodeDefId;
+        PropDefId propDefId;
=20
         try {
             nodeDefId =3D new NodeDefId(ntReg.getRootNodeDef());
@@ -271,7 +276,7 @@
     }
=20
     /**
-     * Checks if this itemstate manager has the given item state without
+     * Checks if this item state manager has the given item state without
      * considering the virtual item state managers.
      */
     private boolean hasNonVirtualItemState(ItemId id) {
@@ -340,6 +345,7 @@
=20
     /**
      * Create a new node state instance
+     *
      * @param other other state associated with new instance
      * @return new node state instance
      */
@@ -361,8 +367,7 @@
      * @return new property state instance
      */
     PropertyState createInstance(QName propName, String parentUUID) {
-        PropertyState state =3D persistMgr.createNew(
-                new PropertyId(parentUUID, propName));
+        PropertyState state =3D persistMgr.createNew(new PropertyId(parent=
UUID, propName));
         state.setStatus(ItemState.STATUS_NEW);
         state.addListener(this);
=20
@@ -376,9 +381,10 @@
      * by this state manager.<p/>
      * After successfully storing the states the observation manager is in=
formed
      * about the changes, if an observation manager is passed to this meth=
od.
-     * @param local change log containing local items
+     *
+     * @param local  change log containing local items
      * @param obsMgr the observation manager to inform, or <code>null</cod=
e> if
-     *  no observation manager should be informed.
+     *               no observation manager should be informed.
      * @throws ItemStateException if an error occurs
      */
     public synchronized void store(ChangeLog local, ObservationManagerImpl=
 obsMgr) throws ItemStateException {