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 @@
/**
* <p>The [EMAIL PROTECTED] Resources} instance that we are wrapping.</p>
*/
- 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 <code>Message</code> 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 @@
* <p>The base URL for the per-Locale resources files containing the
* name-value mappings for this [EMAIL PROTECTED]
org.apache.commons.resources.Resources} instance.</p>
*/
- protected String base = null;
+ private String base = null;
/**
* <p>The default <code>Locale</code> to use when no <code>Locale</code>
* is specified by the caller.</p>
*/
- 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 @@
* <p>The fully qualified base name of the <code>ResourceBundle</code>
* instances to be wrapped.</p>
*/
- protected String base = null;
+ private String base = null;
/**
@@ -95,7 +95,7 @@
* <code>java.util.Map</code> that is then, in turn, keyed by the
* <code>java.util.Locale</code> to which a particular bundle belongs.</p>
*/
- 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 @@
* <p>The set of [EMAIL PROTECTED] Resources} instances previously created
by
* this [EMAIL PROTECTED] ResourcesFactory}, keyed by logical name.</p>
*/
- protected Map resources = new HashMap();
+ private Map resources = new HashMap();
/**
* <p>The <code>returnNull</code> property value that will be configured
* on [EMAIL PROTECTED] Resources} instances created by this factory.</p>
*/
- 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 @@
* <p>The <code>ServletContext</code> instance for resolving
* our resources references.</p>
*/
- protected ServletContext servletContext = null;
+ private ServletContext servletContext = null;
/**
* <p>Return the <code>ServletContext</code> 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
