From 6c836aa7911badc33a1bd32ebd7be32775693bd1 Mon Sep 17 00:00:00 2001
From: Luc Boudreau <lucboudreau@gmail.com>
Date: Mon, 16 Apr 2012 20:47:59 +0000
Subject: [PATCH] Cancel that. We must keep getName(Object).

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@529 c6a108a4-781c-0410-a6c6-c2d559e19af0
---
 src/org/olap4j/driver/xmla/DeferredNamedListImpl.java    | 2 +-
 .../olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java    | 9 +++++----
 src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java          | 2 +-
 src/org/olap4j/impl/NamedListImpl.java                   | 2 +-
 src/org/olap4j/impl/Olap4jUtil.java                      | 2 +-
 src/org/olap4j/metadata/NamedList.java                   | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java b/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java
index 0b42c64..41b135e 100644
--- a/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java
+++ b/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java
@@ -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);
     }
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java
index 8fc964c..e1a0b85 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java
@@ -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;
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java b/src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java
index 810f8d6..83521f6 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java
+++ b/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(Property property) {
+            public String getName(Object property) {
                 return ((Property) property).getName();
             }
         };
diff --git a/src/org/olap4j/impl/NamedListImpl.java b/src/org/olap4j/impl/NamedListImpl.java
index a2df364..e7e252f 100644
--- a/src/org/olap4j/impl/NamedListImpl.java
+++ b/src/org/olap4j/impl/NamedListImpl.java
@@ -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();
     }
 }
diff --git a/src/org/olap4j/impl/Olap4jUtil.java b/src/org/olap4j/impl/Olap4jUtil.java
index 348e26f..f08f500 100644
--- a/src/org/olap4j/impl/Olap4jUtil.java
+++ b/src/org/olap4j/impl/Olap4jUtil.java
@@ -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);
         }
 
diff --git a/src/org/olap4j/metadata/NamedList.java b/src/org/olap4j/metadata/NamedList.java
index 6874b7c..424ca59 100644
--- a/src/org/olap4j/metadata/NamedList.java
+++ b/src/org/olap4j/metadata/NamedList.java
@@ -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