gCubeSystem
/
workspace
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

429: Workspace: uploading big files 

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

Workspace Uploader integrated in workspace

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@119409 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2015-10-05 16:34:15 +00:00
parent f68bb5a328
commit 30c01c88dc
5 changed files with 76 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.settings/org.eclipse.wst.common.component
View File

@ -8,7 +8,7 @@
<dependent-module archiveName="workspace-tree-widget-6.9.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="fileupload-progress-bar-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/fileupload-progress-bar-TRUNK/fileupload-progress-bar-TRUNK">
<dependent-module archiveName="workspace-uploader-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-uploader-1.0.0-SNAPSHOT-TRUNK/workspace-uploader-1.0.0-SNAPSHOT-TRUNK">
<dependency-type>uses</dependency-type>
</dependent-module>

9
pom.xml
View File

@ -59,6 +59,13 @@
<dependencies>
<!-- UNCOMMENT THIS TO RUN IN DEVO MODE -->
<!-- <dependency> -->
<!-- <groupId>xerces</groupId> -->
<!-- <artifactId>xerces</artifactId> -->
<!-- <version>2.4.0</version> -->
<!-- </dependency> -->
<!-- This dependency is needed and is need on TOP to use GWT UI BInder
without old Xerces version of gCore complaining -->
<dependency>
@ -130,7 +137,7 @@
<artifactId>custom-portal-handler</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>aslcore</artifactId>

39
src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
View File

@ -1341,10 +1341,8 @@ public class AppController implements SubscriberInterface {
@Override
public void onSuccess(List<FileGridModel> result) {
wsPortlet.getGridGroupContainer().setCurrentFolderView(parent); //SET folder as current view
wsPortlet.getGridGroupContainer().unmask();
wsPortlet.getGridGroupContainer().updateStore(result);
}
});
}
@ -1365,7 +1363,39 @@ public class AppController implements SubscriberInterface {
@Override
public void addedFile(String itemIdentifier, FileModel parent) {
updateStoreByRpc(parent);
// updateStoreByRpc(parent);
GWT.log("Calling addFileToStoreById "+parent.getIdentifier());
addFileToStoreById(itemIdentifier, parent);
}
//TODO
private void addFileToStoreById(String itemIdentifier, FileModel parent){
GxtBreadcrumbPathPanel breadCrumb = this.wsPortlet.getToolBarPath();
FileModel breadParent = breadCrumb.getLastParent();
//UPDATE GRID ONLY IF TREE AND GRID DISPLAYING THE SAME PARENT
if(breadParent!=null && parent!=null && breadParent.getIdentifier().compareTo(parent.getIdentifier())==0){
// wsPortlet.getGridGroupContainer().mask(ConstantsExplorer.LOADING,ConstantsExplorer.LOADINGSTYLE);
appContrExplorer.getRpcWorkspaceService().getItemForFileGrid(itemIdentifier, new AsyncCallback<FileGridModel>() {
@Override
public void onFailure(Throwable caught) {
// wsPortlet.getGridGroupContainer().unmask();
}
@Override
public void onSuccess(FileGridModel result) {
wsPortlet.getGridGroupContainer().addToStore(result);
// wsPortlet.getGridGroupContainer().unmask();
}
});
}
}
@Override
@ -1385,10 +1415,7 @@ public class AppController implements SubscriberInterface {
wsPortlet.getSearchAndFilterContainer().searchCancel(); //TODO added in 05/04/2012
AppController.getEventBus().fireEvent(new SearchTextEvent(null));
wsPortlet.getSearchAndFilterContainer().setSearchActive(false);
// setSearchActive(false);
resetSmartFolderSelected();
updatGridViewForSelectedItem(item);
return;
}

11
src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
View File

@ -358,6 +358,17 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
return false;
}
public boolean addToStore(FileGridModel result){
if(result!= null){
result.setIcon();
store.add(result);
return true;
}
return false;
}
public FileGridModel getSelectedItem(){
return currenItemSelected;

23
src/main/webapp/WEB-INF/web.xml
View File

@ -69,6 +69,29 @@
<servlet-class>org.gcube.portlets.user.workspace.server.ImageServlet</servlet-class>
</servlet>
<!-- Servlets UploadServletStream -->
<servlet>
<servlet-name>workspaceUploadServletStream</servlet-name>
<servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploadServletStream</servlet-class>
</servlet>
<servlet>
<servlet-name>workspaceUploaderService</servlet-name>
<servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploaderServiceImpl</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>workspaceUploadServletStream</servlet-name>
<url-pattern>/workspace/workspaceUploadServletStream</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>workspaceUploaderService</servlet-name>
<url-pattern>/workspace/workspaceUploaderService</url-pattern>
</servlet-mapping>
<!-- END Servlets UploadServletStream -->
<servlet-mapping>
<servlet-name>ImageService</servlet-name>
<url-pattern>/workspace/ImageService</url-pattern>