Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 10819 invoked from network); 24 Sep 2003 21:54:51 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 24 Sep 2003 21:54:51 -0000 Received: (qmail 46714 invoked by uid 500); 24 Sep 2003 21:54:37 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 46556 invoked by uid 500); 24 Sep 2003 21:54:36 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 46545 invoked by uid 500); 24 Sep 2003 21:54:36 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 46531 invoked from network); 24 Sep 2003 21:54:36 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 24 Sep 2003 21:54:36 -0000 Received: (qmail 10702 invoked by uid 1260); 24 Sep 2003 21:54:49 -0000 Date: 24 Sep 2003 21:54:49 -0000 Message-ID: <20030924215449.10700.qmail@minotaur.apache.org> From: cziegeler@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/util JDBCTypeConversions.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N cziegeler 2003/09/24 14:54:49 Modified: src/blocks/chaperon/java/org/apache/cocoon/transformation LexicalTransformer.java ParserTransformer.java src/blocks/databases/java/org/apache/cocoon/components/modules/database PgsqlAutoIncrementModule.java IfxSerialAutoIncrementModule.java src/blocks/databases/java/org/apache/cocoon/components/source/impl BlobSource.java src/blocks/jfor/java/org/apache/cocoon/serialization RTFSerializer.java src/blocks/databases/java/org/apache/cocoon/acting/modular DatabaseQueryAction.java DatabaseAction.java src/blocks/databases/java/org/apache/cocoon/util JDBCTypeConversions.java Log: Removing unused imports and casts Revision Changes Path 1.5 +6 -10 cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java Index: LexicalTransformer.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- LexicalTransformer.java 9 Apr 2003 12:17:20 -0000 1.4 +++ LexicalTransformer.java 24 Sep 2003 21:54:48 -0000 1.5 @@ -114,14 +114,12 @@ implements Transformer, LogEnabled, Composable, Recyclable, Disposable, Parameterizable, CacheableProcessingComponent { - private XMLConsumer consumer = null; + private String lexicon; + private Source lexiconSource; - private String lexicon = null; - private Source lexiconSource = null; - - private Logger logger = null; - private ComponentManager manager = null; - private SourceResolver resolver = null; + private Logger logger; + private ComponentManager manager; + private SourceResolver resolver; private LexicalAutomaton automaton = null; private LexicalHandlerAdapter adapter = new LexicalHandlerAdapter(true); @@ -164,8 +162,6 @@ * @param consumer */ public void setConsumer(XMLConsumer consumer) { - this.consumer = consumer; - setContentHandler(consumer); setLexicalHandler(consumer); 1.5 +7 -11 cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java Index: ParserTransformer.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ParserTransformer.java 9 Apr 2003 12:17:20 -0000 1.4 +++ ParserTransformer.java 24 Sep 2003 21:54:48 -0000 1.5 @@ -116,16 +116,14 @@ implements Transformer, LogEnabled, Composable, Parameterizable, Recyclable, Disposable, CacheableProcessingComponent { - private XMLConsumer consumer = null; + private String grammar; + private Source grammarSource; - private String grammar = null; - private Source grammarSource = null; + private Logger logger; + private ComponentManager manager; + private SourceResolver resolver; - private Logger logger = null; - private ComponentManager manager = null; - private SourceResolver resolver = null; - - private ParserAutomaton automaton = null; + private ParserAutomaton automaton; private ParserHandlerAdapter adapter = new ParserHandlerAdapter(true); private boolean recovery = false; @@ -169,8 +167,6 @@ * @param consumer */ public void setConsumer(XMLConsumer consumer) { - this.consumer = consumer; - setContentHandler(consumer); setLexicalHandler(consumer); 1.2 +2 -2 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/PgsqlAutoIncrementModule.java Index: PgsqlAutoIncrementModule.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/PgsqlAutoIncrementModule.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PgsqlAutoIncrementModule.java 9 Mar 2003 00:03:09 -0000 1.1 +++ PgsqlAutoIncrementModule.java 24 Sep 2003 21:54:48 -0000 1.2 @@ -98,7 +98,7 @@ queryBuffer.append('_'); queryBuffer.append(columnConf.getAttribute("name")); queryBuffer.append("_seq"); - }; + } queryBuffer.append("')"); PreparedStatement pstmt = conn.prepareStatement(queryBuffer.toString()); 1.2 +6 -6 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/IfxSerialAutoIncrementModule.java Index: IfxSerialAutoIncrementModule.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/modules/database/IfxSerialAutoIncrementModule.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IfxSerialAutoIncrementModule.java 9 Mar 2003 00:03:08 -0000 1.1 +++ IfxSerialAutoIncrementModule.java 24 Sep 2003 21:54:48 -0000 1.2 @@ -76,25 +76,25 @@ throws SQLException, ConfigurationException { return new Integer(((com.informix.jdbc.IfxStatement) stmt).getSerial()); - }; + } - public boolean includeInQuery() { return false; }; + public boolean includeInQuery() { return false; } - public boolean includeAsValue() { return false; }; + public boolean includeAsValue() { return false; } public Object getPreValue( Configuration tableConf, Configuration columnConf, Configuration modeConf, Connection conn, Map objectModel ) throws SQLException, ConfigurationException { return null; - }; + } public String getSubquery( Configuration tableConf, Configuration columnConf, Configuration modeConf ) throws ConfigurationException { return null; - }; + } } 1.3 +2 -2 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/source/impl/BlobSource.java Index: BlobSource.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/source/impl/BlobSource.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BlobSource.java 5 Sep 2003 07:10:54 -0000 1.2 +++ BlobSource.java 24 Sep 2003 21:54:48 -0000 1.3 @@ -391,7 +391,7 @@ cnx = null; tmp.close(); } catch(Exception e) { - String msg = "Error closing the connection for " + BlobSource.this.systemId; + String msg = "Error closing the connection for " + BlobSource.this.getURI(); BlobSource.this.getLogger().warn(msg, e); throw new CascadingIOException(msg + " : " + e.getMessage(), e); } 1.2 +11 -23 cocoon-2.1/src/blocks/jfor/java/org/apache/cocoon/serialization/RTFSerializer.java Index: RTFSerializer.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/jfor/java/org/apache/cocoon/serialization/RTFSerializer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RTFSerializer.java 9 Mar 2003 00:04:08 -0000 1.1 +++ RTFSerializer.java 24 Sep 2003 21:54:48 -0000 1.2 @@ -56,10 +56,7 @@ import java.io.Writer; import org.apache.avalon.framework.CascadingRuntimeException; -import org.apache.avalon.framework.component.ComponentManager; -import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.logger.LogEnabled; - import org.jfor.jfor.converter.Converter; /** @@ -71,20 +68,11 @@ */ public class RTFSerializer extends AbstractTextSerializer - implements Composable, LogEnabled { - - private Writer rtfWriter = null; - private Converter handler = null; - private ComponentManager manager = null; + implements LogEnabled { + private Writer rtfWriter; + private Converter handler; - /** - * Set the current ComponentManager instance used by this - * Composable. - */ - public void compose(ComponentManager manager) { - this.manager = manager; - } /** * Set the OutputStream where the serializer will write to. @@ -93,13 +81,13 @@ */ public void setOutputStream(OutputStream out) { try { - rtfWriter = + rtfWriter = new BufferedWriter(new OutputStreamWriter(out, "ISO-8859-1")); - // FIXME Find a way to work with the org.apache.avalon.framework.logger.Logger - handler = new Converter(rtfWriter, - Converter.createConverterOption(System.out)); - super.setContentHandler(handler); + // FIXME Find a way to work with the org.apache.avalon.framework.logger.Logger + handler = new Converter(rtfWriter, + Converter.createConverterOption(System.out)); + super.setContentHandler(handler); } catch (Exception e) { getLogger().error("RTFSerializer.setOutputStream()", e); @@ -112,7 +100,7 @@ */ public void recycle() { super.recycle(); - rtfWriter = null; - handler = null; + this.rtfWriter = null; + this.handler = null; } } 1.2 +2 -2 cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseQueryAction.java Index: DatabaseQueryAction.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseQueryAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DatabaseQueryAction.java 9 Mar 2003 00:03:04 -0000 1.1 +++ DatabaseQueryAction.java 24 Sep 2003 21:54:48 -0000 1.2 @@ -131,7 +131,7 @@ boolean useValues = true; for (int i=0; i