Revision f1b24b82 src/gr/grnet/pithos/web/client/Pithos.java
b/src/gr/grnet/pithos/web/client/Pithos.java | ||
---|---|---|
240 | 240 |
*/ |
241 | 241 |
private String token; |
242 | 242 |
|
243 |
protected SingleSelectionModel<Folder> folderTreeSelectionModel;
|
|
244 |
protected FolderTreeViewModel folderTreeViewModel;
|
|
245 |
protected FolderTreeView folderTreeView;
|
|
243 |
SingleSelectionModel<Folder> folderTreeSelectionModel; |
|
244 |
FolderTreeViewModel folderTreeViewModel; |
|
245 |
FolderTreeView folderTreeView; |
|
246 | 246 |
|
247 |
protected SingleSelectionModel<Folder> mysharedTreeSelectionModel;
|
|
247 |
SingleSelectionModel<Folder> mysharedTreeSelectionModel; |
|
248 | 248 |
private MysharedTreeViewModel mysharedTreeViewModel; |
249 |
private MysharedTreeView mysharedTreeView;
|
|
249 |
MysharedTreeView mysharedTreeView; |
|
250 | 250 |
|
251 | 251 |
protected SingleSelectionModel<Folder> otherSharedTreeSelectionModel; |
252 | 252 |
private OtherSharedTreeViewModel otherSharedTreeViewModel; |
253 |
private OtherSharedTreeView otherSharedTreeView;
|
|
253 |
OtherSharedTreeView otherSharedTreeView; |
|
254 | 254 |
|
255 | 255 |
protected SingleSelectionModel<Tag> tagTreeSelectionModel; |
256 | 256 |
private TagTreeViewModel tagTreeViewModel; |
... | ... | |
259 | 259 |
private GroupTreeViewModel groupTreeViewModel; |
260 | 260 |
private GroupTreeView groupTreeView; |
261 | 261 |
|
262 |
private TreeView selectedTree; |
|
262 | 263 |
protected AccountResource account; |
263 | 264 |
|
264 | 265 |
private Folder trash; |
... | ... | |
316 | 317 |
@Override |
317 | 318 |
public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { |
318 | 319 |
if (folderTreeSelectionModel.getSelectedObject() != null) { |
319 |
deselectOthers(folderTreeSelectionModel); |
|
320 |
deselectOthers(folderTreeView, folderTreeSelectionModel);
|
|
320 | 321 |
Folder f = folderTreeSelectionModel.getSelectedObject(); |
321 | 322 |
updateFolder(f, true, null); |
322 | 323 |
} |
... | ... | |
335 | 336 |
@Override |
336 | 337 |
public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { |
337 | 338 |
if (mysharedTreeSelectionModel.getSelectedObject() != null) { |
338 |
deselectOthers(mysharedTreeSelectionModel); |
|
339 |
deselectOthers(mysharedTreeView, mysharedTreeSelectionModel);
|
|
339 | 340 |
updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true); |
340 | 341 |
} |
341 | 342 |
} |
... | ... | |
349 | 350 |
@Override |
350 | 351 |
public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { |
351 | 352 |
if (otherSharedTreeSelectionModel.getSelectedObject() != null) { |
352 |
deselectOthers(otherSharedTreeSelectionModel); |
|
353 |
deselectOthers(otherSharedTreeView, otherSharedTreeSelectionModel);
|
|
353 | 354 |
updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true); |
354 | 355 |
} |
355 | 356 |
} |
... | ... | |
358 | 359 |
otherSharedTreeViewModel = new OtherSharedTreeViewModel(this, otherSharedTreeSelectionModel); |
359 | 360 |
otherSharedTreeView = new OtherSharedTreeView(otherSharedTreeViewModel); |
360 | 361 |
|
361 |
tagTreeSelectionModel = new SingleSelectionModel<Tag>(); |
|
362 |
tagTreeSelectionModel.addSelectionChangeHandler(new Handler() { |
|
363 |
@Override |
|
364 |
public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) { |
|
365 |
if (tagTreeSelectionModel.getSelectedObject() != null) { |
|
366 |
deselectOthers(tagTreeSelectionModel); |
|
367 |
Tag t = tagTreeSelectionModel.getSelectedObject(); |
|
368 |
updateTag(t); |
|
369 |
} |
|
370 |
} |
|
371 |
}); |
|
372 |
selectionModels.add(tagTreeSelectionModel); |
|
373 |
tagTreeViewModel = new TagTreeViewModel(this, tagTreeSelectionModel); |
|
374 |
tagTreeView = new TagTreeView(tagTreeViewModel); |
|
375 |
|
|
376 | 362 |
groupTreeViewModel = new GroupTreeViewModel(this); |
377 | 363 |
groupTreeView = new GroupTreeView(groupTreeViewModel); |
378 | 364 |
|
... | ... | |
437 | 423 |
} |
438 | 424 |
|
439 | 425 |
@SuppressWarnings({ "rawtypes", "unchecked" }) |
440 |
public void deselectOthers(SingleSelectionModel model) { |
|
426 |
public void deselectOthers(TreeView _selectedTree, SingleSelectionModel model) { |
|
427 |
selectedTree = _selectedTree; |
|
441 | 428 |
for (SingleSelectionModel s : selectionModels) |
442 | 429 |
if (!s.equals(model)) |
443 | 430 |
s.setSelected(s.getSelectedObject(), false); |
... | ... | |
939 | 926 |
account.removeGroup(group); |
940 | 927 |
updateGroupsNode(); |
941 | 928 |
} |
929 |
|
|
930 |
public TreeView getSelectedTree() { |
|
931 |
return selectedTree; |
|
932 |
} |
|
933 |
|
|
934 |
public Folder getSelection() { |
|
935 |
return selectedTree.getSelection(); |
|
936 |
} |
|
942 | 937 |
} |
Also available in: Unified diff