From 192806eec2df422a824e282acf116cdc1988bd29 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 15 May 2015 16:50:36 +0000 Subject: [PATCH] 81: Allow the creation and use of expressions on multi column in TDM portlet Task-Url: https://support.d4science.org/issues/81 Updated TabularDataController git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@114768 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/td/client/TabularDataController.java | 25 +++++++++++-------- .../user/td/tabulardataportlet.gwt.xml | 4 +-- 2 files changed, 16 insertions(+), 13 deletions(-) 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 a64728c..1320661 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 @@ -18,12 +18,13 @@ import org.gcube.portlets.user.td.client.template.TemplateDeleteDialog; import org.gcube.portlets.user.td.client.template.TemplateOpenDialog; import org.gcube.portlets.user.td.client.template.TemplateShareDialog; import org.gcube.portlets.user.td.codelistmappingimportwidget.client.CodelistMappingImportWizardTD; +import org.gcube.portlets.user.td.columnwidget.client.batch.ReplaceBatchDialog; +import org.gcube.portlets.user.td.columnwidget.client.replace.ReplaceAllDialog; 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.expressionwidget.client.RowsDeleteByExpressionDialog; +import org.gcube.portlets.user.td.expressionwidget.client.ReplaceColumnByMultiColumnExpressionDialog; +import org.gcube.portlets.user.td.expressionwidget.client.RowsDeleteByMultiColumnExpressionDialog; import org.gcube.portlets.user.td.expressionwidget.client.RuleDialog; import org.gcube.portlets.user.td.extractcodelistwidget.client.ExtractCodelistWizardTD; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; @@ -36,8 +37,6 @@ import org.gcube.portlets.user.td.mainboxwidget.client.MainBoxPanel; import org.gcube.portlets.user.td.mapwidget.client.MapWidgetTD; import org.gcube.portlets.user.td.openwidget.client.TDOpen; import org.gcube.portlets.user.td.replacebyexternalwidget.client.ReplaceByExternalTD; -import org.gcube.portlets.user.td.columnwidget.client.batch.ReplaceBatchDialog; -import org.gcube.portlets.user.td.columnwidget.client.replace.ReplaceAllDialog; import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD; import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD; import org.gcube.portlets.user.td.sharewidget.client.TRShare; @@ -1825,9 +1824,13 @@ public class TabularDataController { private void openColumnFilter(String columnLocalId, String columnName) { Log.debug("Request Open Column Filter Dialog"); if (trId != null) { - ColumnFilterDialog cfDialog = new ColumnFilterDialog(trId, + /*ColumnFilterDialog cfDialog = new ColumnFilterDialog(trId, columnLocalId, eventBus); - cfDialog.show(); + cfDialog.show();*/ + MultiColumnFilterDialog mcfDialog=new MultiColumnFilterDialog(trId, eventBus); + mcfDialog.show(); + + } else { Log.error("TRId is null"); UtilsGXT3.alert("Error", "No current tabular resource present"); @@ -1842,9 +1845,9 @@ public class TabularDataController { String columnName) { Log.debug("Request Open Row Delete By Expression Dialog"); if (trId != null) { - RowsDeleteByExpressionDialog cfDialog = new RowsDeleteByExpressionDialog( - trId, columnLocalId, eventBus); - cfDialog.show(); + RowsDeleteByMultiColumnExpressionDialog rowsDeleteDialog = new RowsDeleteByMultiColumnExpressionDialog( + trId, eventBus); + rowsDeleteDialog.show(); } else { Log.error("TRId is null"); UtilsGXT3.alert("Error", "No current tabular resource present"); @@ -1859,7 +1862,7 @@ public class TabularDataController { String columnName) { Log.debug("Request Open Replace Column By Expression Dialog"); if (trId != null) { - ReplaceColumnByExpressionDialog rceDialog = new ReplaceColumnByExpressionDialog( + ReplaceColumnByMultiColumnExpressionDialog rceDialog = new ReplaceColumnByMultiColumnExpressionDialog( trId, columnLocalId, eventBus); rceDialog.show(); } else { 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 155e6ba..26eaf26 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 @@ -99,11 +99,11 @@ - --> + --> - +