diff --git a/.classpath b/.classpath index ae66b85..20a0e51 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -34,5 +34,5 @@ - + 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 40ffb15..19ef4ff 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 @@ -15,8 +15,6 @@ import org.gcube.portlets.user.workspace.client.event.AccountingHistoryEvent; import org.gcube.portlets.user.workspace.client.event.AccountingHistoryEventHandler; import org.gcube.portlets.user.workspace.client.event.AccountingReadersEvent; import org.gcube.portlets.user.workspace.client.event.AccountingReadersEventHandler; -import org.gcube.portlets.user.workspace.client.event.ActiveGroupingView; -import org.gcube.portlets.user.workspace.client.event.ActiveGroupingViewHandler; import org.gcube.portlets.user.workspace.client.event.AddAdministratorEvent; import org.gcube.portlets.user.workspace.client.event.AddAdministratorEventHandler; import org.gcube.portlets.user.workspace.client.event.AddFolderEvent; @@ -28,70 +26,73 @@ import org.gcube.portlets.user.workspace.client.event.DeleteItemEvent; import org.gcube.portlets.user.workspace.client.event.DeleteItemEventHandler; import org.gcube.portlets.user.workspace.client.event.DeleteMessageEvent; import org.gcube.portlets.user.workspace.client.event.DeleteMessageEventHandler; -import org.gcube.portlets.user.workspace.client.event.DoubleClickElementSelectedEvent; -import org.gcube.portlets.user.workspace.client.event.DoubleClickElementSelectedEventHandler; import org.gcube.portlets.user.workspace.client.event.FileDownloadEvent; import org.gcube.portlets.user.workspace.client.event.FileDownloadEvent.DownloadType; import org.gcube.portlets.user.workspace.client.event.FileDownloadEventHandler; import org.gcube.portlets.user.workspace.client.event.FileUploadEvent; import org.gcube.portlets.user.workspace.client.event.FileUploadEventHandler; -import org.gcube.portlets.user.workspace.client.event.FileVersioningEvent; -import org.gcube.portlets.user.workspace.client.event.FileVersioningEventHandler; import org.gcube.portlets.user.workspace.client.event.FilterScopeEvent; import org.gcube.portlets.user.workspace.client.event.GetFolderLinkEvent; import org.gcube.portlets.user.workspace.client.event.GetInfoEvent; import org.gcube.portlets.user.workspace.client.event.GetInfoEventHandler; import org.gcube.portlets.user.workspace.client.event.GetPublicLinkEvent; import org.gcube.portlets.user.workspace.client.event.GetPublicLinkEventHandler; -import org.gcube.portlets.user.workspace.client.event.GetShareLinkEvent; -import org.gcube.portlets.user.workspace.client.event.GetSharedLinkEventHandler; -import org.gcube.portlets.user.workspace.client.event.GridElementSelectedEvent; -import org.gcube.portlets.user.workspace.client.event.GridElementSelectedEventHandler; -import org.gcube.portlets.user.workspace.client.event.GridElementUnSelectedEvent; -import org.gcube.portlets.user.workspace.client.event.GridElementUnSelectedEventHandler; -import org.gcube.portlets.user.workspace.client.event.GridRefreshEvent; -import org.gcube.portlets.user.workspace.client.event.GridRefreshEventHandler; import org.gcube.portlets.user.workspace.client.event.ImagePreviewEvent; import org.gcube.portlets.user.workspace.client.event.ImagePreviewEventHandler; -import org.gcube.portlets.user.workspace.client.event.LoadAllScopeEvent; -import org.gcube.portlets.user.workspace.client.event.LoadAllScopeEventHandler; -import org.gcube.portlets.user.workspace.client.event.LoadBreadcrumbEvent; -import org.gcube.portlets.user.workspace.client.event.LoadBreadcrumbEventHandler; import org.gcube.portlets.user.workspace.client.event.MoveItemsEvent; -import org.gcube.portlets.user.workspace.client.event.MoveItemsEventHandler; import org.gcube.portlets.user.workspace.client.event.OpenContextMenuTreeEvent; import org.gcube.portlets.user.workspace.client.event.OpenContextMenuTreeEventHandler; import org.gcube.portlets.user.workspace.client.event.OpenReportsEvent; import org.gcube.portlets.user.workspace.client.event.OpenReportsEventHandler; import org.gcube.portlets.user.workspace.client.event.OpenUrlEvent; -import org.gcube.portlets.user.workspace.client.event.PathElementSelectedEvent; -import org.gcube.portlets.user.workspace.client.event.PathElementSelectedEventHandler; import org.gcube.portlets.user.workspace.client.event.RefreshFolderEvent; import org.gcube.portlets.user.workspace.client.event.RenameItemEvent; import org.gcube.portlets.user.workspace.client.event.RenameItemEventHandler; -import org.gcube.portlets.user.workspace.client.event.SaveSmartFolderEvent; -import org.gcube.portlets.user.workspace.client.event.SaveSmartFolderEventHandler; -import org.gcube.portlets.user.workspace.client.event.ScopeChangeEvent; -import org.gcube.portlets.user.workspace.client.event.ScopeChangeEventHandler; -import org.gcube.portlets.user.workspace.client.event.SearchItemByIdEvent; -import org.gcube.portlets.user.workspace.client.event.SearchItemByIdEventHandler; -import org.gcube.portlets.user.workspace.client.event.SearchTextEvent; -import org.gcube.portlets.user.workspace.client.event.SearchTextEventHandler; -import org.gcube.portlets.user.workspace.client.event.ShowUrlEvent; -import org.gcube.portlets.user.workspace.client.event.ShowUrlEventHandler; -import org.gcube.portlets.user.workspace.client.event.StoreGridChangedEvent; -import org.gcube.portlets.user.workspace.client.event.StoreGridChangedEventHandler; import org.gcube.portlets.user.workspace.client.event.TrashEvent; import org.gcube.portlets.user.workspace.client.event.TrashEventHandler; import org.gcube.portlets.user.workspace.client.event.UpdateWorkspaceSizeEvent; import org.gcube.portlets.user.workspace.client.event.UpdateWorkspaceSizeEventHandler; -import org.gcube.portlets.user.workspace.client.event.VREChangePermissionsEvent; -import org.gcube.portlets.user.workspace.client.event.VREChangePermissionsEventHandler; import org.gcube.portlets.user.workspace.client.event.VRESettingPermissionEvent; import org.gcube.portlets.user.workspace.client.event.WebDavUrlEvent; import org.gcube.portlets.user.workspace.client.event.WebDavUrlEventHandler; -import org.gcube.portlets.user.workspace.client.event.WsGetFolderLinkEvent; -import org.gcube.portlets.user.workspace.client.event.WsGetFolderLinkEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.ActiveGroupingView; +import org.gcube.portlets.user.workspace.client.gridevent.ActiveGroupingViewHandler; +import org.gcube.portlets.user.workspace.client.gridevent.DoubleClickElementSelectedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.DoubleClickElementSelectedEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.FileVersioningEvent; +import org.gcube.portlets.user.workspace.client.gridevent.FileVersioningEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.GetShareLinkEvent; +import org.gcube.portlets.user.workspace.client.gridevent.GetSharedLinkEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.GridElementSelectedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.GridElementSelectedEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.GridElementUnSelectedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.GridElementUnSelectedEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.GridRefreshEvent; +import org.gcube.portlets.user.workspace.client.gridevent.GridRefreshEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.LoadAllScopeEvent; +import org.gcube.portlets.user.workspace.client.gridevent.LoadAllScopeEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.LoadBreadcrumbEvent; +import org.gcube.portlets.user.workspace.client.gridevent.LoadBreadcrumbEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.MoveItemsGEvent; +import org.gcube.portlets.user.workspace.client.gridevent.MoveItemsGEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.PathElementSelectedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.PathElementSelectedEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.SaveSmartFolderEvent; +import org.gcube.portlets.user.workspace.client.gridevent.SaveSmartFolderEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.ScopeChangeEvent; +import org.gcube.portlets.user.workspace.client.gridevent.ScopeChangeEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.SearchItemByIdEvent; +import org.gcube.portlets.user.workspace.client.gridevent.SearchItemByIdEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.SearchTextEvent; +import org.gcube.portlets.user.workspace.client.gridevent.SearchTextEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.ShowUrlEvent; +import org.gcube.portlets.user.workspace.client.gridevent.ShowUrlEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.StoreGridChangedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.StoreGridChangedEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.VREChangePermissionsEvent; +import org.gcube.portlets.user.workspace.client.gridevent.VREChangePermissionsEventHandler; +import org.gcube.portlets.user.workspace.client.gridevent.WsGetFolderLinkEvent; +import org.gcube.portlets.user.workspace.client.gridevent.WsGetFolderLinkEventHandler; import org.gcube.portlets.user.workspace.client.interfaces.EventsTypeEnum; import org.gcube.portlets.user.workspace.client.interfaces.GXTCategorySmartFolder; import org.gcube.portlets.user.workspace.client.interfaces.GXTFolderItemTypeEnum; @@ -297,31 +298,18 @@ public class AppController implements SubscriberInterface { } }); - //PASTE EVENT - eventBus.addHandler(MoveItemsEvent.TYPE, new MoveItemsEventHandler() { + //MOVE ITEMS EVENT + eventBus.addHandler(MoveItemsGEvent.TYPE, new MoveItemsGEventHandler() { @Override - public void onMoveItems(MoveItemsEvent pasteItemEvent) { + public void onMoveItems(MoveItemsGEvent moveItemsEvent) { - String folderDestinationId = null; - if(pasteItemEvent.getFolderDestinationId()!=null){ //IF FOLDER DESTINATION EXISTS - folderDestinationId = pasteItemEvent.getFolderDestinationId(); - }else{ - FileModel file = wsPortlet.getToolBarPath().getLastParent(); + if(moveItemsEvent.getIds()!=null && moveItemsEvent.getIds().size()>0){ - if(file.getIdentifier()!=null){ //GET LAST PARENT FROM BREADRUMB - folderDestinationId = file.getIdentifier(); - } + AppControllerExplorer.getEventBus().fireEvent(new MoveItemsEvent(moveItemsEvent.getIds(), null)); } - - wsPortlet.getGridGroupContainer().mask(ConstantsExplorer.VALIDATINGOPERATION,ConstantsExplorer.LOADINGSTYLE); - - if(folderDestinationId!=null){ - // Info.display("Info", "pasting..."); - AppControllerExplorer.getEventBus().fireEvent(new MoveItemsEvent(pasteItemEvent.getIds(), folderDestinationId)); - } } }); @@ -1951,7 +1939,7 @@ public class AppController implements SubscriberInterface { * @see org.gcube.portlets.user.workspace.client.interfaces.SubscriberInterface#pasteEventIsCompleted() */ @Override - public void pasteEventIsCompleted(boolean isTreeRefreshable, String parentId) { + public void moveEventIsCompleted(boolean isTreeRefreshable, String parentId) { if(isTreeRefreshable){ wsPortlet.getGridGroupContainer().unmask(); diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GetSharedLinkEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/event/GetSharedLinkEventHandler.java deleted file mode 100644 index 31503cc..0000000 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GetSharedLinkEventHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.gcube.portlets.user.workspace.client.event; - -import com.google.gwt.event.shared.EventHandler; - -/** - * - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * - */ -public interface GetSharedLinkEventHandler extends EventHandler { - /** - * @param getLinkEvent - */ - void onGetLink(GetShareLinkEvent getLinkEvent); -} diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/ActiveGroupingView.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ActiveGroupingView.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/ActiveGroupingView.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ActiveGroupingView.java index e764238..f60910d 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/ActiveGroupingView.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ActiveGroupingView.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.GwtEvent; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/ActiveGroupingViewHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ActiveGroupingViewHandler.java similarity index 75% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/ActiveGroupingViewHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ActiveGroupingViewHandler.java index 82e2712..664f788 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/ActiveGroupingViewHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ActiveGroupingViewHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/DoubleClickElementSelectedEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/DoubleClickElementSelectedEvent.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/DoubleClickElementSelectedEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/DoubleClickElementSelectedEvent.java index 14a4538..cd33ae2 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/DoubleClickElementSelectedEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/DoubleClickElementSelectedEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.model.FileGridModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/DoubleClickElementSelectedEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/DoubleClickElementSelectedEventHandler.java similarity index 83% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/DoubleClickElementSelectedEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/DoubleClickElementSelectedEventHandler.java index 913eaf5..a429428 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/DoubleClickElementSelectedEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/DoubleClickElementSelectedEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/FileVersioningEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/FileVersioningEvent.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/FileVersioningEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/FileVersioningEvent.java index 26324df..434bb41 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/FileVersioningEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/FileVersioningEvent.java @@ -1,7 +1,7 @@ /* * */ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import java.util.List; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/FileVersioningEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/FileVersioningEventHandler.java similarity index 87% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/FileVersioningEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/FileVersioningEventHandler.java index 62d6aac..c92ca1f 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/FileVersioningEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/FileVersioningEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GetShareLinkEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GetShareLinkEvent.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GetShareLinkEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GetShareLinkEvent.java index a61af30..f86fd56 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GetShareLinkEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GetShareLinkEvent.java @@ -1,11 +1,11 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.model.FileModel; import com.google.gwt.event.shared.GwtEvent; /** - * + * * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it * */ @@ -13,7 +13,7 @@ public class GetShareLinkEvent extends GwtEvent { public static Type TYPE = new Type(); private FileModel targetFile = null; - + public GetShareLinkEvent(FileModel target) { this.targetFile = target; } @@ -22,11 +22,11 @@ public class GetShareLinkEvent extends GwtEvent { public Type getAssociatedType() { return TYPE; } - + @Override protected void dispatch(GetSharedLinkEventHandler handler) { handler.onGetLink(this); - + } public FileModel getSourceFile() { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GetSharedLinkEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GetSharedLinkEventHandler.java new file mode 100644 index 0000000..a561628 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GetSharedLinkEventHandler.java @@ -0,0 +1,20 @@ +package org.gcube.portlets.user.workspace.client.gridevent; + +import com.google.gwt.event.shared.EventHandler; + + +/** + * The Interface GetSharedLinkEventHandler. + * + * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) + * Oct 5, 2018 + */ +public interface GetSharedLinkEventHandler extends EventHandler { + + /** + * On get link. + * + * @param getLinkEvent the get link event + */ + void onGetLink(GetShareLinkEvent getLinkEvent); +} diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementSelectedEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementSelectedEvent.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementSelectedEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementSelectedEvent.java index 39a1222..6744ff0 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementSelectedEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementSelectedEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.model.FileGridModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementSelectedEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementSelectedEventHandler.java similarity index 81% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementSelectedEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementSelectedEventHandler.java index 0fda88f..2771cd7 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementSelectedEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementSelectedEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementUnSelectedEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementUnSelectedEvent.java similarity index 90% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementUnSelectedEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementUnSelectedEvent.java index 4e2a447..58539bf 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementUnSelectedEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementUnSelectedEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.GwtEvent; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementUnSelectedEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementUnSelectedEventHandler.java similarity index 82% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementUnSelectedEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementUnSelectedEventHandler.java index 4abec96..06a8a47 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridElementUnSelectedEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridElementUnSelectedEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageSelectedEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageSelectedEvent.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageSelectedEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageSelectedEvent.java index 76192f1..a404712 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageSelectedEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageSelectedEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.model.MessageModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageSelectedEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageSelectedEventHandler.java similarity index 82% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageSelectedEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageSelectedEventHandler.java index 3c17661..dc768ab 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageSelectedEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageSelectedEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageUnSelectedEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageUnSelectedEvent.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageUnSelectedEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageUnSelectedEvent.java index fc93f26..c3f9456 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageUnSelectedEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageUnSelectedEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.model.MessageModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageUnSelectedEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageUnSelectedEventHandler.java similarity index 83% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageUnSelectedEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageUnSelectedEventHandler.java index df26050..fa042e4 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridMessageUnSelectedEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridMessageUnSelectedEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridRefreshEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRefreshEvent.java similarity index 89% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridRefreshEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRefreshEvent.java index 8f73720..2a276b4 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridRefreshEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRefreshEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.GwtEvent; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridRefreshEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRefreshEventHandler.java similarity index 83% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridRefreshEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRefreshEventHandler.java index 4942dc2..31f8308 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridRefreshEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRefreshEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridRenameItemEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRenameItemEvent.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridRenameItemEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRenameItemEvent.java index 489852a..844c801 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridRenameItemEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRenameItemEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.model.FileGridModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridRenameItemEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRenameItemEventHandler.java similarity index 80% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/GridRenameItemEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRenameItemEventHandler.java index 5662c4f..c2f8e52 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/GridRenameItemEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/GridRenameItemEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/LoadAllScopeEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadAllScopeEvent.java similarity index 90% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/LoadAllScopeEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadAllScopeEvent.java index 97174c9..9fc29b9 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/LoadAllScopeEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadAllScopeEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.GwtEvent; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/LoadAllScopeEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadAllScopeEventHandler.java similarity index 80% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/LoadAllScopeEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadAllScopeEventHandler.java index 518424f..b73f3c7 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/LoadAllScopeEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadAllScopeEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/LoadBreadcrumbEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadBreadcrumbEvent.java similarity index 92% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/LoadBreadcrumbEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadBreadcrumbEvent.java index 18689dc..9fb65fa 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/LoadBreadcrumbEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadBreadcrumbEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.model.FileModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/LoadBreadcrumbEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadBreadcrumbEventHandler.java similarity index 81% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/LoadBreadcrumbEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadBreadcrumbEventHandler.java index 08cffec..2da930c 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/LoadBreadcrumbEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/LoadBreadcrumbEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/MoveItemsGEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/MoveItemsGEvent.java new file mode 100644 index 0000000..17b1d48 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/MoveItemsGEvent.java @@ -0,0 +1,128 @@ +package org.gcube.portlets.user.workspace.client.gridevent; + +import java.util.List; + +import org.gcube.portlets.user.workspace.client.interfaces.EventsTypeEnum; +import org.gcube.portlets.user.workspace.client.interfaces.GuiEventInterface; + +import com.google.gwt.event.shared.GwtEvent; + + +/** + * The Class MoveItemsEvent. + * + * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) + * Oct 4, 2018 + */ +public class MoveItemsGEvent extends GwtEvent implements GuiEventInterface{ + public static Type TYPE = new Type(); + + private String folderDestinationId; + + private List ids; + + private String folderSourceId; //Used to move + + private boolean treeRefreshable; + + + /** + * Instantiates a new move items event. + * + * @param ids the ids + * @param folderDestinationId the folder destination id + */ + public MoveItemsGEvent(List ids, String folderDestinationId) { + this.ids = ids; + this.folderDestinationId = folderDestinationId; + } + + /* (non-Javadoc) + * @see com.google.gwt.event.shared.GwtEvent#getAssociatedType() + */ + @Override + public Type getAssociatedType() { + return TYPE; + } + + /* (non-Javadoc) + * @see com.google.gwt.event.shared.GwtEvent#dispatch(com.google.gwt.event.shared.EventHandler) + */ + @Override + protected void dispatch(MoveItemsGEventHandler handler) { + handler.onMoveItems(this); + + } + + /** + * Gets the folder destination id. + * + * @return the folder destination id + */ + public String getFolderDestinationId() { + return folderDestinationId; + } + + /* (non-Javadoc) + * @see org.gcube.portlets.user.workspace.client.interfaces.GuiEventInterface#getKey() + */ + @Override + public EventsTypeEnum getKey() { + return EventsTypeEnum.MOVED_EVENT; + } + + /** + * Gets the ids. + * + * @return the ids + */ + public List getIds() { + return ids; + } + + /** + * Sets the ids. + * + * @param ids the new ids + */ + public void setIds(List ids) { + this.ids = ids; + } + + /** + * Gets the folder source id. + * + * @return the folder source id + */ + public String getFolderSourceId() { + return folderSourceId; + } + + /** + * Sets the folder source id. + * + * @param folderSourceId the new folder source id + */ + public void setFolderSourceId(String folderSourceId) { + this.folderSourceId = folderSourceId; + } + + /** + * Sets the tree refreshable. + * + * @param bool the new tree refreshable + */ + public void setTreeRefreshable(boolean bool){ + this.treeRefreshable = bool; + } + + /** + * Checks if is tree refreshable. + * + * @return true, if is tree refreshable + */ + public boolean isTreeRefreshable() { + return treeRefreshable; + } + +} diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/MoveItemsGEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/MoveItemsGEventHandler.java new file mode 100644 index 0000000..019295d --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/MoveItemsGEventHandler.java @@ -0,0 +1,20 @@ +package org.gcube.portlets.user.workspace.client.gridevent; + +import com.google.gwt.event.shared.EventHandler; + + +/** + * The Interface MoveItemsEventHandler. + * + * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) + * Oct 4, 2018 + */ +public interface MoveItemsGEventHandler extends EventHandler { + + /** + * On move items. + * + * @param pasteItemEvent the paste item event + */ + void onMoveItems(MoveItemsGEvent pasteItemEvent); +} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/PathElementSelectedEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/PathElementSelectedEvent.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/PathElementSelectedEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/PathElementSelectedEvent.java index b791df8..458423f 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/PathElementSelectedEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/PathElementSelectedEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.model.FileModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/PathElementSelectedEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/PathElementSelectedEventHandler.java similarity index 81% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/PathElementSelectedEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/PathElementSelectedEventHandler.java index 75dc426..2b7cacb 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/PathElementSelectedEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/PathElementSelectedEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/SaveSmartFolderEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SaveSmartFolderEvent.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/SaveSmartFolderEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SaveSmartFolderEvent.java index 944b751..0c60fc8 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/SaveSmartFolderEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SaveSmartFolderEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.GwtEvent; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/SaveSmartFolderEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SaveSmartFolderEventHandler.java similarity index 81% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/SaveSmartFolderEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SaveSmartFolderEventHandler.java index 944dda5..0fc0917 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/SaveSmartFolderEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SaveSmartFolderEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/ScopeChangeEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ScopeChangeEvent.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/ScopeChangeEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ScopeChangeEvent.java index 4ae2015..1cda664 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/ScopeChangeEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ScopeChangeEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.GwtEvent; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/ScopeChangeEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ScopeChangeEventHandler.java similarity index 80% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/ScopeChangeEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ScopeChangeEventHandler.java index e93168a..b4bf8b9 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/ScopeChangeEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ScopeChangeEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchItemByIdEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchItemByIdEvent.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/SearchItemByIdEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchItemByIdEvent.java index 6cfccf8..fa61322 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchItemByIdEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchItemByIdEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.ConstantsExplorer; import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WsPortletInitOperation; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchItemByIdEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchItemByIdEventHandler.java similarity index 84% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/SearchItemByIdEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchItemByIdEventHandler.java index e682cfd..4c2f658 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchItemByIdEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchItemByIdEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchTextEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchTextEvent.java similarity index 95% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/SearchTextEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchTextEvent.java index d14b343..dbe4ffd 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchTextEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchTextEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.GwtEvent; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchTextEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchTextEventHandler.java similarity index 80% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/SearchTextEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchTextEventHandler.java index 7093557..1c5d7b8 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/SearchTextEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/SearchTextEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/ShowUrlEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ShowUrlEvent.java similarity index 95% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/ShowUrlEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ShowUrlEvent.java index 6de6199..797c692 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/ShowUrlEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ShowUrlEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.model.FileModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/ShowUrlEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ShowUrlEventHandler.java similarity index 71% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/ShowUrlEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ShowUrlEventHandler.java index 4369ea6..7b20d43 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/ShowUrlEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/ShowUrlEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/StoreGridChangedEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/StoreGridChangedEvent.java similarity index 91% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/StoreGridChangedEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/StoreGridChangedEvent.java index 7042091..b1614e7 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/StoreGridChangedEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/StoreGridChangedEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.GwtEvent; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/StoreGridChangedEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/StoreGridChangedEventHandler.java similarity index 84% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/StoreGridChangedEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/StoreGridChangedEventHandler.java index 9eaee3b..0c2b361 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/StoreGridChangedEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/StoreGridChangedEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/VREChangePermissionsEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/VREChangePermissionsEvent.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/VREChangePermissionsEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/VREChangePermissionsEvent.java index 598640f..f796b03 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/VREChangePermissionsEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/VREChangePermissionsEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.model.FileModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/VREChangePermissionsEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/VREChangePermissionsEventHandler.java similarity index 80% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/VREChangePermissionsEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/VREChangePermissionsEventHandler.java index 7ac611f..d3e04ba 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/VREChangePermissionsEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/VREChangePermissionsEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/WsGetFolderLinkEvent.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/WsGetFolderLinkEvent.java similarity index 95% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/WsGetFolderLinkEvent.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/WsGetFolderLinkEvent.java index 29e13ed..846bc79 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/WsGetFolderLinkEvent.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/WsGetFolderLinkEvent.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import org.gcube.portlets.user.workspace.client.model.FileModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/event/WsGetFolderLinkEventHandler.java b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/WsGetFolderLinkEventHandler.java similarity index 87% rename from src/main/java/org/gcube/portlets/user/workspace/client/event/WsGetFolderLinkEventHandler.java rename to src/main/java/org/gcube/portlets/user/workspace/client/gridevent/WsGetFolderLinkEventHandler.java index df30c3b..b6bb996 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/event/WsGetFolderLinkEventHandler.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/gridevent/WsGetFolderLinkEventHandler.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.workspace.client.event; +package org.gcube.portlets.user.workspace.client.gridevent; import com.google.gwt.event.shared.EventHandler; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java index 9dd3725..eb3d1dc 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java @@ -6,16 +6,16 @@ import java.util.List; import org.gcube.portlets.user.workspace.client.AppController; import org.gcube.portlets.user.workspace.client.ConstantsExplorer; -import org.gcube.portlets.user.workspace.client.event.DoubleClickElementSelectedEvent; import org.gcube.portlets.user.workspace.client.event.FileDownloadEvent; import org.gcube.portlets.user.workspace.client.event.FileDownloadEvent.DownloadType; -import org.gcube.portlets.user.workspace.client.event.GridElementSelectedEvent; -import org.gcube.portlets.user.workspace.client.event.GridElementUnSelectedEvent; import org.gcube.portlets.user.workspace.client.event.ImagePreviewEvent; import org.gcube.portlets.user.workspace.client.event.OpenContextMenuTreeEvent; import org.gcube.portlets.user.workspace.client.event.OpenReportsEvent; -import org.gcube.portlets.user.workspace.client.event.ShowUrlEvent; -import org.gcube.portlets.user.workspace.client.event.StoreGridChangedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.DoubleClickElementSelectedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.GridElementSelectedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.GridElementUnSelectedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.ShowUrlEvent; +import org.gcube.portlets.user.workspace.client.gridevent.StoreGridChangedEvent; import org.gcube.portlets.user.workspace.client.model.FileGridModel; import org.gcube.portlets.user.workspace.client.model.FileModel; import org.gcube.portlets.user.workspace.client.model.GroupingStoreModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterPanel.java index 56d2c99..b9229e3 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterPanel.java @@ -5,8 +5,8 @@ import java.util.List; import org.gcube.portlets.user.workspace.client.AppController; import org.gcube.portlets.user.workspace.client.ConstantsPortlet; -import org.gcube.portlets.user.workspace.client.event.GridElementSelectedEvent; -import org.gcube.portlets.user.workspace.client.event.GridElementUnSelectedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.GridElementSelectedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.GridElementUnSelectedEvent; import org.gcube.portlets.user.workspace.client.model.FileGridModel; import org.gcube.portlets.user.workspace.client.model.FileModel; import org.gcube.portlets.user.workspace.client.model.ListStoreModel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java index d53f52f..bce21c2 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtSeachAndFilterPanel.java @@ -4,8 +4,8 @@ import java.util.List; import org.gcube.portlets.user.workspace.client.AppController; import org.gcube.portlets.user.workspace.client.ConstantsPortlet; -import org.gcube.portlets.user.workspace.client.event.ScopeChangeEvent; -import org.gcube.portlets.user.workspace.client.event.SearchTextEvent; +import org.gcube.portlets.user.workspace.client.gridevent.ScopeChangeEvent; +import org.gcube.portlets.user.workspace.client.gridevent.SearchTextEvent; import org.gcube.portlets.user.workspace.client.model.ScopeModel; import org.gcube.portlets.user.workspace.client.view.GxtComboBox; import org.gcube.portlets.user.workspace.client.view.toolbars.GxtBreadcrumbPathPanel; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/Breadcrumbs.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/Breadcrumbs.java index 54e5ffb..6f1d316 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/Breadcrumbs.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/Breadcrumbs.java @@ -7,7 +7,7 @@ import java.util.LinkedHashMap; import java.util.List; import org.gcube.portlets.user.workspace.client.AppController; -import org.gcube.portlets.user.workspace.client.event.PathElementSelectedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.PathElementSelectedEvent; import org.gcube.portlets.user.workspace.client.model.FileModel; import com.github.gwtbootstrap.client.ui.NavLink; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtBottomToolBarItem.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtBottomToolBarItem.java index 1fc4c72..7b118e7 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtBottomToolBarItem.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtBottomToolBarItem.java @@ -5,9 +5,9 @@ import org.gcube.portlets.user.workspace.client.ConstantsExplorer; import org.gcube.portlets.user.workspace.client.event.AccountingHistoryEvent; import org.gcube.portlets.user.workspace.client.event.AccountingReadersEvent; import org.gcube.portlets.user.workspace.client.event.AddAdministratorEvent; -import org.gcube.portlets.user.workspace.client.event.FileVersioningEvent; import org.gcube.portlets.user.workspace.client.event.GetInfoEvent; import org.gcube.portlets.user.workspace.client.event.TrashEvent; +import org.gcube.portlets.user.workspace.client.gridevent.FileVersioningEvent; import org.gcube.portlets.user.workspace.client.interfaces.GXTFolderItemTypeEnum; import org.gcube.portlets.user.workspace.client.model.FileModel; import org.gcube.portlets.user.workspace.client.resources.Resources; 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 35cbaa5..c6d44ab 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 @@ -6,22 +6,23 @@ import org.gcube.portlets.user.workspace.client.AppController; import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WS_UPLOAD_TYPE; import org.gcube.portlets.user.workspace.client.ConstantsPortlet; import org.gcube.portlets.user.workspace.client.ConstantsPortlet.ViewSwitchTypeInResult; -import org.gcube.portlets.user.workspace.client.event.ActiveGroupingView; import org.gcube.portlets.user.workspace.client.event.AddFolderEvent; import org.gcube.portlets.user.workspace.client.event.DeleteItemEvent; -import org.gcube.portlets.user.workspace.client.event.DoubleClickElementSelectedEvent; import org.gcube.portlets.user.workspace.client.event.FileDownloadEvent; import org.gcube.portlets.user.workspace.client.event.FileDownloadEvent.DownloadType; import org.gcube.portlets.user.workspace.client.event.FileUploadEvent; import org.gcube.portlets.user.workspace.client.event.GetPublicLinkEvent; -import org.gcube.portlets.user.workspace.client.event.GetShareLinkEvent; -import org.gcube.portlets.user.workspace.client.event.GridRefreshEvent; import org.gcube.portlets.user.workspace.client.event.ImagePreviewEvent; import org.gcube.portlets.user.workspace.client.event.RenameItemEvent; -import org.gcube.portlets.user.workspace.client.event.ShowUrlEvent; -import org.gcube.portlets.user.workspace.client.event.VREChangePermissionsEvent; import org.gcube.portlets.user.workspace.client.event.WebDavUrlEvent; -import org.gcube.portlets.user.workspace.client.event.WsGetFolderLinkEvent; +import org.gcube.portlets.user.workspace.client.gridevent.ActiveGroupingView; +import org.gcube.portlets.user.workspace.client.gridevent.DoubleClickElementSelectedEvent; +import org.gcube.portlets.user.workspace.client.gridevent.GetShareLinkEvent; +import org.gcube.portlets.user.workspace.client.gridevent.GridRefreshEvent; +import org.gcube.portlets.user.workspace.client.gridevent.MoveItemsGEvent; +import org.gcube.portlets.user.workspace.client.gridevent.ShowUrlEvent; +import org.gcube.portlets.user.workspace.client.gridevent.VREChangePermissionsEvent; +import org.gcube.portlets.user.workspace.client.gridevent.WsGetFolderLinkEvent; import org.gcube.portlets.user.workspace.client.interfaces.GXTFolderItemTypeEnum; import org.gcube.portlets.user.workspace.client.model.FileGridModel; import org.gcube.portlets.user.workspace.client.model.FileModel; @@ -67,7 +68,7 @@ public class GxtToolBarItemFunctionality { private Button btnGetSharedLink; private Button btnPublicLink; private Button btnFolderLink; - private Button btnMoveItem; + private Button btnMoveItems; //private Button btnPasteItem; private Button btnCutItem; private Button btnSetPermission; @@ -193,11 +194,11 @@ public class GxtToolBarItemFunctionality { toolBar.add(btnFolderLink); - //COPY - btnMoveItem = new Button("Move", Resources.getIconCopy()); - btnMoveItem.setScale(ButtonScale.SMALL); - btnMoveItem.setIconAlign(IconAlign.TOP); - toolBar.add(btnMoveItem); + //MOVE + btnMoveItems = new Button("Move", Resources.getIconPaste()); + btnMoveItems.setScale(ButtonScale.SMALL); + btnMoveItems.setIconAlign(IconAlign.TOP); + toolBar.add(btnMoveItems); //CUT @@ -323,12 +324,12 @@ public class GxtToolBarItemFunctionality { - btnMoveItem.addSelectionListener(new SelectionListener() { + btnMoveItems.addSelectionListener(new SelectionListener() { public void componentSelected(ButtonEvent ce) { List listTarget = gridGroupViewContainer.getIdsSelectedItems(); if(listTarget!=null && listTarget.size()>0){ - + AppController.getEventBus().fireEvent(new MoveItemsGEvent(listTarget, null)); } } @@ -706,14 +707,14 @@ public class GxtToolBarItemFunctionality { this.btnRenameItem.disable(); this.btnDownloadFile.disable(); this.btnOpen.disable(); - this.btnMoveItem.disable(); + this.btnMoveItems.disable(); this.btnCutItem.disable(); } else { this.btnRemoveItem.enable(); this.btnRenameItem.enable(); this.btnDownloadFile.enable(); this.btnOpen.enable(); - this.btnMoveItem.enable(); + this.btnMoveItems.enable(); this.btnCutItem.enable(); } @@ -763,7 +764,7 @@ public class GxtToolBarItemFunctionality { //ONLY ENABLED this.btnRemoveItem.setEnabled(active); - this.btnMoveItem.setEnabled(active); + this.btnMoveItems.setEnabled(active); this.btnCutItem.setEnabled(active); } @@ -789,7 +790,7 @@ public class GxtToolBarItemFunctionality { * Disable button special folder selected. */ public void disableButtonSpecialFolderSelected(){ - this.btnMoveItem.disable(); + this.btnMoveItems.disable(); this.btnAddFolder.disable(); this.btnUploadArchive.disable(); this.btnUploadFile.disable(); @@ -807,7 +808,7 @@ public class GxtToolBarItemFunctionality { if(parent!=null){ - this.btnMoveItem.enable(); + this.btnMoveItems.enable(); this.btnAddFolder.enable(); this.btnUploadArchive.enable(); this.btnUploadFile.enable(); diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/versioning/VersioningInfoContainer.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/versioning/VersioningInfoContainer.java index ab5d0f1..2ab4805 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/versioning/VersioningInfoContainer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/versioning/VersioningInfoContainer.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.List; import org.gcube.portlets.user.workspace.client.AppController; -import org.gcube.portlets.user.workspace.client.event.FileVersioningEvent; +import org.gcube.portlets.user.workspace.client.gridevent.FileVersioningEvent; import org.gcube.portlets.user.workspace.client.model.FileModel; import org.gcube.portlets.user.workspace.client.model.FileVersionModel; import org.gcube.portlets.user.workspace.client.resources.Resources;