Skip to content

Commit

Permalink
Summary: Refactoring code for extra works.(T63772)
Browse files Browse the repository at this point in the history 
Bugzilla Bug(s) Resolved:

Description:
Refactoring code for extra works.(T63772)
  • Loading branch information
heli committed Aug 12, 2013
1 parent 6b46c4d commit 0452cef
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 33 deletions.
54 changes: 21 additions & 33 deletions ...ipse.birt.chart.reportitem/src/org/eclipse/birt/chart/reportitem/ChartReportItemUtil.java
View file
Expand Up @@ -58,8 +58,6 @@
import org.eclipse.birt.report.engine.extension.IReportItemPresentationInfo;
import org.eclipse.birt.report.item.crosstab.core.ICrosstabConstants;
import org.eclipse.birt.report.item.crosstab.core.de.CrosstabReportItemHandle;
import org.eclipse.birt.report.item.crosstab.core.de.CrosstabViewHandle;
import org.eclipse.birt.report.item.crosstab.core.de.DimensionViewHandle;
import org.eclipse.birt.report.model.api.AggregationArgumentHandle;
import org.eclipse.birt.report.model.api.ComputedColumnHandle;
import org.eclipse.birt.report.model.api.DesignElementHandle;
Expand All @@ -77,7 +75,6 @@
import org.eclipse.birt.report.model.api.extension.ExtendedElementException;
import org.eclipse.birt.report.model.api.olap.CubeHandle;
import org.eclipse.birt.report.model.api.olap.HierarchyHandle;
import org.eclipse.birt.report.model.api.olap.LevelHandle;
import org.eclipse.birt.report.model.api.util.CubeUtil;
import org.eclipse.birt.report.model.elements.interfaces.IGroupElementModel;
import org.eclipse.core.runtime.IAdapterManager;
Expand Down Expand Up @@ -974,16 +971,20 @@ public static boolean validateCubeResultSetBinding(
CrosstabReportItemHandle crossTab = (CrosstabReportItemHandle) ( (ExtendedItemHandle) handle ).getReportItem( );
ExpressionCodec exprCodec = ChartModelHelper.instance( )
.createExpressionCodec( );
ArrayList<String> rowAxisDimensions = new ArrayList<String>( );
ArrayList<String> colAxisDimensions = new ArrayList<String>( );
List<String> rowAxisDimensions = new ArrayList<String>( );
List<String> colAxisDimensions = new ArrayList<String>( );
/* get cross tab row and column dimensions */
if ( crossTab.getCrosstabView( ICrosstabConstants.ROW_AXIS_TYPE ) != null )
{
rowAxisDimensions = getDemensions( crossTab.getCrosstabView( ICrosstabConstants.ROW_AXIS_TYPE ) );
rowAxisDimensions = ChartReportItemHelper.instance( )
.getLevelBindingNamesOfCrosstab( crossTab.getCrosstabView( ICrosstabConstants.ROW_AXIS_TYPE ),
itemHandle );
}
if ( crossTab.getCrosstabView( ICrosstabConstants.COLUMN_AXIS_TYPE ) != null )
{
colAxisDimensions = getDemensions( crossTab.getCrosstabView( ICrosstabConstants.COLUMN_AXIS_TYPE ) );
colAxisDimensions = ChartReportItemHelper.instance( )
.getLevelBindingNamesOfCrosstab( crossTab.getCrosstabView( ICrosstabConstants.COLUMN_AXIS_TYPE ),
itemHandle );
}

// get all bindings
Expand Down Expand Up @@ -1046,35 +1047,22 @@ public static boolean validateCubeResultSetBinding(
return true;
}

/*
* get all dimensions in cross tab view.
*/
private static ArrayList<String> getDemensions(
CrosstabViewHandle viewHandle )
{
ArrayList<String> names = new ArrayList<String>( );
for ( int i = 0; i < viewHandle.getDimensionCount( ); i++ )
{
DimensionViewHandle dimensionHandle = viewHandle.getDimension( i );
for ( int k = 0; k < dimensionHandle.getLevelCount( ); k++ )
{
names.add( dimensionHandle.getLevel( k )
.getCubeLevel( )
.getName( ) );
}
}

return names;
}

private static boolean searchAggregation( String aggOn,
Map<String, ComputedColumnHandle> bindingMap,
ArrayList<String> rowAxisDimensions,
ArrayList<String> colAxisDimensions, String[] catecoryBindNames,
List<String> rowAxisDimensions,
List<String> colAxisDimensions, String[] catecoryBindNames,
String[] yOptionalBindNames, ReportItemHandle itemHandle )
{
ExpressionCodec exprCodec = ChartModelHelper.instance( )
.createExpressionCodec( );
ExpressionCodec exprCodec = null;
if ( itemHandle instanceof ExtendedItemHandle )
{
exprCodec = ChartReportItemHelper.instance( )
.createExpressionCodec( (ExtendedItemHandle) itemHandle );
}
else
{
exprCodec = ChartModelHelper.instance( ).createExpressionCodec( );
}
String[] levelNames = CubeUtil.splitLevelName( aggOn );
ComputedColumnHandle cch = ChartReportItemHelper.instance( )
.findDimensionBinding( exprCodec,
Expand All @@ -1088,7 +1076,7 @@ private static boolean searchAggregation( String aggOn,
}

/* see aggregation is on row or column dimension */
ArrayList<String> dimensions = null;
List<String> dimensions = null;
if ( rowAxisDimensions.contains( cch.getName( ) ) )
{
dimensions = rowAxisDimensions;
Expand Down
23 changes: 23 additions & 0 deletions ...irt.chart.reportitem/src/org/eclipse/birt/chart/reportitem/api/ChartReportItemHelper.java
View file
Expand Up @@ -11,14 +11,18 @@

package org.eclipse.birt.chart.reportitem.api;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;

import org.eclipse.birt.chart.model.Chart;
import org.eclipse.birt.chart.model.impl.ChartModelHelper;
import org.eclipse.birt.chart.util.ChartExpressionUtil;
import org.eclipse.birt.chart.util.ChartExpressionUtil.ExpressionCodec;
import org.eclipse.birt.core.data.ExpressionUtil;
import org.eclipse.birt.report.item.crosstab.core.de.CrosstabViewHandle;
import org.eclipse.birt.report.item.crosstab.core.de.DimensionViewHandle;
import org.eclipse.birt.report.model.api.ComputedColumnHandle;
import org.eclipse.birt.report.model.api.DataSetHandle;
import org.eclipse.birt.report.model.api.ExtendedItemHandle;
Expand Down Expand Up @@ -102,4 +106,23 @@ public String getMeasureExprIndicator( CubeHandle cubeHandle )
{
return ExpressionUtil.MEASURE_INDICATOR;
}

public List<String> getLevelBindingNamesOfCrosstab(
CrosstabViewHandle viewHandle, ReportItemHandle chartHandle )
{
ArrayList<String> names = new ArrayList<String>( );
for ( int i = 0; i < viewHandle.getDimensionCount( ); i++ )
{
DimensionViewHandle dimensionHandle = viewHandle.getDimension( i );
dimensionHandle.availableBindings( );
for ( int k = 0; k < dimensionHandle.getLevelCount( ); k++ )
{
names.add( dimensionHandle.getLevel( k )
.getCubeLevel( )
.getName( ) );
}
}

return names;
}
}

0 comments on commit 0452cef

Please sign in to comment.