diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index d879dbe..99f9c8e 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,6 +5,9 @@
+
+ uses
+
diff --git a/pom.xml b/pom.xml
index 09f4dab..888e765 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,21 +164,28 @@
org.gcube.portlets.user
workspace-tree-widget
[6.0.0-SNAPSHOT, 7.0.0-SNAPSHOT)
-
+ compile
org.gcube.portlets.widgets
workspace-light-tree
-
+ compile
+
+
+
+ org.gcube.portlets.widgets
+ fileupload-progress-bar
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ compile
org.gcube.portlets.widgets
wsmail-widget
[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)
-
+ compile
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 61a2cf8..5635cc6 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
@@ -212,6 +212,7 @@ public class AppController implements SubscriberInterface {
//PASTE EVENT
eventBus.addHandler(PasteItemEvent.TYPE, new PasteItemEventHandler() {
+
@Override
public void onCopyAndPaste(PasteItemEvent pasteItemEvent) {
@@ -227,9 +228,11 @@ public class AppController implements SubscriberInterface {
}
+ wsPortlet.getGridGroupContainer().mask(ConstantsExplorer.VALIDATINGOPERATION,ConstantsExplorer.LOADINGSTYLE);
+
if(folderDestinationId!=null){
// Info.display("Info", "pasting...");
- AppControllerExplorer.getEventBus().fireEvent(new PasteItemEvent(pasteItemEvent.getItemId(), folderDestinationId));
+ AppControllerExplorer.getEventBus().fireEvent(new PasteItemEvent(pasteItemEvent.getIds(), folderDestinationId));
}
}
});
@@ -1433,6 +1436,8 @@ public class AppController implements SubscriberInterface {
resetSmartFolderSelected();
+ GWT.log("refreshFolder method, forceRefresh is :" +forceRefresh);
+
if(folderTarget!=null){
if(forceRefresh){
@@ -1440,7 +1445,7 @@ public class AppController implements SubscriberInterface {
//FORCED REFRESH FOLDER
FileGridModel folder = wsPortlet.getGridGroupContainer().getFileGridModelByIdentifier(folderTarget.getIdentifier());
- GWT.log("force refresh folder :" +folder);
+ GWT.log("force refresh, folder :" +folder);
updateStoreByRpc(folderTarget);
@@ -1547,8 +1552,8 @@ public class AppController implements SubscriberInterface {
*/
@Override
public void pasteEventIsCompleted() {
-
- Info.display("Info", "paste submitting...");
+ wsPortlet.getGridGroupContainer().unmask();
+// Info.display("Info", "paste submitting...");
wsPortlet.getGxtCardLayoutResultPanel().getToolBarItemFunctionalities().activePasteButton(false);
}
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 26478df..53fc4dc 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
@@ -308,13 +308,19 @@ public class GxtToolBarItemFunctionality {
btnCopyItem.addSelectionListener(new SelectionListener() {
public void componentSelected(ButtonEvent ce) {
-
- final FileGridModel fileGridModel = gridGroupViewContainer.getSelectedItem();
-
- if(fileGridModel.getIdentifier()!=null){
- CopyAndPaste.copy(fileGridModel.getIdentifier());
+
+ List listTarget = gridGroupViewContainer.getIdsSelectedItems();
+ if(listTarget!=null && listTarget.size()>0){
+ CopyAndPaste.copy(listTarget);
btnPasteItem.setEnabled(true);
}
+
+// final FileGridModel fileGridModel = gridGroupViewContainer.getSelectedItem();
+//
+// if(fileGridModel.getIdentifier()!=null){
+// CopyAndPaste.copy(fileGridModel.getIdentifier());
+// btnPasteItem.setEnabled(true);
+// }
}
});
@@ -330,8 +336,8 @@ public class GxtToolBarItemFunctionality {
if(parentTarget!=null)
parentId=parentTarget.getIdentifier();
- AppController.getEventBus().fireEvent(new PasteItemEvent(CopyAndPaste.getCopiedfileModelId(), parentId));
- CopyAndPaste.setCopiedfileModelId(null);
+ AppController.getEventBus().fireEvent(new PasteItemEvent(CopyAndPaste.getCopiedIdsFilesModel(), parentId));
+ CopyAndPaste.setCopiedIdsFileModels(null);
btnPasteItem.setEnabled(false);
}
@@ -646,13 +652,15 @@ public class GxtToolBarItemFunctionality {
}
public void activeButtonForMultiSelection(boolean active){
- this.btnRemoveItem.setEnabled(active);
this.btnRenameItem.setEnabled(!active);
this.btnDownloadFile.setEnabled(!active);
this.btnOpen.setEnabled(!active);
- this.btnCopyItem.setEnabled(!active);
this.btnGetSharedLink.setEnabled(!active);
this.btnPublicLink.setEnabled(!active);
+
+ //ONLY ENABLED
+ this.btnRemoveItem.setEnabled(active);
+ this.btnCopyItem.setEnabled(active);
}
public ToolBar getToolBar() {