cvs commit: cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/modular DatabaseAddAction.java

[joerg]

joerg       2003/10/25 11:24:54

  Modified:    src/blocks/databases/java/org/apache/cocoon/acting/modular
                        DatabaseAddAction.java
  Log:
  forgot one ComponentSelector => ServiceSelector
  
  Revision  Changes    Path
  1.4       +9 -11     
cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAddAction.java
  
  Index: DatabaseAddAction.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAddAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DatabaseAddAction.java    25 Oct 2003 18:06:19 -0000      1.3
  +++ DatabaseAddAction.java    25 Oct 2003 18:24:54 -0000      1.4
  @@ -57,8 +57,6 @@
   import java.sql.Statement;
   import java.util.Map;
   
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentSelector;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.service.ServiceException;
  @@ -126,14 +124,14 @@
        */
       protected int setKeyAuto ( Configuration table, Column column, int 
currentIndex, int rowIndex,
                                  Connection conn, PreparedStatement statement, 
Map objectModel, String outputMode, Map results )
  -        throws ConfigurationException, SQLException, ComponentException, 
Exception {
  +        throws ConfigurationException, SQLException, Exception {
   
           int columnCount = 0;
  -        ComponentSelector autoincrSelector = null;
  +        ServiceSelector autoincrSelector = null;
           AutoIncrementModule autoincr = null;
           try {
  -            autoincrSelector=(ComponentSelector) 
this.manager.lookup(DATABASE_MODULE_SELECTOR);
  -            if (column.mode != null && autoincrSelector != null && 
autoincrSelector.hasComponent(column.mode)){
  +            autoincrSelector = (ServiceSelector) 
this.manager.lookup(DATABASE_MODULE_SELECTOR);
  +            if (column.mode != null && autoincrSelector != null && 
autoincrSelector.isSelectable(column.mode)){
                   autoincr = (AutoIncrementModule) 
autoincrSelector.select(column.mode);
               }
   
  @@ -168,13 +166,13 @@
        */
       protected void storeKeyValue( Configuration tableConf, Column key, int 
rowIndex, Connection conn,
                                     Statement statement, Map objectModel, 
String outputMode, Map results )
  -        throws SQLException, ConfigurationException, ComponentException, 
ServiceException {
  +        throws SQLException, ConfigurationException, ServiceException {
   
  -        ComponentSelector autoincrSelector = null;
  +            ServiceSelector autoincrSelector = null;
           AutoIncrementModule autoincr = null;
           try {
  -            autoincrSelector=(ComponentSelector) 
this.manager.lookup(DATABASE_MODULE_SELECTOR);
  -            if (key.mode != null && autoincrSelector != null && 
autoincrSelector.hasComponent(key.mode)){
  +            autoincrSelector=(ServiceSelector) 
this.manager.lookup(DATABASE_MODULE_SELECTOR);
  +            if (key.mode != null && autoincrSelector != null && 
autoincrSelector.isSelectable(key.mode)){
                   autoincr = (AutoIncrementModule) 
autoincrSelector.select(key.mode);
               }