jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: rev 56918 - in incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core: . config state
Date Mon, 08 Nov 2004 11:27:31 GMT
Author: stefan
Date: Mon Nov  8 03:27:28 2004
New Revision: 56918

Modified:
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemManager.java
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionImpl.java
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/WorkspaceConfig.java
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
Log:
fixed coding-style

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemManager.java
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemManager.java	(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemManager.java	Mon Nov
 8 03:27:28 2004
@@ -16,16 +16,19 @@
 package org.apache.jackrabbit.core;
 
 import org.apache.commons.collections.ReferenceMap;
+import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
 import org.apache.jackrabbit.core.state.*;
 import org.apache.jackrabbit.core.util.IteratorHelper;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
 import org.apache.log4j.Logger;
 
 import javax.jcr.*;
 import javax.jcr.nodetype.NodeDef;
 import javax.jcr.nodetype.PropertyDef;
 import java.io.PrintStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * There's one <code>ItemManager</code> instance per <code>Session</code>
@@ -155,6 +158,7 @@
 
     /**
      * Checks if the item with the given id exists
+     *
      * @param id
      * @return
      */

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java	(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java	Mon Nov 
8 03:27:28 2004
@@ -18,8 +18,8 @@
 import org.apache.jackrabbit.core.nodetype.*;
 import org.apache.jackrabbit.core.state.*;
 import org.apache.jackrabbit.core.util.ChildrenCollector;
-import org.apache.jackrabbit.core.util.IteratorHelper;
 import org.apache.jackrabbit.core.util.ChildrenCollectorFilter;
+import org.apache.jackrabbit.core.util.IteratorHelper;
 import org.apache.jackrabbit.core.util.uuid.UUID;
 import org.apache.jackrabbit.core.version.*;
 import org.apache.log4j.Logger;
@@ -28,10 +28,10 @@
 import javax.jcr.lock.Lock;
 import javax.jcr.lock.LockException;
 import javax.jcr.nodetype.*;
+import javax.jcr.version.OnParentVersionAction;
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionException;
 import javax.jcr.version.VersionHistory;
-import javax.jcr.version.OnParentVersionAction;
 import java.io.InputStream;
 import java.util.*;
 
@@ -2658,8 +2658,8 @@
             } else if (prop.getQName().equals(VersionManager.PROPNAME_PREDECESSORS)) {
                 continue;
             }
-            if (prop.getDefinition().getOnParentVersion()==OnParentVersionAction.COPY
-                    || prop.getDefinition().getOnParentVersion()==OnParentVersionAction.VERSION)
{
+            if (prop.getDefinition().getOnParentVersion() == OnParentVersionAction.COPY
+                    || prop.getDefinition().getOnParentVersion() == OnParentVersionAction.VERSION)
{
                 if (!propNames.contains(prop.getQName())) {
                     removeChildProperty(prop.getQName());
                 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java	(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java	Mon
Nov  8 03:27:28 2004
@@ -400,12 +400,13 @@
 
     /**
      * Returns the names of all workspaces of this repository.
+     *
      * @return the names of all workspaces of this repository.
      */
     protected String[] getWorkspaceNames() {
-        return (String[] ) wspConfigs.keySet().toArray(new String[wspConfigs.keySet().size()]);
+        return (String[]) wspConfigs.keySet().toArray(new String[wspConfigs.keySet().size()]);
     }
-    
+
     synchronized PersistentItemStateProvider getWorkspaceStateManager(String workspaceName)
             throws NoSuchWorkspaceException, RepositoryException {
         // check state

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionImpl.java
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionImpl.java	(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionImpl.java	Mon Nov
 8 03:27:28 2004
@@ -21,8 +21,8 @@
 import org.apache.jackrabbit.core.state.NodeState;
 import org.apache.jackrabbit.core.state.PersistentItemStateProvider;
 import org.apache.jackrabbit.core.state.SessionItemStateManager;
-import org.apache.jackrabbit.core.xml.ImportHandler;
 import org.apache.jackrabbit.core.version.VersionManager;
+import org.apache.jackrabbit.core.xml.ImportHandler;
 import org.apache.log4j.Logger;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -147,7 +147,7 @@
         hierMgr = itemStateMgr.getHierarchyMgr();
         itemMgr = createItemManager(itemStateMgr, hierMgr);
         accessMgr = createAccessManager(credentials, hierMgr);
-        versionMgr = rep.getPersistentVersionManager()==null?null:rep.getPersistentVersionManager().getVersionManager(wsp);
+        versionMgr = rep.getPersistentVersionManager() == null ? null : rep.getPersistentVersionManager().getVersionManager(wsp);
 
         // add virtual item managers only for normal sessions
         if (!(this instanceof SystemSession)) {
@@ -178,7 +178,7 @@
         itemStateMgr = new SessionItemStateManager(rep.getRootNodeUUID(), wsp.getPersistentStateManager(),
getNamespaceResolver());
         hierMgr = itemStateMgr.getHierarchyMgr();
         itemMgr = createItemManager(itemStateMgr, hierMgr);
-        versionMgr = rep.getPersistentVersionManager()==null?null:rep.getPersistentVersionManager().getVersionManager(wsp);
+        versionMgr = rep.getPersistentVersionManager() == null ? null : rep.getPersistentVersionManager().getVersionManager(wsp);
 
         // add virtual item managers only for normal sessions
         if (!(this instanceof SystemSession)) {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/WorkspaceConfig.java
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/WorkspaceConfig.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/WorkspaceConfig.java
Mon Nov  8 03:27:28 2004
@@ -113,7 +113,7 @@
         Element wspElem = config.getRootElement();
         // name
         wspName = wspElem.getAttributeValue(NAME_ATTRIB);
-        if (wspName==null) {
+        if (wspName == null) {
             // init with wsp home dirname
             wspName = new File(wspHomeDir).getName();
         } else {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
==============================================================================
--- 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
Mon Nov  8 03:27:28 2004
@@ -230,7 +230,7 @@
         }
 
         // check if there is a virtual state for the specified item
-        for (int i=0; i<virtualProviders.length; i++) {
+        for (int i = 0; i < virtualProviders.length; i++) {
             if (virtualProviders[i].hasItemState(id)) {
                 return virtualProviders[i].getItemState(id);
             }

Mime
View raw message