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

removed file items in the tree only folder are shown 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@169664 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2018-07-04 14:34:36 +00:00
parent b63f679d33
commit 1123a92dad
2 changed files with 691 additions and 689 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,7 +366,7 @@ public class Resources {
* @return the icon share user * @return the icon share user
*/ */
public static AbstractImagePrototype getIconShareUser(){ public static AbstractImagePrototype getIconShareUser(){
return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.GROUP()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.USER());
} }
/** /**
@ -1113,7 +1113,7 @@ public class Resources {
* @return the icon un share folder * @return the icon un share folder
*/ */
public static AbstractImagePrototype getIconUnShareFolder() { public static AbstractImagePrototype getIconUnShareFolder() {
return AbstractImagePrototype.create(ICONS.unShareFolder()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.UNSHARE());
} }
/** /**
@ -1122,7 +1122,7 @@ public class Resources {
* @return the icon un share user * @return the icon un share user
*/ */
public static AbstractImagePrototype getIconUnShareUser() { public static AbstractImagePrototype getIconUnShareUser() {
return AbstractImagePrototype.create(ICONS.unShareUser()); return AbstractImagePrototype.create(StorageHubIconResources.INSTANCE.UNSHARE());
} }
/** /**

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

@ -541,11 +541,11 @@ public class GWTWorkspaceBuilder {
* @return the list * @return the list
* @throws InternalErrorException the internal error exception * @throws InternalErrorException the internal error exception
*/ */
protected List<FileModel> buildGXTListFileModelItem(WorkspaceItem workspaceFolder, FileModel parentFolderModel) throws InternalErrorException protected List<FileModel> buildGXTListFileModelItem(WorkspaceItem workspaceFolder, FileModel parentFolderModel) throws InternalErrorException {
{
List<FileModel> listFileModel = new ArrayList<FileModel>(); List<FileModel> listFileModel = new ArrayList<FileModel>();
@SuppressWarnings("unchecked")
List<WorkspaceItem> listItems = (List<WorkspaceItem>) workspaceFolder.getChildren(); List<WorkspaceItem> listItems = (List<WorkspaceItem>) workspaceFolder.getChildren();
if(listItems!=null) if(listItems!=null)
@ -559,9 +559,11 @@ public class GWTWorkspaceBuilder {
// startTime = System.currentTimeMillis(); // startTime = System.currentTimeMillis();
for (WorkspaceItem item : listItems){ for (WorkspaceItem item : listItems){
if (item.isFolder()) {
logger.debug("item: "+item.getName()+ "is root? " +item.isRoot()); logger.debug("item: "+item.getName()+ "is root? " +item.isRoot());
listFileModel.add(buildGXTFileModelItem(item,parentFolderModel)); listFileModel.add(buildGXTFileModelItem(item,parentFolderModel));
} }
}
//TEST TIME //TEST TIME
// endTime = System.currentTimeMillis() - startTime; // endTime = System.currentTimeMillis() - startTime;