Revert "Fix Error when using library with aggregation on table contai…

…ning groups(T55007)"

This reverts commit 926bce8.

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" sourcepath="D:/resource/opensource/jtidy-r938/jtidy-r938-sources"/>
-	<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"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

engine/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/nLayout/LayoutEngine.java

@@ -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 )

engine/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/parser/HTMLTextParser.java

@@ -131,7 +131,7 @@ public HTMLTextParser( )
 	public Document parseHTML( InputStream in )
 	{
 		assert in != null;
-//tidy.setWrapScriptlets( true );
+
 		Document doc = tidy.parseDOM( in, null );
 		try
 		{

model/org.eclipse.birt.report.model/src/org/eclipse/birt/report/model/util/ElementStructureUtil.java

@@ -28,14 +28,12 @@
 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;
@@ -318,15 +316,6 @@ 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;