MONDRIAN: Mistakes on code conventions.

[git-p4: depot-paths = "//open/mondrian/": change = 11552]
pentaho · Sep 12, 2008 · bf56f51 · bf56f51
1 parent 89cbb1f
commit bf56f51
Show file tree

Hide file tree

Showing 4 changed files with 412 additions and 415 deletions.
diff --git a/src/main/mondrian/rolap/NoCacheMemberReader.java b/src/main/mondrian/rolap/NoCacheMemberReader.java
@@ -167,7 +167,7 @@ public void getMemberChildren(
         final List<RolapMember> children,
         final MemberChildrenConstraint constraint)
     {
-        assert(constraint != null);
+        assert (constraint != null);
         LOGGER.debug("Entering getMemberChildren");
         source.getMemberChildren(parentMembers, children, constraint);
     }

diff --git a/src/main/mondrian/rolap/RolapConnection.java b/src/main/mondrian/rolap/RolapConnection.java
@@ -582,7 +582,7 @@ public void memoryUsageNotification(long used, long max) {
 
             if (RolapUtil.MDX_LOGGER.isDebugEnabled()) {
                 currId = executeCount++;
-                RolapUtil.MDX_LOGGER.debug( currId + ": " + Util.unparse(query));
+                RolapUtil.MDX_LOGGER.debug(currId + ": " + Util.unparse(query));
             }
 
             query.setQueryStartTime();
@@ -621,7 +621,7 @@ public void memoryUsageNotification(long used, long max) {
         } finally {
             mm.removeListener(listener);
             if (RolapUtil.MDX_LOGGER.isDebugEnabled()) {
-                RolapUtil.MDX_LOGGER.debug( currId + ": exec: " +
+                RolapUtil.MDX_LOGGER.debug(currId + ": exec: " +
                     (System.currentTimeMillis() - query.getQueryStartTime()) +
                     " ms");
             }
@@ -741,7 +741,7 @@ static class NonEmptyResult extends ResultBase {
                             positions,
                             new FilteredIterableList.Filter<Position>() {
                                 public boolean accept(final Position p) {
-                                    return p.get(0)!=null;
+                                    return p.get(0) != null;
                                 }
                             }
                     );
@@ -792,7 +792,7 @@ private boolean isEmptyRecurse(int fixedAxis, int axis) {
             } else {
                 List<Position> positions = getAxes()[axis].getPositions();
                 int i = 0;
-                for (Position position: positions) {
+                for (Position position : positions) {
                     pos[axis] = i;
                     if (!isEmptyRecurse(fixedAxis, axis - 1)) {
                         return false;
@@ -811,7 +811,7 @@ public synchronized Cell getCell(int[] externalPos) {
                 int mappedOffset = mapOffsetToUnderlying(offset);
                 this.pos[axis] = mappedOffset;
                 return underlying.getCell(this.pos);
-            } catch(NullPointerException npe) {
+            } catch (NullPointerException npe) {
                 return underlying.getCell(externalPos);
             }
         }

diff --git a/src/main/mondrian/rolap/RolapCubeHierarchy.java b/src/main/mondrian/rolap/RolapCubeHierarchy.java
@@ -87,7 +87,7 @@ public RolapCubeHierarchy(
         // re-alias names if necessary
         if (!usingCubeFact) {
             // join expressions are columns only
-            assert(usage.getJoinExp() instanceof MondrianDef.Column);
+            assert (usage.getJoinExp() instanceof MondrianDef.Column);
             currentRelation =
                 parentDimension.getCube().getStar().getUniqueRelation(
                     rolapHierarchy.getRelation(),
@@ -129,7 +129,7 @@ public RolapCubeHierarchy(
             }
         }
 
-        if(dimension.isHighCardinality()) {
+        if (dimension.isHighCardinality()) {
             this.reader = new NoCacheRolapCubeHierarchyMemberReader();
         } else {
             this.reader = new CacheRolapCubeHierarchyMemberReader();
@@ -407,12 +407,10 @@ public CacheRolapCubeHierarchyMemberReader() {
                 new MemberCacheHelper(RolapCubeHierarchy.this);
 
             cubeSource =
-                new RolapCubeSqlMemberSource(
-                    this,
+                new RolapCubeSqlMemberSource(this,
                     RolapCubeHierarchy.this,
                     rolapCubeCacheHelper,
-                    cacheHelper
-                    );
+                    cacheHelper);
 
             cubeSource.setCache(getMemberCache());
         }
@@ -566,7 +564,7 @@ public void getMemberChildren(
                 List<RolapMember> children,
                 MemberChildrenConstraint constraint) {
 
-            synchronized(cacheHelper) {
+            synchronized (cacheHelper) {
                 checkCacheStatus();
 
                 List<RolapMember> missed = new ArrayList<RolapMember>();
@@ -767,12 +765,10 @@ public NoCacheRolapCubeHierarchyMemberReader() {
                 new MemberNoCacheHelper();
 
             cubeSource =
-                new RolapCubeSqlMemberSource(
-                    this,
+                new RolapCubeSqlMemberSource(this,
                     RolapCubeHierarchy.this,
                     rolapCubeCacheHelper,
-                    new MemberNoCacheHelper()
-                    );
+                    new MemberNoCacheHelper());
 
             cubeSource.setCache(rolapCubeCacheHelper);
         }