cmlenz 2003/06/11 09:19:26
Modified: integration/ant/src/java/org/apache/cactus/integration/ant
CactifyWarTask.java ContainerSet.java
CactusTask.java
Log:
Fix some "design for extension" violations
Revision Changes Path
1.21 +10 -9
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactifyWarTask.java
Index: CactifyWarTask.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactifyWarTask.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CactifyWarTask.java 10 Jun 2003 13:59:42 -0000 1.20
+++ CactifyWarTask.java 11 Jun 2003 16:19:26 -0000 1.21
@@ -169,7 +169,7 @@
*
* @param theName The name to set
*/
- public void setName(String theName)
+ public final void setName(String theName)
{
this.name = theName;
}
@@ -179,7 +179,7 @@
*
* @param theMapping The URL pattern to set
*/
- public void setMapping(String theMapping)
+ public final void setMapping(String theMapping)
{
this.mapping = theMapping;
}
@@ -190,7 +190,7 @@
*
* @param theRoles The roles to set
*/
- public void setRoles(String theRoles)
+ public final void setRoles(String theRoles)
{
this.roles = theRoles;
}
@@ -203,7 +203,7 @@
*
* @param theWebXml The deployment descriptor
*/
- protected void addSecurity(WebXml theWebXml)
+ protected final void addSecurity(WebXml theWebXml)
{
StringTokenizer tokenizer = new StringTokenizer(this.roles, ",");
List roles = new ArrayList();
@@ -328,7 +328,7 @@
/**
* Enumeration for the <em>version</em> attribute.
*/
- public static class Version extends EnumeratedAttribute
+ public static final class Version extends EnumeratedAttribute
{
/**
@@ -438,7 +438,7 @@
*
* @param theFilterRedirector The redirector to add
*/
- public void addFilterRedirector(FilterRedirector theFilterRedirector)
+ public final void addFilterRedirector(FilterRedirector theFilterRedirector)
{
this.redirectors.add(theFilterRedirector);
}
@@ -448,7 +448,7 @@
*
* @param theJspRedirector The redirector to add
*/
- public void addJspRedirector(JspRedirector theJspRedirector)
+ public final void addJspRedirector(JspRedirector theJspRedirector)
{
this.redirectors.add(theJspRedirector);
}
@@ -458,7 +458,8 @@
*
* @param theServletRedirector The redirector to add
*/
- public void addServletRedirector(ServletRedirector theServletRedirector)
+ public final void addServletRedirector(
+ ServletRedirector theServletRedirector)
{
this.redirectors.add(theServletRedirector);
}
1.2 +10 -9
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/ContainerSet.java
Index: ContainerSet.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/ContainerSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainerSet.java 25 May 2003 23:12:05 -0000 1.1
+++ ContainerSet.java 11 Jun 2003 16:19:26 -0000 1.2
@@ -104,7 +104,8 @@
/**
* @see org.apache.tools.ant.DynamicConfigurator#createDynamicElement
*/
- public Object createDynamicElement(String theName) throws BuildException
+ public final Object createDynamicElement(String theName)
+ throws BuildException
{
if (isReference())
{
@@ -118,7 +119,7 @@
/**
* @see org.apache.tools.ant.DynamicConfigurator#setDynamicAttribute
*/
- public void setDynamicAttribute(String theName, String theValue)
+ public final void setDynamicAttribute(String theName, String theValue)
throws BuildException
{
if (isReference())
@@ -136,7 +137,7 @@
*
* @param theContainer The generic container element to add
*/
- public void addGeneric(GenericContainer theContainer)
+ public final void addGeneric(GenericContainer theContainer)
{
this.containers.add(theContainer);
}
@@ -147,7 +148,7 @@
*
* @return An iterator over the nested container elements
*/
- public Container[] getContainers()
+ public final Container[] getContainers()
{
Container[] containers = (Container[])
this.containers.toArray(new Container[this.containers.size()]);
@@ -173,7 +174,7 @@
*
* @return The timeout in milliseconds
*/
- public long getTimeout()
+ public final long getTimeout()
{
return this.timeout;
}
@@ -184,7 +185,7 @@
*
* @param theTimeout The timeout in milliseconds
*/
- public void setTimeout(long theTimeout)
+ public final void setTimeout(long theTimeout)
{
this.timeout = theTimeout;
}
@@ -194,7 +195,7 @@
*
* @return The proxy port
*/
- public int getProxyPort()
+ public final int getProxyPort()
{
return this.proxyPort;
}
@@ -206,7 +207,7 @@
*
* @param theProxyPort The proxy port to set
*/
- public void setProxyPort(int theProxyPort)
+ public final void setProxyPort(int theProxyPort)
{
this.proxyPort = theProxyPort;
}
1.20 +2 -2
jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactusTask.java
Index: CactusTask.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/CactusTask.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CactusTask.java 25 May 2003 23:12:38 -0000 1.19
+++ CactusTask.java 11 Jun 2003 16:19:26 -0000 1.20
@@ -112,7 +112,7 @@
/**
* The factory for creating ant tasks that is passed to the containers.
*/
- private transient AntTaskFactory antTaskFactory = new AntTaskFactory()
+ private AntTaskFactory antTaskFactory = new AntTaskFactory()
{
public Task createTask(String theName)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
