Code Refactor: Enhance RTP related feature.

Signed-off-by: Pengcheng Bian <[email protected]>
ailoan · Jan 7, 2015 · 9dabd8b · 9dabd8b
1 parent 76baabe
commit 9dabd8b
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/....item.crosstab.core/src/org/eclipse/birt/report/item/crosstab/core/util/CrosstabUtil.java b/....item.crosstab.core/src/org/eclipse/birt/report/item/crosstab/core/util/CrosstabUtil.java
@@ -1222,11 +1222,16 @@ public static ComputedColumnHandle getMeasureBindingColumnHandle( MeasureViewHan
 
  public static boolean isLinkedDataModelMeasureView( MeasureViewHandle mv )
  {
- String refColumn = getRefLinkedDataModelColumnName( mv );
+ String refColumn = getRefLinkedDataModelColumnName( mv, true );
  return refColumn != null && !refColumn.isEmpty();
  }
 
  public static String getRefLinkedDataModelColumnName( MeasureViewHandle mv )
+ {
+ return getRefLinkedDataModelColumnName( mv, false );
+ }
+
+ public static String getRefLinkedDataModelColumnName( MeasureViewHandle mv, boolean ignoreRTP )
  {
  if( mv == null )
  {
@@ -1246,6 +1251,12 @@ public static String getRefLinkedDataModelColumnName( MeasureViewHandle mv )
  && ch.getAggregateFunction() != null 
  && !ch.getAggregateFunction().isEmpty() )
  { 
+ if( ignoreRTP && ch.getCalculationType( ) != null )
+ {
+ // ignore RTP computed measure view
+ return null;
+ }
+
  ExpressionHandle expr = ch
  .getExpressionProperty( ComputedColumn.EXPRESSION_MEMBER ); 
  String expression = (expr != null) ? expr.getStringExpression( ) : null;