From 76a4bc614c0ee9acfbf1261b8ae03d2f0eb03a61 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 2 Jul 2013 12:27:16 +0000 Subject: [PATCH] bug fixed: download item on toolbar git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@77467 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/client/AppController.java | 19 +++++++++---------- .../workspace/client/ConstantsPortlet.java | 2 -- .../toolbars/GxtToolBarItemFunctionality.java | 5 +---- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java index fe686e9..2ad89be 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java @@ -102,7 +102,6 @@ public class AppController implements SubscriberInterface { private String rootIdentifier = null; // public static boolean isSearchActive = false; - public AppController(AppControllerExplorer appControllerExplorer) { this.appContrExplorer = appControllerExplorer; this.appContrExplorer.subscribe(this, new EventsTypeEnum[] { @@ -258,7 +257,7 @@ public class AppController implements SubscriberInterface { @Override public void onFileDownloadEvent(FileDownloadEvent fileDownloadEvent) { - if(fileDownloadEvent!=null){ + if(fileDownloadEvent!=null && fileDownloadEvent.getItemIdentifier()!=null){ // FileGridModel fileItem = getGridSelectedItem(); // // String id = fileDownloadEvent.getItemIdentifier()!=null? fileDownloadEvent.getItemIdentifier():""; @@ -636,14 +635,14 @@ public class AppController implements SubscriberInterface { }); - eventBus.addHandler(FileDownloadEvent.TYPE, new FileDownloadEventHandler() { - - @Override - public void onFileDownloadEvent(FileDownloadEvent fileDownloadEvent) { - AppControllerExplorer.getEventBus().fireEvent(new FileDownloadEvent(fileDownloadEvent.getItemIdentifier(), fileDownloadEvent.getItemName(), fileDownloadEvent.getDownloadType())); - - } - }); +// eventBus.addHandler(FileDownloadEvent.TYPE, new FileDownloadEventHandler() { +// +// @Override +// public void onFileDownloadEvent(FileDownloadEvent fileDownloadEvent) { +// AppControllerExplorer.getEventBus().fireEvent(new FileDownloadEvent(fileDownloadEvent.getItemIdentifier(), fileDownloadEvent.getItemName(), fileDownloadEvent.getDownloadType())); +// +// } +// }); eventBus.addHandler(DeleteItemEvent.TYPE, new DeleteItemEventHandler() { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java b/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java index 8696d00..e389416 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java @@ -54,6 +54,4 @@ public class ConstantsPortlet { public static final int COOKIE_EXPIRE_DAYS = 30; public static final long MILLISECS_PER_DAY = 1000L * 60L * 60L * 24L; - - } diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java index 5117f57..7622f11 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java @@ -304,10 +304,7 @@ public class GxtToolBarItemFunctionality { final FileGridModel fileGridModel = gridGroupViewContainer.getSelectedItem(); - AppController.getEventBus().fireEvent( - new FileDownloadEvent(fileGridModel - .getIdentifier(), fileGridModel - .getName(), DownloadType.DOWNLOAD)); + AppController.getEventBus().fireEvent(new FileDownloadEvent(fileGridModel.getIdentifier(), fileGridModel.getName(), DownloadType.DOWNLOAD)); } });