Skip to content

Commit

Permalink
Update source code to enforce coding standards (spaces, tabs, braces,…
Browse files Browse the repository at this point in the history
… etc.). No functionality changes.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@109 c6a108a4-781c-0410-a6c6-c2d559e19af0
  • Loading branch information
julianhyde committed Aug 14, 2008
1 parent 9c0fa92 commit 1e25fee
Show file tree
Hide file tree
Showing 64 changed files with 10,337 additions and 10,321 deletions.
2 changes: 1 addition & 1 deletion src/org/olap4j/CellSetAxisMetaData.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public interface CellSetAxisMetaData {
* the properties are not necessarily unique; for example, there might be
* two hierarchies on the axis, each of which returns the DISPLAY_INFO
* property.</p>
*
*
* @return list of member properties on this Axis
*/
List<Property> getProperties();
Expand Down
2 changes: 1 addition & 1 deletion src/org/olap4j/OlapConnection.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public interface OlapConnection extends Connection, OlapWrapper {

/**
* Sets the current locale of this connection. The value must not be null.
*
*
* <p>If the locale is not set, the JDK's current locale is used (see
* {@link java.util.Locale#getDefault()}).
*
Expand Down
78 changes: 39 additions & 39 deletions src/org/olap4j/OlapDataSource.java
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
/*
// 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.
// Copyright (C) 2008-2008 Julian Hyde
// All Rights Reserved.
// You must accept the terms of that agreement to use this software.
*/
package org.olap4j;

import javax.sql.DataSource;
import java.sql.SQLException;

/**
* <p>A factory for connections to the physical OLAP data source that this
* <code>OlapDataSource</code> object represents.
*
* <p><code>OlapDataSource</code> is a refinement of
* {@link javax.sql.DataSource} whose <code>getConnection</code> methods
* return {@link org.olap4j.OlapConnection} objects rather than mere
* {@link java.sql.Connection}s.
*
* @author jhyde
* @version $Id: $
* @since Mar 25, 2008
*/
public interface OlapDataSource extends DataSource {

// override with more specific return type
OlapConnection getConnection() throws SQLException;

// override with more specific return type
OlapConnection getConnection(
String username,
String password)
throws SQLException;
}

// End OlapDataSource.java
/*
// 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.
// Copyright (C) 2008-2008 Julian Hyde
// All Rights Reserved.
// You must accept the terms of that agreement to use this software.
*/
package org.olap4j;

import javax.sql.DataSource;
import java.sql.SQLException;

/**
* <p>A factory for connections to the physical OLAP data source that this
* <code>OlapDataSource</code> object represents.
*
* <p><code>OlapDataSource</code> is a refinement of
* {@link javax.sql.DataSource} whose <code>getConnection</code> methods
* return {@link org.olap4j.OlapConnection} objects rather than mere
* {@link java.sql.Connection}s.
*
* @author jhyde
* @version $Id: $
* @since Mar 25, 2008
*/
public interface OlapDataSource extends DataSource {

// override with more specific return type
OlapConnection getConnection() throws SQLException;

// override with more specific return type
OlapConnection getConnection(
String username,
String password)
throws SQLException;
}

// End OlapDataSource.java
4 changes: 2 additions & 2 deletions src/org/olap4j/OlapDatabaseMetaData.java
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ ResultSet getDimensions(
* function name as it is stored in the database; <code>null</code>
* means that the function name should not be used to narrow the
* search
*
*
* @return a <code>ResultSet</code> object in which each row is a
* function description
*
Expand Down Expand Up @@ -840,7 +840,7 @@ ResultSet getMeasures(
* to the member whose unique name was specified; or null to return
* just the member itself.
* Ignored if <code>memberUniqueName</code> is not specified.
*
*
* @return a <code>ResultSet</code> object in which each row is a
* member description
*
Expand Down
96 changes: 48 additions & 48 deletions src/org/olap4j/Position.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,63 +22,63 @@
* query</p>
*
* <blockquote>
* <code>SELECT {[Measures].[Unit Sales], [Measures].[Store Sales]} ON
* COLUMNS,<br>
* <code>SELECT {[Measures].[Unit Sales], [Measures].[Store Sales]} ON
* COLUMNS,<br>
* &nbsp;&nbsp;&nbsp; CrossJoin(<br>
* &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {[Gender].Members},<br>
* &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {[Product].[Food],
* [Product].[Drink]}) ON ROWS<br>
* FROM [Sales]</code>
* [Product].[Drink]}) ON ROWS<br>
* FROM [Sales]</code>
* </blockquote>
*
* <p>the <code>COLUMNS</code> axis has dimensionality
* {<code>[Measures]</code>} and the <code>ROWS</code> axis has dimensionality
* {<code>[Gender]</code>, <code>[Product]</code>}. In the result,</p>
*
* <table border="1" id="table1" cellpadding="3">
* <tr>
* <td bgcolor="#E0E0E0"><b><i>Gender</i></b></td>
* <td bgcolor="#E0E0E0"><b><i>Product</i></b></td>
* <td bgcolor="#E0E0E0"><b>Unit Sales</b></td>
* <td bgcolor="#E0E0E0"><b>Store Sales</b></td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>All Gender</b></td>
* <td bgcolor="#E0E0E0"><b>Food</b></td>
* <td align="right">191,940</td>
* <td align="right">409,035.59</td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>All Gender</b></td>
* <td bgcolor="#E0E0E0"><b>Drink</b></td>
* <td align="right">24,597</td>
* <td align="right">48,836.21</td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>F</b></td>
* <td bgcolor="#E0E0E0"><b>Food</b></td>
* <td align="right">94,814</td>
* <td align="right">203,094.17</td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>F</b></td>
* <td bgcolor="#E0E0E0"><b>Drink</b></td>
* <td align="right">12,202</td>
* <td align="right">24,457.37</td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>M</b></td>
* <td bgcolor="#E0E0E0"><b>Food</b></td>
* <td align="right">97,126</td>
* <td align="right">205,941.42</td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>M</b></td>
* <td bgcolor="#E0E0E0"><b>Drink</b></td>
* <td align="right">12,395</td>
* <td align="right">24,378.84</td>
* </tr>
* </table>
* <table border="1" id="table1" cellpadding="3">
* <tr>
* <td bgcolor="#E0E0E0"><b><i>Gender</i></b></td>
* <td bgcolor="#E0E0E0"><b><i>Product</i></b></td>
* <td bgcolor="#E0E0E0"><b>Unit Sales</b></td>
* <td bgcolor="#E0E0E0"><b>Store Sales</b></td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>All Gender</b></td>
* <td bgcolor="#E0E0E0"><b>Food</b></td>
* <td align="right">191,940</td>
* <td align="right">409,035.59</td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>All Gender</b></td>
* <td bgcolor="#E0E0E0"><b>Drink</b></td>
* <td align="right">24,597</td>
* <td align="right">48,836.21</td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>F</b></td>
* <td bgcolor="#E0E0E0"><b>Food</b></td>
* <td align="right">94,814</td>
* <td align="right">203,094.17</td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>F</b></td>
* <td bgcolor="#E0E0E0"><b>Drink</b></td>
* <td align="right">12,202</td>
* <td align="right">24,457.37</td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>M</b></td>
* <td bgcolor="#E0E0E0"><b>Food</b></td>
* <td align="right">97,126</td>
* <td align="right">205,941.42</td>
* </tr>
* <tr>
* <td bgcolor="#E0E0E0"><b>M</b></td>
* <td bgcolor="#E0E0E0"><b>Drink</b></td>
* <td align="right">12,395</td>
* <td align="right">24,378.84</td>
* </tr>
* </table>
*
* <p>each of the six positions on the <code>ROWS</code> axis has two members,
* consistent with its dimensionality of 2. The <code>COLUMNS</code> axis has
Expand Down
Loading

0 comments on commit 1e25fee

Please sign in to comment.