From c5b06fac1f02d556c19c4923bcff6ca1ef48676d Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 25 Feb 2014 18:32:59 +0000 Subject: [PATCH] Added Change Table Type git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@92303 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 20 ++++++++++++++++++- .../user/td/client/TabularDataController.java | 13 +++++++++++- .../td/client/ribbon/CurationToolBar.java | 2 +- .../user/td/tabulardataportlet.gwt.xml | 10 +++++----- .../user/td/tabulardataportlet.gwt.xml | 11 +++++----- src/main/webapp/WEB-INF/web.xml | 8 ++++---- 6 files changed, 47 insertions(+), 17 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index aff542d..b17b154 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,12 +4,30 @@ - + + uses + + + 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 716e7ae..a3e9249 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 @@ -320,6 +320,7 @@ public class TabularDataController { case TEMPLATEAPPLY: break; case TABLETYPE: + openTableType(); break; case COLUMNLABEL: openColumnLabel(); @@ -703,6 +704,15 @@ public class TabularDataController { } + protected void openTableType() { + Log.debug("Request Change Table Type Tab"); + if (trId != null) { + WidgetRequestEvent e = new WidgetRequestEvent( + WidgetRequestType.CHANGETABLETYPEPANEL); + e.setTrId(trId); + eventBus.fireEvent(e); + } + } @@ -719,7 +729,8 @@ public class TabularDataController { String opId = event.getOperationId(); String columnName = tabularData.getColumnId(event.getColumnSelected()); Log.debug("GridColumnName: " + columnName); - + + if (opId.compareTo(GridHeaderOperationId.COLUMNLABEL.toString()) == 0) { openColumnLabel(columnName); } else { 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 f0a5369..07aaf49 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 @@ -384,7 +384,7 @@ public class CurationToolBar { denormalizeButton.disable(); changeColumnLabelButton.enable(); columnTypeButton.enable(); - tableTypeButton.disable(); + tableTypeButton.enable(); addColumnButton.disable(); deleteColumnButton.enable(); extractCodelistButton.disable(); 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 728969f..7754f0a 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 @@ -37,11 +37,11 @@ - - - - - + + + + + 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 0f89df0..9e451ac 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 @@ -35,11 +35,12 @@ - - - - - + + + + + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 75bfc33..deeaa3d 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -47,12 +47,12 @@ org.gcube.portlets.user.td.taskswidget.server.TdTasksWidgetServiceImpl - tdTemplateServiceImpl org.gcube.portlets.user.tdtemplate.server.TdTemplateServiceImpl - --> + @@ -153,12 +153,12 @@ /tabulardataportlet/tabularDataTasksService - tdTemplateServiceImpl /tabulardataportlet/tdtemplate - --> +