From 443d2a2b65d1b5b5518fb373f8dd8bbc267df81b Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 26 Oct 2016 12:10:33 +0000 Subject: [PATCH] Updated Parameter git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@133579 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../parameters/ColumnListParameter.java | 12 ----- .../shared/parameters/ColumnParameter.java | 14 ----- .../shared/parameters/DateParameter.java | 15 ------ .../shared/parameters/EnumParameter.java | 45 +++++----------- .../shared/parameters/FileParameter.java | 31 +++-------- .../shared/parameters/ListParameter.java | 12 ----- .../shared/parameters/ObjectParameter.java | 52 ++++++------------- .../shared/parameters/Parameter.java | 23 ++++++-- .../parameters/TabularListParameter.java | 11 ---- .../shared/parameters/TabularParameter.java | 28 +++------- .../shared/parameters/TimeParameter.java | 15 ------ .../shared/parameters/WKTParameter.java | 15 ------ 12 files changed, 59 insertions(+), 214 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ColumnListParameter.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ColumnListParameter.java index da3eb3d..bf3aee9 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ColumnListParameter.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ColumnListParameter.java @@ -15,7 +15,6 @@ public class ColumnListParameter extends Parameter { private static final long serialVersionUID = -6743494426144267089L; private String referredTabularParameterName; // private List columnNames = new ArrayList(); - private String value; private String separator; public ColumnListParameter() { @@ -46,17 +45,6 @@ public class ColumnListParameter extends Parameter { return referredTabularParameterName; } - /** - * @return the value - */ - public String getValue() { - return value; - } - - @Override - public void setValue(String value) { - this.value = value; - } /** * @return the separator diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ColumnParameter.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ColumnParameter.java index 963a204..560bed4 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ColumnParameter.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ColumnParameter.java @@ -3,7 +3,6 @@ */ package org.gcube.portlets.user.dataminermanager.shared.parameters; - /** * * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi email: g.panichi@isti.cnr.it * */ public class EnumParameter extends Parameter { @@ -17,8 +17,6 @@ public class EnumParameter extends Parameter { private static final long serialVersionUID = 1673874854501249519L; private List values = new ArrayList(); private String defaultValue; - private String value; - /** * @@ -27,66 +25,52 @@ public class EnumParameter extends Parameter { super(); this.typology = ParameterType.ENUM; } - + /** * @param type * @param defaultValue * @param value */ - public EnumParameter(String name, String description, List values, String defaultValue) { + public EnumParameter(String name, String description, List values, + String defaultValue) { super(name, ParameterType.ENUM, description); this.values = values; this.defaultValue = defaultValue; } - /** * @return the defaultValue */ public String getDefaultValue() { return defaultValue; } - + /** - * @param defaultValue the defaultValue to set + * @param defaultValue + * the defaultValue to set */ public void setDefaultValue(String defaultValue) { this.defaultValue = defaultValue; } - + /** - * @param values the values to set + * @param values + * the values to set */ public void setValues(List values) { this.values = values; } - + /** * @return the values */ public List getValues() { return values; } - + public void addValue(String value) { this.values.add(value); } - - - - /** - * @return the value - */ - @Override - public String getValue() { - return value; - } - - - @Override - public void setValue(String value) { - this.value = value; - } @Override public String toString() { @@ -95,8 +79,5 @@ public class EnumParameter extends Parameter { + ", description=" + description + ", typology=" + typology + "]"; } - - - } diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/FileParameter.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/FileParameter.java index b9832c7..4c7905b 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/FileParameter.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/FileParameter.java @@ -7,16 +7,16 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi email: g.panichi@isti.cnr.it * */ public class FileParameter extends Parameter { private static final long serialVersionUID = -2967577990287112937L; - private String value; private String defaultMimeType; private ArrayList supportedMimeTypes; + /** * */ @@ -24,7 +24,7 @@ public class FileParameter extends Parameter { super(); this.typology = ParameterType.FILE; } - + /** * * @param name @@ -32,7 +32,8 @@ public class FileParameter extends Parameter { * @param fileName * @param mimeType */ - public FileParameter(String name, String description, String defaultMimeType, ArrayList supportedMimeTypes) { + public FileParameter(String name, String description, + String defaultMimeType, ArrayList supportedMimeTypes) { super(name, ParameterType.FILE, description); this.defaultMimeType = defaultMimeType; this.supportedMimeTypes = supportedMimeTypes; @@ -54,23 +55,6 @@ public class FileParameter extends Parameter { this.supportedMimeTypes = supportedMimeTypes; } - /** - * - */ - public String getValue() { - return value; - } - - /** - * - */ - @Override - public void setValue(String value) { - this.value=value; - } - - - @Override public String toString() { return "FileParameter [value=" + value + ", defaultMimeType=" @@ -79,7 +63,4 @@ public class FileParameter extends Parameter { + description + ", typology=" + typology + "]"; } - - - } diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ListParameter.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ListParameter.java index d509e77..097ce94 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ListParameter.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ListParameter.java @@ -3,7 +3,6 @@ */ package org.gcube.portlets.user.dataminermanager.shared.parameters; - /** * * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi email: g.panichi@isti.cnr.it * */ public class ObjectParameter extends Parameter { - + private static final long serialVersionUID = 1058462575242430851L; private String type; private String defaultValue; - private String value; - - + /** * */ @@ -23,55 +19,43 @@ public class ObjectParameter extends Parameter { super(); this.typology = ParameterType.OBJECT; } - - - public ObjectParameter(String name, String description, String type, String defaultValue) { + + public ObjectParameter(String name, String description, String type, + String defaultValue) { super(name, ParameterType.OBJECT, description); this.type = type; this.defaultValue = defaultValue; } - + /** * @return the type */ public String getType() { return type; } - + /** - * @param type the type to set + * @param type + * the type to set */ public void setType(String type) { this.type = type; } - + /** * @return the defaultValue */ public String getDefaultValue() { return defaultValue; } - + /** - * @param defaultValue the defaultValue to set + * @param defaultValue + * the defaultValue to set */ public void setDefaultValue(String defaultValue) { this.defaultValue = defaultValue; } - - /** - * @return the value - */ - public String getValue() { - return value; - } - - - @Override - public void setValue(String value) { - this.value = value; - } - @Override public String toString() { @@ -81,10 +65,4 @@ public class ObjectParameter extends Parameter { + "]"; } - - - - - - } diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/Parameter.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/Parameter.java index 03e57ed..cd3f478 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/Parameter.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/Parameter.java @@ -21,6 +21,7 @@ public abstract class Parameter implements Serializable { protected String name; protected String description; protected ParameterType typology; + protected String value; /** * @@ -43,10 +44,6 @@ public abstract class Parameter implements Serializable { this.description = description; } - public abstract void setValue(String value); - - public abstract String getValue(); - public String getName() { return name; } @@ -85,10 +82,26 @@ public abstract class Parameter implements Serializable { this.description = description; } + /** + * + * @return + */ + public String getValue() { + return value; + } + + /** + * + * @param value + */ + public void setValue(String value) { + this.value = value; + } + @Override public String toString() { return "Parameter [name=" + name + ", description=" + description - + ", typology=" + typology + "]"; + + ", typology=" + typology + ", value=" + value + "]"; } } diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TabularListParameter.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TabularListParameter.java index 8978c0e..2d6df43 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TabularListParameter.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TabularListParameter.java @@ -14,7 +14,6 @@ import java.util.ArrayList; public class TabularListParameter extends Parameter{ private static final long serialVersionUID = -1786477950530892502L; - private String value; private String separator; private ArrayList templates = new ArrayList(); private String defaultMimeType; @@ -40,16 +39,6 @@ public class TabularListParameter extends Parameter{ this.supportedMimeTypes = supportedMimeTypes; } - @Override - public void setValue(String value) { - this.value = value; - } - - @Override - public String getValue() { - return value; - } - /** * @return the separator */ diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TabularParameter.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TabularParameter.java index 8a05a3d..17ea20b 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TabularParameter.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TabularParameter.java @@ -7,14 +7,13 @@ import java.util.ArrayList; /** * - * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi email: g.panichi@isti.cnr.it * */ public class TabularParameter extends Parameter { private static final long serialVersionUID = 8038591467145151553L; - private String tableName; private ArrayList templates = new ArrayList(); private String defaultMimeType; private ArrayList supportedMimeTypes; @@ -36,7 +35,7 @@ public class TabularParameter extends Parameter { public TabularParameter(String name, String description, String tableName, String defaultMimeType, ArrayList supportedMimeTypes) { super(name, ParameterType.TABULAR, description); - this.tableName = tableName; + this.value = tableName; this.templates = null; this.defaultMimeType = defaultMimeType; this.supportedMimeTypes = supportedMimeTypes; @@ -53,18 +52,18 @@ public class TabularParameter extends Parameter { ArrayList templates, String defaultMimeType, ArrayList supportedMimeTypes) { super(name, ParameterType.TABULAR, description); - this.tableName = tableName; + this.value = tableName; this.templates = templates; this.defaultMimeType = defaultMimeType; this.supportedMimeTypes = supportedMimeTypes; } public String getTableName() { - return tableName; + return value; } public void setTableName(String tableName) { - this.tableName = tableName; + this.value = tableName; } public ArrayList getTemplates() { @@ -75,16 +74,6 @@ public class TabularParameter extends Parameter { this.templates = templates; } - @Override - public String getValue() { - return getTableName(); - } - - @Override - public void setValue(String value) { - this.setTableName(value); - } - public String getDefaultMimeType() { return defaultMimeType; } @@ -103,14 +92,11 @@ public class TabularParameter extends Parameter { @Override public String toString() { - return "TabularParameter [tableName=" + tableName + ", templates=" + return "TabularParameter [tableName=" + value + ", templates=" + templates + ", defaultMimeType=" + defaultMimeType + ", supportedMimeTypes=" + supportedMimeTypes + ", name=" + name + ", description=" + description + ", typology=" + typology + "]"; } - - - } diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TimeParameter.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TimeParameter.java index fa82be7..bc030e2 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TimeParameter.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TimeParameter.java @@ -3,7 +3,6 @@ */ package org.gcube.portlets.user.dataminermanager.shared.parameters; - /** * * @author Giancarlo Panichi email: