MONDRIAN: Fixes for bug 2138161 Workbench Dimension Selection Issue

[git-p4: depot-paths = "//open/mondrian/": change = 11685]
pentaho · Oct 7, 2008 · 8c5fd31 · 8c5fd31
1 parent 4d27f44
commit 8c5fd31
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/mondrian/gui/SchemaTreeCellRenderer.java b/src/main/mondrian/gui/SchemaTreeCellRenderer.java
@@ -16,6 +16,7 @@
 
 import javax.swing.ImageIcon;
 import javax.swing.JTree;
+import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 
 import mondrian.gui.validate.ValidationUtils;
@@ -130,8 +131,11 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
                 super.setIcon(new ImageIcon(myClassLoader.getResource(workbench.getResourceConverter().getGUIReference("join"))));
             } else if (value instanceof MondrianGuiDef.Table) {
                 //setText(prefix+"Table: "+ ((MondrianGuiDef.Table) value).name);
+                //EC: Sets the table name to alias if present.
+                MondrianGuiDef.Table theTable = (MondrianGuiDef.Table) value;
+                String theName = (theTable.alias != null && theTable.alias.trim().length() > 0) ? theTable.alias : theTable.name;
                 setText(workbench.getResourceConverter().getFormattedString("schemaTreeCellRenderer.table.title",
-                        "{0}Table: {1}", new String[] {(prefix.length() == 0 ? "" : prefix + " : "), ((MondrianGuiDef.Table) value).name}));
+                        "{0}Table: {1}", new String[] {(prefix.length() == 0 ? "" : prefix + " : "),theName}));
                 super.setIcon(new ImageIcon(myClassLoader.getResource(workbench.getResourceConverter().getGUIReference("table"))));
             }
             // REVIEW: Need to deal with InlineTable and View here