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 f1c7d83..0dd4821 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
@@ -69,11 +69,11 @@ import org.gcube.portlets.widgets.sessionchecker.client.CheckSession;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.RunAsyncCallback;
+import com.google.gwt.event.shared.SimpleEventBus;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.web.bindery.event.shared.EventBus;
-import com.google.web.bindery.event.shared.SimpleEventBus;
import com.sencha.gxt.widget.core.client.ContentPanel;
import com.sencha.gxt.widget.core.client.Dialog.PredefinedButton;
import com.sencha.gxt.widget.core.client.box.ConfirmMessageBox;
@@ -359,11 +359,13 @@ public class TabularDataController {
case TABLECURATION:
uiStateEvent = new UIStateEvent(UIStateType.TABLECURATION);
uiStateEvent.setTrId(trId);
+ Log.debug("ResumeUIState Fire: "+uiStateEvent);
eventBus.fireEvent(uiStateEvent);
break;
case TABLEUPDATE:
uiStateEvent = new UIStateEvent(UIStateType.TABLEUPDATE);
uiStateEvent.setTrId(trId);
+ Log.debug("ResumeUIState Fire: "+uiStateEvent);
eventBus.fireEvent(uiStateEvent);
break;
case TR_CLOSE:
@@ -374,6 +376,7 @@ public class TabularDataController {
case TR_OPEN:
uiStateEvent = new UIStateEvent(UIStateType.TR_OPEN);
uiStateEvent.setTrId(trId);
+ Log.debug("ResumeUIState Fire: "+uiStateEvent);
eventBus.fireEvent(uiStateEvent);
break;
case TR_READONLY:
@@ -416,6 +419,7 @@ public class TabularDataController {
uiState = UIStateType.TABLEUPDATE;
UIStateEvent uiStateEvent = new UIStateEvent(UIStateType.TABLEUPDATE);
uiStateEvent.setTrId(tabularResourceId);
+ Log.debug("UpdateTable Fire: "+uiStateEvent);
eventBus.fireEvent(uiStateEvent);
}
@@ -429,6 +433,7 @@ public class TabularDataController {
uiState = UIStateType.TABLECURATION;
UIStateEvent uiStateEvent = new UIStateEvent(UIStateType.TABLECURATION);
uiStateEvent.setTrId(tabularResourceId);
+ Log.debug("UpdateTableForCuration Fire: "+uiStateEvent);
eventBus.fireEvent(uiStateEvent);
}
@@ -540,7 +545,11 @@ public class TabularDataController {
}
protected void doOpenTRIdAfterServerUpdate() {
- openTable(openTRIdAfterServerUpdate);
+ if(trId.getId().compareTo(openTRIdAfterServerUpdate.getId())==0
+ && trId.getTableId().compareTo(trId.getTableId())==0){
+ } else {
+ openTable(openTRIdAfterServerUpdate);
+ }
}
protected void doNewActive(DataViewActiveEvent event) {
diff --git a/src/main/java/org/gcube/portlets/user/td/client/logs/TDMLogs.java b/src/main/java/org/gcube/portlets/user/td/client/logs/TDMLogs.java
index 33e4802..d6505ff 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/logs/TDMLogs.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/logs/TDMLogs.java
@@ -151,7 +151,7 @@ public class TDMLogs extends Window {
text=text.substring(body+6);*/
SafeHtmlBuilder builderLogs = new SafeHtmlBuilder();
- /*builderLogs.appendHtmlConstant(text);*/
+
builderLogs.appendEscapedLines(text);
SafeHtml safeLogs = builderLogs.toSafeHtml();
HTML hLogs = new HTML(safeLogs);
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 1d883c5..bdafe94 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
@@ -75,7 +75,7 @@
-
+