diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/WindowImagePreview.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/WindowImagePreview.java index 3ef447b..0e0033b 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/WindowImagePreview.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/WindowImagePreview.java @@ -18,6 +18,7 @@ public class WindowImagePreview { Image img = new Image(image.getThumbnailUrl()); img.setWidth(String.valueOf(image.getThumbnailWidth())); img.setHeight(String.valueOf(image.getThumbnailHeight())); + log("Thumbnail URL: "+image.getThumbnailUrl()); window.add(new Image(image.getThumbnailUrl())); window.show(); } @@ -50,5 +51,9 @@ public class WindowImagePreview { window.setAutoHeight(true); window.setPosition(positionX, positionY); } + + public static native void log(String msg) /*-{ + $console.log(msg); + }-*/; } diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java b/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java index 193e894..70b3f6a 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java @@ -3,7 +3,6 @@ */ package org.gcube.portlets.user.workspace.server; -import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -21,19 +20,15 @@ import javax.servlet.http.HttpSession; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.log4j.Logger; -import org.gcube.common.homelibary.model.items.type.NodeProperty; import org.gcube.common.homelibrary.home.HomeLibrary; import org.gcube.common.homelibrary.home.exceptions.InternalErrorException; import org.gcube.common.homelibrary.home.workspace.Workspace; import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; -import org.gcube.common.homelibrary.home.workspace.exceptions.ExternalResourceBrokenLinkException; -import org.gcube.common.homelibrary.home.workspace.exceptions.ExternalResourcePluginNotFoundException; import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundException; import org.gcube.common.homelibrary.home.workspace.folder.FolderItem; import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile; import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalImage; -import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalResourceLink; import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalUrl; import org.gcube.common.homelibrary.home.workspace.folder.items.GCubeItem; import org.gcube.common.homelibrary.home.workspace.folder.items.Query; @@ -526,9 +521,9 @@ public class DownloadServlet extends HttpServlet{ } - - case EXTERNAL_RESOURCE_LINK:{ //IT'S SAME OF EXTERNAL FILE - + /*COMMENT ACCORDING TO HL + case EXTERNAL_RESOURCE_LINK:{//IT'S SAME OF EXTERNAL FILE + try{ ExternalResourceLink externalResourceLink = (ExternalResourceLink) folderItem; OutputStream out = resp.getOutputStream(); @@ -589,13 +584,10 @@ public class DownloadServlet extends HttpServlet{ // sendError(resp,HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Error during resource retrieving, plugin not found!: "+e.getMessage()); e.printStackTrace(); } - - - return; + return; - - } + }*/ } } diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java index 3c16423..2da2c3d 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java @@ -83,6 +83,7 @@ import org.gcube.portlets.user.workspace.shared.accounting.GxtAccountingEntryTyp import org.gcube.portlets.user.workspace.shared.accounting.GxtAccountingField; import org.gcube.vomanagement.usermanagement.model.UserModel; +import com.google.gwt.user.client.Random; import com.thoughtworks.xstream.XStream; @@ -210,6 +211,8 @@ public class GWTWorkspaceBuilder { sb.append(id); sb.append("&type="); sb.append(requestType.toString()); + sb.append("&random="); + sb.append(Random.nextInt()+""+Random.nextInt()+""+Random.nextInt()); return sb.toString(); }