gCubeSystem
/
data-miner-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated Parameter 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@133579 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2016-10-26 12:10:33 +00:00
parent 1858c55b13
commit 443d2a2b65
12 changed files with 59 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ColumnListParameter.java
View File

@ -15,7 +15,6 @@ public class ColumnListParameter extends Parameter {
private static final long serialVersionUID = -6743494426144267089L;
private String referredTabularParameterName;
// private List<String> columnNames = new ArrayList<String>();
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

14
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ColumnParameter.java
View File

@ -3,7 +3,6 @@
*/
package org.gcube.portlets.user.dataminermanager.shared.parameters;
/**
*
* @author Giancarlo Panichi email: <a
@ -18,7 +17,6 @@ public class ColumnParameter extends Parameter {
private static final long serialVersionUID = -5084557326770554659L;
private String referredTabularParameterName;
private String defaultColumn;
private String value;
/**
*
@ -69,18 +67,6 @@ public class ColumnParameter extends Parameter {
this.defaultColumn = defaultColumn;
}
/**
* @return the value
*/
public String getValue() {
return value;
}
@Override
public void setValue(String value) {
this.value = value;
}
@Override
public String toString() {
return "ColumnParameter [referredTabularParameterName="

15
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/DateParameter.java
View File

@ -3,7 +3,6 @@
*/
package org.gcube.portlets.user.dataminermanager.shared.parameters;
/**
*
* @author Giancarlo Panichi email: <a
@ -14,7 +13,6 @@ public class DateParameter extends Parameter {
private static final long serialVersionUID = 1673874854501249519L;
private String defaultValue;
private String value;
/**
*
@ -49,19 +47,6 @@ public class DateParameter extends Parameter {
this.defaultValue = defaultValue;
}
/**
* @return the value
*/
@Override
public String getValue() {
return value;
}
@Override
public void setValue(String value) {
this.value = value;
}
@Override
public String toString() {
return "DateParameter [defaultValue=" + defaultValue + ", value="

45
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/EnumParameter.java
View File

@ -8,8 +8,8 @@ import java.util.List;
/**
*
* @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class EnumParameter extends Parameter {
@ -17,8 +17,6 @@ public class EnumParameter extends Parameter {
private static final long serialVersionUID = 1673874854501249519L;
private List<String> values = new ArrayList<String>();
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<String> values, String defaultValue) {
public EnumParameter(String name, String description, List<String> 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<String> values) {
this.values = values;
}
/**
* @return the values
*/
public List<String> 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
+ "]";
}
}

31
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/FileParameter.java
View File

@ -7,16 +7,16 @@ import java.util.ArrayList;
/**
*
* @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class FileParameter extends Parameter {
private static final long serialVersionUID = -2967577990287112937L;
private String value;
private String defaultMimeType;
private ArrayList<String> 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<String> supportedMimeTypes) {
public FileParameter(String name, String description,
String defaultMimeType, ArrayList<String> 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 + "]";
}
}

12
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ListParameter.java
View File

@ -3,7 +3,6 @@
*/
package org.gcube.portlets.user.dataminermanager.shared.parameters;
/**
*
* @author Giancarlo Panichi email: <a
@ -14,7 +13,6 @@ public class ListParameter extends Parameter {
private static final long serialVersionUID = 5405965026753332225L;
private String type;
private String value;
private String separator;
/**
@ -51,16 +49,6 @@ public class ListParameter extends Parameter {
this.type = type;
}
@Override
public void setValue(String value) {
this.value = value;
}
@Override
public String getValue() {
return value;
}
/**
* @return the separator
*/

52
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/ObjectParameter.java
View File

@ -1,21 +1,17 @@
package org.gcube.portlets.user.dataminermanager.shared.parameters;
/**
*
* @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
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 {
+ "]";
}
}

23
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/Parameter.java
View File

@ -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 + "]";
}
}

11
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TabularListParameter.java
View File

@ -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<String> templates = new ArrayList<String>();
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
*/

28
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TabularParameter.java
View File

@ -7,14 +7,13 @@ import java.util.ArrayList;
/**
*
* @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class TabularParameter extends Parameter {
private static final long serialVersionUID = 8038591467145151553L;
private String tableName;
private ArrayList<String> templates = new ArrayList<String>();
private String defaultMimeType;
private ArrayList<String> supportedMimeTypes;
@ -36,7 +35,7 @@ public class TabularParameter extends Parameter {
public TabularParameter(String name, String description, String tableName,
String defaultMimeType, ArrayList<String> 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<String> templates, String defaultMimeType,
ArrayList<String> 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<String> 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 + "]";
}
}

15
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/TimeParameter.java
View File

@ -3,7 +3,6 @@
*/
package org.gcube.portlets.user.dataminermanager.shared.parameters;
/**
*
* @author Giancarlo Panichi email: <a
@ -14,7 +13,6 @@ public class TimeParameter extends Parameter {
private static final long serialVersionUID = 1673874854501249519L;
private String defaultValue;
private String value;
/**
*
@ -49,19 +47,6 @@ public class TimeParameter extends Parameter {
this.defaultValue = defaultValue;
}
/**
* @return the value
*/
@Override
public String getValue() {
return value;
}
@Override
public void setValue(String value) {
this.value = value;
}
@Override
public String toString() {
return "TimeParameter [defaultValue=" + defaultValue + ", value="

15
src/main/java/org/gcube/portlets/user/dataminermanager/shared/parameters/WKTParameter.java
View File

@ -3,7 +3,6 @@
*/
package org.gcube.portlets.user.dataminermanager.shared.parameters;
/**
*
* @author Giancarlo Panichi email: <a
@ -15,7 +14,6 @@ public class WKTParameter extends Parameter {
private static final long serialVersionUID = 1673874854501249519L;
private WKTGeometryType wktGeometryType;
private String defaultValue;
private String value;
/**
*
@ -69,19 +67,6 @@ public class WKTParameter extends Parameter {
this.wktGeometryType = wktGeometryType;
}
/**
* @return the value
*/
@Override
public String getValue() {
return value;
}
@Override
public void setValue(String value) {
this.value = value;
}
@Override
public String toString() {
return "WKTParameter [wktGeometryType=" + wktGeometryType