Revision 5eef5c8a
| b/web_client/src/gr/grnet/pithos/web/client/FileList.java | ||
|---|---|---|
| 793 | 793 |
//celltable.redraw(); |
| 794 | 794 |
celltable.redrawHeaders(); |
| 795 | 795 |
} |
| 796 |
|
|
| 797 |
public void showTrash() {
|
|
| 798 |
uploadButtonBottom.setVisible(false); |
|
| 799 |
uploadButtonTop.setVisible(false); |
|
| 800 |
} |
|
| 801 |
|
|
| 802 |
public void showFiles() {
|
|
| 803 |
uploadButtonBottom.setVisible(true); |
|
| 804 |
uploadButtonTop.setVisible(true); |
|
| 805 |
} |
|
| 796 | 806 |
} |
| b/web_client/src/gr/grnet/pithos/web/client/GSS.java | ||
|---|---|---|
| 351 | 351 |
|
| 352 | 352 |
public void showFiles(Folder f) {
|
| 353 | 353 |
inner.selectTab(0); |
| 354 |
if (f.isTrash()) {
|
|
| 355 |
fileList.showTrash(); |
|
| 356 |
} |
|
| 357 |
else |
|
| 358 |
fileList.showFiles(); |
|
| 354 | 359 |
Set<File> files = f.getFiles(); |
| 355 | 360 |
Iterator<File> iter = files.iterator(); |
| 356 | 361 |
fetchFile(iter, files); |
| b/web_client/src/gr/grnet/pithos/web/client/foldertree/Folder.java | ||
|---|---|---|
| 78 | 78 |
|
| 79 | 79 |
private boolean inTrash = false; |
| 80 | 80 |
|
| 81 |
/* |
|
| 82 |
* Flag that indicates that this folder is the Trash |
|
| 83 |
*/ |
|
| 84 |
private boolean trash = false; |
|
| 85 |
|
|
| 81 | 86 |
public Folder() {};
|
| 82 | 87 |
|
| 83 | 88 |
public Folder(String name) {
|
| ... | ... | |
| 237 | 242 |
public boolean isContainer() {
|
| 238 | 243 |
return parent == null; |
| 239 | 244 |
} |
| 245 |
|
|
| 246 |
public boolean isTrash() {
|
|
| 247 |
return trash; |
|
| 248 |
} |
|
| 249 |
|
|
| 250 |
public void setTrash(boolean trash) {
|
|
| 251 |
this.trash = trash; |
|
| 252 |
} |
|
| 253 |
|
|
| 254 |
public void setContainer(String container) {
|
|
| 255 |
this.container = container; |
|
| 256 |
} |
|
| 240 | 257 |
} |
| 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