MONDRIAN:

Converted all uses of '\n' to use the line.separator property value. Also, altered code so that its only the mondrian/olap/Util class that gets the property and all other classes use the value gotten there. [git-p4: depot-paths = "//open/mondrian/": change = 3651]
pentaho · Jun 3, 2005 · 089fddc · 089fddc
1 parent 0fe7db4
commit 089fddc
Show file tree

Hide file tree

Showing 14 changed files with 160 additions and 143 deletions.
diff --git a/src/main/mondrian/olap/Util.java b/src/main/mondrian/olap/Util.java
@@ -31,6 +31,8 @@
  **/
 public class Util extends XOMUtil {
 
+    public static final String nl = System.getProperty("line.separator");
+
     private static final Logger LOGGER = Logger.getLogger(Util.class);
     // properties
 

diff --git a/src/main/mondrian/olap/fun/FunUtil.java b/src/main/mondrian/olap/fun/FunUtil.java
@@ -24,7 +24,6 @@
  * <code>mondrian.olap.fun</code> package.
  **/
 public class FunUtil extends Util {
-    static final String nl = System.getProperty("line.separator");
     static final String[] emptyStringArray = new String[0];
 
     /**

diff --git a/src/main/mondrian/olap/fun/LinReg.java b/src/main/mondrian/olap/fun/LinReg.java
@@ -188,6 +188,8 @@ public Object evaluate(Evaluator evaluator, Exp[] args) {
             if (value == null) {
                 return Util.nullValue;
             }
+// RME
+debug("LinReg.Intercept.evaluator","BOTTOM: " +value.getIntercept());
             return new Double(value.getIntercept());
         }
     }
@@ -269,6 +271,7 @@ public Object evaluate(Evaluator evaluator, Exp[] args) {
 
     protected static void debug(String type, String msg) {
         // comment out for no output
+// RME
         //System.out.println(type + ": " +msg);
     }
 

diff --git a/src/main/mondrian/rolap/RolapCube.java b/src/main/mondrian/rolap/RolapCube.java
@@ -21,9 +21,6 @@
 import java.lang.reflect.Constructor;
 import java.util.*;
 
-/*
-waht sdfs www who goes there
-*/
 /**
  * <code>RolapCube</code> implements {@link Cube} for a ROLAP database.
  *
@@ -1036,7 +1033,7 @@ protected RolapStar.Column makeColumns(
     //
 
     /** 
-     * This method formats a MondrianDef.Relation indenting joins for
+     * This method formats a {@link MondrianDef.Relation} indenting joins for
      * readability.
      * 
      * @param relation 
@@ -1060,7 +1057,7 @@ private static void format(MondrianDef.Relation relation,
                 buf.append(table.alias);
                 buf.append(')');
             }
-            buf.append('\n');
+            buf.append(Util.nl);
         } else {
             MondrianDef.Join join = (MondrianDef.Join) relation;
             String subindent = indent + "  ";
@@ -1075,7 +1072,7 @@ private static void format(MondrianDef.Relation relation,
             //buf.append(join.rightAlias);
             buf.append('.');
             buf.append(join.rightKey);
-            buf.append('\n');
+            buf.append(Util.nl);
             format(join.left, buf, subindent);
             format(join.right, buf, indent);
         }
@@ -1117,8 +1114,9 @@ private static RelNode lookup(MondrianDef.Table table, Map map) {
     }
 
     /** 
-     * This attempts to transform a MondrianDef.Relation into the "canonical" 
-     * form. What is the canonical form you might ask, well it is only relevant
+     * This attempts to transform a {@link MondrianDef.Relation} 
+     * into the "canonical" form. 
+     * What is the canonical form you might ask, well it is only relevant
      * when the relation is a snowflake (nested joins), not simply a table.
      * The canonical form has lower levels to the left of higher levels (Day
      * before Month before Quarter before Year) and the nested joins are always

diff --git a/src/main/mondrian/rolap/RolapStar.java b/src/main/mondrian/rolap/RolapStar.java
@@ -1148,8 +1148,11 @@ private Column makeColumnForLevelExpr(RolapCube cube,
                             + "' of cube '"
                             + this
                             + "' is invalid: table '" + tableName
-                            + "' is not found in current scope\n"
-                            + ", star:\n" + getStar());
+                            + "' is not found in current scope"
+                            + Util.nl
+                            + ", star:" 
+                            + Util.nl
+                            + getStar());
                 }
                 RolapStar.AliasReplacer aliasReplacer =
                         new RolapStar.AliasReplacer(tableName, table.getAlias());

diff --git a/src/main/mondrian/rolap/agg/AggregationManager.java b/src/main/mondrian/rolap/agg/AggregationManager.java
@@ -129,23 +129,23 @@ public String generateSQL(final Segment[] segments,
                 if (getLogger().isDebugEnabled()) {
                     StringBuffer buf = new StringBuffer(256);
                     buf.append("MATCH: ");
-                    buf.append('\n');
+                    buf.append(Util.nl);
                     buf.append("  bitKey=");
                     buf.append(bitKey);
-                    buf.append('\n');
+                    buf.append(Util.nl);
                     buf.append("  bitkey=");
                     buf.append(aggStar.getBitKey());
-                    buf.append('\n');
+                    buf.append(Util.nl);
                     buf.append("AggStar=");
                     buf.append(aggStar.getFactTable().getName());
-                    buf.append('\n');
+                    buf.append(Util.nl);
                     for (Iterator it = aggStar.getFactTable().getColumns();
                             it.hasNext(); ) {
                         AggStar.Table.Column column =
                             (AggStar.Table.Column) it.next();
                         buf.append("   ");
                         buf.append(column);
-                        buf.append('\n');
+                        buf.append(Util.nl);
                     }
                     getLogger().debug(buf.toString());
                 }
@@ -165,12 +165,12 @@ public String generateSQL(final Segment[] segments,
 
             StringBuffer buf = new StringBuffer(256);
             buf.append("NO MATCH: ");
-            buf.append('\n');
+            buf.append(Util.nl);
             buf.append("  bitKey=");
             buf.append(bitKey);
-            buf.append('\n');
+            buf.append(Util.nl);
             buf.append(star.getFactTable().getAlias());
-            buf.append('\n');
+            buf.append(Util.nl);
 
             getLogger().debug(buf.toString());
         }

diff --git a/src/main/mondrian/rolap/aggmatcher/AggGen.java b/src/main/mondrian/rolap/aggmatcher/AggGen.java
@@ -13,6 +13,7 @@
 package mondrian.rolap.aggmatcher;
 
 import mondrian.olap.MondrianDef;
+import mondrian.olap.Util;
 import mondrian.rolap.RolapStar;
 import mondrian.rolap.sql.SqlQuery;
 import org.apache.log4j.Logger;
@@ -139,9 +140,12 @@ private void init() {
         }
         if (getLogger().isDebugEnabled()) {
             StringBuffer buf = new StringBuffer(512);
-            buf.append("RolapStar:\n");
+            buf.append("RolapStar:");
+            buf.append(Util.nl);
             buf.append(getFactTable());
-            buf.append("\nFactTable:\n");
+            buf.append(Util.nl);
+            buf.append("FactTable:");
+            buf.append(Util.nl);
             buf.append(factTable);
             getLogger().debug(buf.toString());
         }

diff --git a/src/main/mondrian/rolap/aggmatcher/AggTableManager.java b/src/main/mondrian/rolap/aggmatcher/AggTableManager.java
@@ -188,7 +188,6 @@ private void loadRolapStarAggregates() throws SQLException {
             }
         }
 
-//System.out.println("AggTableManager.loadRolapStarAggregates: \n" +db);
         } catch (RecorderException ex) {
             throw new MondrianException(ex);
 

diff --git a/src/main/mondrian/rolap/aggmatcher/ExplicitRules.java b/src/main/mondrian/rolap/aggmatcher/ExplicitRules.java
@@ -125,7 +125,7 @@ public static ExplicitRules.Group make(final RolapCube cube,
             }
 
             if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("\n"+group);
+                LOGGER.debug(Util.nl+group);
             }
             return group;
         }