MONDRIAN: Optimize/canonize imports.

[git-p4: depot-paths = "//open/mondrian/": change = 14713]
pentaho · Oct 22, 2011 · 2983fa5 · 2983fa5
1 parent 3e1a2e1
commit 2983fa5
Show file tree

Hide file tree

Showing 139 changed files with 358 additions and 478 deletions.
diff --git a/src/main/mondrian/olap/fun/AbstractAggregateFunDef.java b/src/main/mondrian/olap/fun/AbstractAggregateFunDef.java
@@ -11,11 +11,11 @@
 
 import mondrian.calc.*;
 import mondrian.calc.impl.DelegatingTupleList;
+import mondrian.mdx.UnresolvedFunCall;
 import mondrian.olap.*;
 import mondrian.resource.MondrianResource;
-import mondrian.mdx.UnresolvedFunCall;
-import mondrian.rolap.RolapMember;
 import mondrian.rolap.RolapCube;
+import mondrian.rolap.RolapMember;
 
 import java.util.*;
 

diff --git a/src/main/mondrian/olap/fun/AddCalculatedMembersFunDef.java b/src/main/mondrian/olap/fun/AddCalculatedMembersFunDef.java
@@ -14,9 +14,7 @@
 import mondrian.calc.impl.UnaryTupleList;
 import mondrian.mdx.ResolvedFunCall;
 import mondrian.olap.*;
-import mondrian.olap.type.SetType;
-import mondrian.olap.type.MemberType;
-import mondrian.olap.type.Type;
+import mondrian.olap.type.*;
 
 import java.util.*;
 

diff --git a/src/main/mondrian/olap/fun/AggregateFunDef.java b/src/main/mondrian/olap/fun/AggregateFunDef.java
@@ -14,12 +14,13 @@
 import mondrian.mdx.ResolvedFunCall;
 import mondrian.olap.*;
 import mondrian.olap.Role.RollupPolicy;
-import mondrian.rolap.*;
-
-import java.util.*;
+import mondrian.rolap.RolapAggregator;
+import mondrian.rolap.RolapEvaluator;
 
 import org.eigenbase.util.property.IntegerProperty;
 
+import java.util.*;
+
 /**
  * Definition of the <code>AGGREGATE</code> MDX function.
  *

diff --git a/src/main/mondrian/olap/fun/AncestorFunDef.java b/src/main/mondrian/olap/fun/AncestorFunDef.java
@@ -9,15 +9,12 @@
 */
 package mondrian.olap.fun;
 
-import mondrian.olap.FunDef;
-import mondrian.olap.Member;
-import mondrian.olap.Evaluator;
-import mondrian.olap.Level;
-import mondrian.olap.type.Type;
-import mondrian.olap.type.LevelType;
 import mondrian.calc.*;
 import mondrian.calc.impl.AbstractMemberCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
+import mondrian.olap.type.LevelType;
+import mondrian.olap.type.Type;
 
 /**
  * Definition of the <code>Ancestor</code> MDX function.

diff --git a/src/main/mondrian/olap/fun/AsFunDef.java b/src/main/mondrian/olap/fun/AsFunDef.java
@@ -11,8 +11,8 @@
 
 import mondrian.calc.*;
 import mondrian.calc.impl.AbstractIterCalc;
-import mondrian.mdx.ResolvedFunCall;
 import mondrian.mdx.NamedSetExpr;
+import mondrian.mdx.ResolvedFunCall;
 import mondrian.olap.*;
 
 import java.util.List;

diff --git a/src/main/mondrian/olap/fun/AvgFunDef.java b/src/main/mondrian/olap/fun/AvgFunDef.java
@@ -10,10 +10,10 @@
 package mondrian.olap.fun;
 
 import mondrian.calc.*;
-import mondrian.olap.*;
-import mondrian.calc.impl.ValueCalc;
 import mondrian.calc.impl.AbstractDoubleCalc;
+import mondrian.calc.impl.ValueCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
 
 /**
  * Definition of the <code>Avg</code> MDX function.

diff --git a/src/main/mondrian/olap/fun/BuiltinFunTable.java b/src/main/mondrian/olap/fun/BuiltinFunTable.java
@@ -16,11 +16,10 @@
 import mondrian.calc.impl.*;
 import mondrian.mdx.ResolvedFunCall;
 import mondrian.olap.*;
-import mondrian.olap.Member;
-import mondrian.olap.fun.extra.NthQuartileFunDef;
 import mondrian.olap.fun.extra.CalculatedChildFunDef;
-import mondrian.olap.fun.vba.Vba;
+import mondrian.olap.fun.extra.NthQuartileFunDef;
 import mondrian.olap.fun.vba.Excel;
+import mondrian.olap.fun.vba.Vba;
 import mondrian.olap.type.LevelType;
 import mondrian.olap.type.Type;
 

diff --git a/src/main/mondrian/olap/fun/CacheFunDef.java b/src/main/mondrian/olap/fun/CacheFunDef.java
@@ -9,13 +9,13 @@
 */
 package mondrian.olap.fun;
 
-import mondrian.olap.*;
-import mondrian.olap.type.Type;
-import mondrian.olap.type.SetType;
 import mondrian.calc.*;
 import mondrian.calc.impl.GenericCalc;
 import mondrian.calc.impl.GenericIterCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
+import mondrian.olap.type.SetType;
+import mondrian.olap.type.Type;
 
 import java.io.PrintWriter;
 import java.util.List;

diff --git a/src/main/mondrian/olap/fun/CaseMatchFunDef.java b/src/main/mondrian/olap/fun/CaseMatchFunDef.java
@@ -9,15 +9,15 @@
 */
 package mondrian.olap.fun;
 
-import mondrian.olap.*;
 import mondrian.calc.Calc;
 import mondrian.calc.ExpCompiler;
 import mondrian.calc.impl.ConstantCalc;
 import mondrian.calc.impl.GenericCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Definition of the matched <code>CASE</code> MDX operator.

diff --git a/src/main/mondrian/olap/fun/CaseTestFunDef.java b/src/main/mondrian/olap/fun/CaseTestFunDef.java
@@ -9,16 +9,14 @@
 */
 package mondrian.olap.fun;
 
-import mondrian.olap.*;
-import mondrian.calc.Calc;
-import mondrian.calc.ExpCompiler;
-import mondrian.calc.BooleanCalc;
+import mondrian.calc.*;
 import mondrian.calc.impl.ConstantCalc;
 import mondrian.calc.impl.GenericCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Definition of the tested <code>CASE</code> MDX operator.

diff --git a/src/main/mondrian/olap/fun/CastFunDef.java b/src/main/mondrian/olap/fun/CastFunDef.java
@@ -9,14 +9,14 @@
 */
 package mondrian.olap.fun;
 
-import mondrian.olap.*;
-import mondrian.olap.type.Type;
-import mondrian.olap.type.TypeUtil;
-import mondrian.resource.MondrianResource;
 import mondrian.calc.Calc;
 import mondrian.calc.ExpCompiler;
 import mondrian.calc.impl.GenericCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
+import mondrian.olap.type.Type;
+import mondrian.olap.type.TypeUtil;
+import mondrian.resource.MondrianResource;
 
 import java.util.List;
 

diff --git a/src/main/mondrian/olap/fun/CoalesceEmptyFunDef.java b/src/main/mondrian/olap/fun/CoalesceEmptyFunDef.java
@@ -9,10 +9,11 @@
 */
 package mondrian.olap.fun;
 
-import mondrian.olap.*;
-import mondrian.calc.*;
+import mondrian.calc.Calc;
+import mondrian.calc.ExpCompiler;
 import mondrian.calc.impl.GenericCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
 
 import java.util.List;
 

diff --git a/src/main/mondrian/olap/fun/CorrelationFunDef.java b/src/main/mondrian/olap/fun/CorrelationFunDef.java
@@ -10,10 +10,10 @@
 package mondrian.olap.fun;
 
 import mondrian.calc.*;
-import mondrian.olap.*;
-import mondrian.calc.impl.ValueCalc;
 import mondrian.calc.impl.AbstractDoubleCalc;
+import mondrian.calc.impl.ValueCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
 
 /**
  * Definition of the <code>Correlation</code> MDX function.

diff --git a/src/main/mondrian/olap/fun/CountFunDef.java b/src/main/mondrian/olap/fun/CountFunDef.java
@@ -9,10 +9,10 @@
 */
 package mondrian.olap.fun;
 
-import mondrian.olap.*;
 import mondrian.calc.*;
 import mondrian.calc.impl.AbstractIntegerCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
 
 /**
  * Definition of the <code>Count</code> MDX function.

diff --git a/src/main/mondrian/olap/fun/CovarianceFunDef.java b/src/main/mondrian/olap/fun/CovarianceFunDef.java
@@ -10,10 +10,10 @@
 package mondrian.olap.fun;
 
 import mondrian.calc.*;
-import mondrian.olap.*;
-import mondrian.calc.impl.ValueCalc;
 import mondrian.calc.impl.AbstractDoubleCalc;
+import mondrian.calc.impl.ValueCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
 
 /**
  * Definition of the <code>Covariance</code> and

diff --git a/src/main/mondrian/olap/fun/CrossJoinFunDef.java b/src/main/mondrian/olap/fun/CrossJoinFunDef.java
@@ -15,8 +15,8 @@
 import mondrian.mdx.*;
 import mondrian.olap.*;
 import mondrian.olap.type.*;
-import mondrian.util.*;
-import mondrian.rolap.*;
+import mondrian.rolap.RolapEvaluator;
+import mondrian.util.CartesianProductList;
 
 import java.util.*;
 

diff --git a/src/main/mondrian/olap/fun/CustomizedFunctionTable.java b/src/main/mondrian/olap/fun/CustomizedFunctionTable.java
@@ -9,9 +9,11 @@
 */
 package mondrian.olap.fun;
 
-import java.util.*;
+import mondrian.olap.FunDef;
+import mondrian.olap.FunTable;
 
-import mondrian.olap.*;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Interface to build a customized function table, selecting functions from the

diff --git a/src/main/mondrian/olap/fun/DescendantsFunDef.java b/src/main/mondrian/olap/fun/DescendantsFunDef.java
@@ -10,15 +10,16 @@
 */
 package mondrian.olap.fun;
 
-import java.util.*;
-
-import mondrian.calc.impl.*;
-import mondrian.olap.*;
-import mondrian.olap.type.*;
 import mondrian.calc.*;
+import mondrian.calc.impl.AbstractListCalc;
+import mondrian.calc.impl.UnaryTupleList;
 import mondrian.mdx.*;
+import mondrian.olap.*;
+import mondrian.olap.type.*;
 import mondrian.resource.MondrianResource;
 
+import java.util.*;
+
 /**
  * Definition of the <code>Descendants</code> MDX function.
  *

diff --git a/src/main/mondrian/olap/fun/DimensionDimensionFunDef.java b/src/main/mondrian/olap/fun/DimensionDimensionFunDef.java
@@ -12,8 +12,8 @@
 import mondrian.calc.Calc;
 import mondrian.calc.ExpCompiler;
 import mondrian.calc.impl.ConstantCalc;
-import mondrian.mdx.ResolvedFunCall;
 import mondrian.mdx.DimensionExpr;
+import mondrian.mdx.ResolvedFunCall;
 import mondrian.olap.Dimension;
 import mondrian.olap.type.DimensionType;
 

diff --git a/src/main/mondrian/olap/fun/DimensionsNumericFunDef.java b/src/main/mondrian/olap/fun/DimensionsNumericFunDef.java
@@ -13,7 +13,8 @@
 import mondrian.calc.impl.AbstractHierarchyCalc;
 import mondrian.mdx.ResolvedFunCall;
 import mondrian.olap.*;
-import mondrian.olap.type.*;
+import mondrian.olap.type.HierarchyType;
+import mondrian.olap.type.Type;
 import mondrian.rolap.RolapCube;
 import mondrian.rolap.RolapHierarchy;
 

diff --git a/src/main/mondrian/olap/fun/DimensionsStringFunDef.java b/src/main/mondrian/olap/fun/DimensionsStringFunDef.java
@@ -9,11 +9,12 @@
 */
 package mondrian.olap.fun;
 
-import mondrian.olap.type.*;
-import mondrian.olap.*;
 import mondrian.calc.*;
 import mondrian.calc.impl.AbstractHierarchyCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
+import mondrian.olap.type.HierarchyType;
+import mondrian.olap.type.Type;
 
 /**
  * Definition of the <code>Dimensions(&lt;String Expression&gt;)</code>

diff --git a/src/main/mondrian/olap/fun/DistinctFunDef.java b/src/main/mondrian/olap/fun/DistinctFunDef.java
@@ -9,16 +9,14 @@
 */
 package mondrian.olap.fun;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import mondrian.calc.*;
 import mondrian.calc.impl.AbstractListCalc;
 import mondrian.mdx.ResolvedFunCall;
 import mondrian.olap.Evaluator;
 import mondrian.olap.Member;
 
+import java.util.*;
+
 /**
  * Definition of the <code>Distinct</code> MDX function.
  *

diff --git a/src/main/mondrian/olap/fun/DrilldownLevelFunDef.java b/src/main/mondrian/olap/fun/DrilldownLevelFunDef.java
@@ -9,13 +9,14 @@
 */
 package mondrian.olap.fun;
 
-import mondrian.calc.impl.UnaryTupleList;
-import mondrian.olap.*;
 import mondrian.calc.*;
 import mondrian.calc.impl.AbstractListCalc;
+import mondrian.calc.impl.UnaryTupleList;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Definition of the <code>DrilldownLevel</code> MDX function.

diff --git a/src/main/mondrian/olap/fun/DrilldownLevelTopBottomFunDef.java b/src/main/mondrian/olap/fun/DrilldownLevelTopBottomFunDef.java
@@ -9,13 +9,14 @@
 */
 package mondrian.olap.fun;
 
+import mondrian.calc.*;
 import mondrian.calc.impl.*;
+import mondrian.mdx.ResolvedFunCall;
 import mondrian.olap.*;
 import mondrian.olap.type.ScalarType;
-import mondrian.calc.*;
-import mondrian.mdx.ResolvedFunCall;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Definition of the <code>DrilldownLevelTop</code> and

diff --git a/src/main/mondrian/olap/fun/DrilldownMemberFunDef.java b/src/main/mondrian/olap/fun/DrilldownMemberFunDef.java
@@ -9,10 +9,10 @@
 */
 package mondrian.olap.fun;
 
-import mondrian.calc.impl.AbstractListCalc;
-import mondrian.olap.*;
 import mondrian.calc.*;
+import mondrian.calc.impl.AbstractListCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
 
 import java.util.*;
 

diff --git a/src/main/mondrian/olap/fun/ExistsFunDef.java b/src/main/mondrian/olap/fun/ExistsFunDef.java
@@ -10,12 +10,13 @@
 */
 package mondrian.olap.fun;
 
-import mondrian.olap.*;
 import mondrian.calc.*;
 import mondrian.calc.impl.AbstractListCalc;
 import mondrian.mdx.ResolvedFunCall;
+import mondrian.olap.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Definition of the <code>EXISTS</code> MDX function.

diff --git a/src/main/mondrian/olap/fun/FilterFunDef.java b/src/main/mondrian/olap/fun/FilterFunDef.java
@@ -14,7 +14,7 @@
 import mondrian.mdx.ResolvedFunCall;
 import mondrian.olap.*;
 
-import java.util.*;
+import java.util.List;
 
 /**
  * Definition of the <code>Filter</code> MDX function.