MONDRIAN Fixing some errant spaces.

[git-p4: depot-paths = "//open/mondrian/": change = 12977]

src/main/mondrian/rolap/HighCardSqlTupleReader.java

@@ -42,18 +42,18 @@ public HighCardSqlTupleReader(final TupleConstraint constraint) {
     }
 
     public void addLevelMembers(
-            final RolapLevel level,
-            final MemberBuilder memberBuilder,
-            final List<RolapMember> srcMembers)
+        final RolapLevel level,
+        final MemberBuilder memberBuilder,
+        final List<RolapMember> srcMembers)
     {
         targets.add(new Target(
-                level, memberBuilder, srcMembers, constraint, this));
+            level, memberBuilder, srcMembers, constraint, this));
     }
 
     protected void prepareTuples(
-            final DataSource dataSource,
-            final List<List<RolapMember>> partialResult,
-            final List<List<RolapMember>> newPartialResult)
+        final DataSource dataSource,
+        final List<List<RolapMember>> partialResult,
+        final List<List<RolapMember>> newPartialResult)
     {
         String message = "Populating member cache with members for " + targets;
         SqlStatement stmt = null;
@@ -71,9 +71,9 @@ protected void prepareTuples(
                 }
                 String sql = makeLevelMembersSql(dataSource);
                 stmt = RolapUtil.executeQuery(
-                        dataSource, sql, maxRows,
-                        "HighCardSqlTupleReader.readTuples " + partialTargets,
-                        message, -1, -1);
+                    dataSource, sql, maxRows,
+                    "HighCardSqlTupleReader.readTuples " + partialTargets,
+                    message, -1, -1);
                 resultSet = stmt.getResultSet();
             } else {
                 resultSet = null;
@@ -97,10 +97,10 @@ protected void prepareTuples(
             }
 
             this.resultLoader =
-                    new ResultLoader(
-                            enumTargetCount,
-                            targets, stmt, resultSet, execQuery, partialResult,
-                            newPartialResult);
+                new ResultLoader(
+                    enumTargetCount,
+                    targets, stmt, resultSet, execQuery, partialResult,
+                    newPartialResult);
 
             // Read first and second elements if exists (or marks
             // source as having "no more rows")
@@ -116,19 +116,19 @@ protected void prepareTuples(
     }
 
     public List<RolapMember> readMembers(
-            final DataSource dataSource,
-            final List<List<RolapMember>> partialResult,
-            final List<List<RolapMember>> newPartialResult)
+        final DataSource dataSource,
+        final List<List<RolapMember>> partialResult,
+        final List<List<RolapMember>> newPartialResult)
     {
         prepareTuples(dataSource, partialResult, newPartialResult);
         assert targets.size() == 1;
         return targets.get(0).close();
     }
 
     public List<RolapMember[]> readTuples(
-            final DataSource jdbcConnection,
-            final List<List<RolapMember>> partialResult,
-            final List<List<RolapMember>> newPartialResult)
+        final DataSource jdbcConnection,
+        final List<List<RolapMember>> partialResult,
+        final List<List<RolapMember>> newPartialResult)
     {
         prepareTuples(jdbcConnection, partialResult, newPartialResult);
 
@@ -140,15 +140,15 @@ public List<RolapMember[]> readTuples(
         }
 
         final List<RolapMember[]> tupleList =
-                new TraversalList<RolapMember>(lists, RolapMember.class);
+            new TraversalList<RolapMember>(lists, RolapMember.class);
 
         // need to hierarchize the columns from the enumerated targets
         // since we didn't necessarily add them in the order in which
         // they originally appeared in the cross product
         int enumTargetCount = getEnumTargetCount();
         if (enumTargetCount > 0) {
             FunUtil.hierarchizeTupleList(
-                    Util.<Member[]>cast(tupleList), false, n);
+                Util.<Member[]>cast(tupleList), false, n);
         }
         return tupleList;
     }

src/main/mondrian/rolap/SqlContextConstraint.java

@@ -266,9 +266,9 @@ public void addMemberConstraint(
      * context.
      */
     public void addConstraint(
-            SqlQuery sqlQuery,
-            RolapCube baseCube,
-            AggStar aggStar)
+        SqlQuery sqlQuery,
+        RolapCube baseCube,
+        AggStar aggStar)
     {
         SqlConstraintUtils.addContextConstraint(
             sqlQuery, aggStar, evaluator, strict);

src/main/mondrian/rolap/SqlTupleReader.java

@@ -407,7 +407,7 @@ protected void prepareTuples(
                 if (limit > 0 && limit < ++fetchCount) {
                     // result limit exceeded, throw an exception
                     throw MondrianResource.instance().MemberFetchLimitExceeded
-                            .ex((long) limit);
+                        .ex((long) limit);
                 }
 
                 if (enumTargetCount == 0) {
@@ -695,10 +695,10 @@ String makeLevelMembersSql(DataSource dataSource) {
 
                 WhichSelect whichSelect =
                     (++k == baseCubes.size() - 1)
-                            ? WhichSelect.LAST : WhichSelect.NOT_LAST;
+                        ? WhichSelect.LAST : WhichSelect.NOT_LAST;
                 final String generateSelect =
-                        generateSelectForLevels(
-                                dataSource, baseCube, whichSelect);
+                    generateSelectForLevels(
+                        dataSource, baseCube, whichSelect);
                 if (!"".equals(generateSelect)) {
                     selectString.append(prependString);
                     selectString.append(generateSelect);
@@ -719,17 +719,17 @@ String makeLevelMembersSql(DataSource dataSource) {
 
     Collection<RolapCube> getBaseCubeCollection(final Query query) {
         RolapCube.CubeComparator cubeComparator =
-                new RolapCube.CubeComparator();
+            new RolapCube.CubeComparator();
         Collection<RolapCube> baseCubes =
-                new TreeSet<RolapCube>(cubeComparator);
+            new TreeSet<RolapCube>(cubeComparator);
         baseCubes.addAll(query.getBaseCubes());
         return baseCubes;
     }
 
     String sqlForEmptyTuple(final Collection<RolapCube> baseCubes) {
         return "select 0 from "
-                + baseCubes.iterator().next().getFact().toString()
-                + " where 1 = 0";
+            + baseCubes.iterator().next().getFact().toString()
+            + " where 1 = 0";
     }
 
     /**
@@ -764,11 +764,11 @@ String generateSelectForLevels(
             if (target.getSrcMembers() == null) {
                 if (targetIsOnBaseCube(target, baseCube)) {
                     addLevelMemberSql(
-                            sqlQuery,
-                            target.getLevel(),
-                            baseCube,
-                            whichSelect,
-                            aggStar);
+                        sqlQuery,
+                        target.getLevel(),
+                        baseCube,
+                        whichSelect,
+                        aggStar);
                 } else {
                     return "";
                 }
@@ -782,7 +782,7 @@ String generateSelectForLevels(
 
     boolean targetIsOnBaseCube(TargetBase target, RolapCube baseCube) {
         return baseCube == null || baseCube.findBaseCubeHierarchy(
-                target.getLevel().getHierarchy()) != null;
+            target.getLevel().getHierarchy()) != null;
     }
 
     /**
@@ -1090,8 +1090,8 @@ protected boolean levelContainsMultipleColumns(RolapLevel level) {
      * @return true if agg table has level or not
      */
     protected boolean isLevelCollapsed(
-            AggStar aggStar,
-            RolapCubeLevel level)
+        AggStar aggStar,
+        RolapCubeLevel level)
     {
         boolean levelCollapsed = false;
         if (level.isAll()) {

src/main/mondrian/rolap/Target.java

@@ -118,8 +118,8 @@ int internalAddRow(ResultSet resultSet, int column)
 
     public List<RolapMember> close() {
         final boolean asList = this.constraint.getEvaluator() != null
-                && this.constraint.getEvaluator().getQuery().getResultStyle()
-                    == ResultStyle.LIST;
+            && this.constraint.getEvaluator().getQuery().getResultStyle()
+            == ResultStyle.LIST;
         final int limit = MondrianProperties.instance().ResultLimit.get();
 
         final List<RolapMember> l = new AbstractList<RolapMember>() {
@@ -159,8 +159,8 @@ public RolapMember get(final int idx) {
                     // Cannot send NoSuchElementException since its intercepted
                     // by AbstractSequentialList to identify out of bounds.
                     throw new RuntimeException(
-                            "Element " + idx
-                            + " has been forgotten");
+                        "Element " + idx
+                        + " has been forgotten");
                 }
 
                 while (index >= getList().size() && this.moreRows) {

src/main/mondrian/rolap/TargetBase.java

@@ -28,8 +28,8 @@ public abstract class TargetBase {
     final TupleReader.MemberBuilder memberBuilder;
 
     public TargetBase(
-            List<RolapMember> srcMembers, RolapLevel level,
-            TupleReader.MemberBuilder memberBuilder)
+        List<RolapMember> srcMembers, RolapLevel level,
+        TupleReader.MemberBuilder memberBuilder)
     {
         this.srcMembers = srcMembers;
         this.level = level;
@@ -80,7 +80,7 @@ public int addRow(ResultSet resultSet, int column) throws SQLException {
     public abstract List<RolapMember> close();
 
     abstract int internalAddRow(ResultSet resultSet, int column)
-            throws SQLException;
+        throws SQLException;
 
     public void add(final RolapMember member) {
         this.getList().add(member);