1.1 --- a/etl.editor/src/org/netbeans/modules/sql/framework/model/impl/AbstractDBTable.java	Tue Apr 22 18:44:33 2008 +0530
     1.2 +++ b/etl.editor/src/org/netbeans/modules/sql/framework/model/impl/AbstractDBTable.java	Wed Apr 23 15:56:05 2008 +0530
     1.3 @@ -62,6 +62,7 @@
     1.4  import org.w3c.dom.NodeList;
     1.5  
     1.6  import com.sun.sql.framework.exception.BaseException;
     1.7 +import com.sun.sql.framework.utils.StringUtil;
     1.8  import java.util.LinkedHashMap;
     1.9  import org.netbeans.modules.sql.framework.model.DBTable;
    1.10  import org.netbeans.modules.sql.framework.model.DatabaseModel;
    1.11 @@ -1199,5 +1200,32 @@
    1.12          setUsingFullyQualifiedName(true);
    1.13          setStagingTableName("");
    1.14      }
    1.15 +    
    1.16 +    public String getResolvedCatalogName() {
    1.17 +        // Ensure order of precedence for catalog name is followed.
    1.18 +        String resolvedCatalogName = getUserDefinedCatalogName();
    1.19 +        if (StringUtil.isNullString(resolvedCatalogName)) {
    1.20 +            resolvedCatalogName = getCatalog();
    1.21 +        }
    1.22 +        return resolvedCatalogName;
    1.23 +    }
    1.24 +        
    1.25 +    public String getResolvedSchemaName() {
    1.26 +        // Ensure order of precedence for schema name is followed.
    1.27 +        String resolvedSchemaName = getUserDefinedSchemaName();
    1.28 +        if (StringUtil.isNullString(resolvedSchemaName)) {
    1.29 +            resolvedSchemaName = getSchema();
    1.30 +        }
    1.31 +        return resolvedSchemaName;
    1.32 +    }
    1.33 +    
    1.34 +    public String getResolvedTableName() {
    1.35 +        // Ensure order of precedence for schema name is followed.
    1.36 +        String resolvedTableName = getUserDefinedTableName();
    1.37 +        if (StringUtil.isNullString(resolvedTableName)) {
    1.38 +            resolvedTableName = getName();
    1.39 +        }
    1.40 +        return resolvedTableName;
    1.41 +    }
    1.42  }
    1.43  

     2.1 --- a/etl.editor/src/org/netbeans/modules/sql/framework/model/visitors/SQLDBSynchronizationValidationVisitor.java	Tue Apr 22 18:44:33 2008 +0530
     2.2 +++ b/etl.editor/src/org/netbeans/modules/sql/framework/model/visitors/SQLDBSynchronizationValidationVisitor.java	Wed Apr 23 15:56:05 2008 +0530
     2.3 @@ -219,9 +219,10 @@
     2.4      }
     2.5  
     2.6      private void compareCollabTableWithDatabaseTable(SQLDBTable collabTable, DBMetaDataFactory meta) throws Exception {
     2.7 -        if (meta.isTableOrViewExist(collabTable.getCatalog(), collabTable.getSchema(), collabTable.getName())) {
     2.8 +        AbstractDBTable ct = ((AbstractDBTable)collabTable);
     2.9 +        if (meta.isTableOrViewExist(ct.getResolvedCatalogName(), ct.getResolvedSchemaName(), ct.getResolvedTableName())) {
    2.10              // Get the table from database
    2.11 -            Table newTable = new Table(collabTable.getName(), collabTable.getCatalog(), collabTable.getSchema());
    2.12 +            Table newTable = new Table(ct.getResolvedCatalogName(), ct.getResolvedSchemaName(), ct.getResolvedTableName());
    2.13              meta.populateColumns(newTable);
    2.14  
    2.15              List collabColumns = collabTable.getColumnList();

     3.1 --- a/etl.editor/src/org/netbeans/modules/sql/framework/model/visitors/SQLDBSynchronizationVisitor.java	Tue Apr 22 18:44:33 2008 +0530
     3.2 +++ b/etl.editor/src/org/netbeans/modules/sql/framework/model/visitors/SQLDBSynchronizationVisitor.java	Wed Apr 23 15:56:05 2008 +0530
     3.3 @@ -222,9 +222,10 @@
     3.4          try {
     3.5              meta.connectDB(conn);
     3.6  
     3.7 -            if (meta.isTableOrViewExist(collabTable.getCatalog(), collabTable.getSchema(), collabTable.getName())) {
     3.8 +            AbstractDBTable ct = ((AbstractDBTable)collabTable);
     3.9 +            if (meta.isTableOrViewExist(ct.getResolvedCatalogName(), ct.getResolvedSchemaName(), ct.getResolvedTableName())) {
    3.10                  // Get the table from database
    3.11 -                Table newTable = new Table(collabTable.getName(), collabTable.getCatalog(), collabTable.getSchema());
    3.12 +                Table newTable = new Table(ct.getResolvedCatalogName(), ct.getResolvedSchemaName(), ct.getResolvedTableName());
    3.13                  meta.populateColumns(newTable);
    3.14  
    3.15                  List collabColumns = collabTable.getColumnList();

     4.1 --- a/etl.project/src/org/netbeans/modules/etl/project/ui/resources/emptyProject.html	Tue Apr 22 18:44:33 2008 +0530
     4.2 +++ b/etl.project/src/org/netbeans/modules/etl/project/ui/resources/emptyProject.html	Wed Apr 23 15:56:05 2008 +0530
     4.3 @@ -14,8 +14,8 @@
     4.4  
     4.5  <HTML>
     4.6    <BODY>
     4.7 -    The Empty Composite Application Platform Suite ETL Project creates a project in the system but does not add 
     4.8 -	any files or ETL to the project. This template is best for ETL developers who 
     4.9 +    The Empty Composite Application Platform Suite Data Integrator Project creates a project in the system but does not add 
    4.10 +	any files or ETL to the project. This template is best for Data Integrator developers who 
    4.11  	like to start from scratch.
    4.12    </BODY>
    4.13  </HTML>