Skip to content

Commit

Permalink
Maxlevel option in Preferences should be removed.
Browse files Browse the repository at this point in the history
  • Loading branch information
ning.zhang authored and dgao committed Jun 6, 2012
1 parent af6fd3d commit c7958d2
Show file tree
Hide file tree
Showing 11 changed files with 144 additions and 144 deletions.
4 changes: 2 additions & 2 deletions ...eb/src/org/eclipse/birt/report/designer/ui/actions/GenerateDocumentToolbarMenuAction.java
View file
Expand Up @@ -58,8 +58,8 @@ private void gendoc( IAction action )
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;
Expand Down
4 changes: 2 additions & 2 deletions ...signer.ui.preview.web/src/org/eclipse/birt/report/designer/ui/actions/PreviewSupport.java
View file
Expand Up @@ -259,8 +259,8 @@ protected boolean prePreview( )
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;
}
Expand Down
4 changes: 2 additions & 2 deletions ...iew.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/GenerateDocumentAction.java
View file
Expand Up @@ -34,8 +34,8 @@ protected boolean preGenerate( )
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;
}

Expand Down
4 changes: 2 additions & 2 deletions ...ui.preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/RunReportAction.java
View file
Expand Up @@ -34,8 +34,8 @@ protected boolean prePreview( )
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;
}

Expand Down
4 changes: 2 additions & 2 deletions ...preview.web/src/org/eclipse/birt/report/designer/ui/ide/navigator/ViewDocumentAction.java
View file
Expand Up @@ -34,8 +34,8 @@ protected boolean prePreview( )
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;
}

Expand Down
126 changes: 63 additions & 63 deletions ...ew.web/src/org/eclipse/birt/report/designer/ui/preferences/PreviewDataPreferencePage.java
View file
Expand Up @@ -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;

Expand All @@ -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;

Expand All @@ -84,33 +84,33 @@ protected Control createContents( Composite parent )

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$
Expand Down Expand Up @@ -204,25 +204,25 @@ private void initControlValues( )

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( )
Expand All @@ -244,8 +244,8 @@ public void init( IWorkbench workbench )
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( );
Expand All @@ -259,15 +259,15 @@ public boolean performOk( )
.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( )
Expand Down
32 changes: 16 additions & 16 deletions ...view.web/src/org/eclipse/birt/report/designer/ui/preview/editors/ReportPreviewEditor.java
View file
Expand Up @@ -526,14 +526,14 @@ public void display( )
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 );
Expand Down Expand Up @@ -562,14 +562,14 @@ public void display( )
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( ) )
{
Expand Down
18 changes: 9 additions & 9 deletions ....birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/BirtUtility.java
View file
Expand Up @@ -1134,15 +1134,15 @@ public static Map getAppContext( HttpServletRequest request )
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 );
Expand Down
40 changes: 20 additions & 20 deletions ...report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterAccessor.java
View file
Expand Up @@ -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.
Expand Down Expand Up @@ -802,15 +802,15 @@ public static int getMaxRows( HttpServletRequest request )
* @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.
Expand All @@ -820,15 +820,15 @@ public static int getMaxCubeRowLevels( HttpServletRequest request )
* @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.
Expand Down
16 changes: 8 additions & 8 deletions viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/ViewerPlugin.java
View file
Expand Up @@ -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
Expand Down Expand Up @@ -124,12 +124,12 @@ public void start( BundleContext context ) throws Exception
.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 );
Expand Down

0 comments on commit c7958d2

Please sign in to comment.