You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by db...@apache.org on 2011/03/23 05:53:09 UTC
svn commit: r1084477 - in /jackrabbit/trunk:
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/
jackrabbit-core/src/...
Author: dbrosius
Date: Wed Mar 23 04:53:08 2011
New Revision: 1084477
URL: http://svn.apache.org/viewvc?rev=1084477&view=rev
Log:
JCR-2925
Various inner classes maintain references to owning class for no reason
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/MemoryJournal.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/persistence/db/DatabasePersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.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/LuceneQueryFactory.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/IndexNodeResolver.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/NodeResolver.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java
jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/GQL.java
jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/TransientFileFactory.java
jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ZipHandler.java
jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionManagerImpl.java
jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/LocatorFactoryImpl.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java Wed Mar 23 04:53:08 2011
@@ -1141,7 +1141,7 @@ public class ItemManager implements Item
* Cache of shareable nodes. For performance reasons, methods are not
* synchronized and thread-safety must be guaranteed by caller.
*/
- class ShareableNodesCache {
+ static class ShareableNodesCache {
/**
* This cache is based on a reference map, that maps an item id to a map,
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Wed Mar 23 04:53:08 2011
@@ -2447,7 +2447,7 @@ public class RepositoryImpl extends Abst
/**
* Represents a Repository Descriptor Value (either Value or Value[])
*/
- protected final class DescriptorValue {
+ protected static final class DescriptorValue {
private Value val;
private Value[] vals;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/MemoryJournal.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/MemoryJournal.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/MemoryJournal.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/MemoryJournal.java Wed Mar 23 04:53:08 2011
@@ -228,7 +228,7 @@ public class MemoryJournal extends Abstr
/**
* Memory record.
*/
- public class MemoryRecord {
+ public static class MemoryRecord {
/**
* Journal id.
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=1084477&r1=1084476&r2=1084477&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 Wed Mar 23 04:53:08 2011
@@ -1030,7 +1030,7 @@ public class LockManagerImpl
/**
* Internal event class that holds old and new paths for moved nodes
*/
- private class HierarchyEvent {
+ private static class HierarchyEvent {
/**
* ID recorded in event
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java Wed Mar 23 04:53:08 2011
@@ -1186,7 +1186,7 @@ public abstract class DatabasePersistenc
//--------------------------------------------------------< inner classes >
- class SizedInputStream extends FilterInputStream {
+ static class SizedInputStream extends FilterInputStream {
private final long size;
private boolean consumed = false;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java Wed Mar 23 04:53:08 2011
@@ -296,7 +296,7 @@ public class ConsistencyCheck {
/**
* The parent of a node is not available through the ItemStateManager.
*/
- private class UnknownParent extends ConsistencyCheckError {
+ private static class UnknownParent extends ConsistencyCheckError {
private UnknownParent(NodeId id, NodeId parentId) {
super("Node " + id + " has unknown parent: " + parentId, id);
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=1084477&r1=1084476&r2=1084477&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 Wed Mar 23 04:53:08 2011
@@ -862,7 +862,7 @@ public class IndexingConfigurationImpl
/**
* Simple class that holds boost and nodeScopeIndex flag.
*/
- private class PropertyConfig {
+ private static class PropertyConfig {
/**
* The boost value for a property.
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryFactory.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryFactory.java Wed Mar 23 04:53:08 2011
@@ -712,7 +712,7 @@ public class LuceneQueryFactory {
}
}
- protected class QueryPair {
+ protected static class QueryPair {
Query mainQuery;
BooleanQuery subQuery;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java Wed Mar 23 04:53:08 2011
@@ -228,7 +228,7 @@ class CachingEntryCollector extends Entr
/**
*
*/
- private class CacheEntry {
+ private static class CacheEntry {
private final List<AccessControlEntry> entries;
private NodeId nextAcNodeId;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/IndexNodeResolver.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/IndexNodeResolver.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/IndexNodeResolver.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/IndexNodeResolver.java Wed Mar 23 04:53:08 2011
@@ -257,7 +257,7 @@ class IndexNodeResolver extends NodeReso
/**
*
*/
- private class ResultFilteringNodeIterator extends FilteringNodeIterator {
+ private static class ResultFilteringNodeIterator extends FilteringNodeIterator {
private Set<String> authorizableIDs;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/NodeResolver.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/NodeResolver.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/NodeResolver.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/NodeResolver.java Wed Mar 23 04:53:08 2011
@@ -213,7 +213,7 @@ abstract class NodeResolver {
/**
*
*/
- class AuthorizableTypePredicate implements Predicate {
+ static class AuthorizableTypePredicate implements Predicate {
private final int authorizableType;
private final boolean exact;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java Wed Mar 23 04:53:08 2011
@@ -594,7 +594,7 @@ public class UserImporter implements Pro
*
* @see ImportBehavior For additional configuration options.
*/
- private final class Membership {
+ private static final class Membership {
private final String groupId;
private final List<Member> members = new LinkedList<Member>();
@@ -630,7 +630,7 @@ public class UserImporter implements Pro
*
* @see ImportBehavior For additional configuration options.
*/
- private final class Impersonators {
+ private static final class Impersonators {
private final String userId;
private final Value[] values;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java Wed Mar 23 04:53:08 2011
@@ -321,7 +321,7 @@ class SysViewImportHandler extends Targe
/**
* The state of parsing the XML stream.
*/
- class ImportState {
+ static class ImportState {
/**
* name of current node
*/
Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/GQL.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/GQL.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/GQL.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/GQL.java Wed Mar 23 04:53:08 2011
@@ -889,7 +889,7 @@ public final class GQL {
/**
* A name expression.
*/
- private class NameExpression implements Expression {
+ private static class NameExpression implements Expression {
private final String value;
Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/TransientFileFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/TransientFileFactory.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/TransientFileFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/TransientFileFactory.java Wed Mar 23 04:53:08 2011
@@ -217,7 +217,7 @@ public class TransientFileFactory {
/**
* Tracker object for a file pending deletion.
*/
- private class MoribundFileReference extends PhantomReference<File> {
+ private static class MoribundFileReference extends PhantomReference<File> {
/**
* The full path to the file being tracked.
Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ZipHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ZipHandler.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ZipHandler.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ZipHandler.java Wed Mar 23 04:53:08 2011
@@ -314,7 +314,7 @@ public class ZipHandler extends DefaultH
* Inner class used to create subcontexts for the export of the individual
* zip file entries.
*/
- private class ZipEntryExportContext extends AbstractExportContext {
+ private static class ZipEntryExportContext extends AbstractExportContext {
private ZipEntry entry;
private OutputStream out;
Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionManagerImpl.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionManagerImpl.java Wed Mar 23 04:53:08 2011
@@ -271,7 +271,7 @@ public class SubscriptionManagerImpl imp
* present in the internal map. This allows to hide the subscription Id
* from other sessions, that did create the subscription.
*/
- private class WrappedSubscription implements Subscription {
+ private static class WrappedSubscription implements Subscription {
private final Subscription delegatee;
Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/LocatorFactoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/LocatorFactoryImpl.java?rev=1084477&r1=1084476&r2=1084477&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/LocatorFactoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/LocatorFactoryImpl.java Wed Mar 23 04:53:08 2011
@@ -69,7 +69,7 @@ public class LocatorFactoryImpl implemen
}
//--------------------------------------------------------------------------
- private class Locator implements DavResourceLocator {
+ private static class Locator implements DavResourceLocator {
private final String prefix;
private final String resourcePath;