jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r386994 [2/2] - in /incubator/jackrabbit/trunk/jackrabbit/src: main/java/org/apache/jackrabbit/api/ main/java/org/apache/jackrabbit/core/ main/java/org/apache/jackrabbit/core/config/ main/java/org/apache/jackrabbit/core/fs/ main/java/org/ap...
Date Sun, 19 Mar 2006 16:22:35 GMT
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java Sun Mar 19 08:22:28 2006
@@ -429,7 +429,7 @@
         Map indexReaders = new HashMap();
 
         try {
-            for (Iterator it = indexes.iterator(); it.hasNext(); ) {
+            for (Iterator it = indexes.iterator(); it.hasNext();) {
                 PersistentIndex index = (PersistentIndex) it.next();
                 if (names.contains(index.getName())) {
                     indexReaders.put(index.getReadOnlyIndexReader(listener), index);
@@ -437,7 +437,7 @@
             }
         } catch (IOException e) {
             // close readers obtained so far
-            for (Iterator it = indexReaders.keySet().iterator(); it.hasNext(); ) {
+            for (Iterator it = indexReaders.keySet().iterator(); it.hasNext();) {
                 ReadOnlyIndexReader reader = (ReadOnlyIndexReader) it.next();
                 try {
                     reader.close();
@@ -466,7 +466,7 @@
     synchronized PersistentIndex getOrCreateIndex(String indexName, boolean create)
             throws IOException {
         // check existing
-        for (Iterator it = indexes.iterator(); it.hasNext(); ) {
+        for (Iterator it = indexes.iterator(); it.hasNext();) {
             PersistentIndex idx = (PersistentIndex) it.next();
             if (idx.getName().equals(indexName)) {
                 return idx;
@@ -517,7 +517,7 @@
             executeAndLog(new Start(Action.INTERNAL_TRANSACTION));
             // delete obsolete indexes
             Set names = new HashSet(Arrays.asList(obsoleteIndexes));
-            for (Iterator it = names.iterator(); it.hasNext(); ) {
+            for (Iterator it = names.iterator(); it.hasNext();) {
                 // do not try to delete indexes that are already gone
                 String indexName = (String) it.next();
                 if (indexNames.contains(indexName)) {
@@ -528,7 +528,7 @@
             executeAndLog(new AddIndex(getTransactionId(), index.getName()));
 
             // delete documents in index
-            for (Iterator it = deleted.iterator(); it.hasNext(); ) {
+            for (Iterator it = deleted.iterator(); it.hasNext();) {
                 Term id = (Term) it.next();
                 executeAndLog(new DeleteNode(getTransactionId(), id.text()));
             }
@@ -927,8 +927,8 @@
                 && idleTime > handler.getVolatileIdleTime() * 1000) {
             try {
                 if (redoLog.hasEntries()) {
-                    log.debug("Flushing index after being idle for " +
-                            idleTime + " ms.");
+                    log.debug("Flushing index after being idle for "
+                            + idleTime + " ms.");
                     synchronized (updateMonitor) {
                         updateInProgress = true;
                     }
@@ -1501,7 +1501,7 @@
          */
         public void execute(MultiIndex index) throws IOException {
             // get index if it exists
-            for (Iterator it = index.indexes.iterator(); it.hasNext(); ) {
+            for (Iterator it = index.indexes.iterator(); it.hasNext();) {
                 PersistentIndex idx = (PersistentIndex) it.next();
                 if (idx.getName().equals(indexName)) {
                     idx.close();

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java Sun Mar 19 08:22:28 2006
@@ -179,8 +179,8 @@
      */
     private void throwRepositoryException(Exception e)
             throws RepositoryException {
-        String msg = "Error while indexing node: " + node.getNodeId() + " of " +
-                "type: " + node.getNodeTypeName();
+        String msg = "Error while indexing node: " + node.getNodeId() + " of "
+            + "type: " + node.getNodeTypeName();
         throw new RepositoryException(msg, e);
     }
 
@@ -285,7 +285,7 @@
 
                 String mimeType = mimeTypeProp.getValues()[0].internalValue().toString();
                 Map fields = Collections.EMPTY_MAP;
-                for (Iterator it = textFilters.iterator(); it.hasNext(); ) {
+                for (Iterator it = textFilters.iterator(); it.hasNext();) {
                     TextFilter filter = (TextFilter) it.next();
                     // use the first filter that can handle the mimeType
                     if (filter.canFilter(mimeType)) {

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ReadOnlyIndexReader.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ReadOnlyIndexReader.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ReadOnlyIndexReader.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ReadOnlyIndexReader.java Sun Mar 19 08:22:28 2006
@@ -112,21 +112,21 @@
     /**
      * @exception UnsupportedOperationException always
      */
-    final protected void doDelete(int docNum) {
+    protected final void doDelete(int docNum) {
         throw new UnsupportedOperationException("IndexReader is read-only");
     }
 
     /**
      * @exception UnsupportedOperationException always
      */
-    final protected void doUndeleteAll() {
+    protected final void doUndeleteAll() {
         throw new UnsupportedOperationException("IndexReader is read-only");
     }
 
     /**
      * @exception UnsupportedOperationException always
      */
-    final protected void doCommit() {
+    protected final void doCommit() {
         throw new UnsupportedOperationException("IndexReader is read-only");
     }
 

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/Recovery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/Recovery.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/Recovery.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/Recovery.java Sun Mar 19 08:22:28 2006
@@ -95,7 +95,7 @@
         List actions = redoLog.getActions();
 
         // find loser transactions
-        for (Iterator it = actions.iterator(); it.hasNext(); ) {
+        for (Iterator it = actions.iterator(); it.hasNext();) {
             MultiIndex.Action a = (MultiIndex.Action) it.next();
             if (a.getType() == MultiIndex.Action.TYPE_START) {
                 losers.add(new Long(a.getTransactionId()));

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ScoreNodeIterator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ScoreNodeIterator.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ScoreNodeIterator.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ScoreNodeIterator.java Sun Mar 19 08:22:28 2006
@@ -36,7 +36,7 @@
      * @throws java.util.NoSuchElementException
      *          if there is no next node.
      */
-    public float getScore();
+    float getScore();
 
     /**
      * Returns the next <code>Node</code> in the result set.
@@ -45,5 +45,6 @@
      * @throws java.util.NoSuchElementException
      *          if iteration has no more <code>Node</code>s.
      */
-    public NodeImpl nextNodeImpl();
+    NodeImpl nextNodeImpl();
+
 }

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java Sun Mar 19 08:22:28 2006
@@ -193,7 +193,7 @@
             throw new IOException("SearchIndex requires 'path' parameter in configuration!");
         }
 
-        Set excludedIDs= new HashSet();
+        Set excludedIDs = new HashSet();
         if (context.getExcludedNodeId() != null) {
             excludedIDs.add(context.getExcludedNodeId());
         }
@@ -212,7 +212,7 @@
                     if (errors.size() == 0) {
                         log.info("No errors detected.");
                     }
-                    for (Iterator it = errors.iterator(); it.hasNext(); ) {
+                    for (Iterator it = errors.iterator(); it.hasNext();) {
                         ConsistencyCheckError err = (ConsistencyCheckError) it.next();
                         log.info(err.toString());
                     }
@@ -274,8 +274,8 @@
                 try {
                     doc = createDocument(state, getNamespaceMappings());
                 } catch (RepositoryException e) {
-                    log.error("Exception while creating document for node: " +
-                            state.getNodeId() + ": " + e.toString());
+                    log.error("Exception while creating document for node: "
+                            + state.getNodeId() + ": " + e.toString());
                 }
                 return doc;
             }
@@ -738,7 +738,7 @@
     public String getTextFilterClasses() {
         StringBuffer names = new StringBuffer();
         String delim = "";
-        for (Iterator it = textFilters.iterator(); it.hasNext(); ) {
+        for (Iterator it = textFilters.iterator(); it.hasNext();) {
             names.append(delim);
             names.append(it.next().getClass().getName());
             delim = ",";

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java Sun Mar 19 08:22:28 2006
@@ -174,7 +174,7 @@
      * @param old the document to dispose.
      */
     private void disposeDocument(Document old) {
-        for (Enumeration e = old.fields(); e.hasMoreElements(); ) {
+        for (Enumeration e = old.fields(); e.hasMoreElements();) {
             Field f = (Field) e.nextElement();
             if (f.readerValue() != null) {
                 try {

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java Sun Mar 19 08:22:28 2006
@@ -274,7 +274,7 @@
         /**
          * Offset that always returns the value 0.
          */
-        static final Offset ZERO = new Offset() {
+        Offset ZERO = new Offset() {
             public long getValue() {
                 return 0;
             }

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/fulltext/FastCharStream.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/fulltext/FastCharStream.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/fulltext/FastCharStream.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/fulltext/FastCharStream.java Sun Mar 19 08:22:28 2006
@@ -54,7 +54,7 @@
     /**
      * @inheritDoc
      */
-    public final char readChar() throws IOException {
+    public char readChar() throws IOException {
         if (position >= input.length()) {
             throw new IOException("read past eof");
         }
@@ -64,7 +64,7 @@
     /**
      * @inheritDoc
      */
-    public final char BeginToken() throws IOException {
+    public char BeginToken() throws IOException {
         tokenStart = position;
         return readChar();
     }
@@ -72,21 +72,21 @@
     /**
      * @inheritDoc
      */
-    public final void backup(int amount) {
+    public void backup(int amount) {
         position -= amount;
     }
 
     /**
      * @inheritDoc
      */
-    public final String GetImage() {
+    public String GetImage() {
         return input.substring(tokenStart, position);
     }
 
     /**
      * @inheritDoc
      */
-    public final char[] GetSuffix(int len) {
+    public char[] GetSuffix(int len) {
         char[] value = new char[len];
         for (int i = 0; i < len; i++) {
             value[i] = input.charAt(position - len + i);
@@ -97,48 +97,48 @@
     /**
      * @inheritDoc
      */
-    public final void Done() {
+    public void Done() {
     }
 
     /**
      * @inheritDoc
      */
-    public final int getColumn() {
+    public int getColumn() {
         return position;
     }
 
     /**
      * @inheritDoc
      */
-    public final int getLine() {
+    public int getLine() {
         return 1;
     }
 
     /**
      * @inheritDoc
      */
-    public final int getEndColumn() {
+    public int getEndColumn() {
         return position;
     }
 
     /**
      * @inheritDoc
      */
-    public final int getEndLine() {
+    public int getEndLine() {
         return 1;
     }
 
     /**
      * @inheritDoc
      */
-    public final int getBeginColumn() {
+    public int getBeginColumn() {
         return tokenStart;
     }
 
     /**
      * @inheritDoc
      */
-    public final int getBeginLine() {
+    public int getBeginLine() {
         return 1;
     }
 }

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/xpath/SimpleNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/xpath/SimpleNode.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/xpath/SimpleNode.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/xpath/SimpleNode.java Sun Mar 19 08:22:28 2006
@@ -58,7 +58,7 @@
         if (children == null) {
             children = new Node[i + 1];
         } else if (i >= children.length) {
-            Node c[] = new Node[i + 1];
+            Node[] c = new Node[i + 1];
             System.arraycopy(children, 0, c, 0, children.length);
             children = c;
         }

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java Sun Mar 19 08:22:28 2006
@@ -95,7 +95,7 @@
     /**
      * Sets the default user id to be used when no login credentials
      * are presented.
-     * 
+     *
      * @param defaultUserId default user id
      */
     public void setAnonymousId(String anonymousId) {
@@ -114,7 +114,7 @@
     /**
      * Sets the default user id to be used when no login credentials
      * are presented.
-     * 
+     *
      * @param defaultUserId default user id
      */
     public void setDefaultUserId(String defaultUserId) {
@@ -167,7 +167,7 @@
 
                     Object attr = sc.getAttribute(SecurityConstants.IMPERSONATOR_ATTRIBUTE);
                     if (attr != null && attr instanceof Subject) {
-                        Subject impersonator = (Subject) attr;
+                        // Subject impersonator = (Subject) attr;
                         // @todo check privileges to 'impersonate' the user represented by the supplied credentials
                     } else {
                         // @todo implement simple username/password authentication

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemState.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemState.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemState.java Sun Mar 19 08:22:28 2006
@@ -146,7 +146,7 @@
      * Copy state information from another state into this state
      * @param state source state information
      */
-    abstract protected void copy(ItemState state);
+    protected abstract void copy(ItemState state);
 
     /**
      * Pull state information from overlayed state.
@@ -298,7 +298,7 @@
      *
      * @return the id of this item.
      */
-    abstract public ItemId getId();
+    public abstract ItemId getId();
 
     /**
      * Returns <code>true</code> if this item state represents new or modified
@@ -333,7 +333,7 @@
      *
      * @return the parent <code>NodeState</code>'s Id
      */
-    abstract public NodeId getParentId();
+    public abstract NodeId getParentId();
 
     /**
      * Returns the status of this item.

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeState.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeState.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeState.java Sun Mar 19 08:22:28 2006
@@ -149,9 +149,11 @@
             mixinTypeNames = nodeState.mixinTypeNames;
             defId = nodeState.defId;
             propertyNames = nodeState.propertyNames;
-            sharedPropertyNames = nodeState.sharedPropertyNames = true;
+            sharedPropertyNames = true;
+            nodeState.sharedPropertyNames = true;
             childNodeEntries = nodeState.childNodeEntries;
-            sharedChildNodeEntries = nodeState.sharedChildNodeEntries = true;
+            sharedChildNodeEntries = true;
+            nodeState.sharedChildNodeEntries = true;
         }
     }
 
@@ -842,10 +844,10 @@
     private static class ChildNodeEntries implements List, Cloneable, Serializable {
 
         // insertion-ordered map of entries (key=NodeId, value=entry)
-        LinkedMap entries;
+        private LinkedMap entries;
         // map used for lookup by name
         // (key=name, value=either a single entry or a list of sns entries)
-        HashMap nameMap;
+        private HashMap nameMap;
 
         ChildNodeEntries() {
             entries = new LinkedMap();
@@ -1169,7 +1171,7 @@
             return toArray(array);
         }
 
-        public Object[] toArray(Object a[]) {
+        public Object[] toArray(Object[] a) {
             if (!a.getClass().getComponentType().isAssignableFrom(ChildNodeEntry.class)) {
                 throw new ArrayStoreException();
             }
@@ -1281,7 +1283,7 @@
         //----------------------------------------------------< inner classes >
         class EntriesIterator implements ListIterator {
 
-            OrderedMapIterator mapIter;
+            private final OrderedMapIterator mapIter;
 
             EntriesIterator() {
                 mapIter = entries.orderedMapIterator();

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeStateIterator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeStateIterator.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeStateIterator.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeStateIterator.java Sun Mar 19 08:22:28 2006
@@ -31,4 +31,5 @@
      * @throws NoSuchElementException
      */
     NodeState nextNodeState() throws NoSuchElementException;
-}
\ No newline at end of file
+
+}

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeStateListener.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeStateListener.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeStateListener.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeStateListener.java Sun Mar 19 08:22:28 2006
@@ -54,6 +54,5 @@
      * @param index index of removed node
      * @param id    id of removed node
      */
-    public void nodeRemoved(NodeState state,
-                            QName name, int index, NodeId id);
+    void nodeRemoved(NodeState state, QName name, int index, NodeId id);
 }

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PropertyState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PropertyState.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PropertyState.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PropertyState.java Sun Mar 19 08:22:28 2006
@@ -129,7 +129,7 @@
 
     /**
      * Returns the identifier of this property.
-     * 
+     *
      * @return the id of this property.
      */
     public PropertyId getPropertyId() {
@@ -287,7 +287,7 @@
                     // create InputStream wrapper of size 'length'
                     values[i] = InternalValue.create(new InputStream() {
 
-                        long consumed = 0;
+                        private long consumed = 0;
 
                         public int read() throws IOException {
                             if (consumed >= length) {
@@ -298,7 +298,7 @@
                             return b;
                         }
 
-                        public int read(byte b[], int off, int len) throws IOException {
+                        public int read(byte[] b, int off, int len) throws IOException {
                             if (consumed >= length) {
                                 return -1;  // eof
                             }

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java Sun Mar 19 08:22:28 2006
@@ -349,7 +349,7 @@
 
                 // ensure capacity
                 if (depth > la.length) {
-                    List old[] = la;
+                    List[] old = la;
                     la = new List[depth + 10];
                     System.arraycopy(old, 0, la, 0, old.length);
                 }
@@ -425,7 +425,7 @@
 
                 // ensure capacity
                 if (depth > la.length) {
-                    List old[] = la;
+                    List[] old = la;
                     la = new List[depth + 10];
                     System.arraycopy(old, 0, la, 0, old.length);
                 }

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Sun Mar 19 08:22:28 2006
@@ -159,8 +159,8 @@
                  * thread owns the write lock (reentrant).
                  */
                 protected boolean allowReader() {
-                    return activeWriter_ == null ||
-                      activeWriter_ == Thread.currentThread();
+                    return activeWriter_ == null
+                        || activeWriter_ == Thread.currentThread();
                 }
             };
 
@@ -930,8 +930,8 @@
                     for (int i = 0; vals != null && i < vals.length; i++) {
                         NodeReferencesId refsId = new NodeReferencesId(
                                 (UUID) vals[i].internalValue());
-                        if (virtualProvider != null &&
-                                virtualProvider.hasNodeReferences(refsId)) {
+                        if (virtualProvider != null
+                                && virtualProvider.hasNodeReferences(refsId)) {
                             continue;
                         }
                         NodeReferences refs =
@@ -960,8 +960,8 @@
                     for (int i = 0; vals != null && i < vals.length; i++) {
                         NodeReferencesId refsId = new NodeReferencesId(
                                 (UUID) vals[i].internalValue());
-                        if (virtualProvider != null &&
-                                virtualProvider.hasNodeReferences(refsId)) {
+                        if (virtualProvider != null
+                                && virtualProvider.hasNodeReferences(refsId)) {
                             continue;
                         }
                         // either get node references from change log or load from
@@ -984,8 +984,8 @@
                     for (int i = 0; vals != null && i < vals.length; i++) {
                         NodeReferencesId refsId = new NodeReferencesId(
                                 (UUID) vals[i].internalValue());
-                        if (virtualProvider != null &&
-                                virtualProvider.hasNodeReferences(refsId)) {
+                        if (virtualProvider != null
+                                && virtualProvider.hasNodeReferences(refsId)) {
                             continue;
                         }
                         NodeReferences refs =
@@ -1011,8 +1011,8 @@
                     for (int i = 0; vals != null && i < vals.length; i++) {
                         NodeReferencesId refsId = new NodeReferencesId(
                                 (UUID) vals[i].internalValue());
-                        if (virtualProvider != null &&
-                                virtualProvider.hasNodeReferences(refsId)) {
+                        if (virtualProvider != null
+                                && virtualProvider.hasNodeReferences(refsId)) {
                             continue;
                         }
                         // either get node references from change log or

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DatabasePersistenceManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DatabasePersistenceManager.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DatabasePersistenceManager.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DatabasePersistenceManager.java Sun Mar 19 08:22:28 2006
@@ -366,7 +366,7 @@
         }
 
         PreparedStatement stmt = nodeStateSelect;
-        synchronized(stmt) {
+        synchronized (stmt) {
             ResultSet rs = null;
             InputStream in = null;
             try {
@@ -407,7 +407,7 @@
         }
 
         PreparedStatement stmt = propertyStateSelect;
-        synchronized(stmt) {
+        synchronized (stmt) {
             ResultSet rs = null;
             InputStream in = null;
             try {
@@ -601,7 +601,7 @@
         }
 
         PreparedStatement stmt = nodeReferenceSelect;
-        synchronized(stmt) {
+        synchronized (stmt) {
             ResultSet rs = null;
             InputStream in = null;
             try {
@@ -706,7 +706,7 @@
         }
 
         PreparedStatement stmt = nodeStateSelectExist;
-        synchronized(stmt) {
+        synchronized (stmt) {
             ResultSet rs = null;
             try {
                 stmt.setString(1, id.toString());
@@ -735,7 +735,7 @@
         }
 
         PreparedStatement stmt = propertyStateSelectExist;
-        synchronized(stmt) {
+        synchronized (stmt) {
             ResultSet rs = null;
             try {
                 stmt.setString(1, id.toString());
@@ -764,7 +764,7 @@
         }
 
         PreparedStatement stmt = nodeReferenceSelectExist;
-        synchronized(stmt) {
+        synchronized (stmt) {
             ResultSet rs = null;
             try {
                 stmt.setString(1, targetId.toString());
@@ -788,7 +788,7 @@
     //----------------------------------< misc. helper methods & overridables >
 
     /**
-     * Initializes the database connection used by this file system. 
+     * Initializes the database connection used by this file system.
      * <p>
      * Subclasses should normally override the {@link #getConnection()}
      * method instead of this one. The default implementation calls
@@ -828,7 +828,7 @@
      * The default implementation just calls the {@link Connection#close()}
      * method of the given connection, but subclasses can override this
      * method to provide more extensive database and connection cleanup.
-     * 
+     *
      * @param connection database connection
      * @throws Exception if an error occurs
      */
@@ -997,7 +997,7 @@
          */
         public InputStream get(String blobId) throws Exception {
             PreparedStatement stmt = blobSelect;
-            synchronized(stmt) {
+            synchronized (stmt) {
                 try {
                     stmt.setString(1, blobId);
                     stmt.execute();

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java Sun Mar 19 08:22:28 2006
@@ -32,7 +32,7 @@
  * <p>
  * <strong>WARNING:</strong> The acquired database connection is kept
  * for the entire lifetime of the persistence manager instance. The
- * configured data source should be prepared for this. 
+ * configured data source should be prepared for this.
  */
 public class JNDIDatabasePersistenceManager extends DatabasePersistenceManager {
 

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/util/DOMWalker.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/util/DOMWalker.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/util/DOMWalker.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/util/DOMWalker.java Sun Mar 19 08:22:28 2006
@@ -62,7 +62,7 @@
         } catch (IOException e) {
             throw e;
         } catch (Exception e) {
-            throw (IOException)new IOException(e.getMessage()).initCause(e);
+            throw (IOException) new IOException(e.getMessage()).initCause(e);
         }
     }
 

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java Sun Mar 19 08:22:28 2006
@@ -236,9 +236,9 @@
         // 2. generate version name (assume no namespaces in version names)
         String versionName = best.getName().getLocalName();
         int pos = versionName.lastIndexOf('.');
-        if (pos>0) {
-            versionName = versionName.substring(0, pos + 1) +
-                (Integer.parseInt(versionName.substring(pos + 1)) + 1);
+        if (pos > 0) {
+            versionName = versionName.substring(0, pos + 1)
+                + (Integer.parseInt(versionName.substring(pos + 1)) + 1);
         } else {
             versionName = String.valueOf(best.getSuccessors().length + 1) + ".0";
         }
@@ -330,7 +330,7 @@
             v = history.setVersionLabel(version, label, move);
             stateMgr.update();
             success = true;
-        } catch(ItemStateException e) {
+        } catch (ItemStateException e) {
             log.error("Error while storing: " + e.toString());
         } finally {
             if (!success) {

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java Sun Mar 19 08:22:28 2006
@@ -291,7 +291,7 @@
 
             // save away predecessors before removing version
             AbstractVersion version = (AbstractVersion) historyImpl.getNode(name);
-            InternalVersion preds[] = version.getInternalVersion().getPredecessors();
+            InternalVersion[] preds = version.getInternalVersion().getPredecessors();
 
             InternalVersionHistoryImpl vh = (InternalVersionHistoryImpl)
                     historyImpl.getInternalVersionHistory();

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionSelector.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionSelector.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionSelector.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionSelector.java Sun Mar 19 08:22:28 2006
@@ -25,7 +25,7 @@
  * given some hints and a version history
  */
 public interface VersionSelector {
-    
+
     /**
      * Selects a version of the given version history. If this VersionSelector
      * is unable to select one, it can return <code>null</code>.
@@ -35,4 +35,5 @@
      * @throws RepositoryException if an error occurrs.
      */
     Version select(VersionHistory versionHistory) throws RepositoryException;
+
 }

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/name/AbstractNamespaceResolver.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/name/AbstractNamespaceResolver.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/name/AbstractNamespaceResolver.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/name/AbstractNamespaceResolver.java Sun Mar 19 08:22:28 2006
@@ -127,7 +127,7 @@
         synchronized (listeners) {
             int i = 0;
             currentListeners = new NamespaceListener[listeners.size()];
-            for (Iterator it = listeners.iterator(); it.hasNext(); ) {
+            for (Iterator it = listeners.iterator(); it.hasNext();) {
                 currentListeners[i++] = (NamespaceListener) it.next();
             }
         }
@@ -156,7 +156,7 @@
         synchronized (listeners) {
             int i = 0;
             currentListeners = new NamespaceListener[listeners.size()];
-            for (Iterator it = listeners.iterator(); it.hasNext(); ) {
+            for (Iterator it = listeners.iterator(); it.hasNext();) {
                 currentListeners[i++] = (NamespaceListener) it.next();
             }
         }

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/name/IllegalNameException.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/name/IllegalNameException.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/name/IllegalNameException.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/name/IllegalNameException.java Sun Mar 19 08:22:28 2006
@@ -21,7 +21,7 @@
  * thrown when attempting to parse a JCR name string that does not match the
  * JCR name syntax, or is otherwise not a legal name. Note that an
  * {@link UnknownPrefixException} is thrown if the prefix of the JCR name
- * string is syntactically valid but not bound to any namespace. 
+ * string is syntactically valid but not bound to any namespace.
  * <p>
  * See the section 4.6 of the JCR 1.0 specification for details of the
  * JCR name syntax.

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/ISO8601.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/ISO8601.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/ISO8601.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/ISO8601.java Sun Mar 19 08:22:28 2006
@@ -258,7 +258,7 @@
         buf.append(XXX_FORMAT.format(cal.get(Calendar.MILLISECOND)));
         // time zone designator (Z or +00:00 or -00:00)
         TimeZone tz = cal.getTimeZone();
-        // determine offset of timezone from UTC (incl. daylight saving) 
+        // determine offset of timezone from UTC (incl. daylight saving)
         int offset = tz.getOffset(cal.getTimeInMillis());
         if (offset != 0) {
             int hours = Math.abs((offset / (60 * 1000)) / 60);

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/WeakIdentityCollection.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/WeakIdentityCollection.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/WeakIdentityCollection.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/WeakIdentityCollection.java Sun Mar 19 08:22:28 2006
@@ -300,7 +300,7 @@
 
         /**
          * @inheritDoc
-         */ 
+         */
         public Object next() {
             if (index >= size) {
                 throw new NoSuchElementException();

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceAdder.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceAdder.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceAdder.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceAdder.java Sun Mar 19 08:22:28 2006
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.jackrabbit.util.name;
 
 import javax.jcr.NamespaceRegistry;
@@ -8,7 +24,8 @@
 import java.util.Iterator;
 
 public class NamespaceAdder {
-    NamespaceRegistry registry;
+
+    private final NamespaceRegistry registry;
 
     public NamespaceAdder(NamespaceRegistry nsr) {
         registry = nsr;
@@ -17,10 +34,10 @@
     public void addNamespaces(NamespaceMapping nsm)
             throws NamespaceException, UnsupportedRepositoryOperationException, RepositoryException {
         Map m = nsm.getPrefixToURIMapping();
-        for(Iterator i = m.values().iterator(); i.hasNext();){
-            Map.Entry e = (Map.Entry)i.next();
-            String prefix = (String)e.getKey();
-            String uri =(String)e.getKey();
+        for (Iterator i = m.values().iterator(); i.hasNext();) {
+            Map.Entry e = (Map.Entry) i.next();
+            String prefix = (String) e.getKey();
+            String uri = (String) e.getKey();
             registry.registerNamespace(prefix, uri);
         }
     }

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java Sun Mar 19 08:22:28 2006
@@ -1,19 +1,12 @@
 /*
- * $Id$
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
  *
- * Copyright 2002-2004 Day Management AG, Switzerland.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Licensed under the Day RI License, Version 2.0 (the "License"),
- * as a reference implementation of the following specification:
- *
- *   Content Repository API for Java Technology, revision 0.13
- *        <http://www.jcp.org/en/jsr/detail?id=170>
- *
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License files at
- *
- *     http://www.day.com/content/en/licenses/day-ri-license-2.0
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceMapping.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceMapping.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceMapping.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceMapping.java Sun Mar 19 08:22:28 2006
@@ -94,7 +94,7 @@
      * @param uri
      * @throws NamespaceException
      */
-    public void setMapping(String prefix, String uri) throws NamespaceException{
+    public void setMapping(String prefix, String uri) throws NamespaceException {
         if (prefix == null) {
             throw new NamespaceException("Prefix must not be null");
         }
@@ -118,7 +118,7 @@
      * The returned Map is a copy of the internal Map.
      * @return Map
      */
-    public Map getPrefixToURIMapping(){
+    public Map getPrefixToURIMapping() {
         return new HashMap(prefixToURI);
     }
 
@@ -127,7 +127,7 @@
      * The returned Map is a copy of the internal Map.
      * @return Map
      */
-    public Map getURIToPrefixMapping(){
+    public Map getURIToPrefixMapping() {
         return new HashMap(URIToPrefix);
     }
 
@@ -137,7 +137,7 @@
      * @param obj
      * @return boolean
      */
-    public boolean equals(Object obj){
+    public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
@@ -154,13 +154,13 @@
      *
      * @return String
      */
-    public String toString(){
-        String s= "";
+    public String toString() {
+        String s = "";
         Set mapping = prefixToURI.entrySet();
-        for(Iterator i = mapping.iterator(); i.hasNext();){
-            Map.Entry entry = (Map.Entry)i.next();
-            String prefix = (String)entry.getKey();
-            String uri = (String)entry.getValue();
+        for (Iterator i = mapping.iterator(); i.hasNext();) {
+            Map.Entry entry = (Map.Entry) i.next();
+            String prefix = (String) entry.getKey();
+            String uri = (String) entry.getValue();
             s += "'" + prefix + "' == '" + uri + "'\n";
         }
         return s;

Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/value/ValueHelper.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/value/ValueHelper.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/value/ValueHelper.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/value/ValueHelper.java Sun Mar 19 08:22:28 2006
@@ -549,13 +549,10 @@
             // pass InputStream wrapper to BinaryValue constructor
             return new BinaryValue(new FilterInputStream(new FileInputStream(tmpFile)) {
 
-                File f = tmpFile;
-
                 public void close() throws IOException {
                     in.close();
                     // temp file can now safely be removed
-                    f.delete();
-                    f = null;
+                    tmpFile.delete();
                 }
             });
 /*

Modified: incubator/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java Sun Mar 19 08:22:28 2006
@@ -62,7 +62,7 @@
 
         session = helper.getReadOnlySession();
         manager = session.getWorkspace().getNodeTypeManager();
-        
+
         // Get the NodeTypeManager from the Workspace.
         // Note that it must be cast from the generic JCR NodeTypeManager to the
         // Jackrabbit-specific implementation.
@@ -93,9 +93,9 @@
          * Constructs node types with the following structure:
          * [foo]
          * + myBarInFoo (bar)
-         * 
+         *
          * [bar]
-         * + myFooInBar (foo) 
+         * + myFooInBar (foo)
          */
         final NodeTypeDef foo = new NodeTypeDef();
         foo.setName(new QName("", "foo"));
@@ -143,7 +143,7 @@
          * Constructs node types with the following structure:
          * [foo]
          * + myNTInFoo (I_am_an_invalid_required_primary_type)
-         * 
+         *
          */
         final NodeTypeDef foo = new NodeTypeDef();
         foo.setName(new QName("", "foo"));
@@ -180,13 +180,13 @@
          * [Folder] > CmsObject
          * + folders (Folder)
          * + documents (Document)
-         * 
+         *
          * [CmsObject]
          * + parentFolder (Folder)
-         * 
+         *
          * [Document] > CmsObject
          * - size (long)
-         * 
+         *
          */
 
         final NodeTypeDef folder = new NodeTypeDef();

Modified: incubator/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java Sun Mar 19 08:22:28 2006
@@ -92,7 +92,7 @@
      * failure is generated.
      * <p>
      * If the given property name is <code>null</code>, then the residual
-     * property definition (if one exists) is returned. 
+     * property definition (if one exists) is returned.
      *
      * @param typeName node type name
      * @param propertyName property name, or <code>null</code>



Mime
View raw message