[power-architect commit] r2643 - trunk/src/ca/sqlpower/architect/swingui/olap

[codesite-noreply]

Author: kevin1219
Date: Wed Aug 27 15:35:19 2008
New Revision: 2643
Modified:
   trunk/src/ca/sqlpower/architect/swingui/olap/OLAPPane.java
   trunk/src/ca/sqlpower/architect/swingui/olap/OLAPPaneUI.java

Log:
Changed OLAPPane.getName() to return OLAPUtil.nameFor() so that it returns  
the correct display name. Also changed the preferred size calculation in  
OLAPPaneUI to use OLAPUtil.nameFor() as well so the panes have the correct  
size.

Modified: trunk/src/ca/sqlpower/architect/swingui/olap/OLAPPane.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/olap/OLAPPane.java  (original)
+++ trunk/src/ca/sqlpower/architect/swingui/olap/OLAPPane.java	Wed Aug 27  
15:35:19 2008
@@ -105,7 +105,7 @@

     @Override
     public String getName() {
-        return model.getName();
+        return OLAPUtil.nameFor(model);
     }

     @Override

Modified: trunk/src/ca/sqlpower/architect/swingui/olap/OLAPPaneUI.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/olap/OLAPPaneUI.java        
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/olap/OLAPPaneUI.java	Wed Aug 27  
15:35:19 2008
@@ -600,7 +600,7 @@
                 logger.error("Found null column in  
dimension '"+cp.getName()+"'"); //$NON-NLS-1$ //$NON-NLS-2$
                 throw new NullPointerException("Found null column in  
dimension '"+cp.getName()+"'"); //$NON-NLS-1$ //$NON-NLS-2$
             }
-            width = Math.max(width, calculateTextWidth(cp, oo.getName()));
+            width = Math.max(width, calculateTextWidth(cp,  
OLAPUtil.nameFor(oo)));
         }
         return width;
     }