From 8d1b20d8f41a52849ea4a0cdf2c9d578edb9f74c Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 13 Jun 2018 12:55:53 +0000 Subject: [PATCH] Integrated with Task Executor git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@169140 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/client/AppControllerExplorer.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java index 8326cc4..d139bf9 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.gcube.common.workspacetaskexecutor.shared.FilterOperator; import org.gcube.portal.clientcontext.client.GCubeClientContext; import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WS_UPLOAD_TYPE; import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WsPortletInitOperation; @@ -157,6 +158,7 @@ import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotifi import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.MultipleDilaogUpload; import org.gcube.portlets.widgets.wstaskexecutor.client.WsTaskExecutorWidget; +import org.gcube.portlets.widgets.wstaskexecutor.shared.SelectableOperator; import org.gcube.portlets.widgets.wstaskexecutor.shared.WSItem; import org.gcube.portlets.widgets.wsthreddssync.client.SyncCompletedNotification.SyncCompletedNotificationListner; import org.gcube.portlets.widgets.wsthreddssync.client.WsThreddsWidget; @@ -449,8 +451,15 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt if(executeDataMinerTaskEvent.getTargetFileModel()!=null){ WSItem wsItem = new WSItem(executeDataMinerTaskEvent.getTargetFileModel().getIdentifier(), executeDataMinerTaskEvent.getTargetFileModel().getName()); + wsItem.setFolder(executeDataMinerTaskEvent.getTargetFileModel().isDirectory()); try { - taskExecutor.showTaskConfigurations(wsItem); + + String[] filterForParameterTypes = new String[1]; + filterForParameterTypes[0] = "FILE"; + FilterOperator filterOperator = wsItem.isFolder()?FilterOperator.LOGICAL_NOT:FilterOperator.LOGICAL_OR; + SelectableOperator selectableOperator = new SelectableOperator(filterForParameterTypes, filterOperator); + + taskExecutor.showTaskConfigurations(wsItem, selectableOperator); } catch (Exception e) { Window.alert(e.getMessage());