From dcd6e4d7a18f03a3a1048acdac60624f00fcce7c Mon Sep 17 00:00:00 2001 From: Julian Hyde Date: Wed, 21 Nov 2007 01:57:47 +0000 Subject: [PATCH] Enable keyword expansion. git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@43 c6a108a4-781c-0410-a6c6-c2d559e19af0 --- doc/tasks.txt | 2 +- src/mondrian/olap4j/ArrayNamedListImpl.java | 2 +- src/mondrian/olap4j/Factory.java | 4 ++-- src/mondrian/olap4j/FactoryJdbc3Impl.java | 4 ++-- src/mondrian/olap4j/FactoryJdbc4Impl.java | 4 ++-- src/mondrian/olap4j/MondrianOlap4jCellSetAxisMetaData.java | 2 +- src/mondrian/olap4j/MondrianOlap4jCellSetMetaData.java | 4 ++-- src/mondrian/olap4j/MondrianOlap4jNamedSet.java | 2 +- src/mondrian/olap4j/MondrianOlap4jPreparedStatement.java | 4 ++-- src/mondrian/olap4j/MondrianOlap4jProperty.java | 2 +- src/org/olap4j/OlapWrapper.java | 4 ++-- src/org/olap4j/driver/xmla/EmptyResultSet.java | 2 +- src/org/olap4j/driver/xmla/Factory.java | 2 +- src/org/olap4j/driver/xmla/FactoryJdbc3Impl.java | 2 +- src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java | 2 +- src/org/olap4j/driver/xmla/Named.java | 2 +- src/org/olap4j/driver/xmla/NamedListImpl.java | 2 +- src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java | 2 +- src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java | 2 +- src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java | 2 +- src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java | 2 +- src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java | 2 +- src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java | 2 +- src/org/olap4j/driver/xmla/XmlaOlap4jSchema.java | 2 +- src/org/olap4j/driver/xmla/XmlaOlap4jStatement.java | 2 +- src/org/olap4j/mdx/ParseRegion.java | 4 ++-- src/org/olap4j/mdx/parser/MdxParseException.java | 4 ++-- testsrc/org/olap4j/MetadataTest.java | 2 +- 28 files changed, 36 insertions(+), 36 deletions(-) diff --git a/doc/tasks.txt b/doc/tasks.txt index 2f43949..964b5f6 100644 --- a/doc/tasks.txt +++ b/doc/tasks.txt @@ -1,6 +1,6 @@ # Tasks for olap4j 0.9 # Author: Julian Hyde -# $Id: $ +# $Id$ Introduction: How to use this document -------------------------------------- diff --git a/src/mondrian/olap4j/ArrayNamedListImpl.java b/src/mondrian/olap4j/ArrayNamedListImpl.java index e85a5f2..bf61218 100644 --- a/src/mondrian/olap4j/ArrayNamedListImpl.java +++ b/src/mondrian/olap4j/ArrayNamedListImpl.java @@ -22,7 +22,7 @@ * @see mondrian.olap4j.NamedListImpl * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Nov 12, 2007 */ public abstract class ArrayNamedListImpl diff --git a/src/mondrian/olap4j/Factory.java b/src/mondrian/olap4j/Factory.java index 169f6e6..5f79985 100644 --- a/src/mondrian/olap4j/Factory.java +++ b/src/mondrian/olap4j/Factory.java @@ -1,5 +1,5 @@ /* -// $Id: $ +// $Id$ // This software is subject to the terms of the Common Public License // Agreement, available at the following URL: // http://www.opensource.org/licenses/cpl.html. @@ -24,7 +24,7 @@ * and JDBC 4.0 (which occurs in JDK 1.6). * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Jun 14, 2007 */ interface Factory { diff --git a/src/mondrian/olap4j/FactoryJdbc3Impl.java b/src/mondrian/olap4j/FactoryJdbc3Impl.java index b24cab4..700ebee 100644 --- a/src/mondrian/olap4j/FactoryJdbc3Impl.java +++ b/src/mondrian/olap4j/FactoryJdbc3Impl.java @@ -1,5 +1,5 @@ /* -// $Id: $ +// $Id$ // This software is subject to the terms of the Common Public License // Agreement, available at the following URL: // http://www.opensource.org/licenses/cpl.html. @@ -18,7 +18,7 @@ * Implementation of {@link mondrian.olap4j.Factory} for JDBC 3.0. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Jun 14, 2007 */ class FactoryJdbc3Impl implements Factory { diff --git a/src/mondrian/olap4j/FactoryJdbc4Impl.java b/src/mondrian/olap4j/FactoryJdbc4Impl.java index 842e9fa..58d2c25 100644 --- a/src/mondrian/olap4j/FactoryJdbc4Impl.java +++ b/src/mondrian/olap4j/FactoryJdbc4Impl.java @@ -1,5 +1,5 @@ /* -// $Id: $ +// $Id$ // This software is subject to the terms of the Common Public License // Agreement, available at the following URL: // http://www.opensource.org/licenses/cpl.html. @@ -23,7 +23,7 @@ * Implementation of {@link Factory} for JDBC 4.0. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Jun 14, 2007 */ class FactoryJdbc4Impl implements Factory { diff --git a/src/mondrian/olap4j/MondrianOlap4jCellSetAxisMetaData.java b/src/mondrian/olap4j/MondrianOlap4jCellSetAxisMetaData.java index 0a15d28..a924c2e 100644 --- a/src/mondrian/olap4j/MondrianOlap4jCellSetAxisMetaData.java +++ b/src/mondrian/olap4j/MondrianOlap4jCellSetAxisMetaData.java @@ -24,7 +24,7 @@ * for the Mondrian OLAP engine. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Nov 17, 2007 */ class MondrianOlap4jCellSetAxisMetaData implements CellSetAxisMetaData { diff --git a/src/mondrian/olap4j/MondrianOlap4jCellSetMetaData.java b/src/mondrian/olap4j/MondrianOlap4jCellSetMetaData.java index 443b910..91c478c 100644 --- a/src/mondrian/olap4j/MondrianOlap4jCellSetMetaData.java +++ b/src/mondrian/olap4j/MondrianOlap4jCellSetMetaData.java @@ -1,5 +1,5 @@ /* -// $Id: $ +// $Id$ // This software is subject to the terms of the Common Public License // Agreement, available at the following URL: // http://www.opensource.org/licenses/cpl.html. @@ -21,7 +21,7 @@ * for the Mondrian OLAP engine. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Jun 13, 2007 */ class MondrianOlap4jCellSetMetaData implements CellSetMetaData { diff --git a/src/mondrian/olap4j/MondrianOlap4jNamedSet.java b/src/mondrian/olap4j/MondrianOlap4jNamedSet.java index 54f118b..f94fa0a 100644 --- a/src/mondrian/olap4j/MondrianOlap4jNamedSet.java +++ b/src/mondrian/olap4j/MondrianOlap4jNamedSet.java @@ -19,7 +19,7 @@ * for the Mondrian OLAP engine. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Nov 12, 2007 */ public class MondrianOlap4jNamedSet implements NamedSet, Named { diff --git a/src/mondrian/olap4j/MondrianOlap4jPreparedStatement.java b/src/mondrian/olap4j/MondrianOlap4jPreparedStatement.java index 11c5764..3ddedb7 100644 --- a/src/mondrian/olap4j/MondrianOlap4jPreparedStatement.java +++ b/src/mondrian/olap4j/MondrianOlap4jPreparedStatement.java @@ -1,5 +1,5 @@ /* -// $Id: $ +// $Id$ // This software is subject to the terms of the Common Public License // Agreement, available at the following URL: // http://www.opensource.org/licenses/cpl.html. @@ -28,7 +28,7 @@ * for the Mondrian OLAP engine. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Jun 12, 2007 */ abstract class MondrianOlap4jPreparedStatement diff --git a/src/mondrian/olap4j/MondrianOlap4jProperty.java b/src/mondrian/olap4j/MondrianOlap4jProperty.java index 64b32b2..3c2eedc 100644 --- a/src/mondrian/olap4j/MondrianOlap4jProperty.java +++ b/src/mondrian/olap4j/MondrianOlap4jProperty.java @@ -19,7 +19,7 @@ * {@link mondrian.olap.Property}. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Nov 12, 2007 */ class MondrianOlap4jProperty implements Property, Named { diff --git a/src/org/olap4j/OlapWrapper.java b/src/org/olap4j/OlapWrapper.java index b5703ad..89bf13f 100644 --- a/src/org/olap4j/OlapWrapper.java +++ b/src/org/olap4j/OlapWrapper.java @@ -1,5 +1,5 @@ /* -// $Id: $ +// $Id$ // This software is subject to the terms of the Common Public License // Agreement, available at the following URL: // http://www.opensource.org/licenses/cpl.html. @@ -59,7 +59,7 @@ * to create a JDBC 4.0 connection and convert it to an olap4j connection. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Jun 14, 2007 */ public interface OlapWrapper { diff --git a/src/org/olap4j/driver/xmla/EmptyResultSet.java b/src/org/olap4j/driver/xmla/EmptyResultSet.java index 124d355..d3c6d11 100644 --- a/src/org/olap4j/driver/xmla/EmptyResultSet.java +++ b/src/org/olap4j/driver/xmla/EmptyResultSet.java @@ -26,7 +26,7 @@ * any instances for this particular driver.

* * @author jhyde - * @version $Id: EmptyResultSet.java 22 2007-06-15 02:23:07Z jhyde $ + * @version $Id$ * @since May 24, 2007 */ abstract class EmptyResultSet implements ResultSet, OlapWrapper { diff --git a/src/org/olap4j/driver/xmla/Factory.java b/src/org/olap4j/driver/xmla/Factory.java index 50118a6..7277942 100644 --- a/src/org/olap4j/driver/xmla/Factory.java +++ b/src/org/olap4j/driver/xmla/Factory.java @@ -21,7 +21,7 @@ * and JDBC 4.0 (which occurs in JDK 1.6). * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Jun 14, 2007 */ interface Factory { diff --git a/src/org/olap4j/driver/xmla/FactoryJdbc3Impl.java b/src/org/olap4j/driver/xmla/FactoryJdbc3Impl.java index 45bb7ca..751903e 100644 --- a/src/org/olap4j/driver/xmla/FactoryJdbc3Impl.java +++ b/src/org/olap4j/driver/xmla/FactoryJdbc3Impl.java @@ -17,7 +17,7 @@ * Implementation of {@link Factory} for JDBC 3.0. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Jun 14, 2007 */ class FactoryJdbc3Impl implements Factory { diff --git a/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java b/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java index 4bb4546..fa050d0 100644 --- a/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java +++ b/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java @@ -19,7 +19,7 @@ * Implementation of {@link Factory} for JDBC 4.0. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Jun 14, 2007 */ class FactoryJdbc4Impl implements Factory { diff --git a/src/org/olap4j/driver/xmla/Named.java b/src/org/olap4j/driver/xmla/Named.java index 0b81937..c460f88 100644 --- a/src/org/olap4j/driver/xmla/Named.java +++ b/src/org/olap4j/driver/xmla/Named.java @@ -14,7 +14,7 @@ * {@link org.olap4j.metadata.NamedList} which works on such objects. * * @author jhyde - * @version $Id: Named.java 20 2007-06-10 23:09:28Z jhyde $ + * @version $Id$ * @since May 23, 2007 */ interface Named { diff --git a/src/org/olap4j/driver/xmla/NamedListImpl.java b/src/org/olap4j/driver/xmla/NamedListImpl.java index ccd9d7d..061f86f 100644 --- a/src/org/olap4j/driver/xmla/NamedListImpl.java +++ b/src/org/olap4j/driver/xmla/NamedListImpl.java @@ -18,7 +18,7 @@ * the {@link Named} interface. * * @author jhyde - * @version $Id: NamedListImpl.java 20 2007-06-10 23:09:28Z jhyde $ + * @version $Id$ * @since May 23, 2007 */ class NamedListImpl diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java index 61b9ca0..8f29509 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java @@ -26,7 +26,7 @@ * for XML/A providers. * * @author jhyde - * @version $Id: MondrianOlap4jCellSet.java 22 2007-06-15 02:23:07Z jhyde $ + * @version $Id$ * @since May 24, 2007 */ abstract class XmlaOlap4jCellSet implements CellSet { diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java index a499fb4..3915bfc 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java @@ -21,7 +21,7 @@ * for the Mondrian OLAP engine. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Jun 13, 2007 */ class XmlaOlap4jCellSetMetaData implements CellSetMetaData { diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java index 1c39721..9af1087 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java @@ -26,7 +26,7 @@ * for XML/A providers. * * @author jhyde - * @version $Id: MondrianOlap4jConnection.java 23 2007-06-15 03:53:14Z jhyde $ + * @version $Id$ * @since May 23, 2007 */ abstract class XmlaOlap4jConnection implements OlapConnection { diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java b/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java index 3bc8aff..861c0b0 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java @@ -25,7 +25,7 @@ * for XML/A providers. * * @author jhyde - * @version $Id: MondrianOlap4jDatabaseMetaData.java 22 2007-06-15 02:23:07Z jhyde $ + * @version $Id$ * @since May 23, 2007 */ abstract class XmlaOlap4jDatabaseMetaData implements OlapDatabaseMetaData { diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java b/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java index 7983728..e82741b 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java @@ -61,7 +61,7 @@ * * * @author jhyde - * @version $Id: MondrianOlap4jDriver.java 23 2007-06-15 03:53:14Z jhyde $ + * @version $Id$ * @since May 22, 2007 */ public class XmlaOlap4jDriver implements Driver { diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java b/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java index 2f162d0..0b00f14 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java @@ -25,7 +25,7 @@ * for XML/A providers. * * @author jhyde - * @version $Id: $ + * @version $Id$ * @since Jun 12, 2007 */ abstract class XmlaOlap4jPreparedStatement diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jSchema.java b/src/org/olap4j/driver/xmla/XmlaOlap4jSchema.java index c8464bb..a1e4731 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jSchema.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jSchema.java @@ -24,7 +24,7 @@ * for XML/A providers. * * @author jhyde - * @version $Id: MondrianOlap4jSchema.java 22 2007-06-15 02:23:07Z jhyde $ + * @version $Id$ * @since May 24, 2007 */ class XmlaOlap4jSchema implements Schema, Named { diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jStatement.java b/src/org/olap4j/driver/xmla/XmlaOlap4jStatement.java index 1d94871..fc803a8 100644 --- a/src/org/olap4j/driver/xmla/XmlaOlap4jStatement.java +++ b/src/org/olap4j/driver/xmla/XmlaOlap4jStatement.java @@ -21,7 +21,7 @@ * for XML/A providers. * * @author jhyde - * @version $Id: MondrianOlap4jStatement.java 22 2007-06-15 02:23:07Z jhyde $ + * @version $Id$ * @since May 24, 2007 */ class XmlaOlap4jStatement implements OlapStatement { diff --git a/src/org/olap4j/mdx/ParseRegion.java b/src/org/olap4j/mdx/ParseRegion.java index 96b0096..1573609 100644 --- a/src/org/olap4j/mdx/ParseRegion.java +++ b/src/org/olap4j/mdx/ParseRegion.java @@ -1,5 +1,5 @@ /* -// $Id: ParseTreeNode.java 20 2007-06-10 23:09:28Z jhyde $ +// $Id$ // This software is subject to the terms of the Common Public License // Agreement, available at the following URL: // http://www.opensource.org/licenses/cpl.html. @@ -29,7 +29,7 @@ * *

Regions are immutable. * - * @version $Id: $ + * @version $Id$ * @author jhyde */ public class ParseRegion { diff --git a/src/org/olap4j/mdx/parser/MdxParseException.java b/src/org/olap4j/mdx/parser/MdxParseException.java index 1bb1db4..8b735da 100644 --- a/src/org/olap4j/mdx/parser/MdxParseException.java +++ b/src/org/olap4j/mdx/parser/MdxParseException.java @@ -1,5 +1,5 @@ /* -// $Id: ParseTreeNode.java 20 2007-06-10 23:09:28Z jhyde $ +// $Id$ // This software is subject to the terms of the Common Public License // Agreement, available at the following URL: // http://www.opensource.org/licenses/cpl.html. @@ -16,7 +16,7 @@ * indicate an error in parsing. Has a {@link org.olap4j.mdx.ParseRegion}. * * @author jhyde - * @version $Id: $ + * @version $Id$ */ public class MdxParseException extends RuntimeException { private final ParseRegion region; diff --git a/testsrc/org/olap4j/MetadataTest.java b/testsrc/org/olap4j/MetadataTest.java index 5ea53e4..4378741 100644 --- a/testsrc/org/olap4j/MetadataTest.java +++ b/testsrc/org/olap4j/MetadataTest.java @@ -18,7 +18,7 @@ /** * Unit test for olap4j metadata methods. * - * @version $Id: ConnectionTest.java 31 2007-09-22 02:29:21Z jhyde $ + * @version $Id$ */ public class MetadataTest extends TestCase { private static final String NL = System.getProperty("line.separator");