diff --git a/.classpath b/.classpath
index 3e7099d..876662c 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
-
+
@@ -28,5 +28,5 @@
-
+
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 8338523..753ecc8 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -3,6 +3,6 @@
>>>>>>>=.r93212
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/workspace/target/workspace-6.6.7-SNAPSHOT
+lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/workspace/target/workspace-6.6.8-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 2b4da6a..4027808 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -8,6 +8,9 @@
uses
+
+ uses
+
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
index 5ee6477..634f409 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
@@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.gcube.portlets.user.workspace.client.ConstantsExplorer.ViewSwitchType;
import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WsPortletInitOperation;
@@ -138,6 +140,7 @@ public class AppController implements SubscriberInterface {
private String selectedSmartFolderId;
private String selectedSmartFolderCategory;
+ public static final Logger logger = Logger.getLogger("WsAppController");
public AppController(AppControllerExplorer appControllerExplorer) {
@@ -1615,13 +1618,32 @@ public class AppController implements SubscriberInterface {
@Override
public void viewSessionExpiredPanel() {
- /*if(this.rootPanel!=null){
+ FileModel folder = wsPortlet.getGridGroupContainer().getCurrentFolderView();
+ String folderId = "";
+
+ if(folder!=null){
+ folderId = folder.getIdentifier();
+ }else if(wsPortlet.getToolBarPath().getLastParent()!=null){
+ folderId = wsPortlet.getToolBarPath().getLastParent().getIdentifier();
+ }
+
+ logger.log(Level.INFO, "Showing session expired panel, folderId is: "+folderId);
+
+ if(folderId!=null && !folderId.isEmpty()){
+ HashMap params = new HashMap(1);
+ params.put(ConstantsExplorer.GET_ITEMID_PARAMETER, folderId);
+ logger.log(Level.INFO, "show logut with parameter is: "+folderId);
+ CheckSession.showLogoutDialog(params);
+ }else{
+ logger.log(Level.INFO, "show logut without parameters");
+ CheckSession.showLogoutDialog();
+ }
+
+ if(!CheckSession.getInstance().isShowSessionExpiredDialog() && this.rootPanel!=null){
rootPanel.clear();
rootPanel.add(showProblems());
getMainPanel().setHeight(350);
- }*/
-
- CheckSession.showLogoutDialog();
+ }
}