From 48b63393a745a085f0c8e2c5df85df8352b805d2 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 30 Mar 2017 16:37:56 +0000 Subject: [PATCH] ref 6078:TDM - Create a new widget to support operations's invocation on DataMiner https://support.d4science.org/issues/6078 Updated to support DataMiner git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/data-miner-manager-cl@146464 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../shared/data/TableItemSimple.java | 22 +++++++++++++------ .../parameters/TabularListParameter.java | 10 ++++----- .../shared/parameters/TabularParameter.java | 6 ++--- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/data/TableItemSimple.java b/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/data/TableItemSimple.java index d716f77..581b4b0 100644 --- a/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/data/TableItemSimple.java +++ b/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/data/TableItemSimple.java @@ -3,11 +3,10 @@ package org.gcube.data.analysis.dataminermanagercl.shared.data; import java.io.Serializable; import java.util.ArrayList; - /** * - * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi email: g.panichi@isti.cnr.it * */ public class TableItemSimple implements Serializable { @@ -18,6 +17,7 @@ public class TableItemSimple implements Serializable { private String description; private String type; private ArrayList columns; + private boolean tabularResource; /** * @@ -25,6 +25,7 @@ public class TableItemSimple implements Serializable { public TableItemSimple() { super(); columns = new ArrayList(); + tabularResource = false; } /** @@ -40,6 +41,7 @@ public class TableItemSimple implements Serializable { this.name = name; this.description = description; this.type = type; + tabularResource = false; } /** @@ -115,7 +117,6 @@ public class TableItemSimple implements Serializable { this.id = id; } - public ArrayList getColumns() { return columns; } @@ -124,13 +125,20 @@ public class TableItemSimple implements Serializable { this.columns = columns; } + public boolean isTabularResource() { + return tabularResource; + } + + public void setTabularResource(boolean tabularResource) { + this.tabularResource = tabularResource; + } + @Override public String toString() { return "TableItemSimple [id=" + id + ", name=" + name + ", description=" + description + ", type=" + type - + ", columns=" + columns + "]"; + + ", columns=" + columns + ", tabularResource=" + + tabularResource + "]"; } - - } diff --git a/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/TabularListParameter.java b/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/TabularListParameter.java index fec76a8..7125b86 100644 --- a/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/TabularListParameter.java +++ b/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/TabularListParameter.java @@ -87,11 +87,11 @@ public class TabularListParameter extends Parameter { @Override public String toString() { - return "TabularListParameter [value=" + value + ", separator=" - + separator + ", templates=" + templates + ", defaultMimeType=" - + defaultMimeType + ", supportedMimeTypes=" - + supportedMimeTypes + ", name=" + name + ", description=" - + description + ", typology=" + typology + "]"; + return "TabularListParameter [separator=" + separator + ", templates=" + + templates + ", defaultMimeType=" + defaultMimeType + + ", supportedMimeTypes=" + supportedMimeTypes + ", name=" + + name + ", description=" + description + ", typology=" + + typology + ", value=" + value + "]"; } } diff --git a/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/TabularParameter.java b/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/TabularParameter.java index f233c2a..1c541a6 100644 --- a/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/TabularParameter.java +++ b/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/TabularParameter.java @@ -95,11 +95,11 @@ public class TabularParameter extends Parameter { @Override public String toString() { - return "TabularParameter [tableName=" + value + ", templates=" - + templates + ", defaultMimeType=" + defaultMimeType + return "TabularParameter [templates=" + templates + + ", defaultMimeType=" + defaultMimeType + ", supportedMimeTypes=" + supportedMimeTypes + ", name=" + name + ", description=" + description + ", typology=" - + typology + "]"; + + typology + ", value=" + value + "]"; } }