cmlenz 2003/06/11 09:18:33
Modified: integration/ant/src/java/org/apache/cactus/integration/ant/deployment
EarArchive.java WarArchive.java JarArchive.java
WebXml.java
integration/ant/src/java/org/apache/cactus/integration/ant/util
AntLog.java
Log:
Fix some "design for extension" violations
Revision Changes Path
1.4 +3 -3
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/EarArchive.java
Index: EarArchive.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/EarArchive.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EarArchive.java 16 May 2003 14:07:36 -0000 1.3
+++ EarArchive.java 11 Jun 2003 16:18:33 -0000 1.4
@@ -122,7 +122,7 @@
* @throws ParserConfigurationException If there is an XML parser
* configration problem
*/
- public ApplicationXml getApplicationXml()
+ public final ApplicationXml getApplicationXml()
throws IOException, SAXException, ParserConfigurationException
{
if (this.applicationXml == null)
@@ -153,7 +153,7 @@
* the specified URI
* @throws IOException If there was an errors reading from the EAR or WAR
*/
- public WarArchive getWebModule(String theUri)
+ public final WarArchive getWebModule(String theUri)
throws IOException
{
InputStream war = null;
1.5 +3 -3
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/WarArchive.java
Index: WarArchive.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/WarArchive.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WarArchive.java 9 Jun 2003 19:04:14 -0000 1.4
+++ WarArchive.java 11 Jun 2003 16:18:33 -0000 1.5
@@ -123,7 +123,7 @@
* @throws ParserConfigurationException If there is an XML parser
* configration problem
*/
- public WebXml getWebXml()
+ public final WebXml getWebXml()
throws IOException, SAXException, ParserConfigurationException
{
if (this.webXml == null)
@@ -157,7 +157,7 @@
* @return Whether the class was found in the archive
* @throws IOException If an I/O error occurred reading the archive
*/
- public boolean containsClass(String theClassName)
+ public final boolean containsClass(String theClassName)
throws IOException
{
// Look in WEB-INF/classes first
1.5 +4 -4
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/JarArchive.java
Index: JarArchive.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/JarArchive.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JarArchive.java 9 Jun 2003 19:04:14 -0000 1.4
+++ JarArchive.java 11 Jun 2003 16:18:33 -0000 1.5
@@ -154,7 +154,7 @@
* @return The full path to the resource inside the archive
* @throws IOException If an I/O error occurred reading the archive
*/
- public String findResource(String theName)
+ public final String findResource(String theName)
throws IOException
{
JarInputStream in = null;
@@ -194,7 +194,7 @@
* <code>null</code> if the resource was not found in the JAR
* @throws IOException If an I/O error occurs
*/
- public InputStream getResource(String thePath)
+ public final InputStream getResource(String thePath)
throws IOException
{
JarInputStream in = null;
@@ -234,7 +234,7 @@
* @return The list of resources
* @throws IOException If an I/O error occurs
*/
- public List getResources(String thePath)
+ public final List getResources(String thePath)
throws IOException
{
List resources = new ArrayList();
1.8 +2 -2
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/WebXml.java
Index: WebXml.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/WebXml.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WebXml.java 10 Jun 2003 13:53:54 -0000 1.7
+++ WebXml.java 11 Jun 2003 16:18:33 -0000 1.8
@@ -840,7 +840,7 @@
* @param theAuthMethod The authentication method (for example, BASIC)
* @param theRealmName The name of the realm
*/
- public void setLoginConfig(String theAuthMethod, String theRealmName)
+ public final void setLoginConfig(String theAuthMethod, String theRealmName)
{
if ((theRealmName == null) || (theAuthMethod == null))
{
1.4 +2 -2
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/util/AntLog.java
Index: AntLog.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/util/AntLog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AntLog.java 12 May 2003 09:02:23 -0000 1.3
+++ AntLog.java 11 Jun 2003 16:18:33 -0000 1.4
@@ -78,7 +78,7 @@
*
* @version $Id$
*/
-public class AntLog implements Log
+public final class AntLog implements Log
{
// Constants ---------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
