diff --git a/.classpath b/.classpath
old mode 100644
new mode 100755
index 02cbab1..69f6515
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -15,11 +15,13 @@
+
+
@@ -35,5 +37,5 @@
-
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100644
new mode 100755
index 4827e31..091f97c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,24 +5,18 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v1.13.0-SNAPSHOT] - 2022-01-31
-### Features
-
- Updated to maven-portal-bom-3.7.0 [#22732]
-
+ - Added support to default value for ListParameter [#24026]
## [v1.12.0] - 2021-10-06
-### Features
-
- Added cluster description in Service Info [#19213]
## [v1.11.0] - 2019-06-14
-### Features
-
- Added service info [#12594]
- Added support to show log information [#11711]
- Added support to show files html, json, pdf, txt [#17106]
@@ -33,8 +27,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v1.10.0] - 2019-04-01
-### Features
-
- Added location and zoom support [#11708]
- Added coordinates EPSG:4326 and EPSG:3857 support [ticket #11710]
@@ -42,32 +34,24 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v1.9.1] - 2018-12-13
-### Features
-
- Updated to support StorageHub properties [#11720]
## [v1.9.0] - 2018-10-01
-### Features
-
- Updated download item to support StorageHub[#11720]
## [v1.8.0] - 2018-07-01
-### Features
-
- Updated to new WorkspaceExplorer widget that support StorageHub[#11721]
## [v1.7.0] - 2018-06-01
-### Features
-
- Integrated DataMiner CL for simplify integration with new StorageHub[#11720]
- Added refresh button in operators panel[#11741]
- Added hyperlink for log that contains http reference[ticket #11529]
@@ -76,8 +60,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v1.6.0] - 2016-11-09
-### Features
-
- Added NetCDF files support
- Added [TEXTAREA] string support
@@ -85,24 +67,18 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v1.5.0] - 2016-06-12
-### Features
-
- Support Java 8 compatibility [#8471]
## [v1.4.0] - 2016-02-15
-### Features
-
- Fixed load balancing [#7576]
## [v1.3.0] - 2016-02-15
-### Features
-
- Updated PortalContext [#6278]
- Added encoded parameters in equivalent http request [ticket #7167]
@@ -110,8 +86,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v1.2.0] - 2016-12-01
-### Features
-
- Updated Output support
- Added PortalContext
@@ -119,8 +93,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v1.1.0] - 2016-10-01
-### Features
-
- Updated to Auth 2.0
- Added Spatial data support [#4172]
- Added Temporal data support [#4172]
@@ -129,8 +101,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [v1.0.0] - 2016-07-01
-### Features
-
- First release
diff --git a/changelog.xml b/changelog.xml
old mode 100644
new mode 100755
index 173cdf7..a7865cb
--- a/changelog.xml
+++ b/changelog.xml
@@ -1,6 +1,7 @@
Updated to maven-portal-bom-3.7.0 [#22732]
+ Added support to default value for ListParameter [#24026]
Added cluster description in Service Info [#19213]
diff --git a/pom.xml b/pom.xml
old mode 100644
new mode 100755
index d7d0797..75103a2
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-
4.0.0
@@ -182,6 +183,13 @@
provided
+
+
+ org.projectlombok
+ lombok
+ 1.18.4
+ provided
+
@@ -189,6 +197,9 @@
storagehub-client-library
+
+
org.gcube.resources.discovery
@@ -199,7 +210,7 @@
org.gcube.data.analysis
data-miner-manager-cl
- [1.4.0, 2.0.0-SNAPSHOT)
+ [1.10.0-SNAPSHOT, 2.0.0-SNAPSHOT)
@@ -253,7 +264,7 @@
provided
-
+
junit
junit
@@ -275,7 +286,7 @@
-
+
${webappDirectory}/WEB-INF/classes
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListIntFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListIntFld.java
old mode 100644
new mode 100755
index 971c860..84b9da9
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListIntFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListIntFld.java
@@ -6,10 +6,10 @@ package org.gcube.portlets.user.dataminermanager.client.parametersfield;
import java.util.ArrayList;
import java.util.List;
-import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ListParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ObjectParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import com.google.gwt.user.client.ui.Widget;
import com.sencha.gxt.core.client.util.Margins;
@@ -33,7 +33,7 @@ import com.sencha.gxt.widget.core.client.form.IntegerField;
*/
public class ListIntFld extends AbstractFld {
- private List- items;
+ private List items;
private SimpleContainer simpleContainer;
private VerticalLayoutContainer vp;
private ListParameter listParameter;
@@ -42,8 +42,7 @@ public class ListIntFld extends AbstractFld {
private HBoxLayoutContainer horiz;
/**
- * @param parameter
- * parameter
+ * @param parameter parameter
*/
public ListIntFld(Parameter parameter) {
super(parameter);
@@ -51,7 +50,7 @@ public class ListIntFld extends AbstractFld {
listContainer = new SimpleContainer();
vp = new VerticalLayoutContainer();
- items = new ArrayList
- ();
+ items = new ArrayList();
addField(null);
listContainer.add(vp, new MarginData(new Margins()));
@@ -81,16 +80,19 @@ public class ListIntFld extends AbstractFld {
}
- private void addField(Item upperItem) {
-
- ObjectParameter objPar = new ObjectParameter(listParameter.getName(), listParameter.getDescription(),
- listParameter.getType(), null);
+ private void addField(IntItem upperItem) {
if (upperItem == null) {
- Item item = new Item(objPar, true);
+ ObjectParameter objPar = new ObjectParameter(listParameter.getName(), listParameter.getDescription(),
+ listParameter.getType(), listParameter.getDefaultValue());
+
+ IntItem item = new IntItem(objPar, true);
items.add(item);
vp.add(item, new VerticalLayoutData(1, -1, new Margins()));
} else {
+ ObjectParameter objPar = new ObjectParameter(listParameter.getName(), listParameter.getDescription(),
+ listParameter.getType(), null);
+
// search the position of the upper item
int pos = 0;
for (int i = 0; i < items.size(); i++)
@@ -100,7 +102,7 @@ public class ListIntFld extends AbstractFld {
}
upperItem.showCancelButton();
- Item item = new Item(objPar, false);
+ IntItem item = new IntItem(objPar, false);
items.add(pos + 1, item);
vp.insert(item, pos + 1);
}
@@ -110,7 +112,7 @@ public class ListIntFld extends AbstractFld {
/**
* @param item
*/
- private void removeField(Item item) {
+ private void removeField(IntItem item) {
items.remove(item);
vp.remove(item);
@@ -131,7 +133,7 @@ public class ListIntFld extends AbstractFld {
String separator = listParameter.getSeparator();
String value = "";
boolean first = true;
- for (Item item : items) {
+ for (IntItem item : items) {
Integer itemValue = item.getValue();
if (itemValue != null) {
value += (first ? "" : separator) + itemValue;
@@ -154,14 +156,14 @@ public class ListIntFld extends AbstractFld {
*/
@Override
public boolean isValid() {
- for (Item item : items)
+ for (IntItem item : items)
if (!item.isValid()) {
return false;
}
return true;
}
- private class Item extends HBoxLayoutContainer {
+ private class IntItem extends HBoxLayoutContainer {
private IntegerField field;
private TextButton addBtn;
@@ -170,12 +172,26 @@ public class ListIntFld extends AbstractFld {
/**
* @param objPar
*/
- public Item(ObjectParameter objectParameter, boolean first) {
+ public IntItem(ObjectParameter objectParameter, boolean first) {
super();
field = new IntegerField();
field.setAllowBlank(false);
+ if (objectParameter != null && objectParameter.getDefaultValue() != null
+ && !objectParameter.getDefaultValue().isEmpty()) {
+ Integer defaultV=null;
+ try {
+ defaultV = Integer.parseInt(objectParameter.getDefaultValue());
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ }
+
+ if (defaultV != null) {
+ field.setValue(defaultV);
+ }
+ }
+
addBtn = new TextButton("");
addBtn.setIcon(DataMinerManager.resources.add());
@@ -184,7 +200,7 @@ public class ListIntFld extends AbstractFld {
@Override
public void onSelect(SelectEvent event) {
- addField(Item.this);
+ addField(IntItem.this);
forceLayout();
vp.forceLayout();
fieldContainer.forceLayout();
@@ -199,7 +215,7 @@ public class ListIntFld extends AbstractFld {
@Override
public void onSelect(SelectEvent event) {
- removeField(Item.this);
+ removeField(IntItem.this);
forceLayout();
vp.forceLayout();
fieldContainer.forceLayout();
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringItem.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringItem.java
old mode 100644
new mode 100755
index 1422a03..11fc2b3
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringItem.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringItem.java
@@ -37,6 +37,11 @@ public class StringItem extends HBoxLayoutContainer {
field = new TextField();
field.setAllowBlank(false);
+ if(objectParameter!=null && objectParameter.getDefaultValue()!=null &&
+ !objectParameter.getDefaultValue().isEmpty()) {
+ field.setValue(objectParameter.getDefaultValue());
+ }
+
addBtn = new TextButton("");
addBtn.setIcon(DataMinerManager.resources.add());
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml b/src/main/java/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml
old mode 100644
new mode 100755
index edada06..4d8fac1
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml
@@ -52,18 +52,19 @@
-
+ value="ENABLED" /> -->
-
+
diff --git a/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml b/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml
old mode 100644
new mode 100755
index edada06..4d8fac1
--- a/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml
@@ -52,18 +52,19 @@
-
+ value="ENABLED" /> -->
-
+