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

enhancements on VRE folder management 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@91540 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2014-02-13 15:12:37 +00:00
parent 895c4b33d4
commit 5172556090
8 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/gcube/portlets/user/workspace/client/model/FileModel.java
View File

@ -207,11 +207,14 @@ public class FileModel extends BaseModelData implements Serializable {
}else if(this.isShared()){ //SHARED ITEM?
if(this.isShareable()) //IS ROOT SHARED FOLDER
absImgPr = Resources.getIconSharedFolder();
else
absImgPr = Resources.getIconFolder(); //IS A DESCENDANT
if(this.isVreFolder())
absImgPr = Resources.getIconVREFolder();
else{
if(this.isShareable()) //IS ROOT SHARED FOLDER
absImgPr = Resources.getIconSharedFolder();
else
absImgPr = Resources.getIconFolder(); //IS A DESCENDANT
}
}else if(this.getStatus() == ConstantsExplorer.FOLDERNOTLOAD){ //IS A FOLDER IN LOADING
absImgPr = Resources.getIconLoading2();

2
src/main/java/org/gcube/portlets/user/workspace/client/model/FolderModel.java
View File

@ -17,10 +17,12 @@ public class FolderModel extends FileModel {
public FolderModel(String identifier, String name, FileModel parent, boolean isDirectory, boolean isShared, boolean isVreFolder) {
super(identifier, name, parent, isDirectory, isShared);
super.setVreFolder(isVreFolder);
}
public FolderModel(String identifier, String name, boolean isDirectory, boolean isVreFolder) {
super(identifier, name, isDirectory);
super.setVreFolder(isVreFolder);
}
@Override

3
src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java
View File

@ -298,5 +298,8 @@ public interface Icons extends ClientBundle {
@Source("icons/writeall.png")
ImageResource writeall();
@Source("icons/vrefolder.png")
ImageResource vreFolder();
}

5
src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java
View File

@ -60,6 +60,11 @@ public class Resources {
return AbstractImagePrototype.create(ICONS.createNew());
}
public static AbstractImagePrototype getIconVREFolder(){
return AbstractImagePrototype.create(ICONS.vreFolder());
}
public static AbstractImagePrototype getIconPpt(){
return AbstractImagePrototype.create(ICONS.ppt());

BIN
src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/vrefolder.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 421 B

4
src/main/java/org/gcube/portlets/user/workspace/client/view/tree/AsyncTreePanel.java
View File

@ -151,6 +151,10 @@ public class AsyncTreePanel extends LayoutContainer {
if(model.getStatus() == ConstantsExplorer.FOLDERNOTLOAD)
return Resources.getIconLoading2();
if(model.isVreFolder()){
return Resources.getIconVREFolder();
}
//SHARE ICON
if(model.isShared()){
if(model.isShareable())

6
src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java
View File

@ -710,8 +710,8 @@ public class ContextMenuTree {
contextMenu.getItemByItemId(WorkspaceOperation.SHARE_LINK.getId()).setVisible(true);
}
/*
if(selectedItem.isBaseVREFolder()){
//IS VRE FOLDER?
if(selectedItem.isVreFolder()){
contextMenu.getItemByItemId(WorkspaceOperation.SHARE.getId()).setVisible(false); //SHARE
contextMenu.getItemByItemId(WorkspaceOperation.INSERT_SHARED_FOLDER.getId()).setVisible(false); //insert shared folder
@ -719,7 +719,7 @@ public class ContextMenuTree {
contextMenu.getItemByItemId(WorkspaceOperation.RENAME.getId()).setVisible(false); //UNSHARE
contextMenu.getItemByItemId(WorkspaceOperation.REMOVE.getId()).setVisible(false); //UNSHARE
return;
}*/
}
//CASE DIRECTORY
if(selectedItem.isDirectory()){

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

@ -860,8 +860,10 @@ public class GWTWorkspaceBuilder {
case SHARED_FOLDER:
WorkspaceSharedFolder sharedFolder = (WorkspaceSharedFolder) item;
fileModel = new FolderModel(item.getId(), item.getName(), true, sharedFolder.isVreFolder());
WorkspaceSharedFolder shared = (WorkspaceSharedFolder) item;
String name = shared.isVreFolder()?shared.getDisplayName():item.getName();
fileModel = new FolderModel(item.getId(), name, true, shared.isVreFolder());
fileModel.setShared(true);
fileModel.setType(GXTFolderItemTypeEnum.SHARED_FOLDER.toString());
@ -952,7 +954,7 @@ public class GWTWorkspaceBuilder {
case SHARED_FOLDER:
WorkspaceSharedFolder shared = (WorkspaceSharedFolder) item;
String name = shared.isVreFolder()?shared.getDisplayName():item.getName();
fileModel = new FolderModel(item.getId(), name, (FolderModel) parentFolderModel, true, true,shared.isVreFolder());
fileModel = new FolderModel(item.getId(), name, (FolderModel) parentFolderModel, true, true, shared.isVreFolder());
fileModel.setType(GXTFolderItemTypeEnum.SHARED_FOLDER.toString());
fileModel.setShareable(true);
fileModel.setDescription(item.getDescription());