Revision f55cf326 web_client/src/gr/grnet/pithos/web/client/CellTreeViewModel.java

b/web_client/src/gr/grnet/pithos/web/client/CellTreeViewModel.java
65 65
import gwtquery.plugins.droppable.client.gwt.DragAndDropNodeInfo;
66 66

  
67 67
import java.util.ArrayList;
68
import java.util.Arrays;
69 68
import java.util.HashMap;
70 69
import java.util.List;
71 70
import java.util.Map;
......
218 217
		public void onBrowserEvent(Cell.Context context, com.google.gwt.dom.client.Element parent, RestResource value, com.google.gwt.dom.client.NativeEvent event, com.google.gwt.cell.client.ValueUpdater<RestResource> valueUpdater) {
219 218
			if(event.getType().equals("contextmenu")){
220 219
				selectionModel.setSelected(value, true);
221
				GSS.get().setCurrentSelection(value);
222
				GSS.get().getTreeView().showPopup(event.getClientX(), event.getClientY());
220
				Pithos.get().setCurrentSelection(value);
221
				Pithos.get().getTreeView().showPopup(event.getClientX(), event.getClientY());
223 222
			}
224 223
		};
225 224
		
......
266 265
	        // Second level.
267 266
			ListDataProvider<RestResource> trashProvider = new ListDataProvider<RestResource>();
268 267
			List<RestResource> r = new ArrayList<RestResource>();
269
			for(FolderResource f : GSS.get().getTreeView().getTrash().getFolders()){
268
			for(FolderResource f : Pithos.get().getTreeView().getTrash().getFolders()){
270 269
				r.add(new TrashFolderResource(f));
271 270
			}
272 271
			trashProvider.setList(r);
......
334 333
			public void f(final DragAndDropContext context) {
335 334
				if(context.getDroppableData()!=null && context.getDroppableData() instanceof RestResource){
336 335
					
337
					GSS.get().getTreeView().getUtils().openNodeContainingResource((RestResource) context.getDroppableData(), new RefreshHandler() {
336
					Pithos.get().getTreeView().getUtils().openNodeContainingResource((RestResource) context.getDroppableData(), new RefreshHandler() {
338 337
						
339 338
						@Override
340 339
						public void onRefresh() {
......
423 422
						FolderResource rootResource = getResult();
424 423
						//((MyFolderResource)value).getResource().setFiles(rootResource.getFiles());
425 424
						((MyFolderResource)value).setResource(rootResource);
426
						if(GSS.get().getTreeView().getSelection().getUri().equals(value.getUri()))
425
						if(Pithos.get().getTreeView().getSelection().getUri().equals(value.getUri()))
427 426
							selectionModel.setSelected(value, true);
428
						GSS.get().onResourceUpdate(value,clearSelection);
427
						Pithos.get().onResourceUpdate(value,clearSelection);
429 428
						
430 429
					}
431 430
	
432 431
					@Override
433 432
					public void onError(Throwable t) {
434 433
						GWT.log("Error fetching root folder", t);
435
						GSS.get().displayError("Unable to fetch root folder");
434
						Pithos.get().displayError("Unable to fetch root folder");
436 435
					}
437 436
	
438 437
				};
439 438
				DeferredCommand.addCommand(gf);
440 439
			}
441 440
			else if(value instanceof TrashResource){
442
				DeferredCommand.addCommand(new GetCommand<TrashResource>(TrashResource.class, GSS.get().getCurrentUserResource().getTrashPath(), null) {
441
				DeferredCommand.addCommand(new GetCommand<TrashResource>(TrashResource.class, Pithos.get().getCurrentUserResource().getTrashPath(), null) {
443 442
					@Override
444 443
					public void onComplete() {
445 444
						//trash = getResult();
......
447 446
						((TrashResource)value).setFiles(getResult().getFiles());
448 447
						for(RestResource r : getRootNodes().getList()){
449 448
							if(r instanceof TrashResource)
450
								getRootNodes().getList().set(getRootNodes().getList().indexOf(r),GSS.get().getTreeView().getTrash());
449
								getRootNodes().getList().set(getRootNodes().getList().indexOf(r), Pithos.get().getTreeView().getTrash());
451 450
						}
452
						GSS.get().getTreeView().updateNodeChildren(GSS.get().getTreeView().getTrash());
453
						//GSS.get().showFileList(true);
454
						GSS.get().onResourceUpdate(value,clearSelection);
451
						Pithos.get().getTreeView().updateNodeChildren(Pithos.get().getTreeView().getTrash());
452
						//Pithos.get().showFileList(true);
453
						Pithos.get().onResourceUpdate(value,clearSelection);
455 454
					}
456 455

  
457 456
					@Override
......
465 464
						}
466 465
						else{
467 466
							GWT.log("", t);
468
							GSS.get().displayError("Unable to fetch trash folder:"+t.getMessage());
469
							//GSS.get().getTreeView().getTrash() = new TrashResource(GSS.get().getCurrentUserResource().getTrashPath());
467
							Pithos.get().displayError("Unable to fetch trash folder:"+t.getMessage());
468
							//Pithos.get().getTreeView().getTrash() = new TrashResource(Pithos.get().getCurrentUserResource().getTrashPath());
470 469
						}
471 470
					}
472 471
				}
......
480 479
						FolderResource rootResource = getResult();
481 480
						//((MyFolderResource)value).getResource().setFiles(rootResource.getFiles());
482 481
						((OthersFolderResource)value).setResource(rootResource);
483
						if(GSS.get().getTreeView().getSelection().getUri().equals(value.getUri()))
482
						if(Pithos.get().getTreeView().getSelection().getUri().equals(value.getUri()))
484 483
							selectionModel.setSelected(value, true);
485
						GSS.get().onResourceUpdate(value,clearSelection);
484
						Pithos.get().onResourceUpdate(value,clearSelection);
486 485
						
487 486
					}
488 487
	
489 488
					@Override
490 489
					public void onError(Throwable t) {
491 490
						GWT.log("Error fetching root folder", t);
492
						GSS.get().displayError("Unable to fetch root folder");
491
						Pithos.get().displayError("Unable to fetch root folder");
493 492
					}
494 493
	
495 494
				};
......
503 502
						FolderResource rootResource = getResult();
504 503
						//((MyFolderResource)value).getResource().setFiles(rootResource.getFiles());
505 504
						((SharedFolderResource)value).setResource(rootResource);
506
						if(GSS.get().getTreeView().getSelection().getUri().equals(value.getUri()))
505
						if(Pithos.get().getTreeView().getSelection().getUri().equals(value.getUri()))
507 506
							selectionModel.setSelected(value, true);
508
						GSS.get().onResourceUpdate(value,clearSelection);
507
						Pithos.get().onResourceUpdate(value,clearSelection);
509 508
						
510 509
					}
511 510
	
512 511
					@Override
513 512
					public void onError(Throwable t) {
514 513
						GWT.log("Error fetching root folder", t);
515
						GSS.get().displayError("Unable to fetch root folder");
514
						Pithos.get().displayError("Unable to fetch root folder");
516 515
					}
517 516
	
518 517
				};
......
527 526
						((SharedResource)value).setFolders(getResult().getFolders());
528 527
						((SharedResource)value).setFiles(getResult().getFiles());
529 528
						
530
						if(GSS.get().getTreeView().getSelection().getUri().equals(value.getUri()))
529
						if(Pithos.get().getTreeView().getSelection().getUri().equals(value.getUri()))
531 530
							selectionModel.setSelected(value, true);
532
						GSS.get().onResourceUpdate(value,clearSelection);
531
						Pithos.get().onResourceUpdate(value,clearSelection);
533 532
						
534 533
					}
535 534
	
536 535
					@Override
537 536
					public void onError(Throwable t) {
538 537
						GWT.log("Error fetching root folder", t);
539
						GSS.get().displayError("Unable to fetch root folder");
538
						Pithos.get().displayError("Unable to fetch root folder");
540 539
					}
541 540
	
542 541
				};
......
551 550
						((OtherUserResource)value).setFolders(getResult().getFolders());
552 551
						((OtherUserResource)value).setFiles(getResult().getFiles());
553 552
						
554
						if(GSS.get().getTreeView().getSelection().getUri().equals(value.getUri()))
553
						if(Pithos.get().getTreeView().getSelection().getUri().equals(value.getUri()))
555 554
							selectionModel.setSelected(value, true);
556
						GSS.get().onResourceUpdate(value,clearSelection);
555
						Pithos.get().onResourceUpdate(value,clearSelection);
557 556
						
558 557
					}
559 558
	
560 559
					@Override
561 560
					public void onError(Throwable t) {
562 561
						GWT.log("Error fetching root folder", t);
563
						GSS.get().displayError("Unable to fetch root folder");
562
						Pithos.get().displayError("Unable to fetch root folder");
564 563
					}
565 564
	
566 565
				};
......
674 673

  
675 674
							@Override
676 675
							public void onError(Throwable t) {
677
								GSS.get().displayError("Unable to fetch subfolders");
676
								Pithos.get().displayError("Unable to fetch subfolders");
678 677
								GWT.log("Unable to fetch subfolders", t);
679 678
							}
680 679

  
......
692 691
					public void onError(Throwable t) {
693 692
						
694 693
						GWT.log("Error fetching root folder", t);
695
						GSS.get().displayError("Unable to fetch root folder");
694
						Pithos.get().displayError("Unable to fetch root folder");
696 695
					}
697 696

  
698 697
				};
......
761 760
                                  @Override
762 761
                                  public void onError(Throwable t) {
763 762
                                          GWT.log("Error fetching Others Root folder", t);
764
                                          GSS.get().displayError("Unable to fetch Others Root folder");
763
                                          Pithos.get().displayError("Unable to fetch Others Root folder");
765 764
                                  }
766 765

  
767 766
                                  @Override
......
775 774
			          @Override
776 775
			          public void onError(Throwable t) {
777 776
			                  GWT.log("Error fetching Others Root folder", t);
778
			                  GSS.get().displayError("Unable to fetch Others Root folder");
777
			                  Pithos.get().displayError("Unable to fetch Others Root folder");
779 778
			          }
780 779
			  };
781 780
			  DeferredCommand.addCommand(go);

Also available in: Unified diff