# HG changeset patch
# User rnithya@netbeans.org
# Date 1208946365 -19800
# Node ID 2739cb16db12d79080ae124c9be0b88f93e7ea77
# Parent  8ccd56245a558635275c86930272ed2bbc7dffda
Fix for 6682455

diff -r 8ccd56245a55 -r 2739cb16db12 etl.editor/src/org/netbeans/modules/sql/framework/model/impl/AbstractDBTable.java
--- a/etl.editor/src/org/netbeans/modules/sql/framework/model/impl/AbstractDBTable.java	Tue Apr 22 18:44:33 2008 +0530
+++ b/etl.editor/src/org/netbeans/modules/sql/framework/model/impl/AbstractDBTable.java	Wed Apr 23 15:56:05 2008 +0530
@@ -62,6 +62,7 @@
 import org.w3c.dom.NodeList;
 
 import com.sun.sql.framework.exception.BaseException;
+import com.sun.sql.framework.utils.StringUtil;
 import java.util.LinkedHashMap;
 import org.netbeans.modules.sql.framework.model.DBTable;
 import org.netbeans.modules.sql.framework.model.DatabaseModel;
@@ -1199,5 +1200,32 @@
         setUsingFullyQualifiedName(true);
         setStagingTableName("");
     }
+    
+    public String getResolvedCatalogName() {
+        // Ensure order of precedence for catalog name is followed.
+        String resolvedCatalogName = getUserDefinedCatalogName();
+        if (StringUtil.isNullString(resolvedCatalogName)) {
+            resolvedCatalogName = getCatalog();
+        }
+        return resolvedCatalogName;
+    }
+        
+    public String getResolvedSchemaName() {
+        // Ensure order of precedence for schema name is followed.
+        String resolvedSchemaName = getUserDefinedSchemaName();
+        if (StringUtil.isNullString(resolvedSchemaName)) {
+            resolvedSchemaName = getSchema();
+        }
+        return resolvedSchemaName;
+    }
+    
+    public String getResolvedTableName() {
+        // Ensure order of precedence for schema name is followed.
+        String resolvedTableName = getUserDefinedTableName();
+        if (StringUtil.isNullString(resolvedTableName)) {
+            resolvedTableName = getName();
+        }
+        return resolvedTableName;
+    }
 }
 
diff -r 8ccd56245a55 -r 2739cb16db12 etl.editor/src/org/netbeans/modules/sql/framework/model/visitors/SQLDBSynchronizationValidationVisitor.java
--- a/etl.editor/src/org/netbeans/modules/sql/framework/model/visitors/SQLDBSynchronizationValidationVisitor.java	Tue Apr 22 18:44:33 2008 +0530
+++ b/etl.editor/src/org/netbeans/modules/sql/framework/model/visitors/SQLDBSynchronizationValidationVisitor.java	Wed Apr 23 15:56:05 2008 +0530
@@ -219,9 +219,10 @@
     }
 
     private void compareCollabTableWithDatabaseTable(SQLDBTable collabTable, DBMetaDataFactory meta) throws Exception {
-        if (meta.isTableOrViewExist(collabTable.getCatalog(), collabTable.getSchema(), collabTable.getName())) {
+        AbstractDBTable ct = ((AbstractDBTable)collabTable);
+        if (meta.isTableOrViewExist(ct.getResolvedCatalogName(), ct.getResolvedSchemaName(), ct.getResolvedTableName())) {
             // Get the table from database
-            Table newTable = new Table(collabTable.getName(), collabTable.getCatalog(), collabTable.getSchema());
+            Table newTable = new Table(ct.getResolvedCatalogName(), ct.getResolvedSchemaName(), ct.getResolvedTableName());
             meta.populateColumns(newTable);
 
             List collabColumns = collabTable.getColumnList();
diff -r 8ccd56245a55 -r 2739cb16db12 etl.editor/src/org/netbeans/modules/sql/framework/model/visitors/SQLDBSynchronizationVisitor.java
--- a/etl.editor/src/org/netbeans/modules/sql/framework/model/visitors/SQLDBSynchronizationVisitor.java	Tue Apr 22 18:44:33 2008 +0530
+++ b/etl.editor/src/org/netbeans/modules/sql/framework/model/visitors/SQLDBSynchronizationVisitor.java	Wed Apr 23 15:56:05 2008 +0530
@@ -222,9 +222,10 @@
         try {
             meta.connectDB(conn);
 
-            if (meta.isTableOrViewExist(collabTable.getCatalog(), collabTable.getSchema(), collabTable.getName())) {
+            AbstractDBTable ct = ((AbstractDBTable)collabTable);
+            if (meta.isTableOrViewExist(ct.getResolvedCatalogName(), ct.getResolvedSchemaName(), ct.getResolvedTableName())) {
                 // Get the table from database
-                Table newTable = new Table(collabTable.getName(), collabTable.getCatalog(), collabTable.getSchema());
+                Table newTable = new Table(ct.getResolvedCatalogName(), ct.getResolvedSchemaName(), ct.getResolvedTableName());
                 meta.populateColumns(newTable);
 
                 List collabColumns = collabTable.getColumnList();
diff -r 8ccd56245a55 -r 2739cb16db12 etl.project/src/org/netbeans/modules/etl/project/ui/resources/emptyProject.html
--- a/etl.project/src/org/netbeans/modules/etl/project/ui/resources/emptyProject.html	Tue Apr 22 18:44:33 2008 +0530
+++ b/etl.project/src/org/netbeans/modules/etl/project/ui/resources/emptyProject.html	Wed Apr 23 15:56:05 2008 +0530
@@ -14,8 +14,8 @@
 
 <HTML>
   <BODY>
-    The Empty Composite Application Platform Suite ETL Project creates a project in the system but does not add 
-	any files or ETL to the project. This template is best for ETL developers who 
+    The Empty Composite Application Platform Suite Data Integrator Project creates a project in the system but does not add 
+	any files or ETL to the project. This template is best for Data Integrator developers who 
 	like to start from scratch.
   </BODY>
 </HTML>