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 e0eeb67..2dd2e8e 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 @@ -113,7 +113,7 @@ import org.gcube.portlets.user.workspace.shared.WorkspaceTrashOperation; import org.gcube.portlets.user.workspace.shared.WorkspaceUserQuote; import org.gcube.portlets.widgets.sessionchecker.client.CheckSession; import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; -import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.DNDFileReader; +import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MutlipleDNDUpload; import org.gcube.portlets.widgets.wsmail.client.forms.MailForm; import com.extjs.gxt.ui.client.widget.LayoutContainer; @@ -1193,7 +1193,7 @@ public class AppController implements SubscriberInterface { this.wsPortlet = new WorskpacePortlet(this.appContrExplorer.getPanel(true, false, !isSearch), instanceWithGrouping); - final DNDFileReader dnd = this.wsPortlet.getDND(); + final MutlipleDNDUpload dnd = this.wsPortlet.getDND(); WorskpaceUploadNotificationListener listener = new WorskpaceUploadNotificationListener() { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorskpacePortlet.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorskpacePortlet.java index 497df30..a6d2195 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorskpacePortlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorskpacePortlet.java @@ -1,6 +1,5 @@ package org.gcube.portlets.user.workspace.client.view; -import org.gcube.portlets.user.workspace.client.event.CompletedFileUploadEvent; import org.gcube.portlets.user.workspace.client.view.grids.GxtGridFilterGroupPanel; import org.gcube.portlets.user.workspace.client.view.panels.GxtBasicTabPanel; import org.gcube.portlets.user.workspace.client.view.panels.GxtBorderLayoutPanel; @@ -8,10 +7,7 @@ import org.gcube.portlets.user.workspace.client.view.panels.GxtCardLayoutResultP import org.gcube.portlets.user.workspace.client.view.panels.GxtSeachAndFilterPanel; import org.gcube.portlets.user.workspace.client.view.toolbars.GxtBottomToolBarItem; import org.gcube.portlets.user.workspace.client.view.toolbars.GxtBreadcrumbPathPanel; -import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; -import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.DNDFileReader; - -import com.google.gwt.core.client.GWT; +import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MutlipleDNDUpload; /** @@ -30,7 +26,7 @@ public class WorskpacePortlet { private GxtGridFilterGroupPanel gridFilterGroupContainer; private GxtSeachAndFilterPanel searchAndFilterContainer; private GxtCardLayoutResultPanel gxtCardLayoutResultPanel; - private DNDFileReader dnd; + private MutlipleDNDUpload dnd; public WorskpacePortlet(boolean activeGroup) { @@ -48,7 +44,7 @@ public class WorskpacePortlet { public WorskpacePortlet(ExplorerPanel expPanel, boolean activeGroup) { this(activeGroup); this.explorerPanel = expPanel; - this.dnd = new DNDFileReader(); + this.dnd = new MutlipleDNDUpload(); this.borderLayoutContainer = new GxtBorderLayoutPanel(this.searchAndFilterContainer, this.explorerPanel, this.gxtCardLayoutResultPanel, this.toolBarItemDetails, this.dnd); } @@ -92,7 +88,7 @@ public class WorskpacePortlet { /** * @return the dnd */ - public DNDFileReader getDND() { + public MutlipleDNDUpload getDND() { return dnd; } } diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java index 62423d4..11586f0 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java @@ -3,9 +3,8 @@ package org.gcube.portlets.user.workspace.client.view.panels; import org.gcube.portlets.user.workspace.client.ConstantsPortlet; import org.gcube.portlets.user.workspace.client.view.ExplorerPanel; import org.gcube.portlets.user.workspace.client.view.toolbars.GxtBottomToolBarItem; -import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; -import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.DNDFileReader; +import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MutlipleDNDUpload; import com.extjs.gxt.ui.client.Style.LayoutRegion; import com.extjs.gxt.ui.client.Style.Scroll; @@ -18,7 +17,6 @@ import com.extjs.gxt.ui.client.widget.ContentPanel; import com.extjs.gxt.ui.client.widget.layout.BorderLayout; import com.extjs.gxt.ui.client.widget.layout.BorderLayoutData; import com.extjs.gxt.ui.client.widget.layout.FitLayout; -import com.google.gwt.core.shared.GWT; import com.google.gwt.user.client.Random; @@ -36,14 +34,14 @@ public class GxtBorderLayoutPanel extends ContentPanel { private ExplorerPanel expPanel = null; //TODO change position private GxtSeachAndFilterPanel searchAndFilterContainer; private GxtCardLayoutResultPanel gxtCardLayoutResultPanel; - private DNDFileReader dnd; + private MutlipleDNDUpload dnd; public GxtBorderLayoutPanel( GxtSeachAndFilterPanel searchAndFilterContainer2, ExplorerPanel explorerPanel, GxtCardLayoutResultPanel gxtCardLayoutResultPanel, - GxtBottomToolBarItem detailsContainer2, DNDFileReader dnd) { + GxtBottomToolBarItem detailsContainer2, MutlipleDNDUpload dnd) { this.searchAndFilterContainer = searchAndFilterContainer2; this.expPanel = explorerPanel;