From 855412ae1e4d8a2e4f8effbf31919efdd4b5cd92 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 21 Mar 2014 13:23:47 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@93420 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 17 +---------------- .../user/td/client/TabularDataController.java | 17 ++++++++++++++++- .../td/client/grid/GridHeaderColumnMenu.java | 4 ++-- .../user/td/client/ribbon/CurationToolBar.java | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index ddae41c..da6f30b 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -13,9 +13,6 @@ uses - - uses - uses @@ -25,24 +22,12 @@ uses - - uses - - - uses - - + uses uses - - uses - - - uses - uses 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 4790bfa..b5aebb2 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 @@ -17,6 +17,7 @@ import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD; import org.gcube.portlets.user.td.sharewidget.client.TRShare; import org.gcube.portlets.user.td.tablewidget.client.CloneTabularResource; import org.gcube.portlets.user.td.tablewidget.client.rows.DeleteRows; +import org.gcube.portlets.user.td.tablewidget.client.template.TemplateApplyDialog; import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3; import org.gcube.portlets.user.td.taskswidget.client.TdTaskController; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; @@ -348,6 +349,7 @@ public class TabularDataController { openDuplicatesRows(); break; case TEMPLATEAPPLY: + openTemplateApply(); break; case TABLETYPE: openTableType(); @@ -665,7 +667,8 @@ public class TabularDataController { } protected void openTemplateOpen() { - + Log.debug("Template Open call"); + } protected void openShareWindow(){ @@ -674,6 +677,18 @@ public class TabularDataController { TRShare trShare=new TRShare(trId,eventBus); } + protected void openTemplateApply(){ + Log.debug("Template Apply call"); + if (trId != null) { + TemplateApplyDialog taDialog = new TemplateApplyDialog(trId, eventBus); + taDialog.show(); + } else { + Log.error("TRId is null"); + UtilsGXT3.alert("Error","No current tabular resource present"); + } + + } + protected void openMultiColumnFilter() { Log.debug("Request Open Multi Column Filter Dialog"); diff --git a/src/main/java/org/gcube/portlets/user/td/client/grid/GridHeaderColumnMenu.java b/src/main/java/org/gcube/portlets/user/td/client/grid/GridHeaderColumnMenu.java index 1097577..eb11132 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/grid/GridHeaderColumnMenu.java +++ b/src/main/java/org/gcube/portlets/user/td/client/grid/GridHeaderColumnMenu.java @@ -53,10 +53,10 @@ public class GridHeaderColumnMenu { filterItem.setIcon(TabularDataResources.INSTANCE.columnFilter()); menuItems.add(filterItem); - MenuItem modifyValueOnConditionItem = new MenuItem("Replace Batch"); + /*MenuItem modifyValueOnConditionItem = new MenuItem("Replace Batch"); modifyValueOnConditionItem.setId(GridHeaderOperationId.COLUMNBATCHREPLACE.toString()); modifyValueOnConditionItem.setIcon(TabularDataResources.INSTANCE.columnValues()); - menuItems.add(modifyValueOnConditionItem); + menuItems.add(modifyValueOnConditionItem);*/ /*MenuItem newAnnotationColumnItem = new MenuItem("Annotation"); newAnnotationColumnItem.setId(GridHeaderOperationId.ANNOTATIONADD.toString()); diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java index b89deca..f0ca498 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java @@ -354,7 +354,7 @@ public class CurationToolBar { rulesButton.disable(); normalizeButton.disable(); manageRulesButton.disable(); - applyTemplateButton.enable(); + applyTemplateButton.disable(); denormalizeButton.disable(); changeColumnLabelButton.disable(); columnTypeButton.disable(); @@ -369,7 +369,7 @@ public class CurationToolBar { rulesButton.disable(); normalizeButton.disable(); manageRulesButton.disable(); - applyTemplateButton.enable(); + applyTemplateButton.disable(); denormalizeButton.disable(); changeColumnLabelButton.disable(); columnTypeButton.disable();