Woops.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@528 c6a108a4-781c-0410-a6c6-c2d559e19af0

ivy-tck.xml

@@ -69,7 +69,7 @@
  <dependency org="junit" name="junit" rev="3.8.1"/>
 
  <!-- OLAP tests dependencies - uses Mondrian -->
- <dependency org="pentaho" name="mondrian" rev="3.4.0-SNAPSHOT" changing="true">
+ <dependency org="pentaho" name="mondrian" rev="TRUNK-SNAPSHOT" changing="true">
  <exclude org="${ivy.artifact.group}" module="${ivy.artifact.id}"/>
  </dependency>
  </dependencies>

src/org/olap4j/driver/xmla/DeferredNamedListImpl.java

@@ -117,7 +117,7 @@ public int indexOfName(String name) {
  return getList().indexOfName(name);
  }
 
- public String getName(Object element) {
+ public String getName(T element) {
  return getList().getName(element);
  }
 

src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java

@@ -40,16 +40,15 @@ class XmlaOlap4jCellSetMetaData implements CellSetMetaData {
  final XmlaOlap4jCube cube;
  private final NamedList<CellSetAxisMetaData> axisMetaDataList =
  new ArrayNamedListImpl<CellSetAxisMetaData>() {
- public String getName(Object axisMetaData) {
- return ((CellSetAxisMetaData) axisMetaData).getAxisOrdinal()
- .name();
+ public String getName(CellSetAxisMetaData axisMetaData) {
+ return axisMetaData.getAxisOrdinal().name();
  }
  };
  private final XmlaOlap4jCellSetAxisMetaData filterAxisMetaData;
  private final NamedList<Property> cellProperties =
  new ArrayNamedListImpl<Property>() {
- public String getName(Object property) {
- return ((Property) property).getName();
+ public String getName(Property property) {
+ return property.getName();
  }
  };
  final Map<String, Property> propertiesByTag;

src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java

@@ -181,7 +181,7 @@ public Type getLevelType() {
 
  public NamedList<Property> getProperties() {
  final NamedList<Property> list = new ArrayNamedListImpl<Property>() {
- public String getName(Object property) {
+ public String getName(Property property) {
  return ((Property) property).getName();
  }
  };

src/org/olap4j/impl/NamedListImpl.java

@@ -63,7 +63,7 @@ public NamedListImpl(Collection<? extends T> c) {
  super(c);
  }
 
- public final String getName(Object t) {
+ public final String getName(T t) {
  return ((T) t).getName();
  }
 }

src/org/olap4j/impl/Olap4jUtil.java

@@ -481,7 +481,7 @@ public static <T> NamedList<T> emptyNamedList() {
  * @return an unmodifiable view of the specified list.
  */
  public static <T> NamedList<T> unmodifiableNamedList(
- final NamedList<? extends T> list)
+ final NamedList<T> list)
  {
  return list instanceof RandomAccess
  ? new UnmodifiableNamedRandomAccessList<T>(list)
@@ -638,9 +638,9 @@ private Object readResolve() {
  }
 
  private static class UnmodifiableNamedList<T> implements NamedList<T> {
- private final NamedList<? extends T> list;
+ private final NamedList<T> list;
 
- UnmodifiableNamedList(NamedList<? extends T> list) {
+ UnmodifiableNamedList(NamedList<T> list) {
  this.list = list;
  }
 
@@ -652,7 +652,7 @@ public int indexOfName(String s) {
  return list.indexOfName(s);
  }
 
- public String getName(Object element) {
+ public String getName(T element) {
  return list.getName(element);
  }
 
@@ -760,7 +760,7 @@ private static class UnmodifiableNamedRandomAccessList<T>
  extends UnmodifiableNamedList<T>
  implements RandomAccess
  {
- UnmodifiableNamedRandomAccessList(NamedList<? extends T> list) {
+ UnmodifiableNamedRandomAccessList(NamedList<T> list) {
  super(list);
  }
  }