sylvain 01/11/28 01:21:22
Modified: src/org/apache/cocoon/acting AbstractAction.java
AbstractDatabaseAction.java HttpHeaderAction.java
LocaleAction.java SendmailAction.java
Log:
Removed Configurable and Disposable from AbstractAction since it doesn't do anything
with these contracts.
Also checked implements clause in derived classes where the contract is actually
used.
Revision Changes Path
1.10 +2 -22 xml-cocoon2/src/org/apache/cocoon/acting/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractAction.java 2001/10/11 07:28:15 1.9
+++ AbstractAction.java 2001/11/28 09:21:22 1.10
@@ -7,10 +7,6 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLoggable;
import java.util.Collections;
@@ -23,10 +19,10 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/10/11 07:28:15 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/11/28 09:21:22 $
*/
public abstract class AbstractAction extends AbstractLoggable
-implements Action, Configurable, Disposable {
+implements Action {
/**
* Empty unmodifiable map. Replace with Collections.EMPTY_MAP when
@@ -34,20 +30,4 @@
*/
protected static final Map EMPTY_MAP = Collections.unmodifiableMap(new
TreeMap());
- /**
- * Configures the Action.
- *
- */
- public void configure(Configuration conf) throws ConfigurationException {
- // Purposely empty so that we don't need to implement it in every
- // class.
- }
-
- /**
- * dispose
- */
- public void dispose() {
- // Purposely empty so that we don't need to implement it in every
- // class.
- }
}
1.15 +1 -2
xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java
Index: AbstractDatabaseAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractDatabaseAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractDatabaseAction.java 2001/11/19 15:51:54 1.14
+++ AbstractDatabaseAction.java 2001/11/28 09:21:22 1.15
@@ -147,7 +147,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.14 $ $Date: 2001/11/19 15:51:54 $
+ * @version CVS $Revision: 1.15 $ $Date: 2001/11/28 09:21:22 $
*/
public abstract class AbstractDatabaseAction extends
AbstractComplementaryConfigurableAction implements Configurable, Disposable {
protected Map files = new HashMap();
@@ -654,7 +654,6 @@
*/
public void dispose() {
this.manager.release(dbselector);
- super.dispose();
}
/**
1.7 +2 -1 xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java
Index: HttpHeaderAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HttpHeaderAction.java 2001/10/11 07:28:15 1.6
+++ HttpHeaderAction.java 2001/11/28 09:21:22 1.7
@@ -7,6 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.acting;
+import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
@@ -26,7 +27,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
* @version CVS $Revision:
*/
-public class HttpHeaderAction extends AbstractConfigurableAction implements
ThreadSafe {
+public class HttpHeaderAction extends AbstractConfigurableAction implements
ThreadSafe, Configurable {
private static Object[] defaults = {};
1.7 +2 -1 xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java
Index: LocaleAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LocaleAction.java 2001/10/11 07:28:15 1.6
+++ LocaleAction.java 2001/11/28 09:21:22 1.7
@@ -7,6 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.acting;
+import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
@@ -102,7 +103,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Konstantin Piroumian</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Lassi Immonen</a>
*/
-public class LocaleAction extends ComposerAction implements ThreadSafe {
+public class LocaleAction extends ComposerAction implements ThreadSafe,
Configurable {
/**
* Constant representing the language parameter
1.12 +2 -1 xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java
Index: SendmailAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SendmailAction.java 2001/10/12 08:10:15 1.11
+++ SendmailAction.java 2001/11/28 09:21:22 1.12
@@ -7,6 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.acting;
+import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
@@ -48,7 +49,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
* @version CVS $Revision
*/
-public class SendmailAction extends AbstractAction implements ThreadSafe {
+public class SendmailAction extends AbstractAction implements ThreadSafe,
Configurable {
Properties default_properties = null;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
