vgritsenko 01/12/24 12:33:28 Modified: src/org/apache/cocoon/acting DatabaseAddAction.java DatabaseDeleteAction.java DatabaseUpdateAction.java Log: Formatting Revision Changes Path 1.16 +8 -8 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java Index: DatabaseAddAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- DatabaseAddAction.java 2001/12/02 19:27:20 1.15 +++ DatabaseAddAction.java 2001/12/24 20:33:28 1.16 @@ -33,7 +33,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> * @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a> - * @version CVS $Revision: 1.15 $ $Date: 2001/12/02 19:27:20 $ + * @version CVS $Revision: 1.16 $ $Date: 2001/12/24 20:33:28 $ */ public class DatabaseAddAction extends AbstractDatabaseAction implements ThreadSafe { protected static final Map addStatements = new HashMap(); @@ -49,15 +49,15 @@ Connection conn = null; Map results = new HashMap(); - // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; - if (this.settings.containsKey("reloadable")) - reloadable = Boolean.getBoolean((String) this.settings.get("reloadable")); - // read local parameter settings + // read global parameter settings + boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + if (this.settings.containsKey("reloadable")) + reloadable = Boolean.getBoolean((String) this.settings.get("reloadable")); + // read local parameter settings try { Configuration conf = - this.getConfiguration(param.getParameter("descriptor", (String) this.settings.get("descriptor")), resolver, - param.getParameterAsBoolean("reloadable",reloadable)); + this.getConfiguration(param.getParameter("descriptor", (String) this.settings.get("descriptor")), resolver, + param.getParameterAsBoolean("reloadable",reloadable)); datasource = this.getDataSource(conf); conn = datasource.getConnection(); 1.13 +8 -8 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java Index: DatabaseDeleteAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- DatabaseDeleteAction.java 2001/12/02 19:27:20 1.12 +++ DatabaseDeleteAction.java 2001/12/24 20:33:28 1.13 @@ -32,7 +32,7 @@ * the keys. * * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> - * @version CVS $Revision: 1.12 $ $Date: 2001/12/02 19:27:20 $ + * @version CVS $Revision: 1.13 $ $Date: 2001/12/24 20:33:28 $ */ public final class DatabaseDeleteAction extends AbstractDatabaseAction implements ThreadSafe { private static final Map deleteStatements = new HashMap(); @@ -47,15 +47,15 @@ Connection conn = null; int currentIndex = 0; - // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; - if (this.settings.containsKey("reloadable")) - reloadable = Boolean.getBoolean((String) this.settings.get("reloadable")); - // read local parameter settings + // read global parameter settings + boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + if (this.settings.containsKey("reloadable")) + reloadable = Boolean.getBoolean((String) this.settings.get("reloadable")); + // read local parameter settings try { Configuration conf = - this.getConfiguration(param.getParameter("descriptor", (String) this.settings.get("descriptor")), resolver, - param.getParameterAsBoolean("reloadable",reloadable)); + this.getConfiguration(param.getParameter("descriptor", (String) this.settings.get("descriptor")), resolver, + param.getParameterAsBoolean("reloadable",reloadable)); String query = this.getDeleteQuery(conf); datasource = this.getDataSource(conf); 1.14 +8 -8 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java Index: DatabaseUpdateAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- DatabaseUpdateAction.java 2001/12/02 19:27:20 1.13 +++ DatabaseUpdateAction.java 2001/12/24 20:33:28 1.14 @@ -29,7 +29,7 @@ * only one table at a time to update. * * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> - * @version CVS $Revision: 1.13 $ $Date: 2001/12/02 19:27:20 $ + * @version CVS $Revision: 1.14 $ $Date: 2001/12/24 20:33:28 $ */ public class DatabaseUpdateAction extends AbstractDatabaseAction implements ThreadSafe { private static final Map updateStatements = new HashMap(); @@ -44,15 +44,15 @@ Connection conn = null; int currentIndex = 0; - // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; - if (this.settings.containsKey("reloadable")) - reloadable = Boolean.getBoolean((String) this.settings.get("reloadable")); - // read local parameter settings + // read global parameter settings + boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + if (this.settings.containsKey("reloadable")) + reloadable = Boolean.getBoolean((String) this.settings.get("reloadable")); + // read local parameter settings try { Configuration conf = - this.getConfiguration(param.getParameter("descriptor", (String) this.settings.get("descriptor")), resolver, - param.getParameterAsBoolean("reloadable",reloadable)); + this.getConfiguration(param.getParameter("descriptor", (String) this.settings.get("descriptor")), resolver, + param.getParameterAsBoolean("reloadable",reloadable)); String query = this.getUpdateQuery(conf); datasource = this.getDataSource(conf);
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]