Author: [EMAIL PROTECTED]
Date: Fri Sep 5 13:00:27 2008
New Revision: 2699
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/DimensionPane.java
Log:
Hierarchies with no name have their parent's name displayed in the
dimension pane, but are not given a name.
Modified: trunk/src/ca/sqlpower/architect/swingui/olap/DimensionPane.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/olap/DimensionPane.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/olap/DimensionPane.java Fri
Sep 5 13:00:27 2008
@@ -75,10 +75,13 @@
public String getTitle() {
// a null hierarchy name means it should use the dimension name
- if (hierarchy.getName() == null) {
- hierarchy.setName(hierarchy.getParent().getName());
+ if (hierarchy.getName() != null) {
+ return hierarchy.getName();
+ } else if (hierarchy.getParent() == null) {
+ return "(Unnamed Hierarchy with no parent dimension)";
+ } else {
+ return hierarchy.getParent().getName();
}
- return hierarchy.getName();
}
public Hierarchy getHierarchy() {
