Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 4749 invoked from network); 23 Nov 2005 04:00:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Nov 2005 04:00:00 -0000 Received: (qmail 45770 invoked by uid 500); 23 Nov 2005 03:59:56 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 45715 invoked by uid 500); 23 Nov 2005 03:59:56 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 45704 invoked by uid 500); 23 Nov 2005 03:59:55 -0000 Received: (qmail 45695 invoked by uid 99); 23 Nov 2005 03:59:55 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 22 Nov 2005 19:59:55 -0800 Received: (qmail 4651 invoked by uid 65534); 23 Nov 2005 03:59:35 -0000 Message-ID: <20051123035935.4650.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r348357 - in /jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources: ./ impl/ Date: Wed, 23 Nov 2005 03:59:33 -0000 To: commons-cvs@jakarta.apache.org From: niallp@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: niallp Date: Tue Nov 22 19:59:22 2005 New Revision: 348357 URL: http://svn.apache.org/viewcvs?rev=348357&view=rev Log: Change protected instance variables to private Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/Messages.java jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/ResourcesException.java jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/BasicMessageList.java jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/CollectionResourcesBase.java jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/JDBCResources.java jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/ResourceBundleResources.java jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/ResourcesFactoryBase.java jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappPropertyResourcesFactory.java jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappResourcesFactoryBase.java jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappXMLResourcesFactory.java Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/Messages.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/Messages.java?rev=348357&r1=348356&r2=348357&view=diff ============================================================================== --- jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/Messages.java (original) +++ jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/Messages.java Tue Nov 22 19:59:22 2005 @@ -77,7 +77,7 @@ /** *

The {@link Resources} instance that we are wrapping.

*/ - protected Resources resources = null; + private Resources resources = null; // ------------------------------------------------------------- Properties Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/ResourcesException.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/ResourcesException.java?rev=348357&r1=348356&r2=348357&view=diff ============================================================================== --- jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/ResourcesException.java (original) +++ jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/ResourcesException.java Tue Nov 22 19:59:22 2005 @@ -32,10 +32,10 @@ public class ResourcesException extends RuntimeException implements Serializable { /** Exception message */ - protected String message = ""; + private String message = ""; /** Cause of the exception */ - protected Throwable rootCause = null; + private Throwable rootCause = null; /** * Construct an Exception with the specified message. Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/BasicMessageList.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/BasicMessageList.java?rev=348357&r1=348356&r2=348357&view=diff ============================================================================== --- jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/BasicMessageList.java (original) +++ jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/BasicMessageList.java Tue Nov 22 19:59:22 2005 @@ -60,7 +60,7 @@ * The accumulated set of Message objects (represented * as a List) for each property, keyed by property name. */ - protected Map messages = new HashMap(); + private Map messages = new HashMap(); /** * The current number of the property/key being added. This is used Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/CollectionResourcesBase.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/CollectionResourcesBase.java?rev=348357&r1=348356&r2=348357&view=diff ============================================================================== --- jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/CollectionResourcesBase.java (original) +++ jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/CollectionResourcesBase.java Tue Nov 22 19:59:22 2005 @@ -70,14 +70,14 @@ *

The base URL for the per-Locale resources files containing the * name-value mappings for this {@link org.apache.commons.resources.Resources} instance.

*/ - protected String base = null; + private String base = null; /** *

The default Locale to use when no Locale * is specified by the caller.

*/ - protected Locale defaultLocale = Locale.getDefault(); + private Locale defaultLocale = Locale.getDefault(); /** Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/JDBCResources.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/JDBCResources.java?rev=348357&r1=348356&r2=348357&view=diff ============================================================================== --- jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/JDBCResources.java (original) +++ jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/JDBCResources.java Tue Nov 22 19:59:22 2005 @@ -85,7 +85,7 @@ */ private static final Log log = LogFactory.getLog(JDBCResources.class); - Connection con = null; + private Connection con = null; // ----------------------------------------------------------- Constructors Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/ResourceBundleResources.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/ResourceBundleResources.java?rev=348357&r1=348356&r2=348357&view=diff ============================================================================== --- jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/ResourceBundleResources.java (original) +++ jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/ResourceBundleResources.java Tue Nov 22 19:59:22 2005 @@ -84,7 +84,7 @@ *

The fully qualified base name of the ResourceBundle * instances to be wrapped.

*/ - protected String base = null; + private String base = null; /** @@ -95,7 +95,7 @@ * java.util.Map that is then, in turn, keyed by the * java.util.Locale to which a particular bundle belongs.

*/ - protected Map bundles = new HashMap(); + private Map bundles = new HashMap(); // ------------------------------------------------------ Lifecycle Methods Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/ResourcesFactoryBase.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/ResourcesFactoryBase.java?rev=348357&r1=348356&r2=348357&view=diff ============================================================================== --- jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/ResourcesFactoryBase.java (original) +++ jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/ResourcesFactoryBase.java Tue Nov 22 19:59:22 2005 @@ -47,14 +47,14 @@ *

The set of {@link Resources} instances previously created by * this {@link ResourcesFactory}, keyed by logical name.

*/ - protected Map resources = new HashMap(); + private Map resources = new HashMap(); /** *

The returnNull property value that will be configured * on {@link Resources} instances created by this factory.

*/ - protected boolean returnNull = true; + private boolean returnNull = true; // ------------------------------------------------------------- Properties Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappPropertyResourcesFactory.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappPropertyResourcesFactory.java?rev=348357&r1=348356&r2=348357&view=diff ============================================================================== --- jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappPropertyResourcesFactory.java (original) +++ jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappPropertyResourcesFactory.java Tue Nov 22 19:59:22 2005 @@ -66,7 +66,7 @@ throws ResourcesException { Resources res = - new WebappPropertyResources(name, config, servletContext); + new WebappPropertyResources(name, config, getServletContext()); res.setReturnNull(isReturnNull()); res.init(); return (res); Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappResourcesFactoryBase.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappResourcesFactoryBase.java?rev=348357&r1=348356&r2=348357&view=diff ============================================================================== --- jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappResourcesFactoryBase.java (original) +++ jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappResourcesFactoryBase.java Tue Nov 22 19:59:22 2005 @@ -34,7 +34,7 @@ *

The ServletContext instance for resolving * our resources references.

*/ - protected ServletContext servletContext = null; + private ServletContext servletContext = null; /** *

Return the ServletContext instance for Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappXMLResourcesFactory.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappXMLResourcesFactory.java?rev=348357&r1=348356&r2=348357&view=diff ============================================================================== --- jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappXMLResourcesFactory.java (original) +++ jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/impl/WebappXMLResourcesFactory.java Tue Nov 22 19:59:22 2005 @@ -64,7 +64,7 @@ throws ResourcesException { Resources res = - new WebappXMLResources(name, config, servletContext); + new WebappXMLResources(name, config, getServletContext()); res.setReturnNull(isReturnNull()); res.init(); return (res); --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org