Skip to content

Commit

Permalink
MONDRIAN: fix for 2026930, MondrianOlap4jMember.getCaption() throws e…
Browse files Browse the repository at this point in the history
…xception. A unit test has been committed to the Olap4J project.

[git-p4: depot-paths = "//open/mondrian/": change = 12013]
  • Loading branch information
Will Gorman committed Nov 25, 2008
1 parent 03fec02 commit 72f6571
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions src/main/mondrian/olap4j/MondrianOlap4jMember.java
Expand Up @@ -116,7 +116,7 @@ public boolean isCalculated() {
}

public int getSolveOrder() {
throw new UnsupportedOperationException();
return member.getSolveOrder();
}

public ParseTreeNode getExpression() {
Expand All @@ -128,7 +128,7 @@ public List<Member> getAncestorMembers() {
}

public boolean isCalculatedInQuery() {
throw new UnsupportedOperationException();
return member.isCalculatedInQuery();
}

public Object getPropertyValue(Property property) {
Expand All @@ -155,15 +155,19 @@ public int getOrdinal() {
}

public boolean isHidden() {
throw new UnsupportedOperationException();
return member.isHidden();
}

public int getDepth() {
throw new UnsupportedOperationException();
return member.getDepth();
}

public Member getDataMember() {
throw new UnsupportedOperationException();
final mondrian.olap.Member dataMember = member.getDataMember();
if (dataMember == null) {
return null;
}
return new MondrianOlap4jMember(olap4jSchema, dataMember);
}

public String getName() {
Expand All @@ -175,11 +179,11 @@ public String getUniqueName() {
}

public String getCaption(Locale locale) {
throw new UnsupportedOperationException();
return member.getCaption();
}

public String getDescription(Locale locale) {
throw new UnsupportedOperationException();
return member.getDescription();
}
}

Expand Down

0 comments on commit 72f6571

Please sign in to comment.