From e4e1db223330f84f91e8e4c0115a8f427ba60355 Mon Sep 17 00:00:00 2001 From: koutsoub Date: Wed, 9 Feb 2011 16:15:33 +0200 Subject: [PATCH] clear selection after trash or delete --- src/gr/ebs/gss/client/CellTreeView.java | 36 +++++++++++++++++++- src/gr/ebs/gss/client/DeleteFolderDialog.java | 10 ++---- src/gr/ebs/gss/client/commands/ToTrashCommand.java | 1 + 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/gr/ebs/gss/client/CellTreeView.java b/src/gr/ebs/gss/client/CellTreeView.java index 90c8ca0..d2ab328 100644 --- a/src/gr/ebs/gss/client/CellTreeView.java +++ b/src/gr/ebs/gss/client/CellTreeView.java @@ -34,11 +34,16 @@ import gr.ebs.gss.client.rest.resource.TrashResource; import gr.ebs.gss.client.rest.resource.UserResource; import gwtquery.plugins.draggable.client.DragAndDropManager; import gwtquery.plugins.droppable.client.events.DragAndDropContext; +import gwtquery.plugins.droppable.client.events.OverDroppableEvent; +import gwtquery.plugins.droppable.client.events.OverDroppableEvent.OverDroppableEventHandler; import gwtquery.plugins.droppable.client.gwt.DragAndDropCellTree; import java.util.Arrays; import com.google.gwt.core.client.GWT; +import com.google.gwt.event.logical.shared.AttachEvent; +import com.google.gwt.event.logical.shared.OpenEvent; +import com.google.gwt.event.logical.shared.OpenHandler; import com.google.gwt.query.client.plugins.GQueryUi; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; @@ -156,7 +161,30 @@ public class CellTreeView extends Composite{ }; utils=new CellTreeViewUtils(tree); tree.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.ENABLED); - + /*tree.addOpenHandler(new OpenHandler() { + + @Override + public void onOpen(OpenEvent event) { + Window.alert("[NODE OPENED]"+event.getTarget()); + + } + }); + tree.addOverDroppableHandler(new OverDroppableEventHandler() { + + @Override + public void onOverDroppable(OverDroppableEvent event) { + GWT.log("OVER:"+event); + + } + }); + tree.addAttachHandler(new AttachEvent.Handler() { + + @Override + public void onAttachOrDetach(AttachEvent event) { + GWT.log("ATTACH:"+event.getSource()); + + } + });*/ Handler selectionHandler = new SelectionChangeEvent.Handler() { @Override public void onSelectionChange(com.google.gwt.view.client.SelectionChangeEvent event) { @@ -494,6 +522,12 @@ public class CellTreeView extends Composite{ return selectionModel.getSelectedObject(); } + public void clearSelection(){ + if(GSS.get().getCurrentSelection().equals(getSelection())) + GSS.get().setCurrentSelection(null); + selectionModel.setSelected(getSelection(), false); + } + /** * Retrieve the myFolders. diff --git a/src/gr/ebs/gss/client/DeleteFolderDialog.java b/src/gr/ebs/gss/client/DeleteFolderDialog.java index 0040229..6037b3d 100644 --- a/src/gr/ebs/gss/client/DeleteFolderDialog.java +++ b/src/gr/ebs/gss/client/DeleteFolderDialog.java @@ -112,15 +112,11 @@ public class DeleteFolderDialog extends DialogBox { @Override public void onComplete() { - /*TODO: CELLTREE - TreeItem curFolder = GSS.get().getFolders().getCurrent(); - if(curFolder.getParentItem() != null){ - GSS.get().getFolders().select(curFolder.getParentItem()); - GSS.get().getFolders().updateFolder((DnDTreeItem) curFolder.getParentItem()); - }*/ FolderResource fres = ((RestResourceWrapper) GSS.get().getTreeView().getSelection()).getResource(); - GSS.get().getTreeView().updateNodeChildren(fres.getParentURI()); + GSS.get().getTreeView().updateNodeChildrenForRemove(fres.getParentURI()); + GSS.get().getTreeView().clearSelection(); GSS.get().showFileList(true); + GSS.get().getStatusPanel().updateStats(); } diff --git a/src/gr/ebs/gss/client/commands/ToTrashCommand.java b/src/gr/ebs/gss/client/commands/ToTrashCommand.java index 60d91ee..965e2cc 100644 --- a/src/gr/ebs/gss/client/commands/ToTrashCommand.java +++ b/src/gr/ebs/gss/client/commands/ToTrashCommand.java @@ -73,6 +73,7 @@ public class ToTrashCommand implements Command{ */ FolderResource fres = ((RestResourceWrapper) GSS.get().getTreeView().getSelection()).getResource(); GSS.get().getTreeView().updateNodeChildrenForRemove(fres.getParentURI()); + GSS.get().getTreeView().clearSelection(); //GSS.get().getTreeView().updateNode(GSS.get().getTreeView().getTrash()); GSS.get().getTreeView().updateTrashNode(); GSS.get().showFileList(true); -- 1.7.10.4