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 2008/01/28 00:52:25 UTC
svn commit: r615680 [1/2] - in /jackrabbit/trunk/jackrabbit-core/src:
main/java/org/apache/jackrabbit/core/
main/java/org/apache/jackrabbit/core/cluster/
main/java/org/apache/jackrabbit/core/fs/db/
main/java/org/apache/jackrabbit/core/fs/mem/ main/java...
Author: jukka
Date: Sun Jan 27 15:52:16 2008
New Revision: 615680
URL: http://svn.apache.org/viewvc?rev=615680&view=rev
Log:
JCR-97: Improve Checkstyle conformance
- Various Checkstyle improvements
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeAddedOperation.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeDeletedOperation.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeModifiedOperation.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyAddedOperation.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyDeletedOperation.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyModifiedOperation.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyOperation.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/mem/MemoryFileSystem.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractRecord.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseRecordIterator.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileJournal.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordIterator.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordLog.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/LockableFileRevision.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/ReadRecord.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/AbstractItemDefinitionTemplate.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitsetENTCacheImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCacheImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/CachingPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ErrorHandling.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/LRUNodeIdCache.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/NamespaceIndex.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/TrackingInputStream.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NAryQueryNode.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractExcerpt.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractWeight.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AggregateRuleImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiIndexReader.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DefaultHighlighter.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiScorer.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PooledTextExtractor.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ReadOnlyIndexReader.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SharedFieldSortComparator.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/TextExtractorReader.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/AdaptingHits.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/ArrayHits.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/Hits.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/HitsIntersection.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql2/Parser.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/AbstractPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/FineGrainedISMLocking.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/PMContext.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/PersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/StateChangeDispatcher.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/db/DatabasePersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/db/DerbyPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/db/OraclePersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/db/SimpleDbPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/obj/ObjectPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/util/BLOBStore.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/util/FileSystemBLOBStore.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/util/ResourceBasedBLOBStore.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/util/Serializer.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/xml/XMLPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/DateVersionSelector.java
jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/default/synonyms.properties
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java Sun Jan 27 15:52:16 2008
@@ -312,6 +312,7 @@
// fail-fast test: check status of this item's state
if (isTransient()) {
+ String msg;
switch (state.getStatus()) {
case ItemState.STATUS_EXISTING_MODIFIED:
// add this item's state to the list
@@ -319,36 +320,27 @@
break;
case ItemState.STATUS_NEW:
- {
- String msg = safeGetJCRPath()
- + ": cannot save a new item.";
- log.debug(msg);
- throw new RepositoryException(msg);
- }
+ msg = safeGetJCRPath() + ": cannot save a new item.";
+ log.debug(msg);
+ throw new RepositoryException(msg);
case ItemState.STATUS_STALE_MODIFIED:
- {
- String msg = safeGetJCRPath()
- + ": the item cannot be saved because it has been modified externally.";
- log.debug(msg);
- throw new InvalidItemStateException(msg);
- }
+ msg = safeGetJCRPath()
+ + ": the item cannot be saved because it has been modified externally.";
+ log.debug(msg);
+ throw new InvalidItemStateException(msg);
case ItemState.STATUS_STALE_DESTROYED:
- {
- String msg = safeGetJCRPath()
- + ": the item cannot be saved because it has been deleted externally.";
- log.debug(msg);
- throw new InvalidItemStateException(msg);
- }
+ msg = safeGetJCRPath()
+ + ": the item cannot be saved because it has been deleted externally.";
+ log.debug(msg);
+ throw new InvalidItemStateException(msg);
case ItemState.STATUS_UNDEFINED:
- {
- String msg = safeGetJCRPath()
- + ": the item cannot be saved; it seems to have been removed externally.";
- log.debug(msg);
- throw new InvalidItemStateException(msg);
- }
+ msg = safeGetJCRPath()
+ + ": the item cannot be saved; it seems to have been removed externally.";
+ log.debug(msg);
+ throw new InvalidItemStateException(msg);
default:
log.debug("unexpected state status (" + state.getStatus() + ")");
@@ -363,6 +355,7 @@
while (iter.hasNext()) {
transientState = (ItemState) iter.next();
// fail-fast test: check status of transient state
+ String msg;
switch (transientState.getStatus()) {
case ItemState.STATUS_NEW:
case ItemState.STATUS_EXISTING_MODIFIED:
@@ -371,28 +364,22 @@
break;
case ItemState.STATUS_STALE_MODIFIED:
- {
- String msg = transientState.getId()
- + ": the item cannot be saved because it has been modified externally.";
- log.debug(msg);
- throw new InvalidItemStateException(msg);
- }
+ msg = transientState.getId()
+ + ": the item cannot be saved because it has been modified externally.";
+ log.debug(msg);
+ throw new InvalidItemStateException(msg);
case ItemState.STATUS_STALE_DESTROYED:
- {
- String msg = transientState.getId()
- + ": the item cannot be saved because it has been deleted externally.";
- log.debug(msg);
- throw new InvalidItemStateException(msg);
- }
+ msg = transientState.getId()
+ + ": the item cannot be saved because it has been deleted externally.";
+ log.debug(msg);
+ throw new InvalidItemStateException(msg);
case ItemState.STATUS_UNDEFINED:
- {
- String msg = safeGetJCRPath()
- + ": the item cannot be saved; it seems to have been removed externally.";
- log.debug(msg);
- throw new InvalidItemStateException(msg);
- }
+ msg = safeGetJCRPath()
+ + ": the item cannot be saved; it seems to have been removed externally.";
+ log.debug(msg);
+ throw new InvalidItemStateException(msg);
default:
log.debug("unexpected state status (" + transientState.getStatus() + ")");
@@ -1317,11 +1304,9 @@
break;
case ItemState.STATUS_NEW:
- {
- String msg = safeGetJCRPath() + ": cannot refresh a new item.";
- log.debug(msg);
- throw new RepositoryException(msg);
- }
+ String msg = safeGetJCRPath() + ": cannot refresh a new item.";
+ log.debug(msg);
+ throw new RepositoryException(msg);
default:
log.debug("unexpected state status (" + transientState.getStatus() + ")");
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java Sun Jan 27 15:52:16 2008
@@ -4013,8 +4013,8 @@
// choose the initial one
Version[] vs = history.getRootVersion().getSuccessors();
if (vs.length == 0) {
- String msg = "Unable to select appropariate version for " +
- child.getName() + " using " + vsel;
+ String msg = "Unable to select appropariate version for "
+ + child.getName() + " using " + vsel;
log.error(msg);
throw new VersionException(msg);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java Sun Jan 27 15:52:16 2008
@@ -239,8 +239,8 @@
queryImplClassName = params.getProperty(PARAM_QUERY_IMPL, DEFAULT_QUERY_IMPL_CLASS);
preparedQueryImplClassName = params.getProperty(PARAM_PREPARED_QUERY_IMPL, DEFAULT_PREPARED_QUERY_IMPL_CLASS);
if (params.containsKey(PARAM_IDLE_TIME)) {
- String msg = "Parameter 'idleTime' is not supported anymore. " +
- "Please use 'maxIdleTime' in the repository configuration.";
+ String msg = "Parameter 'idleTime' is not supported anymore. "
+ + "Please use 'maxIdleTime' in the repository configuration.";
log.warn(msg);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java Sun Jan 27 15:52:16 2008
@@ -775,8 +775,8 @@
try {
clusterContext.lockEventsReady(workspace);
} catch (RepositoryException e) {
- String msg = "Unable to make lock listener for workspace " +
- workspace + " online: " + e.getMessage();
+ String msg = "Unable to make lock listener for workspace "
+ + workspace + " online: " + e.getMessage();
log.warn(msg);
}
listener = (LockEventListener) wspLockListeners.get(workspace);
@@ -805,8 +805,8 @@
try {
clusterContext.lockEventsReady(workspace);
} catch (RepositoryException e) {
- String msg = "Unable to make lock listener for workspace " +
- workspace + " online: " + e.getMessage();
+ String msg = "Unable to make lock listener for workspace "
+ + workspace + " online: " + e.getMessage();
log.warn(msg);
}
listener = (LockEventListener) wspLockListeners.get(workspace);
@@ -908,8 +908,8 @@
try {
clusterContext.updateEventsReady(workspace);
} catch (RepositoryException e) {
- String msg = "Error making update listener for workspace " +
- workspace + " online: " + e.getMessage();
+ String msg = "Error making update listener for workspace "
+ + workspace + " online: " + e.getMessage();
log.warn(msg);
}
listener = (UpdateEventListener) wspUpdateListeners.get(workspace);
@@ -1049,8 +1049,8 @@
String msg = "Unable to read revision '" + record.getRevision() + "'.";
log.error(msg, e);
} catch (IllegalArgumentException e) {
- String msg = "Error while processing revision " +
- record.getRevision() + ": " + e.getMessage();
+ String msg = "Error while processing revision "
+ + record.getRevision() + ": " + e.getMessage();
log.error(msg);
}
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeAddedOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeAddedOperation.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeAddedOperation.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeAddedOperation.java Sun Jan 27 15:52:16 2008
@@ -52,4 +52,5 @@
state.setStatus(NodeState.STATUS_EXISTING);
changeLog.added(state);
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeDeletedOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeDeletedOperation.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeDeletedOperation.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeDeletedOperation.java Sun Jan 27 15:52:16 2008
@@ -51,4 +51,5 @@
state.setStatus(NodeState.STATUS_EXISTING_REMOVED);
changeLog.deleted(state);
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeModifiedOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeModifiedOperation.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeModifiedOperation.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/NodeModifiedOperation.java Sun Jan 27 15:52:16 2008
@@ -52,4 +52,5 @@
state.setStatus(NodeState.STATUS_EXISTING_MODIFIED);
changeLog.modified(state);
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyAddedOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyAddedOperation.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyAddedOperation.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyAddedOperation.java Sun Jan 27 15:52:16 2008
@@ -52,4 +52,5 @@
state.setStatus(PropertyState.STATUS_EXISTING);
changeLog.added(state);
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyDeletedOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyDeletedOperation.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyDeletedOperation.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyDeletedOperation.java Sun Jan 27 15:52:16 2008
@@ -51,4 +51,5 @@
state.setStatus(PropertyState.STATUS_EXISTING_REMOVED);
changeLog.deleted(state);
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyModifiedOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyModifiedOperation.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyModifiedOperation.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyModifiedOperation.java Sun Jan 27 15:52:16 2008
@@ -52,4 +52,5 @@
state.setStatus(PropertyState.STATUS_EXISTING_MODIFIED);
changeLog.modified(state);
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyOperation.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyOperation.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/PropertyOperation.java Sun Jan 27 15:52:16 2008
@@ -201,4 +201,5 @@
public void setValues(InternalValue[] values) {
this.values = values;
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java Sun Jan 27 15:52:16 2008
@@ -1550,12 +1550,12 @@
return super.skip(n);
}
- public int read(byte b[]) throws IOException {
+ public int read(byte[] b) throws IOException {
consumed = true;
return super.read(b);
}
- public int read(byte b[], int off, int len) throws IOException {
+ public int read(byte[] b, int off, int len) throws IOException {
consumed = true;
return super.read(b, off, len);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/mem/MemoryFileSystem.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/mem/MemoryFileSystem.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/mem/MemoryFileSystem.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/mem/MemoryFileSystem.java Sun Jan 27 15:52:16 2008
@@ -178,8 +178,9 @@
}
private void assertExistence(String path) throws FileSystemException {
- if (!exists(path))
+ if (!exists(path)) {
throw new FileSystemException("no such file " + path);
+ }
}
public boolean isFolder(String path) throws FileSystemException {
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java Sun Jan 27 15:52:16 2008
@@ -86,8 +86,8 @@
synchronized (consumers) {
String consumerId = consumer.getId();
if (consumers.containsKey(consumerId)) {
- String msg = "Record consumer with identifier '" +
- consumerId + "' already registered.";
+ String msg = "Record consumer with identifier '"
+ + consumerId + "' already registered.";
throw new JournalException(msg);
}
consumers.put(consumerId, consumer);
@@ -190,8 +190,8 @@
while (iterator.hasNext()) {
Record record = iterator.nextRecord();
if (record.getJournalId().equals(id)) {
- log.info("Record with revision '" + record.getRevision() +
- "' created by this journal, skipped.");
+ log.info("Record with revision '" + record.getRevision()
+ + "' created by this journal, skipped.");
} else {
RecordConsumer consumer = getConsumer(record.getProducerId());
if (consumer != null) {
@@ -336,4 +336,5 @@
public NamePathResolver getNamePathResolver() {
return npResolver;
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractRecord.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractRecord.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractRecord.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractRecord.java Sun Jan 27 15:52:16 2008
@@ -270,4 +270,5 @@
}
return index;
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java Sun Jan 27 15:52:16 2008
@@ -611,8 +611,8 @@
// read ddl from resources
InputStream in = DatabaseJournal.class.getResourceAsStream(schema + ".ddl");
if (in == null) {
- String msg = "No schema-specific DDL found: '" + schema + ".ddl" +
- "', falling back to '" + DEFAULT_DDL_NAME + "'.";
+ String msg = "No schema-specific DDL found: '" + schema + ".ddl"
+ + "', falling back to '" + DEFAULT_DDL_NAME + "'.";
log.info(msg);
in = DatabaseJournal.class.getResourceAsStream(DEFAULT_DDL_NAME);
if (in == null) {
@@ -685,19 +685,18 @@
*/
protected void buildSQLStatements() {
selectRevisionsStmtSQL =
- "select REVISION_ID, JOURNAL_ID, PRODUCER_ID, REVISION_DATA " +
- "from " + schemaObjectPrefix + "JOURNAL " +
- "where REVISION_ID > ?";
+ "select REVISION_ID, JOURNAL_ID, PRODUCER_ID, REVISION_DATA from "
+ + schemaObjectPrefix + "JOURNAL where REVISION_ID > ?";
updateGlobalStmtSQL =
- "update " + schemaObjectPrefix + "GLOBAL_REVISION " +
- "set revision_id = revision_id + 1";
+ "update " + schemaObjectPrefix + "GLOBAL_REVISION"
+ + " set revision_id = revision_id + 1";
selectGlobalStmtSQL =
- "select revision_id " +
- "from " + schemaObjectPrefix + "GLOBAL_REVISION";
+ "select revision_id from "
+ + schemaObjectPrefix + "GLOBAL_REVISION";
insertRevisionStmtSQL =
- "insert into " + schemaObjectPrefix + "JOURNAL" +
- "(REVISION_ID, JOURNAL_ID, PRODUCER_ID, REVISION_DATA) " +
- "values (?,?,?,?)";
+ "insert into " + schemaObjectPrefix + "JOURNAL"
+ + " (REVISION_ID, JOURNAL_ID, PRODUCER_ID, REVISION_DATA) "
+ + "values (?,?,?,?)";
}
/**
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseRecordIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseRecordIterator.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseRecordIterator.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseRecordIterator.java Sun Jan 27 15:52:16 2008
@@ -159,4 +159,5 @@
}
}
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileJournal.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileJournal.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileJournal.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileJournal.java Sun Jan 27 15:52:16 2008
@@ -119,8 +119,8 @@
rootDirectory.mkdirs();
if (!rootDirectory.exists() || !rootDirectory.isDirectory()) {
- String msg = "Directory specified does either not exist " +
- "or is not a directory: " + directory;
+ String msg = "Directory specified does either not exist "
+ + "or is not a directory: " + directory;
throw new JournalException(msg);
}
@@ -270,8 +270,8 @@
} else {
try {
int version = Integer.parseInt(ext);
- String newName = name.substring(0, sep + 1) +
- String.valueOf(version + 1);
+ String newName = name.substring(0, sep + 1)
+ + String.valueOf(version + 1);
file.renameTo(new File(rootDirectory, newName));
} catch (NumberFormatException e) {
log.warn("Bogusly named journal file, skipped: " + file);
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordIterator.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordIterator.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordIterator.java Sun Jan 27 15:52:16 2008
@@ -160,4 +160,5 @@
String msg = "No log file found containing revision: " + revision;
throw new IOException(msg);
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordLog.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordLog.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordLog.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordLog.java Sun Jan 27 15:52:16 2008
@@ -144,7 +144,8 @@
close(out);
}
- this.previousRevision = lastRevision = previousRevision;
+ this.previousRevision = previousRevision;
+ this.lastRevision = previousRevision;
isNew = false;
}
}
@@ -229,9 +230,8 @@
String producerId = in.readUTF();
int length = in.readInt();
- position += 2 + utfLength(journalId) +
- 2 + utfLength(producerId) +
- 4 + length;
+ position +=
+ 2 + utfLength(journalId) + 2 + utfLength(producerId) + 4 + length;
long revision = previousRevision + position;
return new ReadRecord(journalId, producerId, revision, in, length, resolver, npResolver);
@@ -264,9 +264,9 @@
}
out.flush();
- lastRevision += 2 + utfLength(journalId) +
- 2 + utfLength(producerId) +
- 4 + length;
+ lastRevision +=
+ 2 + utfLength(journalId) + 2 + utfLength(producerId)
+ + 4 + length;
return lastRevision;
} finally {
close(out);
@@ -300,16 +300,16 @@
for (int i = 0; i < SIGNATURE.length; i++) {
if (signature[i] != SIGNATURE[i]) {
- String msg = "Record log '" + logFile.getPath() +
- "' has wrong signature: " + toHexString(signature);
+ String msg = "Record log '" + logFile.getPath()
+ + "' has wrong signature: " + toHexString(signature);
throw new IOException(msg);
}
}
major = in.readShort();
if (major != MAJOR_VERSION) {
- String msg = "Record log '" + logFile.getPath() +
- "' has incompatible major version: " + major;
+ String msg = "Record log '" + logFile.getPath()
+ + "' has incompatible major version: " + major;
throw new IOException(msg);
}
minor = in.readShort();
@@ -387,4 +387,5 @@
}
return utflen;
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/LockableFileRevision.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/LockableFileRevision.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/LockableFileRevision.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/LockableFileRevision.java Sun Jan 27 15:52:16 2008
@@ -167,4 +167,5 @@
unlock();
}
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/ReadRecord.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/ReadRecord.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/ReadRecord.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/ReadRecord.java Sun Jan 27 15:52:16 2008
@@ -216,8 +216,8 @@
skiplen -= skipped;
}
if (skiplen != 0) {
- String msg = "Should have skipped " + n +
- " bytes, only " + (n - skiplen) + " skipped.";
+ String msg = "Should have skipped " + n
+ + " bytes, only " + (n - skiplen) + " skipped.";
throw new IOException(msg);
}
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java Sun Jan 27 15:52:16 2008
@@ -459,7 +459,7 @@
acquire();
- AbstractLockInfo infos[] = getLockInfos(session);
+ AbstractLockInfo[] infos = getLockInfos(session);
try {
Lock[] locks = new Lock[infos.length];
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/AbstractItemDefinitionTemplate.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/AbstractItemDefinitionTemplate.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/AbstractItemDefinitionTemplate.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/AbstractItemDefinitionTemplate.java Sun Jan 27 15:52:16 2008
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.core.nodetype;
-import javax.jcr.Value;
import javax.jcr.nodetype.ItemDefinition;
import javax.jcr.nodetype.NodeType;
@@ -140,4 +139,5 @@
public boolean isProtected() {
return protectedStatus;
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitsetENTCacheImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitsetENTCacheImpl.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitsetENTCacheImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitsetENTCacheImpl.java Sun Jan 27 15:52:16 2008
@@ -487,4 +487,5 @@
}
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCacheImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCacheImpl.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCacheImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCacheImpl.java Sun Jan 27 15:52:16 2008
@@ -362,5 +362,7 @@
public String toString() {
return Arrays.asList(names).toString() + " (" + weight + ")";
}
+
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java Sun Jan 27 15:52:16 2008
@@ -1244,8 +1244,7 @@
log.error(message);
}
log.error(" Reason: " + se.getMessage());
- log.error(" State/Code: " + se.getSQLState() + "/" +
- se.getErrorCode());
+ log.error(" State/Code: " + se.getSQLState() + "/" + se.getErrorCode());
log.debug(" dump:", se);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java Sun Jan 27 15:52:16 2008
@@ -471,8 +471,8 @@
BundleFsPersistenceManager.log.error(message);
}
BundleFsPersistenceManager.log.error(" Reason: " + se.getMessage());
- BundleFsPersistenceManager.log.error(" State/Code: " + se.getSQLState() + "/" +
- se.getErrorCode());
+ BundleFsPersistenceManager.log.error(
+ " State/Code: " + se.getSQLState() + "/" + se.getErrorCode());
BundleFsPersistenceManager.log.debug(" dump:", se);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/CachingPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/CachingPersistenceManager.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/CachingPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/CachingPersistenceManager.java Sun Jan 27 15:52:16 2008
@@ -32,4 +32,4 @@
*/
void onExternalUpdate(ChangeLog changes);
-}
\ No newline at end of file
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java Sun Jan 27 15:52:16 2008
@@ -271,16 +271,16 @@
if (DERBY_EMBEDDED_DRIVER.equals(getDriver())) {
Statement stmt = connectionManager.getConnection().createStatement();
try {
- stmt.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY " +
- "('derby.storage.initialPages', '" + derbyStorageInitialPages + "')");
- stmt.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY " +
- "('derby.storage.minimumRecordSize', '" + derbyStorageMinimumRecordSize + "')");
- stmt.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY " +
- "('derby.storage.pageCacheSize', '" + derbyStoragePageCacheSize + "')");
- stmt.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY " +
- "('derby.storage.pageReservedSpace', '" + derbyStoragePageReservedSpace + "')");
- stmt.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY " +
- "('derby.storage.pageSize', '" + derbyStoragePageSize + "')");
+ stmt.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY "
+ + "('derby.storage.initialPages', '" + derbyStorageInitialPages + "')");
+ stmt.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY "
+ + "('derby.storage.minimumRecordSize', '" + derbyStorageMinimumRecordSize + "')");
+ stmt.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY "
+ + "('derby.storage.pageCacheSize', '" + derbyStoragePageCacheSize + "')");
+ stmt.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY "
+ + "('derby.storage.pageReservedSpace', '" + derbyStoragePageReservedSpace + "')");
+ stmt.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY "
+ + "('derby.storage.pageSize', '" + derbyStoragePageSize + "')");
} finally {
stmt.close();
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java Sun Jan 27 15:52:16 2008
@@ -579,8 +579,8 @@
BLOBFileValue blobVal = val.getBLOBFileValue();
long size = blobVal.getLength();
if (size < 0) {
- log.warn("Blob has negative size. Potential loss of data. " +
- "id={} idx={}", state.getId(), String.valueOf(i));
+ log.warn("Blob has negative size. Potential loss of data. "
+ + "id={} idx={}", state.getId(), String.valueOf(i));
out.writeInt(0);
values[i] = InternalValue.create(new byte[0]);
blobVal.discard();
@@ -616,8 +616,8 @@
values[i] = InternalValue.create(blobStore.get(blobId));
}
} catch (Exception e) {
- log.error("Error while reloading blob. truncating. id=" + state.getId() +
- " idx=" + i + " size=" + size, e);
+ log.error("Error while reloading blob. truncating. id="
+ + state.getId() + " idx=" + i + " size=" + size, e);
values[i] = InternalValue.create(new byte[0]);
}
blobVal.discard();
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ErrorHandling.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ErrorHandling.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ErrorHandling.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ErrorHandling.java Sun Jan 27 15:52:16 2008
@@ -80,4 +80,5 @@
ret.append("|");
return ret.toString();
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/LRUNodeIdCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/LRUNodeIdCache.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/LRUNodeIdCache.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/LRUNodeIdCache.java Sun Jan 27 15:52:16 2008
@@ -27,11 +27,6 @@
public class LRUNodeIdCache {
/**
- * the cvs/svn id
- */
- static final String CVS_ID = "$URL$ $Rev$ $Date$";
-
- /**
* The default logger
*/
private static Logger log = LoggerFactory.getLogger(LRUNodeIdCache.class);
@@ -106,4 +101,5 @@
public void clear() {
missing.clear();
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/NamespaceIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/NamespaceIndex.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/NamespaceIndex.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/NamespaceIndex.java Sun Jan 27 15:52:16 2008
@@ -27,11 +27,6 @@
public class NamespaceIndex implements StringIndex {
/**
- * The CVS/SVN id
- */
- static final String CVS_ID = "$URL$ $Rev$ $Date$";
-
- /**
* the namespace registry
*/
private final NamespaceRegistryImpl nsReg;
@@ -66,4 +61,5 @@
throw new IllegalStateException("URIIndex not valid? " + e.toString());
}
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/TrackingInputStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/TrackingInputStream.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/TrackingInputStream.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/TrackingInputStream.java Sun Jan 27 15:52:16 2008
@@ -25,11 +25,6 @@
public class TrackingInputStream extends InputStream {
/**
- * the cvs/svn id
- */
- static final String CVS_ID = "$URL$ $Rev$ $Date$";
-
- /**
* The underlying input stream
*/
private final InputStream in;
@@ -103,7 +98,7 @@
/**
* {@inheritDoc}
*/
- public int read(byte b[]) throws IOException {
+ public int read(byte[] b) throws IOException {
int read = in.read(b);
if (read > 0) {
position += read;
@@ -114,7 +109,7 @@
/**
* {@inheritDoc}
*/
- public int read(byte b[], int off, int len) throws IOException {
+ public int read(byte[] b, int off, int len) throws IOException {
int read = in.read(b, off, len);
if (read > 0) {
position += read;
@@ -140,4 +135,5 @@
public long getPosition() {
return position;
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NAryQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NAryQueryNode.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NAryQueryNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NAryQueryNode.java Sun Jan 27 15:52:16 2008
@@ -157,8 +157,9 @@
}
for (Iterator iter = operands.iterator(); iter.hasNext();) {
QueryNode queryNode = (QueryNode) iter.next();
- if (queryNode.needsSystemTree())
+ if (queryNode.needsSystemTree()) {
return true;
+ }
}
return false;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java Sun Jan 27 15:52:16 2008
@@ -172,8 +172,9 @@
}
// First path step starts with "//"
- if (firstWorkspaceRelativeStep.getIncludeDescendants())
+ if (firstWorkspaceRelativeStep.getIncludeDescendants()) {
return true;
+ }
// If the first workspace relative location step is jcr:system we need
// to include the system tree
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractExcerpt.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractExcerpt.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractExcerpt.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractExcerpt.java Sun Jan 27 15:52:16 2008
@@ -296,7 +296,7 @@
}
public int[] indexesOf(String[] terms, int start, int len) {
- int res[] = new int[len];
+ int[] res = new int[len];
for (int i = 0; i < len; i++) {
res[i] = indexOf(terms[i]);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractIndex.java Sun Jan 27 15:52:16 2008
@@ -151,7 +151,7 @@
*/
void addDocuments(Document[] docs) throws IOException {
final IndexWriter writer = getIndexWriter();
- DynamicPooledExecutor.Command commands[] =
+ DynamicPooledExecutor.Command[] commands =
new DynamicPooledExecutor.Command[docs.length];
for (int i = 0; i < docs.length; i++) {
// check if text extractor completed its work
@@ -165,7 +165,7 @@
}
};
}
- DynamicPooledExecutor.Result results[] = EXECUTOR.executeAndWait(commands);
+ DynamicPooledExecutor.Result[] results = EXECUTOR.executeAndWait(commands);
invalidateSharedReader();
IOException ex = null;
for (int i = 0; i < results.length; i++) {
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractWeight.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractWeight.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractWeight.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AbstractWeight.java Sun Jan 27 15:52:16 2008
@@ -64,8 +64,8 @@
public Scorer scorer(IndexReader reader) throws IOException {
if (reader instanceof MultiIndexReader) {
MultiIndexReader mir = (MultiIndexReader) reader;
- IndexReader readers[] = mir.getIndexReaders();
- int starts[] = new int[readers.length + 1];
+ IndexReader[] readers = mir.getIndexReaders();
+ int[] starts = new int[readers.length + 1];
int maxDoc = 0;
for (int i = 0; i < readers.length; i++) {
starts[i] = maxDoc;
@@ -73,9 +73,10 @@
}
starts[readers.length] = maxDoc;
- Scorer scorers[] = new Scorer[readers.length];
- for (int i = 0; i < readers.length; i++)
+ Scorer[] scorers = new Scorer[readers.length];
+ for (int i = 0; i < readers.length; i++) {
scorers[i] = scorer(readers[i]);
+ }
return new MultiScorer(searcher.getSimilarity(), scorers, starts);
} else {
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AggregateRuleImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AggregateRuleImpl.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AggregateRuleImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AggregateRuleImpl.java Sun Jan 27 15:52:16 2008
@@ -114,8 +114,8 @@
throws ItemStateException, RepositoryException {
for (int i = 0; i < rules.length; i++) {
NodeState aggregateRoot = rules[i].matches(nodeState);
- if (aggregateRoot != null &&
- aggregateRoot.getNodeTypeName().equals(nodeTypeName)) {
+ if (aggregateRoot != null
+ && aggregateRoot.getNodeTypeName().equals(nodeTypeName)) {
return aggregateRoot;
}
}
@@ -258,8 +258,8 @@
NodeState matches(NodeState nodeState)
throws ItemStateException, RepositoryException {
// first check node type
- if (nodeTypeName == null ||
- nodeState.getNodeTypeName().equals(nodeTypeName)) {
+ if (nodeTypeName == null
+ || nodeState.getNodeTypeName().equals(nodeTypeName)) {
// check pattern
Path.Element[] elements = pattern.getElements();
for (int e = elements.length - 1; e >= 0; e--) {
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiIndexReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiIndexReader.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiIndexReader.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiIndexReader.java Sun Jan 27 15:52:16 2008
@@ -173,7 +173,7 @@
* {@inheritDoc}
*/
public IndexReader[] getIndexReaders() {
- IndexReader readers[] = new IndexReader[subReaders.length];
+ IndexReader[] readers = new IndexReader[subReaders.length];
System.arraycopy(subReaders, 0, readers, 0, subReaders.length);
return readers;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java Sun Jan 27 15:52:16 2008
@@ -293,8 +293,9 @@
public boolean skipTo(int target) throws IOException {
calculateChildren();
nextDoc = hits.skipTo(target);
- while (nextDoc > -1 && !indexIsValid(nextDoc))
+ while (nextDoc > -1 && !indexIsValid(nextDoc)) {
next();
+ }
return nextDoc > -1;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DefaultHighlighter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DefaultHighlighter.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DefaultHighlighter.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DefaultHighlighter.java Sun Jan 27 15:52:16 2008
@@ -278,8 +278,8 @@
for (; skippedChars >= 0; skippedChars--) {
if (Character.isWhitespace(cbuf[skippedChars])) {
firstWhitespace = skippedChars;
- if (skippedChars - 1 >= 0 &&
- cbuf[skippedChars - 1] == '.') {
+ if (skippedChars - 1 >= 0
+ && cbuf[skippedChars - 1] == '.') {
skippedChars++;
break;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java Sun Jan 27 15:52:16 2008
@@ -147,8 +147,8 @@
try {
Class clazz = Class.forName(analyzerClassName);
if (clazz == JackrabbitAnalyzer.class) {
- log.warn("Not allowed to configure " + JackrabbitAnalyzer.class.getName() + " for a property. " +
- "Using default analyzer for that property.");
+ log.warn("Not allowed to configure " + JackrabbitAnalyzer.class.getName() + " for a property. "
+ + "Using default analyzer for that property.");
}
else if (Analyzer.class.isAssignableFrom(clazz)) {
Analyzer analyzer = (Analyzer) clazz.newInstance();
@@ -445,9 +445,9 @@
elementTest = resolver.getQName(ISO9075.decode(type));
idx += ")/@".length();
} else {
- if (axis == PathExpression.ANCESTOR ||
- axis == PathExpression.CHILD ||
- axis == PathExpression.PARENT) {
+ if (axis == PathExpression.ANCESTOR
+ || axis == PathExpression.CHILD
+ || axis == PathExpression.PARENT) {
// simple name test
String name = conditionString.substring(idx,
conditionString.indexOf('/', idx));
@@ -778,12 +778,12 @@
while (nodeStates.hasNext()) {
try {
NodeState current = (NodeState) nodeStates.next();
- if (elementTest != null &&
- !current.getNodeTypeName().equals(elementTest)) {
+ if (elementTest != null
+ && !current.getNodeTypeName().equals(elementTest)) {
continue;
}
- if (nameTest != null &&
- !hmgr.getName(current.getNodeId()).equals(nameTest)) {
+ if (nameTest != null
+ && !hmgr.getName(current.getNodeId()).equals(nameTest)) {
continue;
}
if (!current.hasPropertyName(propertyName)) {
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java Sun Jan 27 15:52:16 2008
@@ -257,8 +257,8 @@
throws InvalidQueryException {
Value v = (Value) bindVariableValues.get(node.getBindVariableQName());
if (v == null) {
- throw new InvalidQueryException("No value bound for variable " +
- node.getBindVariableName());
+ throw new InvalidQueryException("No value bound for variable "
+ + node.getBindVariableName());
} else {
return v;
}
@@ -313,8 +313,8 @@
break;
default:
// TODO: support for new types defined in JSR 283
- throw new InvalidQueryException("Unsupported property type " +
- PropertyType.nameFromValue(v.getType()));
+ throw new InvalidQueryException("Unsupported property type "
+ + PropertyType.nameFromValue(v.getType()));
}
final int operator = node.getOperator();
@@ -362,8 +362,8 @@
BooleanClause.Occur.MUST_NOT);
return b;
default:
- throw new InvalidQueryException("Unknown operator " +
- operator);
+ throw new InvalidQueryException(
+ "Unknown operator " + operator);
}
}
@@ -396,8 +396,9 @@
} else if (obj instanceof TermQuery) {
return transformTermQuery((TermQuery) obj, true);
} else {
- throw new InvalidQueryException("upper-case not supported " +
- "on operand " + node.getOperand().getClass().getName());
+ throw new InvalidQueryException(
+ "upper-case not supported on operand "
+ + node.getOperand().getClass().getName());
}
}
@@ -409,8 +410,9 @@
} else if (obj instanceof TermQuery) {
return transformTermQuery((TermQuery) obj, false);
} else {
- throw new InvalidQueryException("lower-case not supported " +
- "on operand " + node.getOperand().getClass().getName());
+ throw new InvalidQueryException(
+ "lower-case not supported on operand "
+ + node.getOperand().getClass().getName());
}
}
@@ -423,8 +425,9 @@
return new CaseTermQuery.Lower(query.getTerm());
}
} else {
- throw new InvalidQueryException("Upper/LowerCase not " +
- "supported on field " + query.getTerm().field());
+ throw new InvalidQueryException(
+ "Upper/LowerCase not supported on field "
+ + query.getTerm().field());
}
}
}, data);
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java Sun Jan 27 15:52:16 2008
@@ -660,9 +660,9 @@
+ node.getValueType());
}
- if (node.getRelativePath() == null &&
- node.getOperation() != QueryConstants.OPERATION_SIMILAR &&
- node.getOperation() != QueryConstants.OPERATION_SPELLCHECK) {
+ if (node.getRelativePath() == null
+ && node.getOperation() != QueryConstants.OPERATION_SIMILAR
+ && node.getOperation() != QueryConstants.OPERATION_SPELLCHECK) {
exceptions.add(new InvalidQueryException("@* not supported in predicate"));
return data;
}
@@ -709,17 +709,17 @@
// support for fn:name()
Name propName = relPath.getNameElement().getName();
- if (propName.getNamespaceURI().equals(SearchManager.NS_FN_URI) &&
- propName.getLocalName().equals("name()")) {
+ if (propName.getNamespaceURI().equals(SearchManager.NS_FN_URI)
+ && propName.getLocalName().equals("name()")) {
if (node.getValueType() != QueryConstants.TYPE_STRING) {
- exceptions.add(new InvalidQueryException("Name function can " +
- "only be used in conjunction with a string literal"));
+ exceptions.add(new InvalidQueryException("Name function can "
+ + "only be used in conjunction with a string literal"));
return data;
}
- if (node.getOperation() != QueryConstants.OPERATION_EQ_VALUE &&
- node.getOperation() != QueryConstants.OPERATION_EQ_GENERAL) {
- exceptions.add(new InvalidQueryException("Name function can " +
- "only be used in conjunction with an equals operator"));
+ if (node.getOperation() != QueryConstants.OPERATION_EQ_VALUE
+ && node.getOperation() != QueryConstants.OPERATION_EQ_GENERAL) {
+ exceptions.add(new InvalidQueryException("Name function can "
+ + "only be used in conjunction with an equals operator"));
return data;
}
// check if string literal is a valid XML Name
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiScorer.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiScorer.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiScorer.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiScorer.java Sun Jan 27 15:52:16 2008
@@ -107,7 +107,8 @@
return next();
} else {
// no more document
- return hasNext = false;
+ hasNext = false;
+ return hasNext;
}
}
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java Sun Jan 27 15:52:16 2008
@@ -110,4 +110,5 @@
}
}
}
-}
\ No newline at end of file
+
+}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java Sun Jan 27 15:52:16 2008
@@ -173,7 +173,9 @@
// special fields
// UUID
- doc.add(new Field(FieldNames.UUID, node.getNodeId().getUUID().toString(), Field.Store.YES, Field.Index.NO_NORMS, Field.TermVector.NO));
+ doc.add(new Field(
+ FieldNames.UUID, node.getNodeId().getUUID().toString(),
+ Field.Store.YES, Field.Index.NO_NORMS, Field.TermVector.NO));
try {
// parent UUID
if (node.getParentId() == null) {
@@ -181,14 +183,17 @@
doc.add(new Field(FieldNames.PARENT, "", Field.Store.YES, Field.Index.NO_NORMS, Field.TermVector.NO));
doc.add(new Field(FieldNames.LABEL, "", Field.Store.NO, Field.Index.NO_NORMS, Field.TermVector.NO));
} else {
- doc.add(new Field(FieldNames.PARENT, node.getParentId().toString(), Field.Store.YES, Field.Index.NO_NORMS, Field.TermVector.NO));
+ doc.add(new Field(
+ FieldNames.PARENT, node.getParentId().toString(),
+ Field.Store.YES, Field.Index.NO_NORMS, Field.TermVector.NO));
NodeState parent = (NodeState) stateProvider.getItemState(node.getParentId());
NodeState.ChildNodeEntry child = parent.getChildNodeEntry(node.getNodeId());
if (child == null) {
// this can only happen when jackrabbit
// is running in a cluster.
- throw new RepositoryException("Missing child node entry " +
- "for node with id: " + node.getNodeId());
+ throw new RepositoryException(
+ "Missing child node entry for node with id: "
+ + node.getNodeId());
}
String name = resolver.getJCRName(child.getName());
doc.add(new Field(FieldNames.LABEL, name, Field.Store.NO, Field.Index.NO_NORMS, Field.TermVector.NO));
@@ -328,9 +333,9 @@
case PropertyType.NAME:
// jcr:primaryType and jcr:mixinTypes are required for correct
// node type resolution in queries
- if (isIndexed(name) ||
- name.equals(NameConstants.JCR_PRIMARYTYPE) ||
- name.equals(NameConstants.JCR_MIXINTYPES)) {
+ if (isIndexed(name)
+ || name.equals(NameConstants.JCR_PRIMARYTYPE)
+ || name.equals(NameConstants.JCR_MIXINTYPES)) {
addNameValue(doc, fieldName, value.getQName());
}
break;
@@ -672,8 +677,8 @@
textExtract.append(buffer, 0, len);
}
} catch (IOException e) {
- log.warn("Exception reading value for fulltext field: " +
- e.getMessage());
+ log.warn("Exception reading value for fulltext field: "
+ + e.getMessage());
log.debug("Dump:", e);
} finally {
try {
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PooledTextExtractor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PooledTextExtractor.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PooledTextExtractor.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PooledTextExtractor.java Sun Jan 27 15:52:16 2008
@@ -84,8 +84,8 @@
new PooledExecutor.BlockedExecutionHandler() {
public boolean blockedAction(Runnable command) {
// execute with current thread and log message
- log.info("Extractor pool busy, running command with " +
- "current thread: {}", command.toString());
+ log.info("Extractor pool busy, running command with "
+ + "current thread: {}", command.toString());
command.run();
return true;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ReadOnlyIndexReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ReadOnlyIndexReader.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ReadOnlyIndexReader.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ReadOnlyIndexReader.java Sun Jan 27 15:52:16 2008
@@ -343,7 +343,7 @@
/**
* @inheritDoc
*/
- public byte[] getPayload(byte data[], int offset) throws IOException {
+ public byte[] getPayload(byte[] data, int offset) throws IOException {
return ((TermPositions) in).getPayload(data, offset);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java?rev=615680&r1=615679&r2=615680&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java Sun Jan 27 15:52:16 2008
@@ -370,8 +370,8 @@
* function, <code>false</code> otherwise.
*/
private boolean isExcerptFunction(Name name) {
- return name.getNamespaceURI().equals(Name.NS_REP_URI) &&
- name.getLocalName().startsWith(EXCERPT_FUNC_LPAR);
+ return name.getNamespaceURI().equals(Name.NS_REP_URI)
+ && name.getLocalName().startsWith(EXCERPT_FUNC_LPAR);
}
/**
@@ -487,8 +487,8 @@
* function, <code>false</code> otherwise.
*/
private boolean isSpellCheckFunction(Name name) {
- return name.getNamespaceURI().equals(Name.NS_REP_URI) &&
- name.getLocalName().startsWith(SPELLCHECK_FUNC_LPAR);
+ return name.getNamespaceURI().equals(Name.NS_REP_URI)
+ && name.getLocalName().startsWith(SPELLCHECK_FUNC_LPAR);
}
/**