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 b479ea9..e6fd41f 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
@@ -189,6 +189,19 @@ public class TabularDataController {
eventBus.fireEvent(new UIStateEvent(UIStateType.TR_OPEN));
}
+ protected void closeTabularResources() {
+ if (uiState == UIStateType.TR_OPEN) {
+ tabularData.closeTable();
+ uiState = UIStateType.TR_CLOSE;
+ eventBus.fireEvent(new UIStateEvent(UIStateType.TR_CLOSE));
+ if (uiProperties == UIProperties.OPENED) {
+ functionalityPanel.collapse();
+ functionalityPanel.disable();
+ uiProperties = UIProperties.CLOSED;
+ functionalityTab.remove(trProperties);
+ }
+ }
+ }
protected void openWizard(){
eventBus.fireEvent(new UIStateEvent(UIStateType.WIZARD_OPEN));
}
@@ -424,21 +437,8 @@ public class TabularDataController {
*/
}
- /**
- *
- */
- protected void closeTabularResources() {
- if (uiState == UIStateType.TR_OPEN) {
- tabularData.closeTable();
- uiState = UIStateType.TR_CLOSE;
- if (uiProperties == UIProperties.OPENED) {
- functionalityPanel.collapse();
- functionalityPanel.disable();
- uiProperties = UIProperties.CLOSED;
- functionalityTab.remove(trProperties);
- }
- }
- }
+
+
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
index 5b6e9df..bd3c580 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
@@ -120,7 +120,7 @@ public class FileToolBar {
closeButton = new TextButton("Close",
TabularDataResources.INSTANCE.close());
- propertiesButton.disable();
+ closeButton.disable();
closeButton.setId("closeButton");
closeButton.setToolTip("Close table");
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 6cd3a46..18dd258 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
@@ -27,7 +27,7 @@
-
+