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

@@ -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<String, T> asMap() {

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

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

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 elementName(Object property) {
+ public String getName(Object property) {
  return ((Property) property).getName();
  }
  };

src/org/olap4j/impl/AbstractNamedList.java

@@ -28,7 +28,7 @@
  *
  * <p>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<T>
 {
  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;
  }
  }

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.
  *
- * <p>Derived class must implement {@link #elementName(Object)}, to indicate how
+ * <p>Derived class must implement {@link #getName(Object)}, to indicate how
  * elements are named.
  *
  * @see NamedListImpl
@@ -72,7 +72,7 @@ public ArrayNamedListImpl(Collection<? extends T> 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;
  }
  }

src/org/olap4j/impl/NamedListImpl.java

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

src/org/olap4j/impl/NamedListMap.java

@@ -52,7 +52,7 @@ public boolean hasNext() {
 
  public Entry<String, T> next() {
  T x = iterator.next();
- String name = namedList.elementName(x);
+ String name = namedList.getName(x);
  return new Pair<String, T>(name, x);
  }
 

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<T> extends AbstractNamedList<T> {
- 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<String, T> asMap() {

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 elementName(Object element);
+ String getName(Object element);
 
  /**
  * Returns a view of this named list as a {@link Map} whose key is the name