gCubeSystem
/
workspace-tree-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

129: Updating workspace and workspace tree 

Task-Url: https://support.d4science.org/issues/129

Removed ExternalResourceLink according to HL 2.0
Added log to ImagePreview

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@114881 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2015-05-25 16:05:12 +00:00
parent f9c30d17ec
commit 605dd4f3e1
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/gcube/portlets/user/workspace/client/view/windows/WindowImagePreview.java
View File

@ -18,6 +18,7 @@ public class WindowImagePreview {
Image img = new Image(image.getThumbnailUrl()); Image img = new Image(image.getThumbnailUrl());
img.setWidth(String.valueOf(image.getThumbnailWidth())); img.setWidth(String.valueOf(image.getThumbnailWidth()));
img.setHeight(String.valueOf(image.getThumbnailHeight())); img.setHeight(String.valueOf(image.getThumbnailHeight()));
log("Thumbnail URL: "+image.getThumbnailUrl());
window.add(new Image(image.getThumbnailUrl())); window.add(new Image(image.getThumbnailUrl()));
window.show(); window.show();
} }
@ -50,5 +51,9 @@ public class WindowImagePreview {
window.setAutoHeight(true); window.setAutoHeight(true);
window.setPosition(positionX, positionY); window.setPosition(positionX, positionY);
} }
public static native void log(String msg) /*-{
$console.log(msg);
}-*/;
} }

18
src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java
View File

@ -3,7 +3,6 @@
*/ */
package org.gcube.portlets.user.workspace.server; package org.gcube.portlets.user.workspace.server;
import java.io.BufferedInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -21,19 +20,15 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger; 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.HomeLibrary;
import org.gcube.common.homelibrary.home.exceptions.InternalErrorException; import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
import org.gcube.common.homelibrary.home.workspace.Workspace; import org.gcube.common.homelibrary.home.workspace.Workspace;
import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder; import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; 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.exceptions.ItemNotFoundException;
import org.gcube.common.homelibrary.home.workspace.folder.FolderItem; 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.ExternalFile;
import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalImage; 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.ExternalUrl;
import org.gcube.common.homelibrary.home.workspace.folder.items.GCubeItem; import org.gcube.common.homelibrary.home.workspace.folder.items.GCubeItem;
import org.gcube.common.homelibrary.home.workspace.folder.items.Query; import org.gcube.common.homelibrary.home.workspace.folder.items.Query;
@ -526,9 +521,9 @@ public class DownloadServlet extends HttpServlet{
} }
/*COMMENT ACCORDING TO HL
case EXTERNAL_RESOURCE_LINK:{ //IT'S SAME OF EXTERNAL FILE case EXTERNAL_RESOURCE_LINK:{//IT'S SAME OF EXTERNAL FILE
try{ try{
ExternalResourceLink externalResourceLink = (ExternalResourceLink) folderItem; ExternalResourceLink externalResourceLink = (ExternalResourceLink) folderItem;
OutputStream out = resp.getOutputStream(); 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()); // sendError(resp,HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Error during resource retrieving, plugin not found!: "+e.getMessage());
e.printStackTrace(); e.printStackTrace();
} }
return;
return;
}*/
}
} }
} }

3
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java
View File

@ -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.portlets.user.workspace.shared.accounting.GxtAccountingField;
import org.gcube.vomanagement.usermanagement.model.UserModel; import org.gcube.vomanagement.usermanagement.model.UserModel;
import com.google.gwt.user.client.Random;
import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStream;
@ -210,6 +211,8 @@ public class GWTWorkspaceBuilder {
sb.append(id); sb.append(id);
sb.append("&type="); sb.append("&type=");
sb.append(requestType.toString()); sb.append(requestType.toString());
sb.append("&random=");
sb.append(Random.nextInt()+""+Random.nextInt()+""+Random.nextInt());
return sb.toString(); return sb.toString();
} }