From be1f07644b92146ea18af461faf29c833909214a Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 7 Mar 2013 10:55:29 +0000
Subject: [PATCH] fixed adding /removing col in tables

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@70996 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component                    | 3 +++
 .../user/reportgenerator/client/targets/GenericTable.java     | 4 +++-
 .../portlets/user/reportgenerator/ReportGenerator.gwt.xml     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 2dc054b..7eca16c 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,6 +5,9 @@
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
+        <dependent-module archiveName="gcube-docx-generator-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-docx-generator/gcube-docx-generator">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="reports"/>
   </wb-module>
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/GenericTable.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/GenericTable.java
index 99b13ca..877395a 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/GenericTable.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/GenericTable.java
@@ -437,7 +437,7 @@ public class GenericTable extends Composite {
 		ArrayList<TableCell> toReturn = new ArrayList<TableCell>();
 		for (int j = 0; j < myTable.getCellCount(i); j++) {
 			GenTableCell tb = (GenTableCell) myTable.getWidget(i, j);
-			int colspan = tb.getColspan();
+				int colspan = tb.getColspan();
 
 			toReturn.add(new TableCell(tb.getText(), colspan, tb.getWidth(), tb.getHeight()));
 		}
@@ -619,5 +619,7 @@ public class GenericTable extends Composite {
 				toAdd.addClickHandler(cellClicker);
 			}
 		}
+		cols = originalTable.getColsNo();
+		rows = originalTable.getRowCount();
 	}
 }
diff --git a/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml b/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
index 2176bd5..275b9fe 100644
--- a/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
@@ -10,7 +10,7 @@
 	<inherits name='org.gcube.portlets.user.guidedtour.GuidedTour' />
 
 	<!-- To Comment out -->
-	<set-property name="user.agent" value="gecko1_8" />
+<!-- 	<set-property name="user.agent" value="gecko1_8" /> -->
 
 	<inherits name='org.gcube.portlets.user.workspace.lighttree.WorkspacePortletLightTree' />
 	<inherits name='org.gcube.portlets.user.exporter.Report_exporter_widget' />