bloritsch 01/05/31 08:38:58
Modified: src/org/apache/cocoon/acting AbstractDatabaseAction.java
AbstractComplementaryConfigurableAction.java
AbstractAction.java
Log:
simple code cleanup
Revision Changes Path
1.7 +2 -14
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractDatabaseAction.java 2001/05/23 03:51:41 1.6
+++ AbstractDatabaseAction.java 2001/05/31 15:38:49 1.7
@@ -13,13 +13,9 @@
import java.io.FileInputStream;
import java.io.InputStream;
import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
import java.sql.Clob;
import java.sql.Date;
import java.sql.PreparedStatement;
-import java.sql.Ref;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Time;
@@ -27,10 +23,8 @@
import java.sql.Types;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
@@ -39,17 +33,11 @@
import org.apache.avalon.framework.component.ComponentSelector;
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.configuration.SAXConfigurationHandler;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
-import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
-import org.xml.sax.InputSource;
/**
* Set up environment for configurable form handling data. It is
@@ -171,7 +159,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/05/23 03:51:41 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/05/31 15:38:49 $
*/
public abstract class AbstractDatabaseAction extends
AbstractComplementaryConfigurableAction implements Configurable, Disposable {
protected Map files = new HashMap();
@@ -647,7 +635,7 @@
* dispose
*/
public void dispose() {
- this.manager.release((Component)dbselector);
+ this.manager.release(dbselector);
super.dispose();
}
1.3 +2 -2
xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
Index: AbstractComplementaryConfigurableAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractComplementaryConfigurableAction.java 2001/05/31 13:18:40 1.2
+++ AbstractComplementaryConfigurableAction.java 2001/05/31 15:38:51 1.3
@@ -27,7 +27,7 @@
* effective. The name of the root configuration element is irrelevant.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 13:18:40 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/31 15:38:51 $
*/
public abstract class AbstractComplementaryConfigurableAction extends
ComposerAction {
private static Map configurations = new HashMap();
@@ -71,7 +71,7 @@
throw new ConfigurationException("Error trying to load
configurations for resource: " + resource.toExternalForm());
} finally {
if (urlFactory != null) this.manager.release((Component)
urlFactory);
- if (parser != null) this.manager.release((Component) parser);
+ if (parser != null) this.manager.release(parser);
}
this.cacheConfiguration(descriptor, conf);
1.2 +1 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractAction.java 2001/05/09 20:50:04 1.1
+++ AbstractAction.java 2001/05/31 15:38:53 1.2
@@ -12,14 +12,13 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.log.Logger;
/**
* AbstractAction gives you the infrastructure for easily deploying more
* Actions. In order to get at the Logger, use getLogger().
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:04 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 15:38:53 $
*/
public abstract class AbstractAction extends AbstractLoggable
implements Action, Configurable, Disposable {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
