From 5bbe4e5f460f14fdec00fa331b398e5d18a07b0d Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 11 Feb 2014 09:52:35 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-toolbox-widget@91337 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/td/toolboxwidget/client/ToolBox.java | 57 +++++++++++++++++++ .../td/toolboxwidget/client/ToolBoxPanel.java | 22 +++++++ 2 files changed, 79 insertions(+) diff --git a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java index ffb3d8e..81b2934 100644 --- a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java +++ b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java @@ -1,6 +1,7 @@ package org.gcube.portlets.user.td.toolboxwidget.client; import org.gcube.portlets.user.td.columnwidget.client.ChangeColumnTypePanel; +import org.gcube.portlets.user.td.columnwidget.client.DeleteColumnPanel; import org.gcube.portlets.user.td.informationwidget.client.TabularResourceProperties; import org.gcube.portlets.user.td.toolboxwidget.client.help.HelpPanel; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; @@ -25,6 +26,7 @@ public class ToolBox extends TabPanel { protected ToolBoxPanel toolBoxPanel; protected HelpPanel helpPanel; protected ChangeColumnTypePanel changeColumnTypePanel; + protected DeleteColumnPanel deleteColumnPanel; // protected TdTaskController tdTaskController; // protected DialogBox tdTaskMainWindow; protected FramedPanel taskPanel; @@ -76,7 +78,20 @@ public class ToolBox extends TabPanel { setActiveWidget(changeColumnTypePanel); } + + public void openDeleteColumnTab(TRId trId, String columnName) { + Log.debug("Open Delete Column Tab"); + if (deleteColumnPanel == null) { + addDeleteColumnPanel(trId, columnName); + } else { + deleteColumnPanel.update(trId, columnName); + } + setActiveWidget(deleteColumnPanel); + } + + + public void closePropertiesTabs() { Log.debug("Close Properties Tab"); if (trProperties != null) { @@ -94,6 +109,16 @@ public class ToolBox extends TabPanel { } } + public void closeDeleteColumnPanel() { + Log.debug("Close DeleteColumnPanel Tab"); + if (deleteColumnPanel != null) { + remove(deleteColumnPanel); + deleteColumnPanel = null; + } + } + + + public void updateTabs() { Log.debug("Update ToolBox Tabs"); if (trProperties != null) { @@ -103,6 +128,11 @@ public class ToolBox extends TabPanel { remove(changeColumnTypePanel); changeColumnTypePanel = null; } + if (deleteColumnPanel != null) { + remove(deleteColumnPanel); + deleteColumnPanel = null; + } + } @@ -156,6 +186,33 @@ public class ToolBox extends TabPanel { }); }; + + + protected void addDeleteColumnPanel(TRId trId, String columnName) { + TabItemConfig deleteColumnItemConf = new TabItemConfig( + "Column Delete", true); + + deleteColumnPanel = new DeleteColumnPanel(trId, columnName, + eventBus); + add(deleteColumnPanel, deleteColumnItemConf); + + addBeforeCloseHandler(new BeforeCloseHandler() { + + public void onBeforeClose(BeforeCloseEvent event) { + if (deleteColumnPanel == event.getItem()) { + remove(deleteColumnPanel); + deleteColumnPanel = null; + + } + + } + + }); + }; + + + + protected void addTdTaskPanel() { // tdTaskController = TdTaskController.getInstance(); diff --git a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java index 15cfa30..3445855 100644 --- a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java @@ -116,6 +116,9 @@ public class ToolBoxPanel extends ContentPanel { case CHANGECOLUMNTYPEPANEL: doColumnTypeChangeTab(event); break; + case DELETECOLUMNPANEL: + doDeleteColumnTab(event); + break; default: break; @@ -139,6 +142,24 @@ public class ToolBoxPanel extends ContentPanel { } } + protected void doDeleteColumnTab(WidgetRequestEvent event){ + Log.debug("WidgetRequestEvent.DeleteColumnPanel : ["+event.getTrId()+" ,columnName: "+event.getColumnName()+"]"); + if (uiStateType == UIStateType.TR_OPEN) { + if (state == ToolBoxPanelState.OPENED) { + toolBox.openDeleteColumnTab(event.getTrId(), event.getColumnName()); + Log.debug("ToolBoxPanelSTate.OPENED Add Tabs"); + } else { + enable(); + expand(); + state = ToolBoxPanelState.OPENED; + toolBox.openDeleteColumnTab(event.getTrId(), event.getColumnName()); + } + } else { + Log.debug("ToolBoxPanel No table open"); + } + } + + protected void doPropertiesOpenTab(){ if (uiStateType == UIStateType.TR_OPEN) { if (state == ToolBoxPanelState.OPENED) { @@ -174,6 +195,7 @@ public class ToolBoxPanel extends ContentPanel { public void closePanel(){ toolBox.closePropertiesTabs(); toolBox.closeChangeColumnTypePanel(); + toolBox.closeDeleteColumnPanel(); Log.debug("ToolBoxPanel Closed"); }