From cc74e15912f53ca5516af91a7fcfffa6694be5ee Mon Sep 17 00:00:00 2001 From: Julian Hyde Date: Mon, 27 Feb 2012 06:28:51 +0000 Subject: [PATCH] Rename NamedList.elementName(Object) to .getName(Object); plays better with existing code that implement AbstractNamedList.getName(Object). git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@511 c6a108a4-781c-0410-a6c6-c2d559e19af0 --- src/org/olap4j/driver/xmla/DeferredNamedListImpl.java | 4 ++-- src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java | 4 ++-- src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java | 2 +- src/org/olap4j/impl/AbstractNamedList.java | 6 +++--- src/org/olap4j/impl/ArrayNamedListImpl.java | 6 +++--- src/org/olap4j/impl/NamedListImpl.java | 2 +- src/org/olap4j/impl/NamedListMap.java | 2 +- src/org/olap4j/impl/Olap4jUtil.java | 6 +++--- src/org/olap4j/metadata/NamedList.java | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java b/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java index 3f2a29e..41b135e 100644 --- a/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java +++ b/src/org/olap4j/driver/xmla/DeferredNamedListImpl.java @@ -117,8 +117,8 @@ public int indexOfName(String name) { return getList().indexOfName(name); } - public String elementName(Object element) { - return getList().elementName(element); + public String getName(Object element) { + return getList().getName(element); } public Map asMap() { diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java index 616e739..bf30005 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java @@ -40,7 +40,7 @@ class XmlaOlap4jCellSetMetaData implements CellSetMetaData { final XmlaOlap4jCube cube; private final NamedList axisMetaDataList = new ArrayNamedListImpl() { - public String elementName(Object axisMetaData) { + public String getName(Object axisMetaData) { return ((CellSetAxisMetaData) axisMetaData).getAxisOrdinal() .name(); } @@ -48,7 +48,7 @@ public String elementName(Object axisMetaData) { private final XmlaOlap4jCellSetAxisMetaData filterAxisMetaData; private final NamedList cellProperties = new ArrayNamedListImpl() { - public String elementName(Object property) { + public String getName(Object property) { return ((Property) property).getName(); } }; diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java b/src/org/olap4j/driver/xmla/XmlaOlap4jLevel.java index 9f22253..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 getProperties() { final NamedList list = new ArrayNamedListImpl() { - public String elementName(Object property) { + public String getName(Object property) { return ((Property) property).getName(); } }; diff --git a/src/org/olap4j/impl/AbstractNamedList.java b/src/org/olap4j/impl/AbstractNamedList.java index 8a25046..3513580 100644 --- a/src/org/olap4j/impl/AbstractNamedList.java +++ b/src/org/olap4j/impl/AbstractNamedList.java @@ -28,7 +28,7 @@ * *

Derived class must implement {@link #get(int)} and {@link #size()}, as * per {@link java.util.AbstractList}; and must implement - * {@link #elementName(Object)}, to indicate how elements are named. + * {@link #getName(Object)}, to indicate how elements are named. * * @see org.olap4j.impl.ArrayNamedListImpl * @@ -42,7 +42,7 @@ public abstract class AbstractNamedList { public T get(String name) { for (T t : this) { - if (elementName(t).equals(name)) { + if (getName(t).equals(name)) { return t; } } @@ -52,7 +52,7 @@ public T get(String name) { public int indexOfName(String name) { for (int i = 0; i < size(); ++i) { T t = get(i); - if (elementName(t).equals(name)) { + if (getName(t).equals(name)) { return i; } } diff --git a/src/org/olap4j/impl/ArrayNamedListImpl.java b/src/org/olap4j/impl/ArrayNamedListImpl.java index 8509e0b..5bf1019 100644 --- a/src/org/olap4j/impl/ArrayNamedListImpl.java +++ b/src/org/olap4j/impl/ArrayNamedListImpl.java @@ -27,7 +27,7 @@ * Implementation of {@link org.olap4j.metadata.NamedList} which uses * {@link java.util.ArrayList} for storage. * - *

Derived class must implement {@link #elementName(Object)}, to indicate how + *

Derived class must implement {@link #getName(Object)}, to indicate how * elements are named. * * @see NamedListImpl @@ -72,7 +72,7 @@ public ArrayNamedListImpl(Collection c) { public T get(String name) { for (T t : this) { - if (elementName(t).equals(name)) { + if (getName(t).equals(name)) { return t; } } @@ -82,7 +82,7 @@ public T get(String name) { public int indexOfName(String name) { for (int i = 0; i < size(); ++i) { T t = get(i); - if (elementName(t).equals(name)) { + if (getName(t).equals(name)) { return i; } } diff --git a/src/org/olap4j/impl/NamedListImpl.java b/src/org/olap4j/impl/NamedListImpl.java index a131799..e7e252f 100644 --- a/src/org/olap4j/impl/NamedListImpl.java +++ b/src/org/olap4j/impl/NamedListImpl.java @@ -63,7 +63,7 @@ public NamedListImpl(Collection c) { super(c); } - public final String elementName(Object t) { + public final String getName(Object t) { return ((T) t).getName(); } } diff --git a/src/org/olap4j/impl/NamedListMap.java b/src/org/olap4j/impl/NamedListMap.java index 4b7c5a5..aaf4c9e 100644 --- a/src/org/olap4j/impl/NamedListMap.java +++ b/src/org/olap4j/impl/NamedListMap.java @@ -52,7 +52,7 @@ public boolean hasNext() { public Entry next() { T x = iterator.next(); - String name = namedList.elementName(x); + String name = namedList.getName(x); return new Pair(name, x); } diff --git a/src/org/olap4j/impl/Olap4jUtil.java b/src/org/olap4j/impl/Olap4jUtil.java index 6ebcfde..c1fb553 100644 --- a/src/org/olap4j/impl/Olap4jUtil.java +++ b/src/org/olap4j/impl/Olap4jUtil.java @@ -618,7 +618,7 @@ private enum DummyEnum { * Implementation of {@link NamedList} that is immutable and empty. */ private static class EmptyNamedList extends AbstractNamedList { - public String elementName(Object element) { + public String getName(Object element) { throw new UnsupportedOperationException(); } @@ -652,8 +652,8 @@ public int indexOfName(String s) { return list.indexOfName(s); } - public String elementName(Object element) { - return list.elementName(element); + public String getName(Object element) { + return list.getName(element); } public Map asMap() { diff --git a/src/org/olap4j/metadata/NamedList.java b/src/org/olap4j/metadata/NamedList.java index 171f031..424ca59 100644 --- a/src/org/olap4j/metadata/NamedList.java +++ b/src/org/olap4j/metadata/NamedList.java @@ -62,7 +62,7 @@ public interface NamedList extends List { * @param element Element * @return Name of element */ - String elementName(Object element); + String getName(Object element); /** * Returns a view of this named list as a {@link Map} whose key is the name