[power-architect commit] r3006 - Use physical name instead of logical name in compareDM. Now it gives the right information.

[codesite-noreply]

Author: daceywang
Date: Fri Apr 24 12:32:11 2009
New Revision: 3006
Modified:
   trunk/src/ca/sqlpower/architect/diff/SQLObjectComparator.java
   trunk/src/ca/sqlpower/architect/swingui/CompareDMFormatter.java

Log:
Use physical name instead of logical name in compareDM. Now it gives the  
right information.


Modified: trunk/src/ca/sqlpower/architect/diff/SQLObjectComparator.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/diff/SQLObjectComparator.java       
(original)
+++ trunk/src/ca/sqlpower/architect/diff/SQLObjectComparator.java	Fri Apr  
24 12:32:11 2009
@@ -47,8 +47,18 @@
                else if (t2 == null) return 1;
                else {
             //TODO In version 2.0 we want this to be an option
-                       String n1 = t1.getName();
-                       String n2 = t2.getName();
+                   String n1;
+                   String n2;
+		    if (t1.getPhysicalName() == null ||  
t1.getPhysicalName().trim().equals("")) {
+                       n1 = t1.getName();
+                   } else {
+                       n1 = t1.getPhysicalName();
+                   }
+		    if (t2.getPhysicalName() == null ||  
t2.getPhysicalName().trim().equals("")) {
+                n2 = t2.getName();
+            } else {
+                n2 = t2.getPhysicalName();
+            }
             if (n1 != null) n1 = n1.toLowerCase(Locale.getDefault());
             if (n2 != null) n2 = n2.toLowerCase(Locale.getDefault());
             if (n1 == n2) return 0;

Modified: trunk/src/ca/sqlpower/architect/swingui/CompareDMFormatter.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/CompareDMFormatter.java	 
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/CompareDMFormatter.java	Fri Apr  
24 12:32:11 2009
@@ -298,7 +298,7 @@
                         attributes);
                 sourceDoc.insertString(
                         sourceDoc.getLength(),
-                        o.getName() + " ",
+                        (o.getPhysicalName() != null ||  
o.getPhysicalName().trim().equals("") ? o.getName() :  
o.getPhysicalName())+ " ",
                         boldAttributes);
             } else if (o instanceof SQLColumn) {
                 if (dmSetting.getSuppressSimilarities()  
&& !currentTableName.equals("")) {