You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2006/03/19 17:22:35 UTC
svn commit: r386994 [1/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...
Author: jukka
Date: Sun Mar 19 08:22:28 2006
New Revision: 386994
URL: http://svn.apache.org/viewcvs?rev=386994&view=rev
Log:
JCR-97: Various checkstyle conformance improvements.
Modified:
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/api/JackrabbitNodeTypeManager.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/api/JackrabbitRepository.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/CachingNamespaceResolver.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/InternalXAResource.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeIdIterator.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/PropertyId.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/SearchManager.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/TransientRepository.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/XAWorkspace.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/FileSystemPathUtil.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/jndi/BindableRepository.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/jndi/RegistryHelper.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCache.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDef.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDef.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/PropDef.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefWriter.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/Lexer.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/ParseException.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/converter/SchemaConverter.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollectionFactory.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilderRegistry.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiReader.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/DocNumberCache.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/HierarchyResolver.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexInfos.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexListener.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ReadOnlyIndexReader.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/Recovery.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ScoreNodeIterator.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/VolatileIndex.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/fulltext/FastCharStream.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/xpath/SimpleNode.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/ItemState.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeState.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeStateIterator.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/NodeStateListener.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/PropertyState.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/DatabasePersistenceManager.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/util/DOMWalker.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionSelector.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/name/AbstractNamespaceResolver.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/name/IllegalNameException.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/ISO8601.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/WeakIdentityCollection.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceAdder.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceExtractor.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/util/name/NamespaceMapping.java
incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/value/ValueHelper.java
incubator/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java
incubator/jackrabbit/trunk/jackrabbit/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/api/JackrabbitNodeTypeManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/api/JackrabbitNodeTypeManager.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/api/JackrabbitNodeTypeManager.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/api/JackrabbitNodeTypeManager.java Sun Mar 19 08:22:28 2006
@@ -6,7 +6,7 @@
* 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
+ * 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,
@@ -43,7 +43,7 @@
/**
* The experimental content type for the compact node type definition
- * files.
+ * files.
*/
String TEXT_X_JCR_CND = "text/x-jcr-cnd";
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/api/JackrabbitRepository.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/api/JackrabbitRepository.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/api/JackrabbitRepository.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/api/JackrabbitRepository.java Sun Mar 19 08:22:28 2006
@@ -24,16 +24,16 @@
*/
public interface JackrabbitRepository extends Repository {
- /**
- * Shuts down the repository. A Jackrabbit repository instance contains
- * a acquired resources and cached data that needs to be released and
- * persisted when the repository is no longer used. This method handles
- * all these shutdown tasks and <em>must</em> therefore be called by the
- * client application once the repository instance is no longer used.
- * <p>
- * Possible errors are logged rather than thrown as exceptions as there
- * is little that a client application could do in such a case.
- */
- void shutdown();
+ /**
+ * Shuts down the repository. A Jackrabbit repository instance contains
+ * a acquired resources and cached data that needs to be released and
+ * persisted when the repository is no longer used. This method handles
+ * all these shutdown tasks and <em>must</em> therefore be called by the
+ * client application once the repository instance is no longer used.
+ * <p>
+ * Possible errors are logged rather than thrown as exceptions as there
+ * is little that a client application could do in such a case.
+ */
+ void shutdown();
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java Sun Mar 19 08:22:28 2006
@@ -674,7 +674,8 @@
*/
public void append() {
if (tail == null) {
- head = tail = this;
+ head = this;
+ tail = this;
} else {
previous = tail;
tail.next = this;
@@ -698,7 +699,8 @@
if (tail == this) {
tail = previous;
}
- previous = next = null;
+ previous = null;
+ next = null;
}
/**
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/CachingNamespaceResolver.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/CachingNamespaceResolver.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/CachingNamespaceResolver.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/CachingNamespaceResolver.java Sun Mar 19 08:22:28 2006
@@ -118,7 +118,7 @@
*/
public void namespaceAdded(String prefix, String uri) {
// since it is a new namespace there's no need to flush the
- // cached mappings
+ // cached mappings
}
/**
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/InternalXAResource.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/InternalXAResource.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/InternalXAResource.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/InternalXAResource.java Sun Mar 19 08:22:28 2006
@@ -27,22 +27,22 @@
* recorded in some attribute of the transaction context.
* @param tx transaction context, if <code>null</code> disassociate
*/
- public void associate(TransactionContext tx);
+ void associate(TransactionContext tx);
/**
* Invoked before one of the {@link #prepare}, {@link #commit} or
* {@link #rollback} method is called.
* @param tx transaction context
*/
- public void beforeOperation(TransactionContext tx);
+ void beforeOperation(TransactionContext tx);
/**
* Prepare transaction. The transaction is identified by a transaction
- * context.
+ * context.
* @param tx transaction context
* @throws TransactionException if an error occurs
*/
- public void prepare(TransactionContext tx) throws TransactionException;
+ void prepare(TransactionContext tx) throws TransactionException;
/**
* Commit transaction. The transaction is identified by a transaction
@@ -51,19 +51,20 @@
* @param tx transaction context
* @throws TransactionException if an error occurs
*/
- public void commit(TransactionContext tx) throws TransactionException;
+ void commit(TransactionContext tx) throws TransactionException;
/**
* Rollback transaction. The transaction is identified by a transaction
* context.
* @param tx transaction context.
*/
- public void rollback(TransactionContext tx) throws TransactionException;
+ void rollback(TransactionContext tx) throws TransactionException;
/**
* Invoked after one of the {@link #prepare}, {@link #commit} or
* {@link #rollback} method has been called.
* @param tx transaction context
*/
- public void afterOperation(TransactionContext tx);
+ void afterOperation(TransactionContext tx);
+
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeIdIterator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeIdIterator.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeIdIterator.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeIdIterator.java Sun Mar 19 08:22:28 2006
@@ -32,4 +32,5 @@
* @throws NoSuchElementException
*/
NodeId nextNodeId() throws NoSuchElementException;
-}
\ No newline at end of file
+
+}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/PropertyId.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/PropertyId.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/PropertyId.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/PropertyId.java Sun Mar 19 08:22:28 2006
@@ -53,7 +53,7 @@
this.parentId = parentId;
this.propName = propName;
- int h= 17;
+ int h = 17;
h = 37 * h + parentId.hashCode();
h = 37 * h + propName.hashCode();
this.hashCode = h;
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Sun Mar 19 08:22:28 2006
@@ -195,7 +195,7 @@
this.repConfig = repConfig;
- acquireRepositoryLock() ;
+ acquireRepositoryLock();
// setup file systems
repStore = repConfig.getFileSystemConfig().createFileSystem();
@@ -301,8 +301,8 @@
File lock = new File(home, REPOSITORY_LOCK);
if (lock.exists()) {
- log.warn("Existing lock file at " + lock.getAbsolutePath() +
- " deteteced. Repository was not shut down properly.");
+ log.warn("Existing lock file at " + lock.getAbsolutePath()
+ + " deteteced. Repository was not shut down properly.");
} else {
try {
lock.createNewFile();
@@ -319,9 +319,9 @@
}
if (repLock == null) {
throw new RepositoryException(
- "The repository home at " + home.getAbsolutePath() +
- " appears to be in use since the file at " +
- lock.getAbsolutePath() + " is locked by another process.");
+ "The repository home at " + home.getAbsolutePath()
+ + " appears to be in use since the file at "
+ + lock.getAbsolutePath() + " is locked by another process.");
}
}
@@ -561,9 +561,9 @@
systemSearchMgr = new SystemSearchManager(repConfig.getSearchConfig(),
nsReg, ntReg, defSysSession.getItemStateManager(), SYSTEM_ROOT_NODE_ID);
ObservationManager obsMgr = defSysSession.getWorkspace().getObservationManager();
- obsMgr.addEventListener(systemSearchMgr, Event.NODE_ADDED |
- Event.NODE_REMOVED | Event.PROPERTY_ADDED |
- Event.PROPERTY_CHANGED | Event.PROPERTY_REMOVED,
+ obsMgr.addEventListener(systemSearchMgr, Event.NODE_ADDED
+ | Event.NODE_REMOVED | Event.PROPERTY_ADDED
+ | Event.PROPERTY_CHANGED | Event.PROPERTY_REMOVED,
"/" + QName.JCR_SYSTEM.toJCRName(defSysSession.getNamespaceResolver()),
true, null, null, false);
} else {
@@ -782,7 +782,7 @@
* workspace
* @throws RepositoryException if another error occurs
*/
- protected synchronized final SessionImpl createSession(AuthContext loginContext,
+ protected final synchronized SessionImpl createSession(AuthContext loginContext,
String workspaceName)
throws NoSuchWorkspaceException, AccessDeniedException,
RepositoryException {
@@ -812,7 +812,7 @@
* workspace
* @throws RepositoryException if another error occurs
*/
- protected synchronized final SessionImpl createSession(Subject subject,
+ protected final synchronized SessionImpl createSession(Subject subject,
String workspaceName)
throws NoSuchWorkspaceException, AccessDeniedException,
RepositoryException {
@@ -846,7 +846,7 @@
// shut down workspaces
for (Iterator it = wspInfos.values().iterator(); it.hasNext();) {
WorkspaceInfo wspInfo = (WorkspaceInfo) it.next();
- synchronized(wspInfo) {
+ synchronized (wspInfo) {
if (wspInfo.isInitialized()) {
wspInfo.dispose();
}
@@ -935,7 +935,7 @@
props.setProperty(STATS_PROP_COUNT_PROPERTY, Long.toString(propsCount));
}
} catch (IOException e) {
- String msg = "Failed to load repository properties: " +e.toString();
+ String msg = "Failed to load repository properties: " + e.toString();
log.error(msg);
throw new RepositoryException(msg, e);
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/SearchManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/SearchManager.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/SearchManager.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/SearchManager.java Sun Mar 19 08:22:28 2006
@@ -288,8 +288,8 @@
log.warn("Unable to shutdown idle query handler", e);
}
} else {
- log.debug("SearchManager is idle but " + inUse +
- " queries are still in use.");
+ log.debug("SearchManager is idle but " + inUse
+ + " queries are still in use.");
}
}
}
@@ -446,7 +446,7 @@
public NodeState nextNodeState() {
NodeState item = null;
- NodeId id= (NodeId) iter.next();
+ NodeId id = (NodeId) iter.next();
try {
item = (NodeState) itemMgr.getItemState(id);
} catch (ItemStateException e) {
@@ -509,8 +509,8 @@
activeQueries.put(obj, null);
return (AbstractQueryImpl) obj;
} else {
- throw new IllegalArgumentException(queryImplClassName +
- " is not of type " + AbstractQueryImpl.class.getName());
+ throw new IllegalArgumentException(queryImplClassName
+ + " is not of type " + AbstractQueryImpl.class.getName());
}
} catch (Throwable t) {
throw new RepositoryException("Unable to create query: " + t.toString());
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/TransientRepository.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/TransientRepository.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/TransientRepository.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/TransientRepository.java Sun Mar 19 08:22:28 2006
@@ -6,7 +6,7 @@
* 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
+ * 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,
@@ -131,7 +131,7 @@
/**
* Creates a transient repository proxy that will use the given repository
* factory to initialize the underlying repository instances.
- *
+ *
* @param factory repository factory
* @throws IOException if the static repository descriptors cannot be loaded
*/
@@ -203,7 +203,7 @@
DEFAULT_REPOSITORY_XML);
byte[] buffer = new byte[BUFFER_SIZE];
try {
- int n = input.read(buffer);
+ int n = input.read(buffer);
while (n != -1) {
output.write(buffer, 0, n);
n = input.read(buffer);
@@ -388,7 +388,7 @@
// remaining active sessions including the one that just emitted
// the loggedOut() message to us!
repository.loggedOut(session);
-
+
stopRepository();
}
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/XAWorkspace.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/XAWorkspace.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/XAWorkspace.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/XAWorkspace.java Sun Mar 19 08:22:28 2006
@@ -43,7 +43,7 @@
/**
* {@inheritDoc}
- */
+ */
protected LocalItemStateManager createItemStateManager(SharedItemStateManager shared) {
return new XAItemStateManager(shared, this);
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java Sun Mar 19 08:22:28 2006
@@ -308,7 +308,8 @@
} finally {
try {
fs.close();
- } catch (FileSystemException ignore) {}
+ } catch (FileSystemException ignore) {
+ }
}
} else {
// search for workspace configurations in physical workspace root
@@ -328,8 +329,8 @@
}
if (!workspaces.containsKey(defaultWorkspace)) {
if (!workspaces.isEmpty()) {
- log.warn("Potential misconfiguration. No configuration found " +
- "for default workspace: " + defaultWorkspace);
+ log.warn("Potential misconfiguration. No configuration found "
+ + "for default workspace: " + defaultWorkspace);
}
// create initial default workspace
createWorkspaceConfig(defaultWorkspace);
@@ -419,7 +420,8 @@
if (configReader != null) {
try {
configReader.close();
- } catch (IOException ignore) {}
+ } catch (IOException ignore) {
+ }
}
}
}
@@ -538,7 +540,8 @@
} finally {
try {
configWriter.close();
- } catch (IOException ignore) {}
+ } catch (IOException ignore) {
+ }
}
// Load the created workspace configuration.
@@ -563,7 +566,8 @@
if (virtualFS != null) {
virtualFS.close();
}
- } catch (FileSystemException ignore) {}
+ } catch (FileSystemException ignore) {
+ }
}
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/FileSystemPathUtil.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/FileSystemPathUtil.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/FileSystemPathUtil.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/FileSystemPathUtil.java Sun Mar 19 08:22:28 2006
@@ -30,7 +30,7 @@
private static final char[] HEX_TABLE = "0123456789abcdef".toCharArray();
/**
- * The escape character used to mark hex escape sequences.
+ * The escape character used to mark hex escape sequences.
*/
private static final char ESCAPE_CHAR = '%';
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java Sun Mar 19 08:22:28 2006
@@ -851,7 +851,6 @@
final File tmpFile = fileFactory.createTransientFile("bin", null, null);
return new FilterOutputStream(new FileOutputStream(tmpFile)) {
- File f = tmpFile;
public void close() throws IOException {
super.close();
@@ -862,8 +861,8 @@
if (isFile(filePath)) {
stmt = updateDataStmt;
synchronized (stmt) {
- long length = f.length();
- in = new FileInputStream(f);
+ long length = tmpFile.length();
+ in = new FileInputStream(tmpFile);
stmt.setBinaryStream(1, in, (int) length);
stmt.setLong(2, System.currentTimeMillis());
stmt.setLong(3, length);
@@ -875,8 +874,8 @@
stmt = insertFileStmt;
stmt.setString(1, parentDir);
stmt.setString(2, name);
- long length = f.length();
- in = new FileInputStream(f);
+ long length = tmpFile.length();
+ in = new FileInputStream(tmpFile);
stmt.setBinaryStream(3, in, (int) length);
stmt.setLong(4, System.currentTimeMillis());
stmt.setLong(5, length);
@@ -893,8 +892,7 @@
in.close();
}
// temp file can now safely be removed
- f.delete();
- f = null;
+ tmpFile.delete();
}
}
};
@@ -950,8 +948,8 @@
}
return new RandomAccessOutputStream() {
- File f = tmpFile;
- RandomAccessFile raf = new RandomAccessFile(f, "rw");
+ private final RandomAccessFile raf =
+ new RandomAccessFile(tmpFile, "rw");
public void close() throws IOException {
raf.close();
@@ -962,8 +960,8 @@
if (isFile(filePath)) {
stmt = updateDataStmt;
synchronized (stmt) {
- long length = f.length();
- in = new FileInputStream(f);
+ long length = tmpFile.length();
+ in = new FileInputStream(tmpFile);
stmt.setBinaryStream(1, in, (int) length);
stmt.setLong(2, System.currentTimeMillis());
stmt.setLong(3, length);
@@ -975,8 +973,8 @@
stmt = insertFileStmt;
stmt.setString(1, parentDir);
stmt.setString(2, name);
- long length = f.length();
- in = new FileInputStream(f);
+ long length = tmpFile.length();
+ in = new FileInputStream(tmpFile);
stmt.setBinaryStream(3, in, (int) length);
stmt.setLong(4, System.currentTimeMillis());
stmt.setLong(5, length);
@@ -993,9 +991,7 @@
in.close();
}
// temp file can now safely be removed
- f.delete();
- f = null;
- raf = null;
+ tmpFile.delete();
}
}
@@ -1011,11 +1007,11 @@
// nop
}
- public void write(byte b[]) throws IOException {
+ public void write(byte[] b) throws IOException {
raf.write(b);
}
- public void write(byte b[], int off, int len) throws IOException {
+ public void write(byte[] b, int off, int len) throws IOException {
raf.write(b, off, len);
}
};
@@ -1069,7 +1065,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
@@ -1082,7 +1078,7 @@
con = getConnection();
con.setAutoCommit(false);
}
-
+
/**
* Abstract factory method for creating a new database connection. This
* method is called by {@link #initConnection()} when the file system is
@@ -1109,7 +1105,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
*/
@@ -1282,10 +1278,10 @@
String[] names = listFolders(srcPath);
for (int i = 0; i < names.length; i++) {
- String src = (FileSystemPathUtil.denotesRoot(srcPath) ?
- srcPath + names[i] : srcPath + FileSystem.SEPARATOR + names[i]);
- String dest = (FileSystemPathUtil.denotesRoot(destPath) ?
- destPath + names[i] : destPath + FileSystem.SEPARATOR + names[i]);
+ String src = (FileSystemPathUtil.denotesRoot(srcPath)
+ ? srcPath + names[i] : srcPath + FileSystem.SEPARATOR + names[i]);
+ String dest = (FileSystemPathUtil.denotesRoot(destPath)
+ ? destPath + names[i] : destPath + FileSystem.SEPARATOR + names[i]);
copyDeepFolder(src, dest);
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java Sun Mar 19 08:22:28 2006
@@ -31,7 +31,7 @@
* <p>
* <strong>WARNING:</strong> The acquired database connection is kept
* for the entire lifetime of the file system instance. The configured data
- * source should be prepared for this.
+ * source should be prepared for this.
*/
public class JNDIDatabaseFileSystem extends DatabaseFileSystem {
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/jndi/BindableRepository.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/jndi/BindableRepository.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/jndi/BindableRepository.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/jndi/BindableRepository.java Sun Mar 19 08:22:28 2006
@@ -57,7 +57,7 @@
* repository is properly closed when the JVM shuts down. The
* {@link RegistryHelper#unregisterRepository(javax.naming.Context, String)}
* method should be used to explicitly close the repository if
- * needed.
+ * needed.
*/
class BindableRepository implements Repository, Referenceable, Serializable {
@@ -87,7 +87,7 @@
* called.
*/
private transient Thread hook;
-
+
/**
* Creates a BindableRepository instance with the given configuration
* information, but does not create the underlying repository instance.
@@ -120,7 +120,7 @@
/**
* Creates the underlying repository instance. A shutdown hook is
* registered to make sure that the initialized repository gets closed
- * when the JVM shuts down.
+ * when the JVM shuts down.
*
* @throws RepositoryException if the repository cannot be created
*/
@@ -249,7 +249,7 @@
throw new IOException(re.getMessage());
}
}
-
+
/**
* Delegated to the underlying repository instance.
*/
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/jndi/RegistryHelper.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/jndi/RegistryHelper.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/jndi/RegistryHelper.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/jndi/RegistryHelper.java Sun Mar 19 08:22:28 2006
@@ -73,7 +73,7 @@
*/
public static void unregisterRepository(Context ctx, String name)
throws NamingException {
- ((BindableRepository) ctx.lookup(name)).shutdown() ;
+ ((BindableRepository) ctx.lookup(name)).shutdown();
ctx.unbind(name);
}
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java Sun Mar 19 08:22:28 2006
@@ -266,8 +266,8 @@
throw new LockException("Parent node has deep lock.");
}
}
- if (info.deep && element.hasPath(path) &&
- element.getChildrenCount() > 0) {
+ if (info.deep && element.hasPath(path)
+ && element.getChildrenCount() > 0) {
throw new LockException("Some child node is locked.");
}
@@ -607,12 +607,12 @@
/**
* ID recorded in event
*/
- public final NodeId id;
+ private final NodeId id;
/**
* Path recorded in event
*/
- public final Path path;
+ private final Path path;
/**
* Old path in move operation
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java Sun Mar 19 08:22:28 2006
@@ -204,13 +204,15 @@
* Add lock token to this environment.
* @param lt lock token
*/
- public void addLockToken(String lt) {}
+ public void addLockToken(String lt) {
+ }
/**
* Remove lock token from this environment.
* @param lt lock token
*/
- public void removeLockToken(String lt) {}
+ public void removeLockToken(String lt) {
+ }
/**
* Prepare update. Locks global lock manager and feeds all lock/
@@ -390,8 +392,8 @@
* associated lock information is subject to change.
*/
public boolean mayChange() {
- if (status != Status.STATUS_COMMITTED &&
- status != Status.STATUS_ROLLEDBACK) {
+ if (status != Status.STATUS_COMMITTED
+ && status != Status.STATUS_ROLLEDBACK) {
return true;
}
return super.mayChange();
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCache.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCache.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCache.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCache.java Sun Mar 19 08:22:28 2006
@@ -36,11 +36,12 @@
/**
* ordered set of keys
*/
- final TreeSet sortedKeys;
+ private final TreeSet sortedKeys;
+
/**
* cache of pre-built aggregations of node types
*/
- final HashMap aggregates;
+ private final HashMap aggregates;
EffectiveNodeTypeCache() {
sortedKeys = new TreeSet();
@@ -311,4 +312,4 @@
return Arrays.asList(names).toString() + " (" + weight + ")";
}
}
-}
\ No newline at end of file
+}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDef.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDef.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDef.java Sun Mar 19 08:22:28 2006
@@ -27,12 +27,12 @@
*/
public interface ItemDef {
- public static final ItemDef[] EMPTY_ARRAY = new ItemDef[0];
+ ItemDef[] EMPTY_ARRAY = new ItemDef[0];
/**
* The special wildcard name used as the name of residual item definitions.
*/
- public static final QName ANY_NAME = new QName("", "*");
+ QName ANY_NAME = new QName("", "*");
/**
* Gets the name of the child item.
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java Sun Mar 19 08:22:28 2006
@@ -76,7 +76,7 @@
/**
* Checks whether this is a residual item definition.
*
- * @return <code>true</code> if this is a residual item definition
+ * @return <code>true</code> if this is a residual item definition
*/
public boolean definesResidual() {
return itemDef.definesResidual();
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDef.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDef.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDef.java Sun Mar 19 08:22:28 2006
@@ -27,7 +27,7 @@
*/
public interface NodeDef extends ItemDef {
- public static final NodeDef[] EMPTY_ARRAY = new NodeDef[0];
+ NodeDef[] EMPTY_ARRAY = new NodeDef[0];
/**
* Returns an identifier for this node definition.
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java Sun Mar 19 08:22:28 2006
@@ -85,7 +85,7 @@
try {
if (ntNames == null || ntNames.length == 0) {
// return "nt:base"
- return new NodeType[] { ntMgr.getNodeType(QName.NT_BASE) };
+ return new NodeType[] {ntMgr.getNodeType(QName.NT_BASE)};
} else {
NodeType[] nodeTypes = new NodeType[ntNames.length];
for (int i = 0; i < ntNames.length; i++) {
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java Sun Mar 19 08:22:28 2006
@@ -307,7 +307,7 @@
/**
* Internal helper method for registering a list of node type definitions.
- * Returns an array containing the registered node types.
+ * Returns an array containing the registered node types.
*/
private NodeType[] registerNodeTypes(List defs)
throws InvalidNodeTypeDefException, RepositoryException {
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/PropDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/PropDef.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/PropDef.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/PropDef.java Sun Mar 19 08:22:28 2006
@@ -27,7 +27,7 @@
*/
public interface PropDef extends ItemDef {
- public static final PropDef[] EMPTY_ARRAY = new PropDef[0];
+ PropDef[] EMPTY_ARRAY = new PropDef[0];
/**
* Returns an identifier for this property definition.
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefWriter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefWriter.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefWriter.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefWriter.java Sun Mar 19 08:22:28 2006
@@ -52,7 +52,7 @@
/**
* the indention string
*/
- private final static String INDENT = " ";
+ private static final String INDENT = " ";
/**
* the current namespace resolver
@@ -170,13 +170,14 @@
*/
private void writeSupertypes(NodeTypeDef ntd) throws IOException {
QName[] sta = ntd.getSupertypes();
- if (sta == null) return;
- String delim=" > ";
- for (int i=0; i<sta.length; i++) {
- if (!sta[i].equals(QName.NT_BASE)) {
- out.write(delim);
- out.write(resolve(sta[i]));
- delim=", ";
+ if (sta != null) {
+ String delim = " > ";
+ for (int i = 0; i < sta.length; i++) {
+ if (!sta[i].equals(QName.NT_BASE)) {
+ out.write(delim);
+ out.write(resolve(sta[i]));
+ delim = ", ";
+ }
}
}
}
@@ -255,17 +256,18 @@
* @param dva
*/
private void writeDefaultValues(InternalValue[] dva) throws IOException {
- if (dva == null || dva.length == 0) return;
- String delim=" = '";
- for (int i = 0; i < dva.length; i++) {
- out.write(delim);
- try {
- out.write(escape(dva[i].toJCRValue(resolver).getString()));
- } catch (RepositoryException e) {
- out.write(escape(dva[i].toString()));
+ if (dva != null && dva.length > 0) {
+ String delim = " = '";
+ for (int i = 0; i < dva.length; i++) {
+ out.write(delim);
+ try {
+ out.write(escape(dva[i].toJCRValue(resolver).getString()));
+ } catch (RepositoryException e) {
+ out.write(escape(dva[i].toString()));
+ }
+ out.write("'");
+ delim = ", '";
}
- out.write("'");
- delim=", '";
}
}
@@ -274,16 +276,17 @@
* @param vca
*/
private void writeValueConstraints(ValueConstraint[] vca) throws IOException {
- if (vca == null || vca.length == 0) return;
- String vc = vca[0].getDefinition(resolver);
- out.write("\n" + INDENT + INDENT + "< '");
- out.write(escape(vc));
- out.write("'");
- for (int i = 1; i < vca.length; i++) {
- vc = vca[i].getDefinition(resolver);
- out.write(", '");
+ if (vca != null && vca.length > 0) {
+ String vc = vca[0].getDefinition(resolver);
+ out.write("\n" + INDENT + INDENT + "< '");
out.write(escape(vc));
out.write("'");
+ for (int i = 1; i < vca.length; i++) {
+ vc = vca[i].getDefinition(resolver);
+ out.write(", '");
+ out.write(escape(vc));
+ out.write("'");
+ }
}
}
@@ -341,7 +344,7 @@
for (int i = 0; i < reqTypes.length; i++) {
out.write(delim);
out.write(resolve(reqTypes[i]));
- delim=", ";
+ delim = ", ";
}
out.write(")");
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/Lexer.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/Lexer.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/Lexer.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/Lexer.java Sun Mar 19 08:22:28 2006
@@ -24,36 +24,36 @@
* Lexer
*/
public class Lexer {
- public final static char SINGLE_QUOTE = '\'';
- public final static char DOUBLE_QUOTE = '\"';
- public final static char BEGIN_NODE_TYPE_NAME = '[';
- public final static char END_NODE_TYPE_NAME = ']';
- public final static char EXTENDS = '>';
- public final static char LIST_DELIMITER = ',';
- public final static char PROPERTY_DEFINITION = '-';
- public final static char CHILD_NODE_DEFINITION = '+';
- public final static char BEGIN_TYPE = '(';
- public final static char END_TYPE = ')';
- public final static char DEFAULT = '=';
- public final static char CONSTRAINT = '<';
-
- public final static String[] ORDERABLE = new String[] {"orderable", "ord", "o"};
- public final static String[] MIXIN = new String[]{"mixin", "mix", "m"};
-
- public final static String[] PRIMARY = new String[]{"primary", "pri", "!"};
- public final static String[] AUTOCREATED = new String[]{"autocreated", "aut", "a"};
- public final static String[] MANDATORY = new String[]{"mandatory", "man", "m"};
- public final static String[] PROTECTED = new String[]{"protected", "pro", "p"};
- public final static String[] MULTIPLE = new String[]{"multiple", "mul", "*"};
-
- public final static String[] COPY = new String[]{"copy", "Copy", "COPY"};
- public final static String[] VERSION = new String[]{"version", "Version", "VERSION"};
- public final static String[] INITIALIZE = new String[]{"initialize", "Initialize", "INITIALIZE"};
- public final static String[] COMPUTE = new String[]{"compute", "Compute", "COMPUTE"};
- public final static String[] IGNORE = new String[]{"ignore", "Ignore", "IGNORE"};
- public final static String[] ABORT = new String[]{"abort", "Abort", "ABORT"};
+ public static final char SINGLE_QUOTE = '\'';
+ public static final char DOUBLE_QUOTE = '\"';
+ public static final char BEGIN_NODE_TYPE_NAME = '[';
+ public static final char END_NODE_TYPE_NAME = ']';
+ public static final char EXTENDS = '>';
+ public static final char LIST_DELIMITER = ',';
+ public static final char PROPERTY_DEFINITION = '-';
+ public static final char CHILD_NODE_DEFINITION = '+';
+ public static final char BEGIN_TYPE = '(';
+ public static final char END_TYPE = ')';
+ public static final char DEFAULT = '=';
+ public static final char CONSTRAINT = '<';
+
+ public static final String[] ORDERABLE = new String[] {"orderable", "ord", "o"};
+ public static final String[] MIXIN = new String[]{"mixin", "mix", "m"};
+
+ public static final String[] PRIMARY = new String[]{"primary", "pri", "!"};
+ public static final String[] AUTOCREATED = new String[]{"autocreated", "aut", "a"};
+ public static final String[] MANDATORY = new String[]{"mandatory", "man", "m"};
+ public static final String[] PROTECTED = new String[]{"protected", "pro", "p"};
+ public static final String[] MULTIPLE = new String[]{"multiple", "mul", "*"};
+
+ public static final String[] COPY = new String[]{"copy", "Copy", "COPY"};
+ public static final String[] VERSION = new String[]{"version", "Version", "VERSION"};
+ public static final String[] INITIALIZE = new String[]{"initialize", "Initialize", "INITIALIZE"};
+ public static final String[] COMPUTE = new String[]{"compute", "Compute", "COMPUTE"};
+ public static final String[] IGNORE = new String[]{"ignore", "Ignore", "IGNORE"};
+ public static final String[] ABORT = new String[]{"abort", "Abort", "ABORT"};
- public final static String[] ATTRIBUTE = new String[]{"primary", "pri", "!",
+ public static final String[] ATTRIBUTE = new String[]{"primary", "pri", "!",
"autocreated", "aut", "a",
"mandatory", "man", "m",
"protected", "pro", "p",
@@ -65,19 +65,19 @@
"ignore", "Ignore", "IGNORE",
"abort", "Abort", "ABORT"};
- public final static String[] STRING = {"string", "String", "STRING"};
- public final static String[] BINARY = {"binary", "Binary", "BINARY"};
- public final static String[] LONG = {"long", "Long", "LONG"};
- public final static String[] DOUBLE = {"double", "Double", "DOUBLE"};
- public final static String[] BOOLEAN = {"boolean", "Boolean", "BOOLEAN"};
- public final static String[] DATE = {"date", "Date", "DATE"};
- public final static String[] NAME = {"name", "Name", "NAME"};
- public final static String[] PATH = {"path", "Path", "PATH"};
- public final static String[] REFERENCE = {"reference", "Reference", "REFERENCE"};
+ public static final String[] STRING = {"string", "String", "STRING"};
+ public static final String[] BINARY = {"binary", "Binary", "BINARY"};
+ public static final String[] LONG = {"long", "Long", "LONG"};
+ public static final String[] DOUBLE = {"double", "Double", "DOUBLE"};
+ public static final String[] BOOLEAN = {"boolean", "Boolean", "BOOLEAN"};
+ public static final String[] DATE = {"date", "Date", "DATE"};
+ public static final String[] NAME = {"name", "Name", "NAME"};
+ public static final String[] PATH = {"path", "Path", "PATH"};
+ public static final String[] REFERENCE = {"reference", "Reference", "REFERENCE"};
- public final static String[] UNDEFINED = new String[]{"undefined", "Undefined", "UNDEFINED", "*"};
+ public static final String[] UNDEFINED = new String[]{"undefined", "Undefined", "UNDEFINED", "*"};
- public final static String EOF = "eof";
+ public static final String EOF = "eof";
private final StreamTokenizer st;
@@ -87,7 +87,7 @@
* Constructor
* @param r
*/
- public Lexer(Reader r, String systemId){
+ public Lexer(Reader r, String systemId) {
this.systemId = systemId;
st = new StreamTokenizer(r);
@@ -98,9 +98,9 @@
st.slashSlashComments(true);
st.slashStarComments(true);
- st.wordChars('a','z');
- st.wordChars('A','Z');
- st.wordChars(':',':');
+ st.wordChars('a', 'z');
+ st.wordChars('A', 'Z');
+ st.wordChars(':', ':');
st.quoteChar(SINGLE_QUOTE);
st.quoteChar(DOUBLE_QUOTE);
@@ -126,14 +126,14 @@
public String getNextToken() throws ParseException {
try {
int tokenType = st.nextToken();
- if (tokenType == StreamTokenizer.TT_EOF){
+ if (tokenType == StreamTokenizer.TT_EOF) {
return EOF;
- } else if(tokenType == StreamTokenizer.TT_WORD || tokenType == SINGLE_QUOTE || tokenType == DOUBLE_QUOTE){
+ } else if (tokenType == StreamTokenizer.TT_WORD || tokenType == SINGLE_QUOTE || tokenType == DOUBLE_QUOTE) {
return st.sval;
} else {
- return new String(new char[]{(char)tokenType});
+ return new String(new char[] {(char) tokenType});
}
- } catch (IOException e){
+ } catch (IOException e) {
fail("IOException while attempting to read input stream", e);
return null;
}
@@ -150,4 +150,4 @@
public void fail(Throwable e) throws ParseException {
throw new ParseException(e, st.lineno(), -1, systemId);
}
-}
\ No newline at end of file
+}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/ParseException.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/ParseException.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/ParseException.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/compact/ParseException.java Sun Mar 19 08:22:28 2006
@@ -94,19 +94,19 @@
*/
public String getMessage() {
StringBuffer b = new StringBuffer(super.getMessage());
- String delim =" (";
+ String delim = " (";
if (systemId != null && !systemId.equals("")) {
b.append(delim);
b.append(systemId);
delim = ", ";
}
- if (lineNumber>=0) {
+ if (lineNumber >= 0) {
b.append(delim);
b.append("line ");
b.append(lineNumber);
delim = ", ";
}
- if (colNumber>=0) {
+ if (colNumber >= 0) {
b.append(delim);
b.append("col ");
b.append(colNumber);
@@ -122,7 +122,7 @@
* {@inheritDoc}
*/
public String toString() {
- return super.toString();// + " (" + systemId + ", line " + lineNumber +", col " + colNumber +")";
+ return super.toString(); // + " (" + systemId + ", line " + lineNumber +", col " + colNumber +")";
}
-}
\ No newline at end of file
+}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/converter/SchemaConverter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/converter/SchemaConverter.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/converter/SchemaConverter.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/converter/SchemaConverter.java Sun Mar 19 08:22:28 2006
@@ -45,7 +45,10 @@
import javax.jcr.PropertyType;
import javax.jcr.version.OnParentVersionAction;
import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
/**
* SchemaConverter
@@ -226,8 +229,8 @@
// If the content model of this complex type is element or mixed then we must convert the
// contained XSParticle into a set of node and/or property defs
- } else if (ctdef.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_ELEMENT ||
- ctdef.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_MIXED) {
+ } else if (ctdef.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_ELEMENT
+ || ctdef.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_MIXED) {
XSParticle p = ctdef.getParticle();
// particleToDefs takes the two lists and adds to them as necessary. It also returns
@@ -333,8 +336,8 @@
// If the complex type definition contains a simple content model
// and does not contain any attribute uses or attribute wildcards
// then the enclosing element is converted to a property def
- if (ctDef.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_SIMPLE &&
- ctDef.getAttributeUses().getLength() == 0 && ctDef.getAttributeWildcard() == null) {
+ if (ctDef.getContentType() == XSComplexTypeDefinition.CONTENTTYPE_SIMPLE
+ && ctDef.getAttributeUses().getLength() == 0 && ctDef.getAttributeWildcard() == null) {
XSSimpleTypeDefinition std = ctDef.getSimpleType();
PropDef pd = simpleTypeToPropDef(std, name, mandatory, multiple);
propDefList.add(pd);
@@ -513,7 +516,9 @@
*/
private void addXMLTextNodeType() {
// If the XML text node type already exists, do nothing
- if (nodeTypeDefs.containsKey(XML_TEXT_NODETYPE_NAME)) return;
+ if (nodeTypeDefs.containsKey(XML_TEXT_NODETYPE_NAME)) {
+ return;
+ }
// Otherwise create a new node type def and set its attributes
NodeTypeDef ntd = new NodeTypeDef();
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java Sun Mar 19 08:22:28 2006
@@ -171,7 +171,7 @@
}
// check UUIDs
- NodeId parentId= eventState.getParentId();
+ NodeId parentId = eventState.getParentId();
if (ids != null) {
boolean match = false;
for (int i = 0; i < ids.length && !match; i++) {
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java Sun Mar 19 08:22:28 2006
@@ -149,8 +149,7 @@
if (n.hasOverlayedState()) {
NodeId oldParentId = n.getOverlayedState().getParentId();
NodeId newParentId = n.getParentId();
- if (newParentId != null &&
- !oldParentId.equals(newParentId)) {
+ if (newParentId != null && !oldParentId.equals(newParentId)) {
// node moved
// generate node removed & node added event
NodeState oldParent;
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollectionFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollectionFactory.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollectionFactory.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollectionFactory.java Sun Mar 19 08:22:28 2006
@@ -29,5 +29,6 @@
* @return a new <code>EventStateCollection</code>
* @throws RepositoryException if creation fails for some reason
*/
- public EventStateCollection createEventStateCollection() throws RepositoryException;
+ EventStateCollection createEventStateCollection() throws RepositoryException;
+
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java Sun Mar 19 08:22:28 2006
@@ -121,7 +121,7 @@
NodeId[] ids = null;
if (uuid != null) {
ids = new NodeId[uuid.length];
- for (int i=0; i<uuid.length; i++) {
+ for (int i = 0; i < uuid.length; i++) {
ids[i] = NodeId.valueOf(uuid[i]);
}
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java Sun Mar 19 08:22:28 2006
@@ -34,7 +34,7 @@
* @throws javax.jcr.query.InvalidQueryException
* if the statement is malformed.
*/
- public QueryRootNode createQueryTree(String statement, NamespaceResolver resolver)
+ QueryRootNode createQueryTree(String statement, NamespaceResolver resolver)
throws InvalidQueryException;
/**
@@ -45,7 +45,7 @@
* @return <code>true</code> if this builder can handle <code>language</code>;
* <code>false</code> otherwise.
*/
- public boolean canHandle(String language);
+ boolean canHandle(String language);
/**
* Creates a String representation of the query node tree in the syntax this
@@ -58,6 +58,7 @@
* into a String representation due to
* restrictions in this syntax.
*/
- public String toString(QueryRootNode root, NamespaceResolver resolver)
+ String toString(QueryRootNode root, NamespaceResolver resolver)
throws InvalidQueryException;
+
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilderRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilderRegistry.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilderRegistry.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilderRegistry.java Sun Mar 19 08:22:28 2006
@@ -42,7 +42,7 @@
static {
try {
- Iterator it = ServiceRegistry.lookupProviders(QueryTreeBuilder.class,
+ Iterator it = ServiceRegistry.lookupProviders(QueryTreeBuilder.class,
QueryTreeBuilderRegistry.class.getClassLoader());
while (it.hasNext()) {
BUILDERS.add(it.next());
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiReader.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiReader.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiReader.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiReader.java Sun Mar 19 08:22:28 2006
@@ -89,7 +89,7 @@
* @return the document number of <code>n</code>'s parent.
* @throws IOException if an error occurs while reading from the index.
*/
- final public int getParent(int n) throws IOException {
+ public int getParent(int n) throws IOException {
DocId id = getParentDocId(n);
return id.getDocumentNumber(this);
}
@@ -103,7 +103,7 @@
* @return the DocId of <code>n</code>'s parent.
* @throws IOException if an error occurs while reading from the index.
*/
- final public DocId getParentDocId(int n) throws IOException {
+ public DocId getParentDocId(int n) throws IOException {
int i = readerIndex(n);
DocId id = subReaders[i].getParent(n - starts[i]);
return id.applyOffset(starts[i]);
@@ -171,7 +171,7 @@
* @param n document number.
* @return the reader index.
*/
- final private int readerIndex(int n) {
+ private int readerIndex(int n) {
int lo = 0; // search starts array
int hi = subReaders.length - 1; // for first element less
@@ -202,12 +202,12 @@
/**
* The index reader.
*/
- final ReadOnlyIndexReader reader;
+ private final ReadOnlyIndexReader reader;
/**
* The reader offset in this multi reader instance.
*/
- final int offset;
+ private final int offset;
/**
* Creates a new <code>OffsetReader</code>.
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java Sun Mar 19 08:22:28 2006
@@ -111,7 +111,7 @@
return;
}
int notRepairable = 0;
- for (Iterator it = errors.iterator(); it.hasNext(); ) {
+ for (Iterator it = errors.iterator(); it.hasNext();) {
ConsistencyCheckError error = (ConsistencyCheckError) it.next();
try {
if (error.repairable()) {
@@ -176,12 +176,12 @@
}
// create multiple entries errors
- for (Iterator it = multipleEntries.iterator(); it.hasNext(); ) {
+ for (Iterator it = multipleEntries.iterator(); it.hasNext();) {
errors.add(new MultipleEntries((String) it.next()));
}
// run through documents
- for (Iterator it = documents.values().iterator(); it.hasNext(); ) {
+ for (Iterator it = documents.values().iterator(); it.hasNext();) {
Document d = (Document) it.next();
String uuid = d.get(FieldNames.UUID);
String parentUUID = d.get(FieldNames.PARENT);
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java Sun Mar 19 08:22:28 2006
@@ -138,21 +138,21 @@
/**
* @inheritDoc
*/
- final int getDocumentNumber(IndexReader reader) {
+ int getDocumentNumber(IndexReader reader) {
return docNumber;
}
/**
* @inheritDoc
*/
- final DocId applyOffset(int offset) {
+ DocId applyOffset(int offset) {
return new PlainDocId(docNumber + offset);
}
/**
* @inheritDoc
*/
- final boolean isValid(BitSet deleted) {
+ boolean isValid(BitSet deleted) {
return !deleted.get(docNumber);
}
@@ -161,7 +161,7 @@
*
* @return a String representation for this <code>DocId</code>.
*/
- final public String toString() {
+ public String toString() {
return "PlainDocId(" + docNumber + ")";
}
}
@@ -200,7 +200,7 @@
/**
* @inheritDoc
*/
- final int getDocumentNumber(IndexReader reader) throws IOException {
+ int getDocumentNumber(IndexReader reader) throws IOException {
synchronized (this) {
if (reader == this.reader) {
return docNumber;
@@ -229,7 +229,7 @@
*
* @inheritDoc
*/
- final DocId applyOffset(int offset) {
+ DocId applyOffset(int offset) {
return this;
}
@@ -239,7 +239,7 @@
* @param deleted the deleted documents.
* @return always <code>true</code>.
*/
- final boolean isValid(BitSet deleted) {
+ boolean isValid(BitSet deleted) {
return true;
}
@@ -248,7 +248,7 @@
*
* @return a String representation for this <code>DocId</code>.
*/
- final public String toString() {
+ public String toString() {
return "UUIDDocId(" + uuid + ")";
}
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/DocNumberCache.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/DocNumberCache.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/DocNumberCache.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/DocNumberCache.java Sun Mar 19 08:22:28 2006
@@ -100,9 +100,9 @@
// ignore if reader is older than the one in entry
if (reader.getCreationTick() <= e.reader.getCreationTick()) {
if (log.isDebugEnabled()) {
- log.debug("Ignoring put(). New entry is not from a newer reader. " +
- "existing: " + e.reader.getCreationTick() +
- ", new: " + reader.getCreationTick());
+ log.debug("Ignoring put(). New entry is not from a newer reader. "
+ + "existing: " + e.reader.getCreationTick()
+ + ", new: " + reader.getCreationTick());
}
e = null;
}
@@ -164,7 +164,7 @@
/**
* Returns the segment index for character c.
*/
- private static final int getSegmentIndex(char c) {
+ private static int getSegmentIndex(char c) {
if (c > '9') {
c += 9;
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/HierarchyResolver.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/HierarchyResolver.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/HierarchyResolver.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/HierarchyResolver.java Sun Mar 19 08:22:28 2006
@@ -33,5 +33,6 @@
* @return the document number of <code>n</code>'s parent.
* @throws java.io.IOException if an error occurs while reading from the index.
*/
- public int getParent(int n) throws IOException;
+ int getParent(int n) throws IOException;
+
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexInfos.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexInfos.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexInfos.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexInfos.java Sun Mar 19 08:22:28 2006
@@ -81,7 +81,7 @@
/**
* Returns the name of the file where infos are stored.
- *
+ *
* @return the name of the file where infos are stored.
*/
String getFileName() {
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexListener.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexListener.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexListener.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexListener.java Sun Mar 19 08:22:28 2006
@@ -30,5 +30,6 @@
*
* @param id the <code>Term</code> that identifies the deleted document.
*/
- public void documentDeleted(Term id);
+ void documentDeleted(Term id);
+
}
Modified: incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java?rev=386994&r1=386993&r2=386994&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java (original)
+++ incubator/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMerger.java Sun Mar 19 08:22:28 2006
@@ -163,7 +163,7 @@
// sum up docs in bucket
List indexesToMerge = new ArrayList();
int mergeDocs = 0;
- for (Iterator it = bucket.iterator(); it.hasNext() && mergeDocs <= targetMergeDocs; ) {
+ for (Iterator it = bucket.iterator(); it.hasNext() && mergeDocs <= targetMergeDocs;) {
indexesToMerge.add(it.next());
}
if (indexesToMerge.size() > 2) {
@@ -341,12 +341,12 @@
/**
* The name of the index.
*/
- final String name;
+ private final String name;
/**
* The number of documents the index contains.
*/
- final int numDocs;
+ private final int numDocs;
/**
* Creates a new index struct.
@@ -391,7 +391,7 @@
*/
private static final class Merge {
- final Index[] indexes;
+ private final Index[] indexes;
/**
* Merge task, to merge <code>indexes</code> into a new index with