1.1 --- a/etl.editor/src/org/netbeans/modules/sql/framework/model/impl/AbstractDBTable.java	Sat Dec 08 10:04:51 2007 +0000
     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