Revision a845b044 src/gr/grnet/pithos/web/client/Pithos.java

b/src/gr/grnet/pithos/web/client/Pithos.java
306 306
        folderTreeSelectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() {
307 307
            @Override
308 308
            public void onSelectionChange(SelectionChangeEvent event) {
309
                Folder f = folderTreeSelectionModel.getSelectedObject();
310
                updateFolder(f);
309
                if (folderTreeSelectionModel.getSelectedObject() != null) {
310
                    tagTreeSelectionModel.setSelected(tagTreeSelectionModel.getSelectedObject(), false);
311
                    Folder f = folderTreeSelectionModel.getSelectedObject();
312
                    updateFolder(f);
313
                }
311 314
            }
312 315
        });
313 316

  
......
321 324
        tagTreeSelectionModel.addSelectionChangeHandler(new Handler() {
322 325
            @Override
323 326
            public void onSelectionChange(SelectionChangeEvent event) {
324
                Tag t = tagTreeSelectionModel.getSelectedObject();
325
                updateTag(t);
327
                if (tagTreeSelectionModel.getSelectedObject() != null) {
328
                    folderTreeSelectionModel.setSelected(folderTreeSelectionModel.getSelectedObject(), false);
329
                    Tag t = tagTreeSelectionModel.getSelectedObject();
330
                    updateTag(t);
331
                }
326 332
            }
327 333
        });
328 334
        tagTreeViewModel = new TagTreeViewModel(tagTreeSelectionModel);
......
387 393
        else
388 394
            fileList.showFiles();
389 395
        Set<File> files = f.getFiles();
390
        Iterator<File> iter = files.iterator();
391
        fetchFile(iter, files);
396
        showFiles(files);
397
    }
398

  
399
    public void showFiles(Set<File> files) {
400
        //Iterator<File> iter = files.iterator();
401
        //fetchFile(iter, files);
402
        fileList.setFiles(new ArrayList<File>(files));
392 403
    }
393 404

  
394 405
    private void fetchFile(final Iterator<File> iter, final Set<File> files) {

Also available in: Unified diff