MONDRIAN: Optimize/canonize imports.

[git-p4: depot-paths = "//open/mondrian/": change = 14711]
pentaho · Oct 22, 2011 · b973c68 · b973c68
1 parent 3adcb5a
commit b973c68
Show file tree

Hide file tree

Showing 319 changed files with 777 additions and 1,122 deletions.
diff --git a/src/main/mondrian/calc/CalcWriter.java b/src/main/mondrian/calc/CalcWriter.java
@@ -12,7 +12,8 @@
 import org.apache.commons.collections.map.CompositeMap;
 
 import java.io.PrintWriter;
-import java.util.*;
+import java.util.IdentityHashMap;
+import java.util.Map;
 
 /**
  * Visitor which serializes an expression to text.

diff --git a/src/main/mondrian/calc/DummyExp.java b/src/main/mondrian/calc/DummyExp.java
@@ -9,9 +9,10 @@
 */
 package mondrian.calc;
 
-import mondrian.olap.*;
-import mondrian.olap.type.Type;
 import mondrian.mdx.MdxVisitor;
+import mondrian.olap.Exp;
+import mondrian.olap.Validator;
+import mondrian.olap.type.Type;
 
 import java.io.PrintWriter;
 

diff --git a/src/main/mondrian/calc/ExpCompiler.java b/src/main/mondrian/calc/ExpCompiler.java
@@ -9,12 +9,13 @@
 */
 package mondrian.calc;
 
-import org.eigenbase.util.property.StringProperty;
+import mondrian.calc.impl.BetterExpCompiler;
 import mondrian.olap.*;
 import mondrian.olap.type.Type;
-import mondrian.util.ObjectFactory;
 import mondrian.util.CreationException;
-import mondrian.calc.impl.BetterExpCompiler;
+import mondrian.util.ObjectFactory;
+
+import org.eigenbase.util.property.StringProperty;
 
 import java.util.List;
 

diff --git a/src/main/mondrian/calc/ResultStyle.java b/src/main/mondrian/calc/ResultStyle.java
@@ -8,8 +8,8 @@
 */
 package mondrian.calc;
 
-import java.util.List;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * Enumeration of ways that a compiled expression can return its result to

diff --git a/src/main/mondrian/calc/TupleCalc.java b/src/main/mondrian/calc/TupleCalc.java
@@ -9,8 +9,8 @@
 */
 package mondrian.calc;
 
-import mondrian.olap.Member;
 import mondrian.olap.Evaluator;
+import mondrian.olap.Member;
 
 /**
  * Expression which yields a tuple.

diff --git a/src/main/mondrian/calc/TupleList.java b/src/main/mondrian/calc/TupleList.java
@@ -9,9 +9,9 @@
 */
 package mondrian.calc;
 
-import mondrian.olap.*;
+import mondrian.olap.Member;
 
-import java.util.*;
+import java.util.List;
 
 /**
  * List of tuples.

diff --git a/src/main/mondrian/calc/impl/AbstractBooleanCalc.java b/src/main/mondrian/calc/impl/AbstractBooleanCalc.java
@@ -9,10 +9,10 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.BooleanCalc;
+import mondrian.calc.Calc;
 import mondrian.olap.Evaluator;
 import mondrian.olap.Exp;
-import mondrian.olap.type.BooleanType;
-import mondrian.calc.*;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.BooleanCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractCalc.java b/src/main/mondrian/calc/impl/AbstractCalc.java
@@ -9,12 +9,10 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.*;
+import mondrian.mdx.ResolvedFunCall;
 import mondrian.olap.*;
 import mondrian.olap.type.Type;
-import mondrian.calc.Calc;
-import mondrian.calc.CalcWriter;
-import mondrian.calc.ResultStyle;
-import mondrian.mdx.ResolvedFunCall;
 import mondrian.rolap.RolapEvaluator;
 import mondrian.rolap.RolapHierarchy;
 

diff --git a/src/main/mondrian/calc/impl/AbstractDateTimeCalc.java b/src/main/mondrian/calc/impl/AbstractDateTimeCalc.java
@@ -9,9 +9,10 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.Calc;
+import mondrian.calc.DateTimeCalc;
 import mondrian.olap.Evaluator;
 import mondrian.olap.Exp;
-import mondrian.calc.*;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.DateTimeCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractDimensionCalc.java b/src/main/mondrian/calc/impl/AbstractDimensionCalc.java
@@ -9,11 +9,11 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.Calc;
+import mondrian.calc.DimensionCalc;
 import mondrian.olap.Evaluator;
 import mondrian.olap.Exp;
 import mondrian.olap.type.DimensionType;
-import mondrian.calc.DimensionCalc;
-import mondrian.calc.Calc;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.DimensionCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractDoubleCalc.java b/src/main/mondrian/calc/impl/AbstractDoubleCalc.java
@@ -9,11 +9,12 @@
 */
 package mondrian.calc.impl;
 
-import mondrian.olap.*;
+import mondrian.calc.Calc;
+import mondrian.calc.DoubleCalc;
+import mondrian.olap.Evaluator;
+import mondrian.olap.Exp;
 import mondrian.olap.fun.FunUtil;
 import mondrian.olap.type.NumericType;
-import mondrian.calc.DoubleCalc;
-import mondrian.calc.Calc;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.DoubleCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractExpCompiler.java b/src/main/mondrian/calc/impl/AbstractExpCompiler.java
@@ -9,14 +9,15 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.*;
+import mondrian.mdx.MemberExpr;
+import mondrian.mdx.UnresolvedFunCall;
 import mondrian.olap.*;
 import mondrian.olap.fun.*;
 import mondrian.olap.type.*;
 import mondrian.olap.type.DimensionType;
 import mondrian.olap.type.LevelType;
 import mondrian.resource.MondrianResource;
-import mondrian.calc.*;
-import mondrian.mdx.*;
 
 import java.util.*;
 

diff --git a/src/main/mondrian/calc/impl/AbstractHierarchyCalc.java b/src/main/mondrian/calc/impl/AbstractHierarchyCalc.java
@@ -9,11 +9,11 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.Calc;
+import mondrian.calc.HierarchyCalc;
 import mondrian.olap.Evaluator;
 import mondrian.olap.Exp;
 import mondrian.olap.type.HierarchyType;
-import mondrian.calc.HierarchyCalc;
-import mondrian.calc.Calc;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.HierarchyCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractIntegerCalc.java b/src/main/mondrian/calc/impl/AbstractIntegerCalc.java
@@ -9,12 +9,12 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.Calc;
+import mondrian.calc.IntegerCalc;
 import mondrian.olap.Evaluator;
 import mondrian.olap.Exp;
 import mondrian.olap.fun.FunUtil;
 import mondrian.olap.type.NumericType;
-import mondrian.calc.IntegerCalc;
-import mondrian.calc.Calc;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.IntegerCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractIterCalc.java b/src/main/mondrian/calc/impl/AbstractIterCalc.java
@@ -9,9 +9,10 @@
 */
 package mondrian.calc.impl;
 
-import mondrian.olap.*;
-import mondrian.olap.type.SetType;
 import mondrian.calc.*;
+import mondrian.olap.Evaluator;
+import mondrian.olap.Exp;
+import mondrian.olap.type.SetType;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.IterCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractLevelCalc.java b/src/main/mondrian/calc/impl/AbstractLevelCalc.java
@@ -9,11 +9,11 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.Calc;
+import mondrian.calc.LevelCalc;
 import mondrian.olap.Evaluator;
 import mondrian.olap.Exp;
 import mondrian.olap.type.LevelType;
-import mondrian.calc.LevelCalc;
-import mondrian.calc.Calc;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.LevelCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractListCalc.java b/src/main/mondrian/calc/impl/AbstractListCalc.java
@@ -9,9 +9,10 @@
 */
 package mondrian.calc.impl;
 
-import mondrian.olap.*;
-import mondrian.olap.type.SetType;
 import mondrian.calc.*;
+import mondrian.olap.Evaluator;
+import mondrian.olap.Exp;
+import mondrian.olap.type.SetType;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.ListCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractMemberCalc.java b/src/main/mondrian/calc/impl/AbstractMemberCalc.java
@@ -9,11 +9,11 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.Calc;
+import mondrian.calc.MemberCalc;
 import mondrian.olap.Evaluator;
 import mondrian.olap.Exp;
 import mondrian.olap.type.MemberType;
-import mondrian.calc.MemberCalc;
-import mondrian.calc.Calc;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.MemberCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractStringCalc.java b/src/main/mondrian/calc/impl/AbstractStringCalc.java
@@ -9,10 +9,10 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.Calc;
+import mondrian.calc.StringCalc;
 import mondrian.olap.Evaluator;
 import mondrian.olap.Exp;
-import mondrian.calc.StringCalc;
-import mondrian.calc.Calc;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.StringCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractTupleCalc.java b/src/main/mondrian/calc/impl/AbstractTupleCalc.java
@@ -9,10 +9,10 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.Calc;
+import mondrian.calc.TupleCalc;
 import mondrian.olap.Evaluator;
 import mondrian.olap.Exp;
-import mondrian.calc.TupleCalc;
-import mondrian.calc.Calc;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.TupleCalc} interface.

diff --git a/src/main/mondrian/calc/impl/AbstractVoidCalc.java b/src/main/mondrian/calc/impl/AbstractVoidCalc.java
@@ -9,9 +9,10 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.Calc;
+import mondrian.calc.VoidCalc;
 import mondrian.olap.Evaluator;
 import mondrian.olap.Exp;
-import mondrian.calc.*;
 
 /**
  * Abstract implementation of the {@link mondrian.calc.VoidCalc} interface.

diff --git a/src/main/mondrian/calc/impl/BetterExpCompiler.java b/src/main/mondrian/calc/impl/BetterExpCompiler.java
@@ -9,9 +9,9 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.*;
 import mondrian.olap.*;
 import mondrian.olap.type.*;
-import mondrian.calc.*;
 
 import java.util.List;
 

diff --git a/src/main/mondrian/calc/impl/CacheCalc.java b/src/main/mondrian/calc/impl/CacheCalc.java
@@ -9,8 +9,8 @@
 */
 package mondrian.calc.impl;
 
-import mondrian.olap.*;
 import mondrian.calc.Calc;
+import mondrian.olap.*;
 
 /**
  * Calculation which retrieves the value of an underlying calculation

diff --git a/src/main/mondrian/calc/impl/ConstantCalc.java b/src/main/mondrian/calc/impl/ConstantCalc.java
@@ -9,12 +9,12 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.*;
 import mondrian.olap.*;
 import mondrian.olap.fun.FunUtil;
 import mondrian.olap.type.*;
 import mondrian.olap.type.DimensionType;
 import mondrian.olap.type.LevelType;
-import mondrian.calc.*;
 
 import java.util.Map;
 

diff --git a/src/main/mondrian/calc/impl/DelegatingExpCompiler.java b/src/main/mondrian/calc/impl/DelegatingExpCompiler.java
@@ -9,10 +9,10 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.*;
 import mondrian.mdx.MdxVisitor;
 import mondrian.olap.*;
 import mondrian.olap.type.Type;
-import mondrian.calc.*;
 
 import java.io.PrintWriter;
 import java.util.List;

diff --git a/src/main/mondrian/calc/impl/DelegatingTupleList.java b/src/main/mondrian/calc/impl/DelegatingTupleList.java
@@ -11,7 +11,8 @@
 
 import mondrian.calc.TupleIterator;
 import mondrian.calc.TupleList;
-import mondrian.olap.*;
+import mondrian.olap.Member;
+import mondrian.olap.Util;
 
 import java.util.*;
 

diff --git a/src/main/mondrian/calc/impl/GenericCalc.java b/src/main/mondrian/calc/impl/GenericCalc.java
@@ -9,11 +9,11 @@
 */
 package mondrian.calc.impl;
 
+import mondrian.calc.*;
 import mondrian.olap.*;
 import mondrian.olap.fun.FunUtil;
-import mondrian.calc.*;
 
-import java.util.*;
+import java.util.Date;
 
 /**
  * Adapter which computes a scalar or tuple expression and converts it to any

diff --git a/src/main/mondrian/calc/impl/GenericIterCalc.java b/src/main/mondrian/calc/impl/GenericIterCalc.java
@@ -9,9 +9,10 @@
 */
 package mondrian.calc.impl;
 
-import mondrian.olap.*;
-import mondrian.olap.type.SetType;
 import mondrian.calc.*;
+import mondrian.olap.Evaluator;
+import mondrian.olap.Exp;
+import mondrian.olap.type.SetType;
 
 /**
  * Adapter which computes a set expression and converts it to any list or

diff --git a/src/main/mondrian/calc/impl/IterableListCalc.java b/src/main/mondrian/calc/impl/IterableListCalc.java
@@ -10,7 +10,7 @@
 package mondrian.calc.impl;
 
 import mondrian.calc.*;
-import mondrian.olap.*;
+import mondrian.olap.Evaluator;
 
 /**
  * Adapter that converts a {@link mondrian.calc.IterCalc} to a

diff --git a/src/main/mondrian/calc/impl/MemberValueCalc.java b/src/main/mondrian/calc/impl/MemberValueCalc.java
@@ -9,7 +9,8 @@
 */
 package mondrian.calc.impl;
 
-import mondrian.calc.*;
+import mondrian.calc.Calc;
+import mondrian.calc.MemberCalc;
 import mondrian.olap.*;
 import mondrian.olap.type.ScalarType;
 import mondrian.olap.type.Type;

diff --git a/src/main/mondrian/calc/impl/ValueCalc.java b/src/main/mondrian/calc/impl/ValueCalc.java
@@ -9,8 +9,8 @@
 */
 package mondrian.calc.impl;
 
-import mondrian.olap.*;
 import mondrian.calc.Calc;
+import mondrian.olap.*;
 
 /**
  * Expression which yields the value of the current member in the current