Revision 5eef5c8a web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java

b/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
62 62

  
63 63
       @Override
64 64
        public void render(Context context, Folder folder, SafeHtmlBuilder safeHtmlBuilder) {
65
            String html = AbstractImagePrototype.create(FolderTreeView.images.folderYellow()).getHTML();
65
            String html;
66
            if (folder.isTrash())
67
                html = AbstractImagePrototype.create(FolderTreeView.images.emptyTrash()).getHTML();
68
            else
69
                html = AbstractImagePrototype.create(FolderTreeView.images.folderYellow()).getHTML();
66 70
            safeHtmlBuilder.appendHtmlConstant(html);
67 71
            safeHtmlBuilder.append(Templates.INSTANCE.nameSpan(folder.getName()));
68 72
        }
......
142 146
        else {
143 147
            dataProvider.getList().clear();
144 148
            dataProvider.getList().addAll(folders);
145
            if (dataProvider.equals(rootDataProvider))
149
            if (dataProvider.equals(rootDataProvider)) {
146 150
                selectionModel.setSelected(dataProvider.getList().get(0), true);
151
                Folder f = new Folder("Trash");
152
                f.setTrash(true);
153
                f.setContainer("trash");
154
                dataProvider.getList().add(f);
155
            }
147 156
        }
148 157
    }
149 158

  
......
161 170
            dataProviderMap.put(folder, new ListDataProvider<Folder>());
162 171
        }
163 172
        final ListDataProvider<Folder> dataProvider = dataProviderMap.get(folder);
164
        fetchFolder(folder, dataProvider);
173
        if (!folder.isTrash())
174
            fetchFolder(folder, dataProvider);
175
        else
176
            GSS.get().showFiles(folder);
165 177
    }
166 178

  
167 179
    public void fetchFolder(final Folder f, final ListDataProvider<Folder> dataProvider) {

Also available in: Unified diff