From ffc7be82f7efc6bfa5ef89a1eebb71b04e8b900c Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Tue, 18 Mar 2014 11:57:35 +0000
Subject: [PATCH] Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@93265 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component    |  6 +-
 pom.xml                                       | 14 ++++
 .../user/td/client/TabularDataController.java |  2 +-
 .../user/td/client/ribbon/ModifyToolBar.java  |  7 +-
 .../user/td/tabulardataportlet.gwt.xml        | 77 +++++++++---------
 .../user/td/tabulardataportlet.gwt.xml        | 78 ++++++++++---------
 6 files changed, 105 insertions(+), 79 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 3c740da..6a91eb1 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -37,15 +37,15 @@
         <dependent-module archiveName="tabular-data-table-widget-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-table-widget/tabular-data-table-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="tabular-data-toolbox-widget-1.1.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.1.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-column-widget-1.1.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>
+        <dependent-module archiveName="tabular-data-toolbox-widget-1.1.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>
         <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 f590f29..476c230 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,6 +255,20 @@
 			<artifactId>tabular-data-table-widget</artifactId>
 			<version>[0.0.1-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
+		
+		<!--tabular-data-information-widget -->
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>tabular-data-information-widget</artifactId>
+			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+		</dependency>
+		
+		<!--  tabular-data-column-widget -->
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>tabular-data-column-widget</artifactId>
+			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+		</dependency>
 
 		<!-- tabular-data-toolbox-widget -->
 		<dependency>
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 bdeb0c7..8b9ef40 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
@@ -403,7 +403,7 @@ public class TabularDataController {
 			case COLUMNFILTER:
 				openMultiColumnFilter();
 				break;
-			case COLUMNEDIT:
+			case COLUMNBATCHREPLACE:
 				break;
 			case ANALYSETABLEFILTER:
 				break;
diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
index b3ff355..cd5361d 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
@@ -256,15 +256,14 @@ public class ModifyToolBar {
 		editColumnValueOnConditionButton.setScale(ButtonScale.LARGE);
 		editColumnValueOnConditionButton.setIconAlign(IconAlign.TOP);
 		editColumnValueOnConditionButton
-				.setToolTip("Edit column values according to an condition");
+				.setToolTip("Replace column values");
 		editColumnValueOnConditionButton
 				.setArrowAlign(ButtonArrowAlign.BOTTOM);
 		editColumnValueOnConditionButton
 				.addSelectHandler(new SelectHandler() {
 
 					public void onSelect(SelectEvent event) {
-						// eventBus.fireEvent(new
-						// ImportTableEvent(ImportTableType.JSON));
+						eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNBATCHREPLACE));
 					}
 				});
 
@@ -340,7 +339,7 @@ public class ModifyToolBar {
 				annotationButton.disable();	
 				// Column
 				filterColumnButton.enable();
-				editColumnValueOnConditionButton.disable();
+				editColumnValueOnConditionButton.enable();
 				break;
 			case WIZARD_OPEN:
 				// Table
diff --git a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index a4a34e8..8c2e4f7 100644
--- a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -4,51 +4,58 @@
 	<inherits name='com.google.gwt.user.User' />
 
 	<!-- Other module inherits -->
-    <!--  <inherits name='com.extjs.gxt.ui.GXT' /> -->
-    <inherits name='com.sencha.gxt.ui.GXT' />
- 
+	<!-- <inherits name='com.extjs.gxt.ui.GXT' /> -->
+	<inherits name='com.sencha.gxt.ui.GXT' />
+
 	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
 	<inherits name="com.google.gwt.resources.Resources" />
-		
-	<inherits name="org.gcube.portlets.user.tdwx.TabularDataWidgetX" />
-	
-	<!-- <inherits name='org.gcube.portlets.user.td.ciw.csvimporterwidget' /> -->
-	
-	<inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' />	
-	<inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
-	<inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
-	<inherits name='org.gcube.portlets.user.td.expressionwidget.ExpressionWidget' />
-	<inherits name='org.gcube.portlets.user.td.tablewidget.TableWidget'/>
-	<inherits name='org.gcube.portlets.user.td.sharewidget.ShareWidget' />
-	
-	<inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' />
-    <inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />
-	<inherits name='org.gcube.portlets.user.td.sdmximportwidget.SDMXImportWizardTD' />
-	<inherits name='org.gcube.portlets.user.td.sdmxexportwidget.SDMXExportWizardTD' /> 
-	<inherits name='org.gcube.portlets.user.td.csvimportwidget.CSVImportWizardTD' />
-	<inherits name='org.gcube.portlets.user.td.csvexportwidget.CSVExportWizardTD' />
-	<inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
-	
-	
-	<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' /> 
-	<inherits name="org.gcube.portlets.user.tdtemplate.TabularDataTemplate" /> 
 
-	
+	<inherits name="org.gcube.portlets.user.tdwx.TabularDataWidgetX" />
+
+	<!-- <inherits name='org.gcube.portlets.user.td.ciw.csvimporterwidget' /> -->
+
+	<inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' />
+	<inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
+	<inherits
+		name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
+	<inherits
+		name='org.gcube.portlets.user.td.expressionwidget.ExpressionWidget' />
+	<inherits name='org.gcube.portlets.user.td.tablewidget.TableWidget' />
+	<inherits name='org.gcube.portlets.user.td.sharewidget.ShareWidget' />
+	<inherits name='org.gcube.portlets.user.td.informationwidget.Information' />
+	<inherits name='org.gcube.portlets.user.td.columnwidget.ColumnWidget' />
+
+
+	<inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' />
+	<inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />
+	<inherits
+		name='org.gcube.portlets.user.td.sdmximportwidget.SDMXImportWizardTD' />
+	<inherits
+		name='org.gcube.portlets.user.td.sdmxexportwidget.SDMXExportWizardTD' />
+	<inherits
+		name='org.gcube.portlets.user.td.csvimportwidget.CSVImportWizardTD' />
+	<inherits
+		name='org.gcube.portlets.user.td.csvexportwidget.CSVExportWizardTD' />
+	<inherits
+		name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
+
+
+	<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' />
+	<inherits name="org.gcube.portlets.user.tdtemplate.TabularDataTemplate" />
+
+
 	<!-- Specify the app entry point class. -->
 	<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
-	<!--  
-	<set-property name="log_DivLogger" value="ENABLED" />
-	<set-property name="log_ConsoleLogger" value="ENABLED" />
-	<set-property name="log_FirebugLogger" value="ENABLED" />
-	<set-property name="log_GWTLogger" value="ENABLED" />
-	<set-property name="log_SystemLogger" value="ENABLED" /> 
-	 -->     
+	<!-- <set-property name="log_DivLogger" value="ENABLED" /> <set-property 
+		name="log_ConsoleLogger" value="ENABLED" /> <set-property name="log_FirebugLogger" 
+		value="ENABLED" /> <set-property name="log_GWTLogger" value="ENABLED" /> 
+		<set-property name="log_SystemLogger" value="ENABLED" /> -->
 	<set-property name="log_DivLogger" value="DISABLED" />
 	<set-property name="log_ConsoleLogger" value="DISABLED" />
 	<set-property name="log_FirebugLogger" value="DISABLED" />
 	<set-property name="log_GWTLogger" value="DISABLED" />
 	<set-property name="log_SystemLogger" value="DISABLED" />
-	
+
 
 	<!-- Specify the paths for translatable code -->
 	<source path='client' />
diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index ec53639..4e11f09 100644
--- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -4,53 +4,59 @@
 	<inherits name='com.google.gwt.user.User' />
 
 	<!-- Other module inherits -->
-    <!--  <inherits name='com.extjs.gxt.ui.GXT' /> -->
-    <inherits name='com.sencha.gxt.ui.GXT' />
- 
+	<!-- <inherits name='com.extjs.gxt.ui.GXT' /> -->
+	<inherits name='com.sencha.gxt.ui.GXT' />
+
 	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
 	<inherits name="com.google.gwt.resources.Resources" />
-		
-	<inherits name="org.gcube.portlets.user.tdwx.TabularDataWidgetX" />
-	
-	<!-- <inherits name='org.gcube.portlets.user.td.ciw.csvimporterwidget' /> -->
-	
-	<inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' />	
-	<inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
-	<inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
-	<inherits name='org.gcube.portlets.user.td.expressionwidget.ExpressionWidget' />
-	<inherits name='org.gcube.portlets.user.td.tablewidget.TableWidget'/>
-	<inherits name='org.gcube.portlets.user.td.sharewidget.ShareWidget' />
-	
-	<inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' />
-    <inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />
-	<inherits name='org.gcube.portlets.user.td.sdmximportwidget.SDMXImportWizardTD' />
-	<inherits name='org.gcube.portlets.user.td.sdmxexportwidget.SDMXExportWizardTD' /> 
-	<inherits name='org.gcube.portlets.user.td.csvimportwidget.CSVImportWizardTD' />
-	<inherits name='org.gcube.portlets.user.td.csvexportwidget.CSVExportWizardTD' />
-	<inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
-	
-	
-	<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' /> 
-	<inherits name="org.gcube.portlets.user.tdtemplate.TabularDataTemplate" />  
-	
 
-	
+	<inherits name="org.gcube.portlets.user.tdwx.TabularDataWidgetX" />
+
+	<!-- <inherits name='org.gcube.portlets.user.td.ciw.csvimporterwidget' /> -->
+
+	<inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' />
+	<inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
+	<inherits
+		name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
+	<inherits
+		name='org.gcube.portlets.user.td.expressionwidget.ExpressionWidget' />
+	<inherits name='org.gcube.portlets.user.td.tablewidget.TableWidget' />
+	<inherits name='org.gcube.portlets.user.td.sharewidget.ShareWidget' />
+	<inherits name='org.gcube.portlets.user.td.informationwidget.Information' />
+	<inherits name='org.gcube.portlets.user.td.columnwidget.ColumnWidget' />
+
+	<inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' />
+	<inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />
+	<inherits
+		name='org.gcube.portlets.user.td.sdmximportwidget.SDMXImportWizardTD' />
+	<inherits
+		name='org.gcube.portlets.user.td.sdmxexportwidget.SDMXExportWizardTD' />
+	<inherits
+		name='org.gcube.portlets.user.td.csvimportwidget.CSVImportWizardTD' />
+	<inherits
+		name='org.gcube.portlets.user.td.csvexportwidget.CSVExportWizardTD' />
+	<inherits
+		name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
+
+
+	<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' />
+	<inherits name="org.gcube.portlets.user.tdtemplate.TabularDataTemplate" />
+
+
+
 	<!-- Specify the app entry point class. -->
 	<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
-	<!--    
-	<set-property name="log_DivLogger" value="ENABLED" />
-	<set-property name="log_ConsoleLogger" value="ENABLED" />
-	<set-property name="log_FirebugLogger" value="ENABLED" />
-	<set-property name="log_GWTLogger" value="ENABLED" />
-	<set-property name="log_SystemLogger" value="ENABLED" /> 
-	 -->
+	<!-- <set-property name="log_DivLogger" value="ENABLED" /> <set-property 
+		name="log_ConsoleLogger" value="ENABLED" /> <set-property name="log_FirebugLogger" 
+		value="ENABLED" /> <set-property name="log_GWTLogger" value="ENABLED" /> 
+		<set-property name="log_SystemLogger" value="ENABLED" /> -->
 	<set-property name="log_DivLogger" value="DISABLED" />
 	<set-property name="log_ConsoleLogger" value="DISABLED" />
 	<set-property name="log_FirebugLogger" value="DISABLED" />
 	<set-property name="log_GWTLogger" value="DISABLED" />
 	<set-property name="log_SystemLogger" value="DISABLED" />
 
-	
+
 	<!-- Specify the paths for translatable code -->
 	<source path='client' />
 	<source path='shared' />