Skip to content

Commit

Permalink
Cancel that. We must keep getName(Object).
Browse files Browse the repository at this point in the history
git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@529 c6a108a4-781c-0410-a6c6-c2d559e19af0
  • Loading branch information
lucboudreau committed Apr 16, 2012
1 parent f7768c3 commit 6c836aa
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/org/olap4j/driver/xmla/DeferredNamedListImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public int indexOfName(String name) {
return getList().indexOfName(name);
}

public String getName(T element) {
public String getName(Object element) {
return getList().getName(element);
}

Expand Down
9 changes: 5 additions & 4 deletions src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,16 @@ class XmlaOlap4jCellSetMetaData implements CellSetMetaData {
final XmlaOlap4jCube cube;
private final NamedList<CellSetAxisMetaData> axisMetaDataList =
new ArrayNamedListImpl<CellSetAxisMetaData>() {
public String getName(CellSetAxisMetaData axisMetaData) {
return axisMetaData.getAxisOrdinal().name();
public String getName(Object axisMetaData) {
return ((CellSetAxisMetaData)axisMetaData)
.getAxisOrdinal().name();
}
};
private final XmlaOlap4jCellSetAxisMetaData filterAxisMetaData;
private final NamedList<Property> cellProperties =
new ArrayNamedListImpl<Property>() {
public String getName(Property property) {
return property.getName();
public String getName(Object property) {
return ((Property)property).getName();
}
};
final Map<String, Property> propertiesByTag;
Expand Down
2 changes: 1 addition & 1 deletion src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public Type getLevelType() {

public NamedList<Property> getProperties() {
final NamedList<Property> list = new ArrayNamedListImpl<Property>() {
public String getName(Property property) {
public String getName(Object property) {
return ((Property) property).getName();
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/org/olap4j/impl/NamedListImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public NamedListImpl(Collection<? extends T> c) {
super(c);
}

public final String getName(T t) {
public final String getName(Object t) {
return ((T) t).getName();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/olap4j/impl/Olap4jUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ public int indexOfName(String s) {
return list.indexOfName(s);
}

public String getName(T element) {
public String getName(Object element) {
return list.getName(element);
}

Expand Down
2 changes: 1 addition & 1 deletion src/org/olap4j/metadata/NamedList.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public interface NamedList<E> extends List<E> {
* @param element Element
* @return Name of element
*/
String getName(E element);
String getName(Object element);

/**
* Returns a view of this named list as a {@link Map} whose key is the name
Expand Down

0 comments on commit 6c836aa

Please sign in to comment.