Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 61042 invoked from network); 20 Nov 2009 20:02:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Nov 2009 20:02:52 -0000 Received: (qmail 97148 invoked by uid 500); 20 Nov 2009 20:02:51 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 97092 invoked by uid 500); 20 Nov 2009 20:02:51 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 97082 invoked by uid 99); 20 Nov 2009 20:02:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Nov 2009 20:02:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Nov 2009 20:02:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 845142388989; Fri, 20 Nov 2009 20:02:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r882699 - in /sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl: FactoryCache.java ProcessorManagerImpl.java Date: Fri, 20 Nov 2009 20:02:27 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091120200227.845142388989@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri Nov 20 20:02:26 2009 New Revision: 882699 URL: http://svn.apache.org/viewvc?rev=882699&view=rev Log: As factory cache is a private implementation detail there is no need for protected methods etc. Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java?rev=882699&r1=882698&r2=882699&view=diff ============================================================================== --- sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java (original) +++ sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java Fri Nov 20 20:02:26 2009 @@ -68,19 +68,19 @@ private static final String PROPERTY_RESOURCE_TYPES = "pipeline.resourceTypes"; /** The logger. */ - protected static final Logger LOGGER = LoggerFactory.getLogger(FactoryCache.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FactoryCache.class); /** The tracker for generator factories. */ - protected final HashingServiceTrackerCustomizer generatorTracker; + private final HashingServiceTrackerCustomizer generatorTracker; /** The tracker for serializers factories. */ - protected final HashingServiceTrackerCustomizer serializerTracker; + private final HashingServiceTrackerCustomizer serializerTracker; /** The tracker for transformer factories. */ - protected final TransformerFactoryServiceTracker transformerTracker; + private final TransformerFactoryServiceTracker transformerTracker; /** The tracker for processor factories. */ - protected final HashingServiceTrackerCustomizer processorTracker; + private final HashingServiceTrackerCustomizer processorTracker; public FactoryCache(final BundleContext context) throws InvalidSyntaxException { @@ -190,7 +190,7 @@ * @param factories The transformer factories * @return The transformer instances */ - protected Transformer[][] createTransformers(final TransformerFactory[][] factories) { + private Transformer[][] createTransformers(final TransformerFactory[][] factories) { if ( factories == EMPTY_DOUBLE_ARRAY ) { return FactoryCache.EMPTY_DOUBLE_ARRAY; } @@ -219,7 +219,7 @@ /** * This service tracker stores all services into a hash map. */ - protected static class HashingServiceTrackerCustomizer extends ServiceTracker { + private static class HashingServiceTrackerCustomizer extends ServiceTracker { /** The services hashed by their name property. */ private final Map services = new ConcurrentHashMap(); @@ -268,7 +268,7 @@ } } - protected static final class TransformerFactoryServiceTracker extends HashingServiceTrackerCustomizer { + private static final class TransformerFactoryServiceTracker extends HashingServiceTrackerCustomizer { private String getMode(final ServiceReference ref) { final String mode = (String) ref.getProperty(PROPERTY_MODE); @@ -295,13 +295,6 @@ } /** - * Is this cache still valid? - */ - public boolean isCacheValid() { - return this.cacheIsValid; - } - - /** * @see org.osgi.util.tracker.ServiceTracker#addingService(org.osgi.framework.ServiceReference) */ public Object addingService(ServiceReference reference) { @@ -417,7 +410,7 @@ /** * Comparator for service references. */ - protected static final class ServiceReferenceComparator implements Comparator { + private static final class ServiceReferenceComparator implements Comparator { public static ServiceReferenceComparator INSTANCE = new ServiceReferenceComparator(); public int compare(ServiceReference o1, ServiceReference o2) { @@ -425,7 +418,7 @@ } } - protected static final class TransformerFactoryEntry { + private static final class TransformerFactoryEntry { public final TransformerFactory factory; private final ProcessorConfiguration configuration; Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java?rev=882699&r1=882698&r2=882699&view=diff ============================================================================== --- sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java (original) +++ sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java Fri Nov 20 20:02:26 2009 @@ -102,7 +102,7 @@ protected void activate(final ComponentContext ctx) throws RepositoryException, InvalidSyntaxException { this.bundleContext = ctx.getBundleContext(); - this.factoryCache = this.getFactoryCache(this.bundleContext); + this.factoryCache = new FactoryCache(this.bundleContext); this.adminSession = this.repository.loginAdministrative(null); // create array of search paths for actions and constraints @@ -134,14 +134,6 @@ } /** - * Get the factory cache - */ - protected FactoryCache getFactoryCache(BundleContext bc) - throws InvalidSyntaxException { - return new FactoryCache(bc); - } - - /** * Deactivate this component. * @param ctx */