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 fa0f434..a485df9 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 @@ -83,9 +83,7 @@ public class ToolBox extends TabPanel { Log.debug("Open History Tab"); if (historyPanel == null) { addHistoryPanel(); - } else { - historyPanel.update(); - } + } setActiveWidget(historyPanel); } @@ -138,12 +136,11 @@ public class ToolBox extends TabPanel { Log.debug("Open Validations Table Tab: "+trId); if (validationsTablePanel == null) { addValidationsTablePanel(trId); - } else { - validationsTablePanel.update(trId); - } + } setActiveWidget(validationsTablePanel); } + public void openDuplicatesRowsTab(TRId trId) { @@ -158,7 +155,9 @@ public class ToolBox extends TabPanel { } + + //Close public void closePropertiesTabs() { Log.debug("Close Properties Tab"); if (trProperties != null) { @@ -238,6 +237,10 @@ public class ToolBox extends TabPanel { historyPanel.update(); } + if (validationsTablePanel != null) { + validationsTablePanel.update(); + } + if (changeColumnTypePanel != null) { remove(changeColumnTypePanel); changeColumnTypePanel = null; @@ -254,10 +257,6 @@ public class ToolBox extends TabPanel { remove(changeTableTypePanel); changeTableTypePanel = null; } - if (validationsTablePanel != null) { - remove(validationsTablePanel); - validationsTablePanel = null; - } if (duplicatesRowsPanel != null) { remove(duplicatesRowsPanel); 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 22d3935..b0698fa 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 @@ -348,30 +348,30 @@ public class ToolBoxPanel extends ContentPanel { public void updateForOpenPanel(){ if (state == ToolBoxPanelState.OPENED) { - toolBox.openPropertiesTab(); toolBox.updateTabs(); + toolBox.openPropertiesTab(); Log.debug("ToolBoxPanel Updated For Table"); } else { enable(); expand(); state = ToolBoxPanelState.OPENED; - toolBox.openPropertiesTab(); toolBox.updateTabs(); + toolBox.openPropertiesTab(); Log.debug("ToolBoxPanel Updated For Table"); } } public void updateForCurationPanel(TRId trId){ if (state == ToolBoxPanelState.OPENED) { - toolBox.openValidationsTableTab(trId); toolBox.updateTabs(); + toolBox.openValidationsTableTab(trId); Log.debug("ToolBoxPanel Updated For Curation"); } else { enable(); expand(); state = ToolBoxPanelState.OPENED; - toolBox.openValidationsTableTab(trId); toolBox.updateTabs(); + toolBox.openValidationsTableTab(trId); Log.debug("ToolBoxPanel Updated For Curation"); } }