Skip to content

Commit

Permalink
Override of equals() so objects can be properly used in Collections API.
Browse files Browse the repository at this point in the history
Also relates to Wabit bug 1927: Drill operations not working in XMLA 
http://trillian.sqlpower.ca/bugzilla/show_bug.cgi?id=1927

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@256 c6a108a4-781c-0410-a6c6-c2d559e19af0
  • Loading branch information
lucboudreau committed Jul 2, 2009
1 parent c4940c5 commit 7ef5ea4
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/org/olap4j/driver/xmla/XmlaOlap4jDimension.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ public Hierarchy getDefaultHierarchy() {
}
return hierarchies.get(0);
}

public boolean equeals(Object obj) {
return (obj instanceof XmlaOlap4jDimension) &&
this.uniqueName.equals(
((XmlaOlap4jDimension)obj).getUniqueName());
}
}

// End XmlaOlap4jDimension.java
4 changes: 4 additions & 0 deletions src/org/olap4j/driver/xmla/XmlaOlap4jElement.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ public int hashCode() {
}
return hash;
}

// Keep this declaration abstract as a reminder to
// overriding classes.
abstract public boolean equeals(Object obj);
}

// End XmlaOlap4jElement.java
6 changes: 6 additions & 0 deletions src/org/olap4j/driver/xmla/XmlaOlap4jHierarchy.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ public NamedList<Member> getRootMembers() throws OlapException {
list.addAll(memberList);
return Olap4jUtil.cast(list);
}

public boolean equeals(Object obj) {
return (obj instanceof XmlaOlap4jHierarchy) &&
this.uniqueName.equals(
((XmlaOlap4jHierarchy)obj).getUniqueName());
}
}

// End XmlaOlap4jHierarchy.java
6 changes: 6 additions & 0 deletions src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,12 @@ public List<Member> getMembers() throws OlapException {
public int getCardinality() {
return cardinality;
}

public boolean equeals(Object obj) {
return (obj instanceof XmlaOlap4jLevel) &&
this.uniqueName.equals(
((XmlaOlap4jLevel)obj).getUniqueName());
}
}

// End XmlaOlap4jLevel.java
6 changes: 6 additions & 0 deletions src/org/olap4j/driver/xmla/XmlaOlap4jMember.java
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,12 @@ static int toInteger(Object o) {
public Member getDataMember() {
throw new UnsupportedOperationException();
}

public boolean equeals(Object obj) {
return (obj instanceof XmlaOlap4jMember) &&
this.uniqueName.equals(
((XmlaOlap4jMember)obj).getUniqueName());
}
}

// End XmlaOlap4jMember.java
6 changes: 6 additions & 0 deletions src/org/olap4j/driver/xmla/XmlaOlap4jProperty.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ public Set<TypeFlag> getType() {
public ContentType getContentType() {
return contentType;
}

public boolean equeals(Object obj) {
return (obj instanceof XmlaOlap4jProperty) &&
this.uniqueName.equals(
((XmlaOlap4jProperty)obj).getUniqueName());
}
}

// End XmlaOlap4jProperty.java

0 comments on commit 7ef5ea4

Please sign in to comment.