From 51a1f2f0cba8921591bb550714a77c55508b30d5 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 30 Jul 2018 15:09:33 +0000 Subject: [PATCH] USING DEFAULT VALUE of FILE PARMATER IF EXISTS git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/ws-task-executor-widget@169991 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../binder/CreateTaskConfigurationView.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/view/binder/CreateTaskConfigurationView.java b/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/view/binder/CreateTaskConfigurationView.java index 607a09f..1e76eeb 100644 --- a/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/view/binder/CreateTaskConfigurationView.java +++ b/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/view/binder/CreateTaskConfigurationView.java @@ -281,14 +281,23 @@ public abstract class CreateTaskConfigurationView extends Composite { for (TaskParameter operator : taskOperator.getInputOperators()) { addedPublicLink = false; if(!wsItem.isFolder()){ - //IF ITEM IS A FILE THEN I'M ISTANCING ITS FIRST FILE PARAMETER OCCURED (IF IT EXISTS) WITH THE PUBLIC LINK OF THE ITEM + //IF ITEM IS A FILE THEN I'M ISTANCING ITS FIRST FILE PARAMETER OCCURED (IF IT EXISTS) + //WITH THE PUBLIC LINK OF THE FILE IF A DEFAULT VALUE FOR THE PARAMETER IS MISSING if(operator.getType().getType().equals("FILE")){ countFileParameter++; if(countFileParameter==1){ - List pLink = new ArrayList(1); - pLink.add(wsItem.getPublicLink()); + List linkValues = new ArrayList(); + String publicLinkParamName = operator.getKey()!=null? operator.getKey():"publicLink"; - appendCustomField(publicLinkParamName, pLink, operator.getType().getType(), false); + //USING DEFAULT VALUES IF EXISTS + if(operator.getDefaultValues()!=null && operator.getDefaultValues().size()>0){ + linkValues = operator.getDefaultValues(); + }else{ + //USING PUBLIC LINK OF SELECTED FILE + linkValues.add(wsItem.getPublicLink()); + } + + appendCustomField(publicLinkParamName, linkValues, operator.getType().getType(), false); addedPublicLink = true; } }