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 dcb2298..6244032 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 @@ -5,6 +5,7 @@ import org.gcube.portlets.user.td.columnwidget.client.DeleteColumnPanel; import org.gcube.portlets.user.td.columnwidget.client.LabelColumnPanel; import org.gcube.portlets.user.td.columnwidget.client.create.AddColumnPanel; import org.gcube.portlets.user.td.informationwidget.client.TabularResourceProperties; +import org.gcube.portlets.user.td.monitorwidget.client.background.MonitorBackgroundPanel; import org.gcube.portlets.user.td.tablewidget.client.ChangeTableTypePanel; import org.gcube.portlets.user.td.tablewidget.client.history.HistoryPanel; import org.gcube.portlets.user.td.tablewidget.client.normalize.DenormalizePanel; @@ -51,7 +52,8 @@ public class ToolBox extends TabPanel { protected GroupByColumnPanel groupByPanel; protected NormalizePanel normalizePanel; protected DenormalizePanel denormalizePanel; - + protected MonitorBackgroundPanel monitorBackgroundPanel; + // protected TdTaskController tdTaskController; // protected DialogBox tdTaskMainWindow; protected FramedPanel taskPanel; @@ -92,6 +94,14 @@ public class ToolBox extends TabPanel { setActiveWidget(trProperties); } + + public void openMonitorBackgroundTab(){ + Log.debug("Open Monitor Background Tab"); + if (monitorBackgroundPanel == null) { + addMonitorBackgroundPanel(); + } + setActiveWidget(monitorBackgroundPanel); + } public void openHistoryTab() { Log.debug("Open History Tab"); @@ -250,6 +260,16 @@ public class ToolBox extends TabPanel { } } + + public void closeMonitorBackgroundPanel() { + Log.debug("Close MonitorBackground Tab"); + if (monitorBackgroundPanel != null) { + remove(monitorBackgroundPanel); + monitorBackgroundPanel = null; + } + + } + public void closeHistoryPanel() { Log.debug("Close History Tab"); @@ -370,6 +390,10 @@ public class ToolBox extends TabPanel { if (trProperties != null) { trProperties.update(); } + if (monitorBackgroundPanel != null) { + monitorBackgroundPanel.update(); + } + if (historyPanel != null) { // historyPanel.update(); remove(historyPanel); @@ -473,6 +497,25 @@ public class ToolBox extends TabPanel { }); }; + + + protected void addMonitorBackgroundPanel() { + TabItemConfig monitorBackgroundPanelItemConf = new TabItemConfig("Background", true); + + monitorBackgroundPanel = new MonitorBackgroundPanel(eventBus); + add(monitorBackgroundPanel, monitorBackgroundPanelItemConf); + addBeforeCloseHandler(new BeforeCloseHandler() { + + public void onBeforeClose(BeforeCloseEvent event) { + if (monitorBackgroundPanel == event.getItem()) { + monitorBackgroundPanel.close(); + remove(monitorBackgroundPanel); + monitorBackgroundPanel = null; + } + } + + }); + }; protected void addHistoryPanel() { TabItemConfig historyPanelItemConf = new TabItemConfig("History", true); 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 9cc3f5a..4091eb9 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 @@ -1,6 +1,5 @@ package org.gcube.portlets.user.td.toolboxwidget.client; - import org.gcube.portlets.user.td.widgetcommonevent.client.event.RibbonEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.event.UIStateEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.event.WidgetRequestEvent; @@ -12,70 +11,64 @@ import com.allen_sauer.gwt.log.client.Log; import com.google.web.bindery.event.shared.EventBus; import com.sencha.gxt.widget.core.client.ContentPanel; - public class ToolBoxPanel extends ContentPanel { - + protected EventBus eventBus; protected ToolBox toolBox; protected ToolBoxPanelState state; protected UIStateType uiStateType; protected WidgetRequestType widgetRequestType; - + public ToolBoxPanel(String name, EventBus eventBus) { super(); Log.debug("Open ToolBoxPanel"); - this.eventBus=eventBus; + this.eventBus = eventBus; setId(name); - setWidth(310); + setWidth(310); setHeaderVisible(false); setResize(true); setBodyBorder(false); setBorders(false); forceLayoutOnResize = true; - toolBox = new ToolBox("ToolBox",eventBus,this); + toolBox = new ToolBox("ToolBox", eventBus, this); add(toolBox); startPanel(); bindToEvents(); - + } - + protected void bindToEvents() { eventBus.addHandler(RibbonEvent.TYPE, new RibbonEvent.RibbonEventHandler() { - public void onRibbon(RibbonEvent event) { manageRibbonEvents(event); } - }); - + }); + eventBus.addHandler(WidgetRequestEvent.TYPE, new WidgetRequestEvent.WidgetRequestEventHandler() { - public void onWidgetRequest(WidgetRequestEvent event) { manageWidgetRequestEvents(event); } - }); - - - eventBus.addHandler( - UIStateEvent.TYPE, + }); + + eventBus.addHandler(UIStateEvent.TYPE, new UIStateEvent.UIStateHandler() { - - + public void onUIState(UIStateEvent event) { manageUIStateEvents(event); - + } - }); + }); } - - protected void manageRibbonEvents(RibbonEvent event){ - Log.debug("ToolBox recieved event: "+event.getRibbonType().toString()); - switch (event.getRibbonType()){ + + protected void manageRibbonEvents(RibbonEvent event) { + Log.debug("ToolBox recieved event: " + event.getRibbonType().toString()); + switch (event.getRibbonType()) { case PROPERTIES: doPropertiesOpenTab(); break; @@ -83,26 +76,27 @@ public class ToolBoxPanel extends ContentPanel { doHelpTab(); break; case HISTORY: - doHistoryTab(); + doHistoryTab(); break; - + default: break; } } - - protected void manageUIStateEvents(UIStateEvent event){ - Log.debug("ToolBox recieved event: "+event.getUIStateType().toString()); + + protected void manageUIStateEvents(UIStateEvent event) { + Log.debug("ToolBox recieved event: " + + event.getUIStateType().toString()); uiStateType = event.getUIStateType(); - switch (event.getUIStateType()){ + switch (event.getUIStateType()) { case START: break; case TR_CLOSE: - //this.enable(); + // this.enable(); closePanel(); break; case TR_OPEN: - //this.enable(); + // this.enable(); updateForOpenPanel(); break; case TABLECURATION: @@ -114,19 +108,19 @@ public class ToolBoxPanel extends ContentPanel { case TR_READONLY: break; case WIZARD_OPEN: - //this.disable(); + // this.disable(); break; default: break; - + } } - - protected void manageWidgetRequestEvents(WidgetRequestEvent event){ - Log.debug("ToolBox recieved event: "+event.getWidgetRequestType().toString()); + protected void manageWidgetRequestEvents(WidgetRequestEvent event) { + Log.debug("ToolBox recieved event: " + + event.getWidgetRequestType().toString()); widgetRequestType = event.getWidgetRequestType(); - switch (event.getWidgetRequestType()){ + switch (event.getWidgetRequestType()) { case CHANGECOLUMNTYPEPANEL: doColumnTypeChangeTab(event); break; @@ -138,38 +132,42 @@ public class ToolBoxPanel extends ContentPanel { break; case SPLITCOLUMNPANEL: doSplitColumnTab(event); - break; + break; case MERGECOLUMNPANEL: doMergeColumnTab(event); break; case GROUPBYPANEL: doGroupByTab(event); - break; + break; case LABELCOLUNPANEL: doLabelColumnTab(event); - break; + break; case CHANGETABLETYPEPANEL: doChangeTableTypeTab(event); - break; + break; case DUPLICATESROWSPANEL: doDuplicatesRowsTab(event); - break; + break; case VALIDATIONSTASKSPANEL: doValidationsTasksTab(event); break; case NORMALIZEPANEL: - doNormalizeTab(event); + doNormalizeTab(event); break; case DENORMALIZEPANEL: - doDenormalizeTab(event); - break; + doDenormalizeTab(event); + break; + + case MONITORBACKGROUNDPANEL: + doMonitorBackgroundTab(event); + break; default: break; - + } } - - protected void doHistoryTab(){ + + protected void doHistoryTab() { if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { @@ -186,30 +184,33 @@ public class ToolBoxPanel extends ContentPanel { Log.debug("ToolBoxPanel No table open"); } } - - - - protected void doColumnTypeChangeTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.CHANGECOLUMNTYPEPANEL : ["+event.getTrId()+" ,columnName: "+event.getColumnName()+"]"); + + protected void doColumnTypeChangeTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.CHANGECOLUMNTYPEPANEL : [" + + event.getTrId() + " ,columnName: " + event.getColumnName() + + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { if (state == ToolBoxPanelState.OPENED) { - toolBox.openColumnTypeChangeTab(event.getTrId(), event.getColumnName()); + toolBox.openColumnTypeChangeTab(event.getTrId(), + event.getColumnName()); Log.debug("ToolBoxPanelSTate.OPENED Add Tabs"); } else { enable(); expand(); state = ToolBoxPanelState.OPENED; - toolBox.openColumnTypeChangeTab(event.getTrId(), event.getColumnName()); + toolBox.openColumnTypeChangeTab(event.getTrId(), + event.getColumnName()); } } else { Log.debug("ToolBoxPanel No table open"); } } - - protected void doAddColumnTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.AddColumnPanel : ["+event.getTrId()+"]"); + + protected void doAddColumnTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.AddColumnPanel : [" + event.getTrId() + + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { @@ -226,68 +227,75 @@ public class ToolBoxPanel extends ContentPanel { Log.debug("ToolBoxPanel No table open"); } } - - - protected void doDeleteColumnTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.DeleteColumnPanel : ["+event.getTrId()+" ,columnName: "+event.getColumnName()+"]"); + + protected void doDeleteColumnTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.DeleteColumnPanel : [" + event.getTrId() + + " ,columnName: " + event.getColumnName() + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { if (state == ToolBoxPanelState.OPENED) { - toolBox.openDeleteColumnTab(event.getTrId(), event.getColumnName()); + toolBox.openDeleteColumnTab(event.getTrId(), + event.getColumnName()); Log.debug("ToolBoxPanelSTate.OPENED Add Tabs"); } else { enable(); expand(); state = ToolBoxPanelState.OPENED; - toolBox.openDeleteColumnTab(event.getTrId(), event.getColumnName()); + toolBox.openDeleteColumnTab(event.getTrId(), + event.getColumnName()); } } else { Log.debug("ToolBoxPanel No table open"); } } - - protected void doSplitColumnTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.SplitColumnPanel : ["+event.getTrId()+" ,columnName: "+event.getColumnName()+"]"); + + protected void doSplitColumnTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.SplitColumnPanel : [" + event.getTrId() + + " ,columnName: " + event.getColumnName() + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { if (state == ToolBoxPanelState.OPENED) { - toolBox.openSplitColumnTab(event.getTrId(), event.getColumnName()); + toolBox.openSplitColumnTab(event.getTrId(), + event.getColumnName()); Log.debug("ToolBoxPanelSTate.OPENED Add Tabs"); } else { enable(); expand(); state = ToolBoxPanelState.OPENED; - toolBox.openLabelColumnTab(event.getTrId(), event.getColumnName()); + toolBox.openLabelColumnTab(event.getTrId(), + event.getColumnName()); } } else { Log.debug("ToolBoxPanel No table open"); } } - - - protected void doMergeColumnTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.MergeColumnPanel : ["+event.getTrId()+" ,columnName: "+event.getColumnName()+"]"); + + protected void doMergeColumnTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.MergeColumnPanel : [" + event.getTrId() + + " ,columnName: " + event.getColumnName() + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { if (state == ToolBoxPanelState.OPENED) { - toolBox.openMergeColumnTab(event.getTrId(), event.getColumnName()); + toolBox.openMergeColumnTab(event.getTrId(), + event.getColumnName()); Log.debug("ToolBoxPanelSTate.OPENED Add Tabs"); } else { enable(); expand(); state = ToolBoxPanelState.OPENED; - toolBox.openLabelColumnTab(event.getTrId(), event.getColumnName()); + toolBox.openLabelColumnTab(event.getTrId(), + event.getColumnName()); } } else { Log.debug("ToolBoxPanel No table open"); } } - - protected void doGroupByTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.GroupByPanel : ["+event.getTrId()+"]"); + + protected void doGroupByTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.GroupByPanel : [" + event.getTrId() + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { @@ -304,30 +312,32 @@ public class ToolBoxPanel extends ContentPanel { Log.debug("ToolBoxPanel No table open"); } } - - - protected void doLabelColumnTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.LabelColumnPanel : ["+event.getTrId()+" ,columnName: "+event.getColumnName()+"]"); + + protected void doLabelColumnTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.LabelColumnPanel : [" + event.getTrId() + + " ,columnName: " + event.getColumnName() + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { if (state == ToolBoxPanelState.OPENED) { - toolBox.openLabelColumnTab(event.getTrId(), event.getColumnName()); + toolBox.openLabelColumnTab(event.getTrId(), + event.getColumnName()); Log.debug("ToolBoxPanelSTate.OPENED Add Tabs"); } else { enable(); expand(); state = ToolBoxPanelState.OPENED; - toolBox.openLabelColumnTab(event.getTrId(), event.getColumnName()); + toolBox.openLabelColumnTab(event.getTrId(), + event.getColumnName()); } } else { Log.debug("ToolBoxPanel No table open"); } } - - - protected void doChangeTableTypeTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.ChangeTableTypePanel : ["+event.getTrId()+"]"); + + protected void doChangeTableTypeTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.ChangeTableTypePanel : [" + + event.getTrId() + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { @@ -344,10 +354,10 @@ public class ToolBoxPanel extends ContentPanel { Log.debug("ToolBoxPanel No table open"); } } - - - protected void doDuplicatesRowsTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.DuplicateRowsPanel : ["+event.getTrId()+"]"); + + protected void doDuplicatesRowsTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.DuplicateRowsPanel : [" + event.getTrId() + + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { @@ -364,9 +374,10 @@ public class ToolBoxPanel extends ContentPanel { Log.debug("ToolBoxPanel No table open"); } } - - protected void doValidationsTableTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.ValidationsTablePanel : ["+event.getTrId()+"]"); + + protected void doValidationsTableTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.ValidationsTablePanel : [" + + event.getTrId() + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { @@ -383,10 +394,10 @@ public class ToolBoxPanel extends ContentPanel { Log.debug("ToolBoxPanel No table open"); } } - - - protected void doValidationsTasksTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.ValidationsTasksPanel : ["+event.getTrId()+"]"); + + protected void doValidationsTasksTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.ValidationsTasksPanel : [" + + event.getTrId() + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { @@ -403,10 +414,10 @@ public class ToolBoxPanel extends ContentPanel { Log.debug("ToolBoxPanel No table open"); } } - - - protected void doNormalizeTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.NoramlizePanel : ["+event.getTrId()+"]"); + + protected void doNormalizeTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.NoramlizePanel : [" + event.getTrId() + + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { @@ -423,9 +434,10 @@ public class ToolBoxPanel extends ContentPanel { Log.debug("ToolBoxPanel No table open"); } } - - protected void doDenormalizeTab(WidgetRequestEvent event){ - Log.debug("WidgetRequestEvent.DenoramlizePanel : ["+event.getTrId()+"]"); + + protected void doDenormalizeTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.DenoramlizePanel : [" + event.getTrId() + + "]"); if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { @@ -442,9 +454,22 @@ public class ToolBoxPanel extends ContentPanel { Log.debug("ToolBoxPanel No table open"); } } - - - protected void doPropertiesOpenTab(){ + + protected void doMonitorBackgroundTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.MonitorBackgroundPanel"); + if (state == ToolBoxPanelState.OPENED) { + toolBox.openMonitorBackgroundTab(); + Log.debug("ToolBoxPanelSTate.OPENED Monitor Background Tab"); + } else { + enable(); + expand(); + state = ToolBoxPanelState.OPENED; + toolBox.openMonitorBackgroundTab(); + } + + } + + protected void doPropertiesOpenTab() { if (uiStateType == UIStateType.TR_OPEN || uiStateType == UIStateType.TABLECURATION || uiStateType == UIStateType.TABLEUPDATE) { @@ -460,25 +485,23 @@ public class ToolBoxPanel extends ContentPanel { } else { Log.debug("ToolBoxPanel No table open"); } - - + } - - protected void doHelpTab(){ + + protected void doHelpTab() { Log.debug("ToolBoxPanel show help tab"); enable(); expand(); toolBox.showHelpTab(); } - - - public void closePanelOnly(){ + + public void closePanelOnly() { collapse(); disable(); - state=ToolBoxPanelState.CLOSED; + state = ToolBoxPanelState.CLOSED; } - - public void closePanel(){ + + public void closePanel() { toolBox.closePropertiesTabs(); toolBox.closeHistoryPanel(); toolBox.closeChangeColumnTypePanel(); @@ -496,25 +519,24 @@ public class ToolBoxPanel extends ContentPanel { toolBox.closeDenormalizePanel(); Log.debug("ToolBoxPanel Closed"); } - - public void startPanel(){ + + public void startPanel() { enable(); expand(); state = ToolBoxPanelState.OPENED; toolBox.startTabs(); } - - - public void updatePanel(){ - if (state == ToolBoxPanelState.OPENED) { + + public void updatePanel() { + if (state == ToolBoxPanelState.OPENED) { toolBox.updateTabs(); Log.debug("ToolBoxPanel Updated"); } } - - public void updateForOpenPanel(){ - if (state == ToolBoxPanelState.OPENED) { + + public void updateForOpenPanel() { + if (state == ToolBoxPanelState.OPENED) { toolBox.updateTabs(); toolBox.openPropertiesTab(); Log.debug("ToolBoxPanel Updated For Table"); @@ -527,8 +549,8 @@ public class ToolBoxPanel extends ContentPanel { Log.debug("ToolBoxPanel Updated For Table"); } } - - public void updateForCurationPanel(TRId trId){ + + public void updateForCurationPanel(TRId trId) { if (state == ToolBoxPanelState.OPENED) { toolBox.updateTabs(); toolBox.openValidationsTasksTab(trId); @@ -542,5 +564,5 @@ public class ToolBoxPanel extends ContentPanel { Log.debug("ToolBoxPanel Updated For Curation"); } } - + }