From 225d77b3e28d712a245d8d00925e9f514874a257 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Wed, 9 Oct 2013 10:29:15 +0000
Subject: [PATCH] Updated pom

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@82786 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component    |  9 --------
 pom.xml                                       | 23 +++++++++++--------
 .../user/td/client/TabularDataController.java |  2 +-
 .../user/td/client/TabularDataPortlet.java    |  6 +++--
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 965ca9f..9594802 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,15 +4,6 @@
     <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="/src/main/resources"/>
-        <dependent-module archiveName="tabular-data-widget-td-source-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-td-source/tabular-data-widget-td-source">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget/tabular-data-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="csv-import-wizard-gxt3-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/csv-import-wizard-gxt3/csv-import-wizard-gxt3">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="SDMXImportWizardTD-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/SDMXImportWizardTD/SDMXImportWizardTD">
             <dependency-type>uses</dependency-type>
         </dependent-module>
diff --git a/pom.xml b/pom.xml
index 6cf4c3e..f068da7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,7 @@
 	<artifactId>tabular-data-portlet</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<name>Tabular data portlet</name>
+	<packaging>war</packaging>
 
 	<properties>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
@@ -70,19 +71,21 @@
 			<artifactId>aslcore</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>gcube-widgets</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- WORKSPACE -->
+		<!-- WSLT dependencies -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>workspace-light-tree</artifactId>
+			<version>[2.10.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+			<scope>provided</scope>
 		</dependency>
-		
+  
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>workspace-tree-widget</artifactId>
@@ -165,8 +168,8 @@
 			<artifactId>tabular-data-gxtservice</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-		
-		<!--  TD Service Mock -->
+
+		<!-- TD Service Mock -->
 		<dependency>
 			<groupId>org.gcube.data.analysis.tabulardata</groupId>
 			<artifactId>service-client-mock</artifactId>
@@ -179,7 +182,7 @@
 			<artifactId>tabular-data-information</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-		
+
 		<!-- LOGGING -->
 		<dependency>
 			<groupId>com.allen-sauer.gwt.log</groupId>
@@ -198,7 +201,7 @@
 			<version>1.0.1</version>
 			<scope>runtime</scope>
 		</dependency>
-		
+
 		<!-- JUnit TEST -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -242,7 +245,7 @@
 					<webappDirectory>${webappDirectory}</webappDirectory>
 				</configuration>
 			</plugin>
-			
+
 			<!-- Maven Surefire Plugin for Test -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -260,7 +263,7 @@
 					</dependency>
 				</dependencies>
 			</plugin>
-			
+
 		</plugins>
 	</build>
 
@@ -276,5 +279,5 @@
 		</dependencies>
 	</dependencyManagement>
 
-	<packaging>war</packaging>
+	
 </project>
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
index 6fb3753..875a47f 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
@@ -262,7 +262,7 @@ public class TabularDataController {
 
 				
 				trProperties = new TabularResourceProperties(
-						"TRProperties", eventBus, trId);
+						"TRProperties", eventBus);
 				trProperties.setHeaderVisible(false);
 				functionalityTab.add(trProperties, propertiesItemConf);
 				functionalityTab
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
index 1db661a..e9bbf91 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
@@ -115,6 +115,7 @@ public class TabularDataPortlet implements EntryPoint {
 	    toolBarData.setSplit(false);
 	    
 	    mainPanelLayout.setNorthWidget(toolBarPanel, toolBarData);
+	   
 	    
 	    //Grid	Panel
 		final TabularDataGridPanel gridPanel = tabularData.getGridPanel();	
@@ -126,7 +127,7 @@ public class TabularDataPortlet implements EntryPoint {
 		
 	    //Functionality Panel
 	    functionalityPanel= new ContentPanel();
-	    functionalityPanel.setWidth(250);
+	    functionalityPanel.setWidth(310);
 	    functionalityPanel.setHeaderVisible(false);
 	    functionalityPanel.setResize(true);
 		 
@@ -137,7 +138,7 @@ public class TabularDataPortlet implements EntryPoint {
 	    
 	    functionalityPanel.add(functionalityTab);
 	    
-	    eastData = new BorderLayoutData(250);
+	    eastData = new BorderLayoutData(310);
 	    eastData.setCollapsible(true);
 	    eastData.setSplit(false);
 	    eastData.setFloatable(false);
@@ -150,6 +151,7 @@ public class TabularDataPortlet implements EntryPoint {
 		functionalityPanel.collapse();
 		functionalityPanel.disable();
 		
+		mainPanelLayout.onResize();
 	
 	    controller.setFunctionalityTab(functionalityTab);
 	    controller.setFunctionalityPanel(functionalityPanel);