Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
Error when using library with aggregation on table containing
groups(T55007)
  • Loading branch information
gliu committed Dec 7, 2012
1 parent f085fa1 commit 926bce8
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 12 deletions.
18 changes: 9 additions & 9 deletions engine/org.eclipse.birt.report.engine/.classpath
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/commons-cli-1.0.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/Tidy.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/commons-cli-1.0.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/Tidy.jar" sourcepath="D:/resource/opensource/jtidy-r938/jtidy-r938-sources"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Binary file modified engine/org.eclipse.birt.report.engine/lib/Tidy.jar
Binary file not shown.
Expand Up @@ -574,11 +574,11 @@ public void startListGroup( IListGroupContent listGroup )

public void endListBand( IListBandContent listBand ) throws BirtException
{
while ( !( current instanceof ListArea || current instanceof ListGroupArea ) )
/*while ( !( current instanceof ListArea || current instanceof ListGroupArea ) )
{
current.close( );
current = current.getParent( );
}
}*/
int bandType = listBand.getBandType( );
if ( bandType == IBandContent.BAND_HEADER
|| bandType == IBandContent.BAND_GROUP_HEADER )
Expand Down
Expand Up @@ -131,7 +131,7 @@ public HTMLTextParser( )
public Document parseHTML( InputStream in )
{
assert in != null;

//tidy.setWrapScriptlets( true );
Document doc = tidy.parseDOM( in, null );
try
{
Expand Down
Expand Up @@ -28,12 +28,14 @@
import org.eclipse.birt.report.model.core.StyledElement;
import org.eclipse.birt.report.model.core.namespace.NameExecutor;
import org.eclipse.birt.report.model.elements.ExtendedItem;
import org.eclipse.birt.report.model.elements.GroupElement;
import org.eclipse.birt.report.model.elements.OdaDataSet;
import org.eclipse.birt.report.model.elements.OdaDataSource;
import org.eclipse.birt.report.model.elements.TableItem;
import org.eclipse.birt.report.model.elements.interfaces.ICubeModel;
import org.eclipse.birt.report.model.elements.interfaces.IDesignElementModel;
import org.eclipse.birt.report.model.elements.interfaces.IExtendedItemModel;
import org.eclipse.birt.report.model.elements.interfaces.IGroupElementModel;
import org.eclipse.birt.report.model.elements.interfaces.IStyledElementModel;
import org.eclipse.birt.report.model.elements.olap.Cube;
import org.eclipse.birt.report.model.elements.olap.Dimension;
Expand Down Expand Up @@ -316,6 +318,15 @@ public static boolean duplicateStructure( DesignElement source,

// do some special handle for cube and dimension

if ( target instanceof GroupElement )
{
GroupElement group = (GroupElement) target;
GroupElement sourceGroup = (GroupElement) source;
group.setProperty( IGroupElementModel.GROUP_NAME_PROP, sourceGroup
.getProperty( sourceGroup.getRoot( ), IGroupElementModel.GROUP_NAME_PROP ) );

}

if ( target instanceof TabularCube )
{
TabularCube targetCube = (TabularCube) target;
Expand Down

0 comments on commit 926bce8

Please sign in to comment.