| author | ning.zhang | 2012-06-06 01:36:14 (EDT) |
|---|---|---|
| committer | dgao | 2012-06-06 01:36:14 (EDT) |
| commit | c7958d22c21e887343b0f82820721fcf12c6be61 (patch) (side-by-side diff) | |
| tree | 5c2f5b82f6c4c714a5bea3785bbe560d6a35883e | |
| parent | af6fd3dae538f1cf4f659da4842ab1599d72ccb4 (diff) | |
| download | org.eclipse.birt-c7958d22c21e887343b0f82820721fcf12c6be61.zip org.eclipse.birt-c7958d22c21e887343b0f82820721fcf12c6be61.tar.gz org.eclipse.birt-c7958d22c21e887343b0f82820721fcf12c6be61.tar.bz2 | |
Maxlevel option in Preferences should be removed.
11 files changed, 144 insertions, 144 deletions
diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/actions/GenerateDocumentToolbarMenuAction.java b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/actions/GenerateDocumentToolbarMenuAction.java index f7bf5ef..769d8f4 100644 --- a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/actions/GenerateDocumentToolbarMenuAction.java +++ b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/actions/GenerateDocumentToolbarMenuAction.java @@ -58,8 +58,8 @@ public class GenerateDocumentToolbarMenuAction implements System.clearProperty( IPreviewConstants.SID ); System.clearProperty( IPreviewConstants.DSID ); System.clearProperty( IPreviewConstants.MAX_DATASET_ROWS ); - System.clearProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS ); - System.clearProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS ); +// System.clearProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS ); +// System.clearProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS ); FormEditor editor = UIUtil.getActiveReportEditor( false ); ModuleHandle model = null; diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/actions/PreviewSupport.java b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/actions/PreviewSupport.java index 71221fe..241ac0a 100644 --- a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/actions/PreviewSupport.java +++ b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/actions/PreviewSupport.java @@ -259,8 +259,8 @@ abstract class PreviewSupport System.clearProperty( IPreviewConstants.SID ); System.clearProperty( IPreviewConstants.DSID ); System.clearProperty( IPreviewConstants.MAX_DATASET_ROWS ); - System.clearProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS ); - System.clearProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS ); +// System.clearProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS ); +// System.clearProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS ); return true; } diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/GenerateDocumentAction.java b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/GenerateDocumentAction.java index 5b8f036..282ae52 100644 --- a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/GenerateDocumentAction.java +++ b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/GenerateDocumentAction.java @@ -34,8 +34,8 @@ public class GenerateDocumentAction extends AbstractViewAction System.clearProperty( IPreviewConstants.SID ); System.clearProperty( IPreviewConstants.DSID ); System.clearProperty( IPreviewConstants.MAX_DATASET_ROWS ); - System.clearProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS ); - System.clearProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS ); +// System.clearProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS ); +// System.clearProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS ); return true; } diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/RunReportAction.java b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/RunReportAction.java index 24c62e1..aa30573 100644 --- a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/RunReportAction.java +++ b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/RunReportAction.java @@ -34,8 +34,8 @@ public class RunReportAction extends AbstractViewAction System.clearProperty( IPreviewConstants.SID ); System.clearProperty( IPreviewConstants.DSID ); System.clearProperty( IPreviewConstants.MAX_DATASET_ROWS ); - System.clearProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS ); - System.clearProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS ); +// System.clearProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS ); +// System.clearProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS ); return true; } diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/ViewDocumentAction.java b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/ViewDocumentAction.java index 3f3f02d..4598e91 100644 --- a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/ViewDocumentAction.java +++ b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/ViewDocumentAction.java @@ -34,8 +34,8 @@ public class ViewDocumentAction extends AbstractViewAction implements System.clearProperty( IPreviewConstants.SID ); System.clearProperty( IPreviewConstants.DSID ); System.clearProperty( IPreviewConstants.MAX_DATASET_ROWS ); - System.clearProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS ); - System.clearProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS ); +// System.clearProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS ); +// System.clearProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS ); return true; } diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/preferences/PreviewDataPreferencePage.java b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/preferences/PreviewDataPreferencePage.java index cdb6134..75d0ce7 100644 --- a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/preferences/PreviewDataPreferencePage.java +++ b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/preferences/PreviewDataPreferencePage.java @@ -44,9 +44,9 @@ public class PreviewDataPreferencePage extends PreferencePage public static final int MAX_DATASET_ROW_DEFAULT = ViewerPlugin.DEFAULT_MAX_ROWS; - public static final int MAX_CUBE_ROW_LEVEL_MEMBER_DEFAULT = ViewerPlugin.DEFAULT_MAX_CUBEROWLEVELS; +// public static final int MAX_CUBE_ROW_LEVEL_MEMBER_DEFAULT = ViewerPlugin.DEFAULT_MAX_CUBEROWLEVELS; - public static final int MAX_CUBE_COLUMN_LEVEL_MEMBER_DEFAULT = ViewerPlugin.DEFAULT_MAX_CUBECOLUMNLEVELS; +// public static final int MAX_CUBE_COLUMN_LEVEL_MEMBER_DEFAULT = ViewerPlugin.DEFAULT_MAX_CUBECOLUMNLEVELS; public static final int MAX_IN_MEMORY_CUBE_SIZE_DEFAULT = ViewerPlugin.DEFAULT_MAX_IN_MEMORY_CUBE_SIZE; @@ -55,17 +55,17 @@ public class PreviewDataPreferencePage extends PreferencePage /** max Row preference name */ public static final String PREVIEW_MAXROW = WebViewer.PREVIEW_MAXROW; - public static final String PREVIEW_MAX_ROW_LEVEL_MEMBER = WebViewer.PREVIEW_MAXCUBEROWLEVEL; +// public static final String PREVIEW_MAX_ROW_LEVEL_MEMBER = WebViewer.PREVIEW_MAXCUBEROWLEVEL; - public static final String PREVIEW_MAX_COLUMN_LEVEL_MEMBER = WebViewer.PREVIEW_MAXCUBECOLUMNLEVEL; +// public static final String PREVIEW_MAX_COLUMN_LEVEL_MEMBER = WebViewer.PREVIEW_MAXCUBECOLUMNLEVEL; public static final String PREVIEW_MAX_IN_MEMORY_CUBE_SIZE = WebViewer.PREVIEW_MAXINMEMORYCUBESIZE; private transient DisplayNumberFieldEditor txtMaxDataSetRow; - private transient IntegerFieldEditor txtMaxRowLevelMember; +// private transient IntegerFieldEditor txtMaxRowLevelMember; - private transient IntegerFieldEditor txtMaxColumnLevelMember; +// private transient IntegerFieldEditor txtMaxColumnLevelMember; private transient IntegerFieldEditor txtMaxInMemoryCubeSize; @@ -84,33 +84,33 @@ public class PreviewDataPreferencePage extends PreferencePage createDispalyRowLimitGroup( cmpTop ); - txtMaxRowLevelMember = new IntegerFieldEditor( PREVIEW_MAX_ROW_LEVEL_MEMBER, - Messages.getString( "designer.preview.preference.resultset.maxrowlevelmember.description" ), cmpTop ); //$NON-NLS-1$ - txtMaxRowLevelMember.setPage( this ); - txtMaxRowLevelMember.setValidateStrategy( StringFieldEditor.VALIDATE_ON_KEY_STROKE ); - txtMaxRowLevelMember.setEmptyStringAllowed( false ); - txtMaxRowLevelMember.setPropertyChangeListener( new IPropertyChangeListener( ) { - - public void propertyChange( PropertyChangeEvent event ) - { - if ( event.getProperty( ).equals( FieldEditor.IS_VALID ) ) - setValid( txtMaxRowLevelMember.isValid( ) ); - } - } ); - - txtMaxColumnLevelMember = new IntegerFieldEditor( PREVIEW_MAX_COLUMN_LEVEL_MEMBER, - Messages.getString( "designer.preview.preference.resultset.maxcolumnlevelmember.description" ), cmpTop ); //$NON-NLS-1$ - txtMaxColumnLevelMember.setPage( this ); - txtMaxColumnLevelMember.setValidateStrategy( StringFieldEditor.VALIDATE_ON_KEY_STROKE ); - txtMaxColumnLevelMember.setEmptyStringAllowed( false ); - txtMaxColumnLevelMember.setPropertyChangeListener( new IPropertyChangeListener( ) { - - public void propertyChange( PropertyChangeEvent event ) - { - if ( event.getProperty( ).equals( FieldEditor.IS_VALID ) ) - setValid( txtMaxColumnLevelMember.isValid( ) ); - } - } ); +// txtMaxRowLevelMember = new IntegerFieldEditor( PREVIEW_MAX_ROW_LEVEL_MEMBER, +// Messages.getString( "designer.preview.preference.resultset.maxrowlevelmember.description" ), cmpTop ); //$NON-NLS-1$ +// txtMaxRowLevelMember.setPage( this ); +// txtMaxRowLevelMember.setValidateStrategy( StringFieldEditor.VALIDATE_ON_KEY_STROKE ); +// txtMaxRowLevelMember.setEmptyStringAllowed( false ); +// txtMaxRowLevelMember.setPropertyChangeListener( new IPropertyChangeListener( ) { +// +// public void propertyChange( PropertyChangeEvent event ) +// { +// if ( event.getProperty( ).equals( FieldEditor.IS_VALID ) ) +// setValid( txtMaxRowLevelMember.isValid( ) ); +// } +// } ); +// +// txtMaxColumnLevelMember = new IntegerFieldEditor( PREVIEW_MAX_COLUMN_LEVEL_MEMBER, +// Messages.getString( "designer.preview.preference.resultset.maxcolumnlevelmember.description" ), cmpTop ); //$NON-NLS-1$ +// txtMaxColumnLevelMember.setPage( this ); +// txtMaxColumnLevelMember.setValidateStrategy( StringFieldEditor.VALIDATE_ON_KEY_STROKE ); +// txtMaxColumnLevelMember.setEmptyStringAllowed( false ); +// txtMaxColumnLevelMember.setPropertyChangeListener( new IPropertyChangeListener( ) { +// +// public void propertyChange( PropertyChangeEvent event ) +// { +// if ( event.getProperty( ).equals( FieldEditor.IS_VALID ) ) +// setValid( txtMaxColumnLevelMember.isValid( ) ); +// } +// } ); txtMaxInMemoryCubeSize = new IntegerFieldEditor( PREVIEW_MAX_IN_MEMORY_CUBE_SIZE, Messages.getString( "designer.preview.preference.resultset.maxinmemorycubesize.description" ), cmpTop ); //$NON-NLS-1$ @@ -204,25 +204,25 @@ public class PreviewDataPreferencePage extends PreferencePage txtMaxDataSetRow.setStringValue( previewAllRows ? "" : defaultMaxRow ); - defaultMaxRow = ViewerPlugin.getDefault( ) - .getPluginPreferences( ) - .getString( PREVIEW_MAX_ROW_LEVEL_MEMBER ); - - if ( defaultMaxRow == null || defaultMaxRow.trim( ).length( ) <= 0 ) - { - defaultMaxRow = String.valueOf( MAX_CUBE_ROW_LEVEL_MEMBER_DEFAULT ); - } - txtMaxRowLevelMember.setStringValue( defaultMaxRow ); - - defaultMaxRow = ViewerPlugin.getDefault( ) - .getPluginPreferences( ) - .getString( PREVIEW_MAX_COLUMN_LEVEL_MEMBER ); - - if ( defaultMaxRow == null || defaultMaxRow.trim( ).length( ) <= 0 ) - { - defaultMaxRow = String.valueOf( MAX_CUBE_COLUMN_LEVEL_MEMBER_DEFAULT ); - } - txtMaxColumnLevelMember.setStringValue( defaultMaxRow ); +// defaultMaxRow = ViewerPlugin.getDefault( ) +// .getPluginPreferences( ) +// .getString( PREVIEW_MAX_ROW_LEVEL_MEMBER ); +// +// if ( defaultMaxRow == null || defaultMaxRow.trim( ).length( ) <= 0 ) +// { +// defaultMaxRow = String.valueOf( MAX_CUBE_ROW_LEVEL_MEMBER_DEFAULT ); +// } +// txtMaxRowLevelMember.setStringValue( defaultMaxRow ); +// +// defaultMaxRow = ViewerPlugin.getDefault( ) +// .getPluginPreferences( ) +// .getString( PREVIEW_MAX_COLUMN_LEVEL_MEMBER ); +// +// if ( defaultMaxRow == null || defaultMaxRow.trim( ).length( ) <= 0 ) +// { +// defaultMaxRow = String.valueOf( MAX_CUBE_COLUMN_LEVEL_MEMBER_DEFAULT ); +// } +// txtMaxColumnLevelMember.setStringValue( defaultMaxRow ); defaultMaxRow = ViewerPlugin.getDefault( ) .getPluginPreferences( ) @@ -244,8 +244,8 @@ public class PreviewDataPreferencePage extends PreferencePage protected void performDefaults( ) { txtMaxDataSetRow.setStringValue( String.valueOf( MAX_DATASET_ROW_DEFAULT ) ); - txtMaxRowLevelMember.setStringValue( String.valueOf( MAX_CUBE_ROW_LEVEL_MEMBER_DEFAULT ) ); - txtMaxColumnLevelMember.setStringValue( String.valueOf( MAX_CUBE_COLUMN_LEVEL_MEMBER_DEFAULT ) ); +// txtMaxRowLevelMember.setStringValue( String.valueOf( MAX_CUBE_ROW_LEVEL_MEMBER_DEFAULT ) ); +// txtMaxColumnLevelMember.setStringValue( String.valueOf( MAX_CUBE_COLUMN_LEVEL_MEMBER_DEFAULT ) ); txtMaxInMemoryCubeSize.setStringValue( String.valueOf( MAX_IN_MEMORY_CUBE_SIZE_DEFAULT ) ); super.performDefaults( ); @@ -259,15 +259,15 @@ public class PreviewDataPreferencePage extends PreferencePage .getPluginPreferences( ) .setValue( PREVIEW_MAXROW, maxRowValue ); - ViewerPlugin.getDefault( ) - .getPluginPreferences( ) - .setValue( PREVIEW_MAX_ROW_LEVEL_MEMBER, - txtMaxRowLevelMember.getIntValue( ) ); - - ViewerPlugin.getDefault( ) - .getPluginPreferences( ) - .setValue( PREVIEW_MAX_COLUMN_LEVEL_MEMBER, - txtMaxColumnLevelMember.getIntValue( ) ); +// ViewerPlugin.getDefault( ) +// .getPluginPreferences( ) +// .setValue( PREVIEW_MAX_ROW_LEVEL_MEMBER, +// txtMaxRowLevelMember.getIntValue( ) ); +// +// ViewerPlugin.getDefault( ) +// .getPluginPreferences( ) +// .setValue( PREVIEW_MAX_COLUMN_LEVEL_MEMBER, +// txtMaxColumnLevelMember.getIntValue( ) ); ViewerPlugin.getDefault( ) .getPluginPreferences( ) diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/preview/editors/ReportPreviewEditor.java b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/preview/editors/ReportPreviewEditor.java index 9b17ccf..7d7eac2 100644 --- a/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/preview/editors/ReportPreviewEditor.java +++ b/UI/org.eclipse.birt.report.designer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/preview/editors/ReportPreviewEditor.java @@ -526,14 +526,14 @@ public abstract class ReportPreviewEditor extends EditorPart this.options.put( WebViewer.MAX_ROWS_KEY, ViewerPlugin.getDefault( ) .getPluginPreferences( ) .getString( WebViewer.PREVIEW_MAXROW ) ); - this.options.put( WebViewer.MAX_CUBE_ROW_LEVELS_KEY, - ViewerPlugin.getDefault( ) - .getPluginPreferences( ) - .getString( WebViewer.PREVIEW_MAXCUBEROWLEVEL ) ); - this.options.put( WebViewer.MAX_CUBE_COLUMN_LEVELS_KEY, - ViewerPlugin.getDefault( ) - .getPluginPreferences( ) - .getString( WebViewer.PREVIEW_MAXCUBECOLUMNLEVEL ) ); +// this.options.put( WebViewer.MAX_CUBE_ROW_LEVELS_KEY, +// ViewerPlugin.getDefault( ) +// .getPluginPreferences( ) +// .getString( WebViewer.PREVIEW_MAXCUBEROWLEVEL ) ); +// this.options.put( WebViewer.MAX_CUBE_COLUMN_LEVELS_KEY, +// ViewerPlugin.getDefault( ) +// .getPluginPreferences( ) +// .getString( WebViewer.PREVIEW_MAXCUBECOLUMNLEVEL ) ); String extKey = ViewerPlugin.getDefault( ) .getPluginPreferences( ) .getString( WebViewer.APPCONTEXT_EXTENSION_KEY ); @@ -562,14 +562,14 @@ public abstract class ReportPreviewEditor extends EditorPart ViewerPlugin.getDefault( ) .getPluginPreferences( ) .getString( WebViewer.PREVIEW_MAXROW ) ); - System.setProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS, - ViewerPlugin.getDefault( ) - .getPluginPreferences( ) - .getString( WebViewer.PREVIEW_MAXCUBEROWLEVEL ) ); - System.setProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS, - ViewerPlugin.getDefault( ) - .getPluginPreferences( ) - .getString( WebViewer.PREVIEW_MAXCUBECOLUMNLEVEL ) ); +// System.setProperty( IPreviewConstants.MAX_CUBE_ROW_LEVELS, +// ViewerPlugin.getDefault( ) +// .getPluginPreferences( ) +// .getString( WebViewer.PREVIEW_MAXCUBEROWLEVEL ) ); +// System.setProperty( IPreviewConstants.MAX_CUBE_COLUMN_LEVELS, +// ViewerPlugin.getDefault( ) +// .getPluginPreferences( ) +// .getString( WebViewer.PREVIEW_MAXCUBECOLUMNLEVEL ) ); if ( browser != null && !browser.isDisposed( ) ) { diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/BirtUtility.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/BirtUtility.java index 1c5de3f..b2c4416 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/BirtUtility.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/BirtUtility.java @@ -1134,15 +1134,15 @@ public class BirtUtility ParameterAccessor.getDpi( request ) ); // Max cube fetch levels - int maxCubeRowLevels = ParameterAccessor.getMaxCubeRowLevels( request ); - if ( maxCubeRowLevels >= 0 ) - context.put( DataEngine.CUBECUSROR_FETCH_LIMIT_ON_ROW_EDGE, - Integer.valueOf( maxCubeRowLevels ) ); - - int maxCubeColumnLevels = ParameterAccessor.getMaxCubeColumnLevels( request ); - if ( maxCubeColumnLevels >= 0 ) - context.put( DataEngine.CUBECURSOR_FETCH_LIMIT_ON_COLUMN_EDGE, - Integer.valueOf( maxCubeColumnLevels ) ); +// int maxCubeRowLevels = ParameterAccessor.getMaxCubeRowLevels( request ); +// if ( maxCubeRowLevels >= 0 ) +// context.put( DataEngine.CUBECUSROR_FETCH_LIMIT_ON_ROW_EDGE, +// Integer.valueOf( maxCubeRowLevels ) ); +// +// int maxCubeColumnLevels = ParameterAccessor.getMaxCubeColumnLevels( request ); +// if ( maxCubeColumnLevels >= 0 ) +// context.put( DataEngine.CUBECURSOR_FETCH_LIMIT_ON_COLUMN_EDGE, +// Integer.valueOf( maxCubeColumnLevels ) ); // Cube memory size int cubeMemorySize = ParameterAccessor.getCubeMemorySize( request ); diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterAccessor.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterAccessor.java index d7c65a7..57f94b0 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterAccessor.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterAccessor.java @@ -214,8 +214,8 @@ public class ParameterAccessor /** * URL parameter name that gives the preview max cube fetch levels option. */ - public static final String PARAM_MAXCUBE_ROWLEVELS = "__maxrowlevels"; //$NON-NLS-1$ - public static final String PARAM_MAXCUBE_COLUMNLEVELS = "__maxcolumnlevels"; //$NON-NLS-1$ +// public static final String PARAM_MAXCUBE_ROWLEVELS = "__maxrowlevels"; //$NON-NLS-1$ +// public static final String PARAM_MAXCUBE_COLUMNLEVELS = "__maxcolumnlevels"; //$NON-NLS-1$ /** * URL parameter name that gives the cube memory size option. @@ -802,15 +802,15 @@ public class ParameterAccessor * @return max levels */ - public static int getMaxCubeRowLevels( HttpServletRequest request ) - { - int curMaxRowLevels = ParameterAccessor.getParameterAsInt( request, - PARAM_MAXCUBE_ROWLEVELS ); - if ( curMaxRowLevels <= 0 ) - curMaxRowLevels = maxCubeRowLevels; - - return curMaxRowLevels; - } +// public static int getMaxCubeRowLevels( HttpServletRequest request ) +// { +// int curMaxRowLevels = ParameterAccessor.getParameterAsInt( request, +// PARAM_MAXCUBE_ROWLEVELS ); +// if ( curMaxRowLevels <= 0 ) +// curMaxRowLevels = maxCubeRowLevels; +// +// return curMaxRowLevels; +// } /** * Get preview max cube fetch column levels. @@ -820,15 +820,15 @@ public class ParameterAccessor * @return max levels */ - public static int getMaxCubeColumnLevels( HttpServletRequest request ) - { - int curMaxColumnLevels = ParameterAccessor.getParameterAsInt( request, - PARAM_MAXCUBE_COLUMNLEVELS ); - if ( curMaxColumnLevels <= 0 ) - curMaxColumnLevels = maxCubeColumnLevels; - - return curMaxColumnLevels; - } +// public static int getMaxCubeColumnLevels( HttpServletRequest request ) +// { +// int curMaxColumnLevels = ParameterAccessor.getParameterAsInt( request, +// PARAM_MAXCUBE_COLUMNLEVELS ); +// if ( curMaxColumnLevels <= 0 ) +// curMaxColumnLevels = maxCubeColumnLevels; +// +// return curMaxColumnLevels; +// } /** * Get cube memory size. diff --git a/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/ViewerPlugin.java b/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/ViewerPlugin.java index 7cd0ea8..623125e 100644 --- a/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/ViewerPlugin.java +++ b/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/ViewerPlugin.java @@ -55,9 +55,9 @@ public class ViewerPlugin extends Plugin * Default value of max cube fetch levels setting displaying in preference * page */ - public final static int DEFAULT_MAX_CUBEROWLEVELS = 50; +// public final static int DEFAULT_MAX_CUBEROWLEVELS = 50; - public final static int DEFAULT_MAX_CUBECOLUMNLEVELS = 50; +// public final static int DEFAULT_MAX_CUBECOLUMNLEVELS = 50; /** * Default value of max in-memory cube size in MB @@ -124,12 +124,12 @@ public class ViewerPlugin extends Plugin .setDefault( WebViewer.MASTER_PAGE_CONTENT, true ); plugin.getPluginPreferences( ).setDefault( WebViewer.PREVIEW_MAXROW, DEFAULT_MAX_ROWS ); - plugin.getPluginPreferences( ) - .setDefault( WebViewer.PREVIEW_MAXCUBEROWLEVEL, - DEFAULT_MAX_CUBEROWLEVELS ); - plugin.getPluginPreferences( ) - .setDefault( WebViewer.PREVIEW_MAXCUBECOLUMNLEVEL, - DEFAULT_MAX_CUBECOLUMNLEVELS ); +// plugin.getPluginPreferences( ) +// .setDefault( WebViewer.PREVIEW_MAXCUBEROWLEVEL, +// DEFAULT_MAX_CUBEROWLEVELS ); +// plugin.getPluginPreferences( ) +// .setDefault( WebViewer.PREVIEW_MAXCUBECOLUMNLEVEL, +// DEFAULT_MAX_CUBECOLUMNLEVELS ); plugin.getPluginPreferences( ) .setDefault( WebViewer.PREVIEW_MAXINMEMORYCUBESIZE, DEFAULT_MAX_IN_MEMORY_CUBE_SIZE ); diff --git a/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/utilities/WebViewer.java b/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/utilities/WebViewer.java index a20cb17..f7ac066 100644 --- a/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/utilities/WebViewer.java +++ b/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/utilities/WebViewer.java @@ -119,9 +119,9 @@ public class WebViewer public final static String PREVIEW_MAXROW = "preview_maxrow"; //$NON-NLS-1$ /** Preference key for max cube fetch levels. */ - public final static String PREVIEW_MAXCUBEROWLEVEL = "preview_maxrowlevelmember"; //$NON-NLS-1$ +// public final static String PREVIEW_MAXCUBEROWLEVEL = "preview_maxrowlevelmember"; //$NON-NLS-1$ - public final static String PREVIEW_MAXCUBECOLUMNLEVEL = "preview_maxcolumnlevelmember"; //$NON-NLS-1$ +// public final static String PREVIEW_MAXCUBECOLUMNLEVEL = "preview_maxcolumnlevelmember"; //$NON-NLS-1$ /** Preference key for max in-memory cube size. */ public final static String PREVIEW_MAXINMEMORYCUBESIZE = "preview_maxinmemorycubesize"; //$NON-NLS-1$ @@ -207,9 +207,9 @@ public class WebViewer /** * Key to indicate the 'maxLevelMember' */ - public final static String MAX_CUBE_ROW_LEVELS_KEY = "MAX_CUBE_ROW_LEVELS_KEY"; //$NON-NLS-1$ +// public final static String MAX_CUBE_ROW_LEVELS_KEY = "MAX_CUBE_ROW_LEVELS_KEY"; //$NON-NLS-1$ - public final static String MAX_CUBE_COLUMN_LEVELS_KEY = "MAX_CUBE_COLUMN_LEVELS_KEY"; //$NON-NLS-1$ +// public final static String MAX_CUBE_COLUMN_LEVELS_KEY = "MAX_CUBE_COLUMN_LEVELS_KEY"; //$NON-NLS-1$ /** * Property to indicate whether it is a report debug mode @@ -394,15 +394,15 @@ public class WebViewer String maxrows = (String) params.get( MAX_ROWS_KEY ); // max level member setting - String maxrowlevels = (String) params.get( MAX_CUBE_ROW_LEVELS_KEY ); - String maxcolumnlevels = (String) params.get( MAX_CUBE_COLUMN_LEVELS_KEY ); +// String maxrowlevels = (String) params.get( MAX_CUBE_ROW_LEVELS_KEY ); +// String maxcolumnlevels = (String) params.get( MAX_CUBE_COLUMN_LEVELS_KEY ); // process common parameters Map<String, String> urlParams = prepareCommonURLParams( format, resourceFolder, maxrows, - maxrowlevels, - maxcolumnlevels ); + null, + null ); // if document mode, append document parameter in URL String documentName = (String) params.get( DOCUMENT_NAME_KEY ); @@ -722,16 +722,16 @@ public class WebViewer { params.put( ParameterAccessor.PARAM_MAXROWS, maxrows.trim( ) ); } - if ( !StringUtil.isBlank( maxrowlevels ) ) - { - params.put( ParameterAccessor.PARAM_MAXCUBE_ROWLEVELS, - maxrowlevels.trim( ) ); - } - if ( !StringUtil.isBlank( maxcolumnlevels ) ) - { - params.put( ParameterAccessor.PARAM_MAXCUBE_COLUMNLEVELS, - maxcolumnlevels.trim( ) ); - } +// if ( !StringUtil.isBlank( maxrowlevels ) ) +// { +// params.put( ParameterAccessor.PARAM_MAXCUBE_ROWLEVELS, +// maxrowlevels.trim( ) ); +// } +// if ( !StringUtil.isBlank( maxcolumnlevels ) ) +// { +// params.put( ParameterAccessor.PARAM_MAXCUBE_COLUMNLEVELS, +// maxcolumnlevels.trim( ) ); +// } if ( !StringUtil.isBlank( cubeMemorySize ) ) { params.put( ParameterAccessor.PARAM_CUBEMEMSIZE, |

