Updated ListParameter

This commit is contained in:
Giancarlo Panichi 2022-11-16 17:48:47 +01:00
parent aacee12d33
commit 802447e63b
8 changed files with 69 additions and 62 deletions

8
.classpath Normal file → Executable file
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/data-miner-manager-1.11.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/data-miner-manager-1.13.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/data-miner-manager-1.11.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/data-miner-manager-1.13.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -15,11 +15,13 @@
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
@ -35,5 +37,5 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/data-miner-manager-1.11.1-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/data-miner-manager-1.13.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

32
CHANGELOG.md Normal file → Executable file
View File

@ -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

1
changelog.xml Normal file → Executable file
View File

@ -1,6 +1,7 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlets.user.data-miner-manager.1-13-0" date="2022-01-31">
<Change>Updated to maven-portal-bom-3.7.0 [#22732]</Change>
<Change>Added support to default value for ListParameter [#24026]</Change>
</Changeset>
<Changeset component="org.gcube.portlets.user.data-miner-manager.1-12-0" date="2021-10-06">
<Change>Added cluster description in Service Info [#19213]</Change>

19
pom.xml Normal file → Executable file
View File

@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@ -182,6 +183,13 @@
<scope>provided</scope>
</dependency>
<!-- Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.4</version>
<scope>provided</scope>
</dependency>
<!-- StorageHub -->
<dependency>
@ -189,6 +197,9 @@
<artifactId>storagehub-client-library</artifactId>
</dependency>
<!-- <dependency> <groupId>org.gcube.information-system</groupId> <artifactId>information-system-model</artifactId>
<version>5.0.0-SNAPSHOT</version> </dependency> -->
<!-- Information System Client IC-Client -->
<dependency>
<groupId>org.gcube.resources.discovery</groupId>
@ -199,7 +210,7 @@
<dependency>
<groupId>org.gcube.data.analysis</groupId>
<artifactId>data-miner-manager-cl</artifactId>
<version>[1.4.0, 2.0.0-SNAPSHOT)</version>
<version>[1.10.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency>
@ -253,7 +264,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@ -275,7 +286,7 @@
</dependency>
</dependencies>
</dependencyManagement>
<build>
<!-- Generate compiled stuff in the folder used for developing mode -->
<outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>

View File

@ -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<Item> items;
private List<IntItem> 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<Item>();
items = new ArrayList<IntItem>();
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();

View File

@ -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());

View File

@ -52,18 +52,19 @@
<entry-point
class='org.gcube.portlets.user.dataminermanager.client.DataMinerManager' />
<!-- <set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property
<!--
<set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property
name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger"
value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED"
/> <set-property name="gwt.logging.logLevel" value="SEVERE" /> <set-property
name="gwt.logging.enabled" value="TRUE" /> <set-property name="gwt.logging.consoleHandler"
value="ENABLED" /> -->
value="ENABLED" /> -->
<set-property name="log_ConsoleLogger" value="DISABLED" />
<set-property name="log_DivLogger" value="DISABLED" />
<set-property name="log_GWTLogger" value="DISABLED" />
<set-property name="log_SystemLogger" value="DISABLED" />
<source path='client' />
<source path='shared' />

View File

@ -52,18 +52,19 @@
<entry-point
class='org.gcube.portlets.user.dataminermanager.client.DataMinerManager' />
<!-- <set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property
<!--
<set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property
name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger"
value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED"
/> <set-property name="gwt.logging.logLevel" value="SEVERE" /> <set-property
name="gwt.logging.enabled" value="TRUE" /> <set-property name="gwt.logging.consoleHandler"
value="ENABLED" /> -->
value="ENABLED" /> -->
<set-property name="log_ConsoleLogger" value="DISABLED" />
<set-property name="log_DivLogger" value="DISABLED" />
<set-property name="log_GWTLogger" value="DISABLED" />
<set-property name="log_SystemLogger" value="DISABLED" />
<source path='client' />
<source path='shared' />