jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r156036 - in incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core: ItemImpl.java WorkspaceImpl.java state/SessionItemStateManager.java state/SharedItemStateManager.java
Date Thu, 03 Mar 2005 13:29:07 GMT
Author: stefan
Date: Thu Mar  3 05:29:04 2005
New Revision: 156036

URL: http://svn.apache.org/viewcvs?view=rev&rev=156036
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/WorkspaceImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java?view=diff&r1=156035&r2=156036
==============================================================================
--- 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;
     }
 
-    private void validateTransientItems(Iterator dirtyIter, Iterator removerIter)
-            throws AccessDeniedException, ConstraintViolationException, RepositoryException
{
+    private void validateTransientItems(Iterator dirtyIter, Iterator removedIter)
+            throws AccessDeniedException, ConstraintViolationException,
+            RepositoryException {
         /**
          * the following validations/checks are performed on transient items:
          *
@@ -607,8 +608,8 @@
         }
 
         // walk through list of removed transient items and check REMOVE permission
-        while (removerIter.hasNext()) {
-            ItemState itemState = (ItemState) removerIter.next();
+        while (removedIter.hasNext()) {
+            ItemState itemState = (ItemState) removedIter.next();
             ItemId id = itemState.getId();
             // check WRITE permission
             if (!accessMgr.isGranted(id, AccessManager.REMOVE)) {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java?view=diff&r1=156035&r2=156036
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java Thu
Mar  3 05:29:04 2005
@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.core;
 
 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 @@
 
     /**
      * 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/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java?view=diff&r1=156035&r2=156036
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
Thu Mar  3 05:29:04 2005
@@ -16,14 +16,27 @@
  */
 package org.apache.jackrabbit.core.state;
 
-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;
 
 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;
 
 /**
  * <code>SessionItemStateManager</code> ...

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?view=diff&r1=156035&r2=156036
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Thu Mar  3 05:29:04 2005
@@ -16,19 +16,24 @@
  */
 package org.apache.jackrabbit.core.state;
 
-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;
 
 import javax.jcr.PropertyType;
 import javax.jcr.nodetype.NoSuchNodeTypeException;
 import java.io.PrintStream;
-import java.util.*;
+import java.util.Iterator;
 
 /**
  * Shared <code>ItemStateManager</code>. Caches objects returned from a
@@ -107,8 +112,8 @@
         NodeState rootState = createInstance(rootNodeUUID, Constants.REP_ROOT, null);
 
         // @todo FIXME need to manually setup root node by creating mandatory jcr:primaryType
property
-        NodeDefId nodeDefId = null;
-        PropDefId propDefId = null;
+        NodeDefId nodeDefId;
+        PropDefId propDefId;
 
         try {
             nodeDefId = new NodeDefId(ntReg.getRootNodeDef());
@@ -271,7 +276,7 @@
     }
 
     /**
-     * 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 @@
 
     /**
      * 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 = persistMgr.createNew(
-                new PropertyId(parentUUID, propName));
+        PropertyState state = persistMgr.createNew(new PropertyId(parentUUID, propName));
         state.setStatus(ItemState.STATUS_NEW);
         state.addListener(this);
 
@@ -376,9 +381,10 @@
      * by this state manager.<p/>
      * After successfully storing the states the observation manager is informed
      * about the changes, if an observation manager is passed to this method.
-     * @param local change log containing local items
+     *
+     * @param local  change log containing local items
      * @param obsMgr the observation manager to inform, or <code>null</code>
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 {



Mime
View raw message