Added Replace Column By Expression

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@99820 82a268e6-3cf1-43bd-a215-b396298e98cf

.settings/org.eclipse.wst.common.component

@@ -4,9 +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-expression-widget-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-expression-widget/tabular-data-expression-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="tabular-data-widgetx-tdx-source-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx-tdx-source/tabular-data-widgetx-tdx-source">
             <dependency-type>uses</dependency-type>
         </dependent-module>

src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java

@@ -16,6 +16,7 @@ import org.gcube.portlets.user.td.csvexportwidget.client.CSVExportWizardTD;
 import org.gcube.portlets.user.td.csvimportwidget.client.CSVImportWizardTD;
 import org.gcube.portlets.user.td.expressionwidget.client.ColumnFilterDialog;
 import org.gcube.portlets.user.td.expressionwidget.client.MultiColumnFilterDialog;
+import org.gcube.portlets.user.td.expressionwidget.client.ReplaceColumnByExpressionDialog;
 import org.gcube.portlets.user.td.extractcodelistwidget.client.ExtractCodelistWizardTD;
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
 import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
@@ -1147,6 +1148,19 @@ public class TabularDataController {
 			UtilsGXT3.alert("Error", "No current tabular resource present");
 		}
 	}
+	
+	protected void openReplaceColumnByExpression(String columnName) {
+		Log.debug("Request Open Replace Column By Expression Dialog");
+		if (trId != null) {
+			ReplaceColumnByExpressionDialog rceDialog = new ReplaceColumnByExpressionDialog(trId,
+					columnName, eventBus);
+			rceDialog.show();
+		} else {
+			Log.error("TRId is null");
+			UtilsGXT3.alert("Error", "No current tabular resource present");
+		}
+	}
+	
 
 	protected void openColumnType() {
 		openColumnType(null);
@@ -1297,6 +1311,9 @@ public class TabularDataController {
 		}
 	}
 	
+	
+	
+	
 	protected void openGroupBy() {
 		openGroupBy(null);
 	}
@@ -1526,7 +1543,13 @@ public class TabularDataController {
 													.toString()) == 0) {
 												openColumnMerge(columnName);
 											} else {
+												if (opId.compareTo(GridHeaderOperationId.COLUMNREPLACEBYEXPRESSION
+														.toString()) == 0) {
+													//TODO
+													openColumnMerge(columnName);
+												} else {
 
+												}
 											}
 										}
 									}

src/main/java/org/gcube/portlets/user/td/client/grid/GridHeaderColumnMenu.java

@@ -65,10 +65,17 @@ public class GridHeaderColumnMenu {
 		menuItems.add(filterItem);
 		
 	
-		MenuItem modifyValueOnConditionItem = new MenuItem("Replace Batch");
-		modifyValueOnConditionItem.setId(GridHeaderOperationId.COLUMNBATCHREPLACE.toString());
-		modifyValueOnConditionItem.setIcon(TabularDataResources.INSTANCE.columnReplaceBatch());	
-		menuItems.add(modifyValueOnConditionItem);
+		MenuItem replaceValueBatchItem = new MenuItem("Replace Batch");
+		replaceValueBatchItem.setId(GridHeaderOperationId.COLUMNBATCHREPLACE.toString());
+		replaceValueBatchItem.setIcon(TabularDataResources.INSTANCE.columnReplaceBatch());	
+		menuItems.add(replaceValueBatchItem);
+		
+
+		MenuItem replaceValueOnConditionItem = new MenuItem("Replace By Expression");
+		replaceValueOnConditionItem.setId(GridHeaderOperationId.COLUMNREPLACEBYEXPRESSION.toString());
+		replaceValueOnConditionItem.setIcon(TabularDataResources.INSTANCE.columnReplaceByExpression());	
+		menuItems.add(replaceValueOnConditionItem);
+		
 		
 		/*MenuItem newAnnotationColumnItem = new MenuItem("Annotation");
 		newAnnotationColumnItem.setId(GridHeaderOperationId.ANNOTATIONADD.toString());

src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java

@@ -405,6 +405,11 @@ public interface TabularDataResources extends ClientBundle {
 	
 	@Source("basket-background.png")
 	ImageResource basketBackground();
-
+	
+	@Source("column-replace-by-expression_32.png")
+	ImageResource columnReplaceByExpression32();
+	
+	@Source("column-replace-by-expression.png")
+	ImageResource columnReplaceByExpression();
 	
 }