From 5e1a1b1e6cf2795a16c1ec53568b6cc8222b813a Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 11 Feb 2014 16:02:35 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-toolbox-widget@91406 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/td/toolboxwidget/client/ToolBox.java | 48 ++++++++++++++++++- .../td/toolboxwidget/client/ToolBoxPanel.java | 23 +++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) 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 81b2934..48ed4c3 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 @@ -2,6 +2,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.columnwidget.client.LabelColumnPanel; 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; @@ -27,6 +28,8 @@ public class ToolBox extends TabPanel { protected HelpPanel helpPanel; protected ChangeColumnTypePanel changeColumnTypePanel; protected DeleteColumnPanel deleteColumnPanel; + protected LabelColumnPanel labelColumnPanel; + // protected TdTaskController tdTaskController; // protected DialogBox tdTaskMainWindow; protected FramedPanel taskPanel; @@ -90,6 +93,16 @@ public class ToolBox extends TabPanel { } + public void openLabelColumnTab(TRId trId, String columnName) { + Log.debug("Open Label Column Tab"); + if (labelColumnPanel == null) { + addDeleteColumnPanel(trId, columnName); + } else { + labelColumnPanel.update(trId, columnName); + } + setActiveWidget(labelColumnPanel); + + } public void closePropertiesTabs() { @@ -117,7 +130,14 @@ public class ToolBox extends TabPanel { } } - + public void closeLabelColumnPanel() { + Log.debug("Close LabelColumnPanel Tab"); + if (labelColumnPanel != null) { + remove(labelColumnPanel); + labelColumnPanel = null; + } + } + public void updateTabs() { Log.debug("Update ToolBox Tabs"); @@ -132,6 +152,10 @@ public class ToolBox extends TabPanel { remove(deleteColumnPanel); deleteColumnPanel = null; } + if (labelColumnPanel != null) { + remove(labelColumnPanel); + labelColumnPanel = null; + } } @@ -210,6 +234,28 @@ public class ToolBox extends TabPanel { }); }; + protected void addLabelColumnPanel(TRId trId, String columnName) { + TabItemConfig labelColumnItemConf = new TabItemConfig( + "Column Label", true); + + labelColumnPanel = new LabelColumnPanel(trId, columnName, + eventBus); + add(labelColumnPanel, labelColumnItemConf); + + addBeforeCloseHandler(new BeforeCloseHandler() { + + public void onBeforeClose(BeforeCloseEvent event) { + if (labelColumnPanel == event.getItem()) { + remove(labelColumnPanel); + labelColumnPanel = null; + + } + + } + + }); + }; + 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 3445855..1bf4c13 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 @@ -119,6 +119,10 @@ public class ToolBoxPanel extends ContentPanel { case DELETECOLUMNPANEL: doDeleteColumnTab(event); break; + case LABELCOLUNPANEL: + doLabelColumnTab(event); + break; + default: break; @@ -159,6 +163,24 @@ public class ToolBoxPanel extends ContentPanel { } } + protected void doLabelColumnTab(WidgetRequestEvent event){ + Log.debug("WidgetRequestEvent.LabelColumnPanel : ["+event.getTrId()+" ,columnName: "+event.getColumnName()+"]"); + if (uiStateType == UIStateType.TR_OPEN) { + if (state == ToolBoxPanelState.OPENED) { + toolBox.openLabelColumnTab(event.getTrId(), event.getColumnName()); + Log.debug("ToolBoxPanelSTate.OPENED Add Tabs"); + } else { + enable(); + expand(); + state = ToolBoxPanelState.OPENED; + toolBox.openLabelColumnTab(event.getTrId(), event.getColumnName()); + } + } else { + Log.debug("ToolBoxPanel No table open"); + } + } + + protected void doPropertiesOpenTab(){ if (uiStateType == UIStateType.TR_OPEN) { @@ -196,6 +218,7 @@ public class ToolBoxPanel extends ContentPanel { toolBox.closePropertiesTabs(); toolBox.closeChangeColumnTypePanel(); toolBox.closeDeleteColumnPanel(); + toolBox.closeLabelColumnPanel(); Log.debug("ToolBoxPanel Closed"); }