1.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DatabaseSettingsImporter.java	Wed Aug 22 01:28:34 2007 +0000
     1.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DatabaseSettingsImporter.java	Wed Aug 22 01:55:00 2007 +0000
     1.3 @@ -550,7 +550,7 @@
     1.4       * @param ress
     1.5       *
     1.6       */
     1.7 -    public void updateWebXml(Project project, ArrayList <RequestedResource> ress) {
     1.8 +    public void updateWebXml(Project project, List <RequestedResource> ress) {
     1.9          WebModule wmod = WebModule.getWebModule(project.getProjectDirectory());
    1.10          FileObject deployDescFO = wmod.getDeploymentDescriptor();
    1.11          WebApp webApp = getWebApp(deployDescFO);

     2.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceHelper.java	Wed Aug 22 01:28:34 2007 +0000
     2.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceHelper.java	Wed Aug 22 01:55:00 2007 +0000
     2.3 @@ -26,6 +26,7 @@
     2.4  import java.util.HashMap;
     2.5  import java.util.Hashtable;
     2.6  import java.util.Iterator;
     2.7 +import java.util.List;
     2.8  import java.util.Locale;
     2.9  import java.util.Map;
    2.10  import java.util.ResourceBundle;
    2.11 @@ -497,9 +498,9 @@
    2.12          // Get the data sources in the project then bind them to the project's context
    2.13          String[] dynamicDataSources = ProjectDataSourceTracker.getDynamicDataSources(currentProj);
    2.14          String[] hardCodedDataSources = ProjectDataSourceTracker.getHardcodedDataSources(currentProj);
    2.15 -        ArrayList <RequestedResource> jdbcResources = new ArrayList();
    2.16 +        List <RequestedResource> jdbcResources = new ArrayList<RequestedResource>();
    2.17          RequestedJdbcResource jdbcResource = null;
    2.18 -        ArrayList <DesignTimeDataSource> ds = null;
    2.19 +        List <DesignTimeDataSource> ds = null;
    2.20          Map binding = new HashMap();
    2.21          
    2.22          ProjectDataSourceManager projectDataSourceManager = new ProjectDataSourceManager(currentProj);
    2.23 @@ -530,7 +531,7 @@
    2.24                  DesignTimeDataSourceService dataSourceService = null;
    2.25                  
    2.26                  for (String name : dynamicDataSources) {
    2.27 -                    ArrayList<DataSourceInfo> dataSourcesInfo = DatabaseSettingsImporter.getInstance().getDataSourcesInfo();
    2.28 +                    List<DataSourceInfo> dataSourcesInfo = DatabaseSettingsImporter.getInstance().getDataSourcesInfo();
    2.29                      Iterator it = dataSourcesInfo.iterator();
    2.30                      while (it.hasNext()) {
    2.31                          dsInfo = (DataSourceInfo)it.next();