From 4e3b70fed85b054df80442e30c67793b80319a56 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Tue, 4 Feb 2014 17:53:38 +0000
Subject: [PATCH] Minor Update

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

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 0b732c8..516834d 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -7,30 +7,18 @@
         <dependent-module archiveName="tabular-data-widget-common-event-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-common-event/tabular-data-widget-common-event">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="tabular-data-csv-import-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-import-widget/tabular-data-csv-import-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-sdmx-import-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-sdmx-import-widget/tabular-data-sdmx-import-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-open-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-open-widget/tabular-data-open-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-csv-export-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-export-widget/tabular-data-csv-export-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-sdmx-export-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-sdmx-export-widget/tabular-data-sdmx-export-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-gwt-service-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-gwt-service/tabular-data-gwt-service">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-wizard-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-wizard-widget/tabular-data-wizard-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="tabular-data-toolbox-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-toolbox-widget/tabular-data-toolbox-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="tabular-data-information-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-information-widget/tabular-data-information-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="tabular-data-metadata-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-metadata-widget/tabular-data-metadata-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="tabular-data-column-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-column-widget/tabular-data-column-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="context-root" value="tabular-data-portlet"/>
         <property name="java-output-path" value="/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
     </wb-module>
diff --git a/pom.xml b/pom.xml
index 10e6470..934527b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,7 +235,7 @@
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-toolbox-widget</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<!--tabular-data-tasks-widget -->
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 5d11c73..c915bbe 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
@@ -14,9 +14,11 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.event.GridHeaderColum
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.RibbonEvent;
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.TasksMonitorEvent;
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.UIStateEvent;
+import org.gcube.portlets.user.td.widgetcommonevent.client.event.WidgetRequestEvent;
 import org.gcube.portlets.user.td.widgetcommonevent.client.type.RibbonType;
 import org.gcube.portlets.user.td.widgetcommonevent.client.type.TaskType;
 import org.gcube.portlets.user.td.widgetcommonevent.client.type.UIStateType;
+import org.gcube.portlets.user.td.widgetcommonevent.client.type.WidgetRequestType;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderOperationId;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 import org.gcube.portlets.user.td.wizardwidget.client.WizardListener;
@@ -194,6 +196,8 @@ public class TabularDataController {
 		if (uiState == UIStateType.TR_OPEN) {
 			Log.debug("CloseTabularResource Open");
 			tabularData.closeTable();
+			trId = null;
+			tableOpening=null;
 			uiState = UIStateType.TR_CLOSE;
 			Log.debug("fireEvent TR_CLOSE");
 			try {
@@ -288,6 +292,7 @@ public class TabularDataController {
 			case COLUMNLABEL:
 				break;
 			case COLUMNTYPE:
+				openColumnTYPE();
 				break;
 			case COLUMNADD:
 				break;
@@ -582,7 +587,18 @@ public class TabularDataController {
 		tdTaskController.updateTasks(true);
 		tdTaskMainWindow.show();
 	}
-
+	
+	
+	
+	protected void openColumnTYPE(){
+		Log.debug("Request Open Change Column Tab");
+		if(trId!=null){
+			WidgetRequestEvent e= new WidgetRequestEvent(WidgetRequestType.CHANGECOLUMNTYPEPANEL);
+			e.setTrId(trId);
+			eventBus.fireEvent(e);
+		}
+	}
+	
 	protected void doGridHeaderColumnMenuCommand(
 			GridHeaderColumnMenuItemEvent event) {
 		Log.debug("GridHeaderColumnMenu Fire Event",