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

ref 8471:TDM - DataMiner Manager - Support Java 8 compatibility 

https://support.d4science.org/issues/8471

Updated to support Java 8 compatibility

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@148553 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2017-05-12 09:58:15 +00:00
parent 135edd837e
commit 5497d22d2f
170 changed files with 1175 additions and 1187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.classpath
View File

@ -1,20 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/data-miner-manager-1.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java"> <classpathentry kind="src" output="target/data-miner-manager-1.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry including="**/*.java" kind="src" path="src/main/resources"/> <classpathentry excluding="**" kind="src" output="target/data-miner-manager-1.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"> <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <attributes>
<attribute name="maven.pomderived" 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">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -26,5 +34,5 @@
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/data-miner-manager-1.4.0-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="output" path="target/data-miner-manager-1.5.0-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

4
distro/changelog.xml
View File

@ -1,4 +1,8 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="org.gcube.portlets-user.data-miner-manager.1-5-0"
date="2016-06-12">
<Change>Support Java 8 compatibility [ticket #8471]</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.data-miner-manager.1-4-0" <Changeset component="org.gcube.portlets-user.data-miner-manager.1-4-0"
date="2016-02-15"> date="2016-02-15">
<Change>Fixed load balancing [ticket #7576]</Change> <Change>Fixed load balancing [ticket #7576]</Change>

12
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>data-miner-manager</artifactId> <artifactId>data-miner-manager</artifactId>
<version>1.4.0-SNAPSHOT</version> <version>1.5.0-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>data-miner-manager</name> <name>data-miner-manager</name>
@ -41,8 +41,10 @@
<configDirectory>config</configDirectory> <configDirectory>config</configDirectory>
<!-- Java Version --> <!-- Java -->
<javaVersion>1.7</javaVersion> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- GWT configuration --> <!-- GWT configuration -->
<gwtVersion>2.6.1</gwtVersion> <gwtVersion>2.6.1</gwtVersion>
@ -425,8 +427,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version> <version>2.3.2</version>
<configuration> <configuration>
<source>${javaVersion}</source> <source>${maven.compiler.source}</source>
<target>${javaVersion}</target> <target>${maven.compiler.target}</target>
</configuration> </configuration>
</plugin> </plugin>

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java
View File

@ -47,8 +47,8 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class DataMinerManagerController { public class DataMinerManagerController {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/Header.java
View File

@ -21,8 +21,8 @@ import com.google.gwt.user.client.ui.Image;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class Header extends HorizontalPanel { public class Header extends HorizontalPanel {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/HomePanel.java
View File

@ -22,8 +22,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.Verti
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class HomePanel extends SimpleContainer { public class HomePanel extends SimpleContainer {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/PortalViewport.java
View File

@ -15,8 +15,8 @@ import com.sencha.gxt.widget.core.client.container.Viewport.ViewportAppearance;
/** /**
* *
* @author "Giancarlo Panichi" * @author Giancarlo Panichi
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class PortalViewport extends SimpleContainer { public class PortalViewport extends SimpleContainer {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/common/EventBusProvider.java
View File

@ -8,8 +8,8 @@ import com.google.gwt.event.shared.SimpleEventBus;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class EventBusProvider { public class EventBusProvider {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationValueFileListPanel.java
View File

@ -13,8 +13,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationValueFileListPanel extends SimpleContainer { public class ComputationValueFileListPanel extends SimpleContainer {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationValueFilePanel.java
View File

@ -14,8 +14,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationValueFilePanel extends SimpleContainer { public class ComputationValueFilePanel extends SimpleContainer {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationValueImagePanel.java
View File

@ -14,8 +14,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationValueImagePanel extends SimpleContainer { public class ComputationValueImagePanel extends SimpleContainer {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsExecutedPanel.java
View File

@ -51,8 +51,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationsExecutedPanel extends FramedPanel { public class ComputationsExecutedPanel extends FramedPanel {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsPanel.java
View File

@ -20,8 +20,8 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationsPanel extends SimpleContainer { public class ComputationsPanel extends SimpleContainer {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsPropertiesType.java
View File

@ -2,8 +2,8 @@ package org.gcube.portlets.user.dataminermanager.client.computations;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum ComputationsPropertiesType { public enum ComputationsPropertiesType {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/computations/ComputationsViewerPanel.java
View File

@ -26,8 +26,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationsViewerPanel extends FramedPanel { public class ComputationsViewerPanel extends FramedPanel {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/Gxt2ZIndexXDOM.java
View File

@ -3,8 +3,8 @@ package org.gcube.portlets.user.dataminermanager.client.custom;
/** /**
* Fix for z-index bug between GXT3 and GXT2 * Fix for z-index bug between GXT3 and GXT2
* *
* @author giancarlo email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class Gxt2ZIndexXDOM extends public class Gxt2ZIndexXDOM extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBar.java
View File

@ -5,8 +5,8 @@ import com.sencha.gxt.widget.core.client.ProgressBar;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class GreenProgressBar extends ProgressBar { public class GreenProgressBar extends ProgressBar {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/GreenProgressBarAppearance.java
View File

@ -19,8 +19,8 @@ import com.sencha.gxt.core.client.util.Format;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class GreenProgressBarAppearance implements ProgressBarAppearance { public class GreenProgressBarAppearance implements ProgressBarAppearance {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/OrangeProgressBar.java
View File

@ -5,8 +5,8 @@ import com.sencha.gxt.widget.core.client.ProgressBar;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class OrangeProgressBar extends ProgressBar { public class OrangeProgressBar extends ProgressBar {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/OrangeProgressBarAppearance.java
View File

@ -19,8 +19,8 @@ import com.sencha.gxt.core.client.util.Format;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class OrangeProgressBarAppearance implements ProgressBarAppearance { public class OrangeProgressBarAppearance implements ProgressBarAppearance {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBar.java
View File

@ -5,8 +5,8 @@ import com.sencha.gxt.widget.core.client.ProgressBar;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class RedProgressBar extends ProgressBar { public class RedProgressBar extends ProgressBar {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/custom/progress/RedProgressBarAppearance.java
View File

@ -19,8 +19,8 @@ import com.sencha.gxt.core.client.util.Format;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class RedProgressBarAppearance implements ProgressBarAppearance { public class RedProgressBarAppearance implements ProgressBarAppearance {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/DataSpacePanel.java
View File

@ -11,8 +11,8 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class DataSpacePanel extends SimpleContainer { public class DataSpacePanel extends SimpleContainer {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/DataSpacePropertiesType.java
View File

@ -2,8 +2,8 @@ package org.gcube.portlets.user.dataminermanager.client.dataspace;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum DataSpacePropertiesType { public enum DataSpacePropertiesType {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/InputDataSetsPanel.java
View File

@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class InputDataSetsPanel extends FramedPanel { public class InputDataSetsPanel extends FramedPanel {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/dataspace/OutputDataSetsPanel.java
View File

@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class OutputDataSetsPanel extends FramedPanel { public class OutputDataSetsPanel extends FramedPanel {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/CancelComputationExecutionRequestEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Cancel Computation Request Event * Cancel Computation Request Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class CancelComputationExecutionRequestEvent public class CancelComputationExecutionRequestEvent

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/CancelExecutionFromComputationsRequestEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Cancel Execution From Computations Request Event * Cancel Execution From Computations Request Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class CancelExecutionFromComputationsRequestEvent public class CancelExecutionFromComputationsRequestEvent

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/ComputationDataEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Computation Data Event * Computation Data Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationDataEvent extends public class ComputationDataEvent extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/ComputationDataRequestEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Output Show Request Event * Output Show Request Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationDataRequestEvent public class ComputationDataRequestEvent

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/ComputationReadyEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Computation Ready Event * Computation Ready Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationReadyEvent extends public class ComputationReadyEvent extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/DataMinerWorkAreaEvent.java
View File

@ -13,8 +13,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Data Miner Work Area Event * Data Miner Work Area Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class DataMinerWorkAreaEvent extends public class DataMinerWorkAreaEvent extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/DataMinerWorkAreaRequestEvent.java
View File

@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Data Miner Work Area Request Event * Data Miner Work Area Request Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class DataMinerWorkAreaRequestEvent public class DataMinerWorkAreaRequestEvent

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/DeleteItemRequestEvent.java
View File

@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Delete Item Request Event * Delete Item Request Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class DeleteItemRequestEvent extends public class DeleteItemRequestEvent extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/MenuEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Menu Event * Menu Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class MenuEvent extends public class MenuEvent extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/MenuSwitchEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Menu Event * Menu Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class MenuSwitchEvent extends public class MenuSwitchEvent extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/OperatorsClassificationEvent.java
View File

@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Operators Classification Event * Operators Classification Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class OperatorsClassificationEvent public class OperatorsClassificationEvent

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/OperatorsClassificationRequestEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Operators Classification Request Event * Operators Classification Request Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class OperatorsClassificationRequestEvent public class OperatorsClassificationRequestEvent

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/OutputDataEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Output Data Event * Output Data Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class OutputDataEvent extends public class OutputDataEvent extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/OutputDataRequestEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Output Data Request Event * Output Data Request Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class OutputDataRequestEvent extends public class OutputDataRequestEvent extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/RefreshDataMinerWorkAreaEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Refresh DataMiner Work Area Event * Refresh DataMiner Work Area Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class RefreshDataMinerWorkAreaEvent extends public class RefreshDataMinerWorkAreaEvent extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/ResubmitComputationExecutionEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Resubmit Computation Execution Event * Resubmit Computation Execution Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ResubmitComputationExecutionEvent public class ResubmitComputationExecutionEvent

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/ResubmitComputationExecutionRequestEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Resubmit Computation Execution Request Event * Resubmit Computation Execution Request Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ResubmitComputationExecutionRequestEvent public class ResubmitComputationExecutionRequestEvent

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/SessionExpiredEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Session Expired Event * Session Expired Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class SessionExpiredEvent extends GwtEvent<SessionExpiredEvent.SessionExpiredEventHandler> { public class SessionExpiredEvent extends GwtEvent<SessionExpiredEvent.SessionExpiredEventHandler> {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/StartComputationExecutionEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Start Computation Execution Event * Start Computation Execution Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class StartComputationExecutionEvent public class StartComputationExecutionEvent

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/StartComputationExecutionRequestEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Start Computation Execution Request Event * Start Computation Execution Request Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class StartComputationExecutionRequestEvent public class StartComputationExecutionRequestEvent

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/TabularFldChangeEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* Start Computation Event * Start Computation Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class TabularFldChangeEvent extends public class TabularFldChangeEvent extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/UIStateEvent.java
View File

@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
* User Interface State Event * User Interface State Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class UIStateEvent extends GwtEvent<UIStateEvent.UIStateEventHandler> { public class UIStateEvent extends GwtEvent<UIStateEvent.UIStateEventHandler> {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/WPSMenuEvent.java
View File

@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers;
* WPS Menu Event * WPS Menu Event
* *
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class WPSMenuEvent extends public class WPSMenuEvent extends

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationExecutionPanel.java
View File

@ -25,8 +25,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationExecutionPanel extends FramedPanel { public class ComputationExecutionPanel extends FramedPanel {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationOutputPanel.java
View File

@ -34,8 +34,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.Verti
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationOutputPanel extends SimpleContainer { public class ComputationOutputPanel extends SimpleContainer {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationPanel.java
View File

@ -28,8 +28,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationPanel extends FramedPanel implements HasComputationReadyEventHandler public class ComputationPanel extends FramedPanel implements HasComputationReadyEventHandler

6
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java
View File

@ -47,8 +47,8 @@ import com.sencha.gxt.widget.core.client.form.FormPanel;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationParametersPanel extends SimpleContainer { public class ComputationParametersPanel extends SimpleContainer {
@ -199,7 +199,7 @@ public class ComputationParametersPanel extends SimpleContainer {
*/ */
/** /**
* @param parametersPanel * @param parameter parametersPanel
*/ */
private void loadOperatorParameters() { private void loadOperatorParameters() {
DataMinerPortletServiceAsync.INSTANCE.getParameters(operator, DataMinerPortletServiceAsync.INSTANCE.getParameters(operator,

5
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java
View File

@ -33,8 +33,8 @@ import com.sencha.gxt.widget.core.client.info.Info;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ComputationStatusPanel extends SimpleContainer { public class ComputationStatusPanel extends SimpleContainer {
@ -49,6 +49,7 @@ public class ComputationStatusPanel extends SimpleContainer {
/** /**
* *
* @param operatorName operator name
*/ */
public ComputationStatusPanel(String operatorName) { public ComputationStatusPanel(String operatorName) {
super(); super();

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/EquivalentRequestDialog.java
View File

@ -9,8 +9,8 @@ import com.sencha.gxt.widget.core.client.form.TextArea;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class EquivalentRequestDialog extends Dialog { public class EquivalentRequestDialog extends Dialog {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ExperimentPanel.java
View File

@ -10,8 +10,8 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ExperimentPanel extends SimpleContainer implements public class ExperimentPanel extends SimpleContainer implements

49
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorCategoryPanel.java
View File

@ -22,7 +22,7 @@ import com.sencha.gxt.widget.core.client.tips.ToolTipConfig;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class OperatorCategoryPanel extends SimpleContainer { public class OperatorCategoryPanel extends SimpleContainer {
@ -38,28 +38,27 @@ public class OperatorCategoryPanel extends SimpleContainer {
/** /**
* *
* @param handler * @param handler
* @param cat * operator panel handler
* @param operatorCategory
* operator category
*/ */
public OperatorCategoryPanel(OperatorsPanelHandler handler, OperatorCategory cat) { public OperatorCategoryPanel(OperatorsPanelHandler handler, OperatorCategory operatorCategory) {
super(); super();
this.handler = handler; this.handler = handler;
this.category = cat; this.category = operatorCategory;
create(); create();
} }
public OperatorCategory getCategory() { public OperatorCategory getCategory() {
return category; return category;
} }
private void create() {
v = new VerticalLayoutContainer();
private void create(){
v=new VerticalLayoutContainer();
add(v); add(v);
// set category info // set category info
categoryHtml = new HtmlLayoutContainer(category.getName() + " <span class='counter'>("+category.getOperators().size()+")</span>"); categoryHtml = new HtmlLayoutContainer(
category.getName() + " <span class='counter'>(" + category.getOperators().size() + ")</span>");
categoryHtml.addStyleName("categoryItem"); categoryHtml.addStyleName("categoryItem");
categoryHtml.addStyleName("categoryItem-Collapsed"); categoryHtml.addStyleName("categoryItem-Collapsed");
ToolTipConfig tooltipConfig = createToolTip(category); ToolTipConfig tooltipConfig = createToolTip(category);
@ -85,14 +84,13 @@ public class OperatorCategoryPanel extends SimpleContainer {
*/ */
private ToolTipConfig createToolTip(OperatorCategory cat) { private ToolTipConfig createToolTip(OperatorCategory cat) {
ToolTipConfig tooltipConfig = new ToolTipConfig(); ToolTipConfig tooltipConfig = new ToolTipConfig();
tooltipConfig.setTitleHtml("<br>&nbsp;&nbsp;"+cat.getName()); tooltipConfig.setTitleHtml("<br>&nbsp;&nbsp;" + cat.getName());
tooltipConfig.setMouseOffsetX(0); tooltipConfig.setMouseOffsetX(0);
tooltipConfig.setMouseOffsetY(0); tooltipConfig.setMouseOffsetY(0);
tooltipConfig.setAnchor(Side.LEFT); tooltipConfig.setAnchor(Side.LEFT);
tooltipConfig.setDismissDelay(5000); tooltipConfig.setDismissDelay(5000);
tooltipConfig.setBodyHtml( tooltipConfig.setBodyHtml(
getTooltipTemplate(GWT.getModuleBaseURL(), cat.getId(), cat.hasImage(), cat.getDescription()) getTooltipTemplate(GWT.getModuleBaseURL(), cat.getId(), cat.hasImage(), cat.getDescription()));
);
tooltipConfig.setMaxWidth(TOOLTIP_WIDTH); tooltipConfig.setMaxWidth(TOOLTIP_WIDTH);
return tooltipConfig; return tooltipConfig;
} }
@ -105,12 +103,9 @@ public class OperatorCategoryPanel extends SimpleContainer {
* @param description * @param description
* @return * @return
*/ */
private String getTooltipTemplate(String base, String id, boolean hasImage, String description){ private String getTooltipTemplate(String base, String id, boolean hasImage, String description) {
String html = String html = "<div class='categoryItemTooltip'>" + "<img src='" + base + "../images/categories/"
"<div class='categoryItemTooltip'>"+ + (hasImage ? id : "DEFAULT_IMAGE") + ".png' >" + Format.ellipse(description, 100) + "</div>";
"<img src='" + base + "../images/categories/"+(hasImage ? id : "DEFAULT_IMAGE")+".png' >"+
Format.ellipse(description, 100)+
"</div>";
return html; return html;
}; };
@ -131,7 +126,7 @@ public class OperatorCategoryPanel extends SimpleContainer {
categoryHtml.removeStyleName("categoryItem-Expanded"); categoryHtml.removeStyleName("categoryItem-Expanded");
categoryHtml.addStyleName("categoryItem-Collapsed"); categoryHtml.addStyleName("categoryItem-Collapsed");
for (OperatorPanel op: this.operatorPanelsList) for (OperatorPanel op : this.operatorPanelsList)
v.remove(op); v.remove(op);
isCollapsed = true; isCollapsed = true;
forceLayout(); forceLayout();
@ -141,7 +136,7 @@ public class OperatorCategoryPanel extends SimpleContainer {
* *
*/ */
private void expand() { private void expand() {
if (operatorPanelsList==null) { if (operatorPanelsList == null) {
// init operator panels // init operator panels
operatorPanelsList = new ArrayList<OperatorPanel>(); operatorPanelsList = new ArrayList<OperatorPanel>();
for (Operator op : category.getOperators()) { for (Operator op : category.getOperators()) {
@ -152,22 +147,20 @@ public class OperatorCategoryPanel extends SimpleContainer {
categoryHtml.removeStyleName("categoryItem-Collapsed"); categoryHtml.removeStyleName("categoryItem-Collapsed");
categoryHtml.addStyleName("categoryItem-Expanded"); categoryHtml.addStyleName("categoryItem-Expanded");
for (OperatorPanel op: this.operatorPanelsList) for (OperatorPanel op : this.operatorPanelsList)
v.add(op); v.add(op);
isCollapsed = false; isCollapsed = false;
forceLayout(); forceLayout();
} }
public void setDefaultOperator(){ public void setDefaultOperator() {
expand(); expand();
} }
public void setOperatorDefault(Operator operatorDefault) { public void setOperatorDefault(Operator operatorDefault) {
expand(); expand();
for(OperatorPanel opPanel:operatorPanelsList){ for (OperatorPanel opPanel : operatorPanelsList) {
if(opPanel.getOperator().compareTo(operatorDefault)==0){ if (opPanel.getOperator().compareTo(operatorDefault) == 0) {
opPanel.setAsTheDefaultOperator(); opPanel.setAsTheDefaultOperator();
break; break;
} }

40
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorPanel.java
View File

@ -17,7 +17,7 @@ import com.sencha.gxt.widget.core.client.tips.ToolTipConfig;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class OperatorPanel extends SimpleContainer { public class OperatorPanel extends SimpleContainer {
@ -34,7 +34,9 @@ public class OperatorPanel extends SimpleContainer {
/** /**
* *
* @param operator * @param operator
* operator
* @param handler * @param handler
* operator panel handler
*/ */
public OperatorPanel(Operator operator, OperatorsPanelHandler handler) { public OperatorPanel(Operator operator, OperatorsPanelHandler handler) {
super(); super();
@ -62,10 +64,11 @@ public class OperatorPanel extends SimpleContainer {
titleHtml = new HTML(operator.getName()); titleHtml = new HTML(operator.getName());
titleHtml.addStyleName("operatorPanel-title"); titleHtml.addStyleName("operatorPanel-title");
HTML descriptionHtml = new HTML(Format.ellipse(operator.getBriefDescription(),OPERATOR_BRIEF_DESCRIPTION_LENGHT)); HTML descriptionHtml = new HTML(
Format.ellipse(operator.getBriefDescription(), OPERATOR_BRIEF_DESCRIPTION_LENGHT));
descriptionHtml.addStyleName("operatorPanel-briefDescription"); descriptionHtml.addStyleName("operatorPanel-briefDescription");
vert=new VerticalLayoutContainer(); vert = new VerticalLayoutContainer();
vert.add(titleHtml, new VerticalLayoutData(1, -1, new Margins(0))); vert.add(titleHtml, new VerticalLayoutData(1, -1, new Margins(0)));
vert.add(descriptionHtml, new VerticalLayoutData(1, -1, new Margins(0))); vert.add(descriptionHtml, new VerticalLayoutData(1, -1, new Margins(0)));
@ -78,14 +81,14 @@ public class OperatorPanel extends SimpleContainer {
/** /**
* *
* @return * @return operator
*/ */
public Operator getOperator() { public Operator getOperator() {
return operator; return operator;
} }
/** /**
* @return * @return tooltip config
*/ */
private ToolTipConfig createToolTip(Operator op) { private ToolTipConfig createToolTip(Operator op) {
ToolTipConfig tooltipConfig = new ToolTipConfig(); ToolTipConfig tooltipConfig = new ToolTipConfig();
@ -94,27 +97,17 @@ public class OperatorPanel extends SimpleContainer {
tooltipConfig.setMouseOffsetY(0); tooltipConfig.setMouseOffsetY(0);
tooltipConfig.setAnchor(Side.LEFT); tooltipConfig.setAnchor(Side.LEFT);
tooltipConfig.setDismissDelay(5000); tooltipConfig.setDismissDelay(5000);
tooltipConfig.setBodyHtml(getTooltipTemplate(GWT.getModuleBaseURL(), tooltipConfig.setBodyHtml(
op.getId(), op.hasImage(), op.getDescription())); getTooltipTemplate(GWT.getModuleBaseURL(), op.getId(), op.hasImage(), op.getDescription()));
// config.setCloseable(true); // config.setCloseable(true);
tooltipConfig.setMaxWidth(TOOLTIP_WIDTH); tooltipConfig.setMaxWidth(TOOLTIP_WIDTH);
return tooltipConfig; return tooltipConfig;
} }
/** private String getTooltipTemplate(String base, String id, boolean hasImage, String description) {
* String template = "<div class='categoryItemTooltip'>" + "<img src='" + base + "../images/operators/"
* @param base + (hasImage ? id : "DEFAULT_IMAGE") + ".png' >"
* @param id + Format.ellipse(description, TOOLTIP_DESCRIPTION_LENGHT) + "</div>";
* @param hasImage
* @param description
* @return
*/
private String getTooltipTemplate(String base, String id, boolean hasImage,
String description) {
String template = "<div class='categoryItemTooltip'>" + "<img src='"
+ base + "../images/operators/"
+ (hasImage ? id : "DEFAULT_IMAGE") + ".png' >" + Format.ellipse(description, TOOLTIP_DESCRIPTION_LENGHT)
+ "</div>";
return template; return template;
}; };
@ -128,7 +121,10 @@ public class OperatorPanel extends SimpleContainer {
// titleHtml.removeStyleName("operatorPanel-title-selected"); // titleHtml.removeStyleName("operatorPanel-title-selected");
} }
public void setAsTheDefaultOperator(){ /**
* Set as the default operator
*/
public void setAsTheDefaultOperator() {
handler.addOperator(OperatorPanel.this, operator); handler.addOperator(OperatorPanel.this, operator);
} }

5
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanel.java
View File

@ -42,8 +42,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class OperatorsPanel extends FramedPanel { public class OperatorsPanel extends FramedPanel {
@ -73,6 +73,7 @@ public class OperatorsPanel extends FramedPanel {
/** /**
* *
* @param handler operators panel handler
*/ */
public OperatorsPanel(OperatorsPanelHandler handler) { public OperatorsPanel(OperatorsPanelHandler handler) {
super(); super();

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanelHandler.java
View File

@ -8,14 +8,16 @@ import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public interface OperatorsPanelHandler { public interface OperatorsPanelHandler {
/** /**
* @param operatorPanel * @param operatorPanel
* operator panel
* @param operator * @param operator
* operator
*/ */
void addOperator(OperatorPanel operatorPanel, Operator operator); void addOperator(OperatorPanel operatorPanel, Operator operator);

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/WorkflowPanel.java
View File

@ -15,8 +15,8 @@ import com.sencha.gxt.widget.core.client.TabPanel;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class WorkflowPanel extends TabPanel { public class WorkflowPanel extends TabPanel {

10
src/main/java/org/gcube/portlets/user/dataminermanager/client/monitor/StatusMonitor.java
View File

@ -5,8 +5,8 @@ import com.sencha.gxt.widget.core.client.box.AutoProgressMessageBox;
/** /**
* *
* @author giancarlo email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class StatusMonitor extends AutoProgressMessageBox { public class StatusMonitor extends AutoProgressMessageBox {
@ -19,7 +19,9 @@ public class StatusMonitor extends AutoProgressMessageBox {
/** /**
* *
* @param headingHtml * @param headingHtml
* head
* @param messageHtml * @param messageHtml
* message
*/ */
public StatusMonitor(SafeHtml headingHtml, SafeHtml messageHtml) { public StatusMonitor(SafeHtml headingHtml, SafeHtml messageHtml) {
super(headingHtml, messageHtml); super(headingHtml, messageHtml);
@ -29,6 +31,7 @@ public class StatusMonitor extends AutoProgressMessageBox {
/** /**
* *
* @param headingHtml * @param headingHtml
* head
*/ */
public StatusMonitor(SafeHtml headingHtml) { public StatusMonitor(SafeHtml headingHtml) {
super(headingHtml); super(headingHtml);
@ -38,7 +41,9 @@ public class StatusMonitor extends AutoProgressMessageBox {
/** /**
* *
* @param headingHtml * @param headingHtml
* head
* @param messageHtml * @param messageHtml
* message
*/ */
public StatusMonitor(String headingHtml, String messageHtml) { public StatusMonitor(String headingHtml, String messageHtml) {
super(headingHtml, messageHtml); super(headingHtml, messageHtml);
@ -48,6 +53,7 @@ public class StatusMonitor extends AutoProgressMessageBox {
/** /**
* *
* @param headingHtml * @param headingHtml
* head
*/ */
public StatusMonitor(String headingHtml) { public StatusMonitor(String headingHtml) {
super(headingHtml); super(headingHtml);

19
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/AbstractFld.java
View File

@ -10,32 +10,38 @@ import com.google.gwt.user.client.ui.Widget;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public abstract class AbstractFld { public abstract class AbstractFld {
protected Parameter parameter; protected Parameter parameter;
public abstract String getValue();
public abstract Widget getWidget();
public abstract String getValue();
public abstract Widget getWidget();
/** /**
* *
* @param parameter parameter
* parameter
*/ */
public AbstractFld(Parameter parameter) { public AbstractFld(Parameter parameter) {
this.parameter = parameter; this.parameter = parameter;
} }
/** /**
* @return the operator *
* @return Parameter
*/ */
public Parameter getParameter() { public Parameter getParameter() {
return parameter; return parameter;
} }
/** /**
* @param operator the operator to set *
* @param parameter parameter
* parameter
*/ */
public void setParameter(Parameter parameter) { public void setParameter(Parameter parameter) {
this.parameter = parameter; this.parameter = parameter;
@ -43,11 +49,10 @@ public abstract class AbstractFld {
/** /**
* *
* @return * @return true if is valid
*/ */
public boolean isValid() { public boolean isValid() {
return true; return true;
} }
} }

18
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/BooleanFld.java
View File

@ -19,8 +19,8 @@ import com.sencha.gxt.widget.core.client.form.SimpleComboBox;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class BooleanFld extends AbstractFld { public class BooleanFld extends AbstractFld {
@ -30,6 +30,7 @@ public class BooleanFld extends AbstractFld {
/** /**
* @param parameter * @param parameter
* parameter
*/ */
public BooleanFld(Parameter parameter) { public BooleanFld(Parameter parameter) {
super(parameter); super(parameter);
@ -48,9 +49,9 @@ public class BooleanFld extends AbstractFld {
listBox.setEditable(false); listBox.setEditable(false);
listBox.setTriggerAction(TriggerAction.ALL); listBox.setTriggerAction(TriggerAction.ALL);
if (p.getDefaultValue() != null&& !p.getDefaultValue().isEmpty()) { if (p.getDefaultValue() != null && !p.getDefaultValue().isEmpty()) {
Boolean b=Boolean.valueOf(p.getDefaultValue()); Boolean b = Boolean.valueOf(p.getDefaultValue());
if(b){ if (b) {
listBox.setValue("true"); listBox.setValue("true");
} else { } else {
listBox.setValue("false"); listBox.setValue("false");
@ -63,15 +64,12 @@ public class BooleanFld extends AbstractFld {
HtmlLayoutContainer descr; HtmlLayoutContainer descr;
if (p.getDescription() == null) { if (p.getDescription() == null) {
descr = new HtmlLayoutContainer( descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
"<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} else { } else {
// listBox.setToolTip(p.getDescription()); // listBox.setToolTip(p.getDescription());
descr = new HtmlLayoutContainer( descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" + p.getDescription() + "</p>");
"<p style='margin-left:5px !important;'>"
+ p.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} }
horiz.add(listBox, new BoxLayoutData(new Margins())); horiz.add(listBox, new BoxLayoutData(new Margins()));

6
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnFld.java
View File

@ -31,8 +31,8 @@ import com.sencha.gxt.widget.core.client.form.ComboBox;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ColumnFld extends AbstractFld implements public class ColumnFld extends AbstractFld implements
@ -47,7 +47,7 @@ public class ColumnFld extends AbstractFld implements
private SimpleContainer vContainer; private SimpleContainer vContainer;
/** /**
* @param parameter * @param parameter parameter
*/ */
public ColumnFld(Parameter parameter) { public ColumnFld(Parameter parameter) {
super(parameter); super(parameter);

6
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnListFld.java
View File

@ -39,8 +39,8 @@ import com.sencha.gxt.widget.core.client.grid.Grid;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ColumnListFld extends AbstractFld implements public class ColumnListFld extends AbstractFld implements
@ -61,7 +61,7 @@ public class ColumnListFld extends AbstractFld implements
/** /**
* *
* @param parameter * @param parameter parameter
*/ */
public ColumnListFld(Parameter parameter) { public ColumnListFld(Parameter parameter) {
super(parameter); super(parameter);

6
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/DateFld.java
View File

@ -23,8 +23,8 @@ import com.sencha.gxt.widget.core.client.form.DateField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class DateFld extends AbstractFld { public class DateFld extends AbstractFld {
@ -34,7 +34,7 @@ public class DateFld extends AbstractFld {
private DateTimeFormat dateFormat; private DateTimeFormat dateFormat;
/** /**
* @param parameter * @param parameter parameter
*/ */
public DateFld(Parameter parameter) { public DateFld(Parameter parameter) {
super(parameter); super(parameter);

34
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/DoubleFld.java
View File

@ -16,8 +16,8 @@ import com.sencha.gxt.widget.core.client.form.DoubleField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class DoubleFld extends AbstractFld { public class DoubleFld extends AbstractFld {
@ -26,11 +26,13 @@ public class DoubleFld extends AbstractFld {
private DoubleField numberField; private DoubleField numberField;
/** /**
* @param operator *
* @param parameter
* parameter
*/ */
public DoubleFld(Parameter parameter) { public DoubleFld(Parameter parameter) {
super(parameter); super(parameter);
fieldContainer=new SimpleContainer(); fieldContainer = new SimpleContainer();
HBoxLayoutContainer horiz = new HBoxLayoutContainer(); HBoxLayoutContainer horiz = new HBoxLayoutContainer();
horiz.setPack(BoxLayoutPack.START); horiz.setPack(BoxLayoutPack.START);
horiz.setEnableOverflow(false); horiz.setEnableOverflow(false);
@ -50,19 +52,17 @@ public class DoubleFld extends AbstractFld {
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} else { } else {
//numberField.setToolTip(p.getDescription()); // numberField.setToolTip(p.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" + p.getDescription() + "</p>");
+ p.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} }
SimpleContainer vContainer=new SimpleContainer(); SimpleContainer vContainer = new SimpleContainer();
VerticalLayoutContainer vField = new VerticalLayoutContainer(); VerticalLayoutContainer vField = new VerticalLayoutContainer();
HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( HtmlLayoutContainer typeDescription = new HtmlLayoutContainer("Double Value");
"Double Value");
typeDescription.setStylePrimaryName("workflow-parameters-description"); typeDescription.setStylePrimaryName("workflow-parameters-description");
vField.add(numberField, new VerticalLayoutData(-1,-1,new Margins(0))); vField.add(numberField, new VerticalLayoutData(-1, -1, new Margins(0)));
vField.add(typeDescription, new VerticalLayoutData(-1,-1,new Margins(0))); vField.add(typeDescription, new VerticalLayoutData(-1, -1, new Margins(0)));
vContainer.add(vField); vContainer.add(vField);
horiz.add(vContainer, new BoxLayoutData(new Margins())); horiz.add(vContainer, new BoxLayoutData(new Margins()));
@ -73,29 +73,19 @@ public class DoubleFld extends AbstractFld {
fieldContainer.forceLayout(); fieldContainer.forceLayout();
} }
/**
*
*/
@Override @Override
public String getValue() { public String getValue() {
return numberField.getCurrentValue().toString(); return numberField.getCurrentValue().toString();
} }
/**
*
*/
@Override @Override
public Widget getWidget() { public Widget getWidget() {
return fieldContainer; return fieldContainer;
} }
/**
*
*/
@Override @Override
public boolean isValid() { public boolean isValid() {
return numberField.isValid(); return numberField.isValid();
} }
} }

10
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/EnumFld.java
View File

@ -19,8 +19,8 @@ import com.sencha.gxt.widget.core.client.form.SimpleComboBox;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class EnumFld extends AbstractFld { public class EnumFld extends AbstractFld {
@ -30,6 +30,7 @@ public class EnumFld extends AbstractFld {
/** /**
* @param parameter * @param parameter
* parameter
*/ */
public EnumFld(Parameter parameter) { public EnumFld(Parameter parameter) {
super(parameter); super(parameter);
@ -57,9 +58,8 @@ public class EnumFld extends AbstractFld {
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} else { } else {
//listBox.setToolTip(p.getDescription()); // listBox.setToolTip(p.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" + p.getDescription() + "</p>");
+ p.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} }
horiz.add(listBox, new BoxLayoutData(new Margins())); horiz.add(listBox, new BoxLayoutData(new Margins()));

6
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java
View File

@ -40,8 +40,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class FileFld extends AbstractFld { public class FileFld extends AbstractFld {
@ -62,7 +62,7 @@ public class FileFld extends AbstractFld {
private TextButton downloadButton; private TextButton downloadButton;
/** /**
* @param parameter * @param parameter parameter
*/ */
public FileFld(Parameter parameter) { public FileFld(Parameter parameter) {
super(parameter); super(parameter);

26
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FloatFld.java
View File

@ -16,8 +16,8 @@ import com.sencha.gxt.widget.core.client.form.FloatField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class FloatFld extends AbstractFld { public class FloatFld extends AbstractFld {
@ -26,7 +26,9 @@ public class FloatFld extends AbstractFld {
private FloatField numberField; private FloatField numberField;
/** /**
* @param operator *
* @param parameter
* parameter
*/ */
public FloatFld(Parameter parameter) { public FloatFld(Parameter parameter) {
super(parameter); super(parameter);
@ -50,20 +52,17 @@ public class FloatFld extends AbstractFld {
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} else { } else {
//numberField.setToolTip(p.getDescription()); // numberField.setToolTip(p.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" + p.getDescription() + "</p>");
+ p.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} }
SimpleContainer vContainer = new SimpleContainer(); SimpleContainer vContainer = new SimpleContainer();
VerticalLayoutContainer vField = new VerticalLayoutContainer(); VerticalLayoutContainer vField = new VerticalLayoutContainer();
HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( HtmlLayoutContainer typeDescription = new HtmlLayoutContainer("Float Value");
"Float Value");
typeDescription.setStylePrimaryName("workflow-parameters-description"); typeDescription.setStylePrimaryName("workflow-parameters-description");
vField.add(numberField, new VerticalLayoutData(-1, -1, new Margins(0))); vField.add(numberField, new VerticalLayoutData(-1, -1, new Margins(0)));
vField.add(typeDescription, new VerticalLayoutData(-1, -1, new Margins( vField.add(typeDescription, new VerticalLayoutData(-1, -1, new Margins(0)));
0)));
vContainer.add(vField); vContainer.add(vField);
horiz.add(vContainer, new BoxLayoutData(new Margins())); horiz.add(vContainer, new BoxLayoutData(new Margins()));
@ -74,18 +73,13 @@ public class FloatFld extends AbstractFld {
} }
/**
*
*/
@Override @Override
public String getValue() { public String getValue() {
Float f = numberField.getCurrentValue(); Float f = numberField.getCurrentValue();
return f.toString(); return f.toString();
} }
/**
*
*/
@Override @Override
public Widget getWidget() { public Widget getWidget() {
return fieldContainer; return fieldContainer;

23
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/IntFld.java
View File

@ -16,8 +16,8 @@ import com.sencha.gxt.widget.core.client.form.IntegerField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class IntFld extends AbstractFld { public class IntFld extends AbstractFld {
@ -26,7 +26,9 @@ public class IntFld extends AbstractFld {
private IntegerField numberField; private IntegerField numberField;
/** /**
* @param operator *
* @param parameter
* parameter
*/ */
public IntFld(Parameter parameter) { public IntFld(Parameter parameter) {
super(parameter); super(parameter);
@ -50,19 +52,17 @@ public class IntFld extends AbstractFld {
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} else { } else {
//numberField.setToolTip(p.getDescription()); // numberField.setToolTip(p.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" + p.getDescription() + "</p>");
+ p.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} }
SimpleContainer vContainer=new SimpleContainer(); SimpleContainer vContainer = new SimpleContainer();
VerticalLayoutContainer vField = new VerticalLayoutContainer(); VerticalLayoutContainer vField = new VerticalLayoutContainer();
HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( HtmlLayoutContainer typeDescription = new HtmlLayoutContainer("Integer Value");
"Integer Value");
typeDescription.setStylePrimaryName("workflow-parameters-description"); typeDescription.setStylePrimaryName("workflow-parameters-description");
vField.add(numberField, new VerticalLayoutData(-1,-1,new Margins(0))); vField.add(numberField, new VerticalLayoutData(-1, -1, new Margins(0)));
vField.add(typeDescription, new VerticalLayoutData(-1,-1,new Margins(0))); vField.add(typeDescription, new VerticalLayoutData(-1, -1, new Margins(0)));
vContainer.add(vField); vContainer.add(vField);
horiz.add(vContainer, new BoxLayoutData(new Margins())); horiz.add(vContainer, new BoxLayoutData(new Margins()));
@ -90,7 +90,6 @@ public class IntFld extends AbstractFld {
return fieldContainer; return fieldContainer;
} }
@Override @Override
public boolean isValid() { public boolean isValid() {
return numberField.isValid(); return numberField.isValid();

14
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListIntFld.java
View File

@ -28,7 +28,7 @@ import com.sencha.gxt.widget.core.client.form.IntegerField;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ListIntFld extends AbstractFld { public class ListIntFld extends AbstractFld {
@ -43,6 +43,7 @@ public class ListIntFld extends AbstractFld {
/** /**
* @param parameter * @param parameter
* parameter
*/ */
public ListIntFld(Parameter parameter) { public ListIntFld(Parameter parameter) {
super(parameter); super(parameter);
@ -66,9 +67,9 @@ public class ListIntFld extends AbstractFld {
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} else { } else {
//listContainer.setToolTip(listParameter.getDescription()); // listContainer.setToolTip(listParameter.getDescription());
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" descr = new HtmlLayoutContainer(
+ listParameter.getDescription() + "</p>"); "<p style='margin-left:5px !important;'>" + listParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} }
@ -78,13 +79,12 @@ public class ListIntFld extends AbstractFld {
fieldContainer.add(horiz); fieldContainer.add(horiz);
fieldContainer.forceLayout(); fieldContainer.forceLayout();
} }
private void addField(Item upperItem) { private void addField(Item upperItem) {
ObjectParameter objPar = new ObjectParameter(listParameter.getName(), ObjectParameter objPar = new ObjectParameter(listParameter.getName(), listParameter.getDescription(),
listParameter.getDescription(), listParameter.getType(), null); listParameter.getType(), null);
if (upperItem == null) { if (upperItem == null) {
Item item = new Item(objPar, true); Item item = new Item(objPar, true);

30
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListStringFld.java
View File

@ -22,8 +22,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ListStringFld extends AbstractFld { public class ListStringFld extends AbstractFld {
@ -38,6 +38,7 @@ public class ListStringFld extends AbstractFld {
/** /**
* *
* @param parameter * @param parameter
* parameter
*/ */
public ListStringFld(Parameter parameter) { public ListStringFld(Parameter parameter) {
super(parameter); super(parameter);
@ -61,9 +62,9 @@ public class ListStringFld extends AbstractFld {
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} else { } else {
/*listContainer.setToolTip(listParameter.getDescription());*/ /* listContainer.setToolTip(listParameter.getDescription()); */
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" descr = new HtmlLayoutContainer(
+ listParameter.getDescription() + "</p>"); "<p style='margin-left:5px !important;'>" + listParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} }
@ -76,8 +77,8 @@ public class ListStringFld extends AbstractFld {
protected void addField(StringItem upperItem) { protected void addField(StringItem upperItem) {
ObjectParameter objPar = new ObjectParameter(listParameter.getName(), ObjectParameter objPar = new ObjectParameter(listParameter.getName(), listParameter.getDescription(),
listParameter.getDescription(), listParameter.getType(), null); listParameter.getType(), null);
if (upperItem == null) { if (upperItem == null) {
StringItem item = new StringItem(this, objPar, true); StringItem item = new StringItem(this, objPar, true);
@ -91,30 +92,27 @@ public class ListStringFld extends AbstractFld {
upperItem.forceLayout(); upperItem.forceLayout();
StringItem item = new StringItem(this, objPar, false); StringItem item = new StringItem(this, objPar, false);
items.add(pos + 1, item); items.add(pos + 1, item);
vp.insert(item, pos + 1);//don't use new VerticalLayoutData(1, -1,new Margins(0)) vp.insert(item, pos + 1);// don't use new VerticalLayoutData(1,
// -1,new Margins(0))
} else { } else {
upperItem.forceLayout(); upperItem.forceLayout();
StringItem item = new StringItem(this, objPar, true); StringItem item = new StringItem(this, objPar, true);
items.add(item); items.add(item);
vp.add(item);//don't use new VerticalLayoutData(-1, -1, new Margins(0)) vp.add(item);// don't use new VerticalLayoutData(-1, -1, new
// Margins(0))
} }
} }
forceLayout(); forceLayout();
} }
protected void forceLayout(){ protected void forceLayout() {
vp.forceLayout(); vp.forceLayout();
horiz.forceLayout(); horiz.forceLayout();
fieldContainer.forceLayout(); fieldContainer.forceLayout();
} }
/**
* @param item
*/
protected void removeField(StringItem item) { protected void removeField(StringItem item) {
items.remove(item); items.remove(item);
@ -168,6 +166,4 @@ public class ListStringFld extends AbstractFld {
return valid; return valid;
} }
} }

64
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/OperatorFieldWidget.java
View File

@ -12,8 +12,8 @@ import com.sencha.gxt.widget.core.client.form.FieldLabel;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class OperatorFieldWidget { public class OperatorFieldWidget {
@ -23,46 +23,49 @@ public class OperatorFieldWidget {
private FieldLabel parameterLabel; private FieldLabel parameterLabel;
/** /**
*
* @param parameter
* parameter
*/ */
public OperatorFieldWidget(Parameter p) { public OperatorFieldWidget(Parameter parameter) {
super(); super();
this.parameter = p; this.parameter = parameter;
try { try {
if (p.getTypology() != null) { if (parameter.getTypology() != null) {
switch (p.getTypology()) { switch (parameter.getTypology()) {
case COLUMN: case COLUMN:
field = new ColumnFld(p); field = new ColumnFld(parameter);
break; break;
case COLUMN_LIST: case COLUMN_LIST:
field = new ColumnListFld(p); field = new ColumnListFld(parameter);
break; break;
case ENUM: case ENUM:
field = new EnumFld(p); field = new EnumFld(parameter);
break; break;
case FILE: case FILE:
field = new FileFld(p); field = new FileFld(parameter);
break; break;
case LIST: case LIST:
field = createListField(p); field = createListField(parameter);
break; break;
case OBJECT: case OBJECT:
field = createObjectField(p); field = createObjectField(parameter);
break; break;
case TABULAR: case TABULAR:
field = new TabularFld(p); field = new TabularFld(parameter);
break; break;
case TABULAR_LIST: case TABULAR_LIST:
field = new TabularListFld(p); field = new TabularListFld(parameter);
break; break;
case WKT: case WKT:
field = new WKTFld(p); field = new WKTFld(parameter);
break; break;
case DATE: case DATE:
field = new DateFld(p); field = new DateFld(parameter);
break; break;
case TIME: case TIME:
field = new TimeFld(p); field = new TimeFld(parameter);
break; break;
default: default:
break; break;
@ -71,12 +74,12 @@ public class OperatorFieldWidget {
} }
if (field == null) { if (field == null) {
parameterLabel = new FieldLabel(null, p.getName()); parameterLabel = new FieldLabel(null, parameter.getName());
parameterLabel.setLabelWidth(200); parameterLabel.setLabelWidth(200);
parameterLabel.setLabelWordWrap(true); parameterLabel.setLabelWordWrap(true);
} else { } else {
parameterLabel = new FieldLabel(field.getWidget(), p.getName()); parameterLabel = new FieldLabel(field.getWidget(), parameter.getName());
parameterLabel.setLabelWidth(200); parameterLabel.setLabelWidth(200);
parameterLabel.setLabelWordWrap(true); parameterLabel.setLabelWordWrap(true);
} }
@ -107,11 +110,12 @@ public class OperatorFieldWidget {
} }
/** /**
* @param p * @param parameter
* @return * parameter
* @return abstract field
*/ */
private AbstractFld createObjectField(Parameter p) { private AbstractFld createObjectField(Parameter parameter) {
ObjectParameter objectParameter = (ObjectParameter) p; ObjectParameter objectParameter = (ObjectParameter) parameter;
String type = objectParameter.getType(); String type = objectParameter.getType();
if (type.contentEquals(Integer.class.getName())) { if (type.contentEquals(Integer.class.getName())) {
return new IntFld(objectParameter); return new IntFld(objectParameter);
@ -127,18 +131,15 @@ public class OperatorFieldWidget {
return null; return null;
} }
/**
*
*/
private AbstractFld createListField(Parameter p) { private AbstractFld createListField(Parameter p) {
ListParameter listParameter = (ListParameter) p; ListParameter listParameter = (ListParameter) p;
String type = listParameter.getType(); String type = listParameter.getType();
if (type.contentEquals(String.class.getName()) if (type.contentEquals(String.class.getName()) || type.contentEquals("STRING")) { // TODO
|| type.contentEquals("STRING")) { // TODO REMOVE "STRING" // REMOVE
// "STRING"
return new ListStringFld(listParameter); return new ListStringFld(listParameter);
} else if (type.contentEquals(Integer.class.getName()) } else if (type.contentEquals(Integer.class.getName()) || type.contentEquals("NUMBER")) {
|| type.contentEquals("NUMBER")) {
return new ListIntFld(listParameter); return new ListIntFld(listParameter);
} }
// } else if (type.contentEquals(Boolean.class.getName())) { // } else if (type.contentEquals(Boolean.class.getName())) {
@ -152,9 +153,6 @@ public class OperatorFieldWidget {
return null; return null;
} }
/**
*
*/
public void updateOperatorParameterValue() { public void updateOperatorParameterValue() {
this.parameter.setValue(this.getFieldValue()); this.parameter.setValue(this.getFieldValue());
} }

6
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringFld.java
View File

@ -19,8 +19,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class StringFld extends AbstractFld { public class StringFld extends AbstractFld {
@ -29,7 +29,7 @@ public class StringFld extends AbstractFld {
private TextField textField; private TextField textField;
/** /**
* @param parameter * @param parameter parameter
*/ */
public StringFld(Parameter parameter) { public StringFld(Parameter parameter) {
super(parameter); super(parameter);

7
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringItem.java
View File

@ -12,7 +12,7 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class StringItem extends HBoxLayoutContainer { public class StringItem extends HBoxLayoutContainer {
@ -22,7 +22,10 @@ public class StringItem extends HBoxLayoutContainer {
private TextButton removeBtn; private TextButton removeBtn;
/** /**
* @param objPar *
* @param parent parend
* @param objectParameter object parameter
* @param first true if is first
*/ */
public StringItem(ListStringFld parent, ObjectParameter objectParameter, boolean first) { public StringItem(ListStringFld parent, ObjectParameter objectParameter, boolean first) {
super(); super();

102
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java
View File

@ -30,8 +30,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class TabItem extends HBoxLayoutContainer { public class TabItem extends HBoxLayoutContainer {
@ -49,12 +49,14 @@ public class TabItem extends HBoxLayoutContainer {
/** /**
* *
* @param tabularListFld * @param parent
* parent
* @param tabularParameter * @param tabularParameter
* tabular parameter
* @param first * @param first
* true if is first
*/ */
public TabItem(TabularListFld parent, TabularParameter tabularParameter, public TabItem(TabularListFld parent, TabularParameter tabularParameter, boolean first) {
boolean first) {
super(); super();
this.parent = parent; this.parent = parent;
initDialog(); initDialog();
@ -91,7 +93,6 @@ public class TabItem extends HBoxLayoutContainer {
}); });
selectButton2.setVisible(false); selectButton2.setVisible(false);
downloadButton = new TextButton(""); downloadButton = new TextButton("");
downloadButton.setIcon(DataMinerManager.resources.download()); downloadButton.setIcon(DataMinerManager.resources.download());
downloadButton.addSelectHandler(new SelectEvent.SelectHandler() { downloadButton.addSelectHandler(new SelectEvent.SelectHandler() {
@ -103,7 +104,6 @@ public class TabItem extends HBoxLayoutContainer {
}); });
downloadButton.setVisible(false); downloadButton.setVisible(false);
addBtn = new TextButton(""); addBtn = new TextButton("");
addBtn.setIcon(DataMinerManager.resources.add()); addBtn.setIcon(DataMinerManager.resources.add());
addBtn.addSelectHandler(new SelectEvent.SelectHandler() { addBtn.addSelectHandler(new SelectEvent.SelectHandler() {
@ -128,8 +128,6 @@ public class TabItem extends HBoxLayoutContainer {
}); });
removeBtn.setVisible(!first); removeBtn.setVisible(!first);
setPack(BoxLayoutPack.START); setPack(BoxLayoutPack.START);
setEnableOverflow(false); setEnableOverflow(false);
@ -158,7 +156,8 @@ public class TabItem extends HBoxLayoutContainer {
* "multipart/x-zip" * "multipart/x-zip"
*/ */
// List<String> allowedMimeTypes = // List<String> allowedMimeTypes =
// Arrays.asList("text/csv","text/plain","text/plain; charset=ISO-8859-1"); // Arrays.asList("text/csv","text/plain","text/plain;
// charset=ISO-8859-1");
/** /**
* "zip" * "zip"
@ -190,8 +189,7 @@ public class TabItem extends HBoxLayoutContainer {
@Override @Override
public void onFailed(Throwable throwable) { public void onFailed(Throwable throwable) {
Log.error("Error in create project: " Log.error("Error in create project: " + throwable.getLocalizedMessage());
+ throwable.getLocalizedMessage());
UtilsGXT3.alert("Error", throwable.getLocalizedMessage()); UtilsGXT3.alert("Error", throwable.getLocalizedMessage());
throwable.printStackTrace(); throwable.printStackTrace();
} }
@ -214,66 +212,56 @@ public class TabItem extends HBoxLayoutContainer {
private void retrieveTableInformation(Item item) { private void retrieveTableInformation(Item item) {
Log.debug("Retrieved: " + item); Log.debug("Retrieved: " + item);
itemDescriptionSelected = new ItemDescription( itemDescriptionSelected = new ItemDescription(item.getId(), item.getName(), item.getOwner(), item.getPath(),
item.getId(), item.getName(), item.getOwner(), item.getPath(),
item.getType().name()); item.getType().name());
DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(item, DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(item, new AsyncCallback<TableItemSimple>() {
new AsyncCallback<TableItemSimple>() {
@Override @Override
public void onFailure(Throwable caught) { public void onFailure(Throwable caught) {
Log.error("Error in retrieveTableInformation " Log.error("Error in retrieveTableInformation " + caught.getMessage());
+ caught.getMessage()); if (caught instanceof SessionExpiredServiceException) {
if (caught instanceof SessionExpiredServiceException) { UtilsGXT3.alert("Error", "Expired Session");
UtilsGXT3.alert("Error", "Expired Session");
} else { } else {
UtilsGXT3.alert("Error", UtilsGXT3.alert("Error", "Error retrieving table information: " + caught.getLocalizedMessage());
"Error retrieving table information: " }
+ caught.getLocalizedMessage());
}
} }
@Override @Override
public void onSuccess(TableItemSimple result) { public void onSuccess(TableItemSimple result) {
Log.debug("Retrieved: " + result); Log.debug("Retrieved: " + result);
selectedTableItem = result; selectedTableItem = result;
showFieldWithSelection(); showFieldWithSelection();
} }
}); });
} }
private void downloadFile() { private void downloadFile() {
if (itemDescriptionSelected != null) { if (itemDescriptionSelected != null) {
DataMinerPortletServiceAsync.INSTANCE.getPublicLink( DataMinerPortletServiceAsync.INSTANCE.getPublicLink(itemDescriptionSelected, new AsyncCallback<String>() {
itemDescriptionSelected, new AsyncCallback<String>() {
@Override @Override
public void onFailure(Throwable caught) { public void onFailure(Throwable caught) {
if (caught instanceof SessionExpiredServiceException) { if (caught instanceof SessionExpiredServiceException) {
EventBusProvider.INSTANCE EventBusProvider.INSTANCE.fireEvent(new SessionExpiredEvent());
.fireEvent(new SessionExpiredEvent()); } else {
} else { Log.error("Error downloading table: " + caught.getLocalizedMessage());
Log.error("Error downloading table: " UtilsGXT3.alert("Error", caught.getLocalizedMessage());
+ caught.getLocalizedMessage()); }
UtilsGXT3.alert("Error", caught.printStackTrace();
caught.getLocalizedMessage());
}
caught.printStackTrace();
} }
@Override @Override
public void onSuccess(String link) { public void onSuccess(String link) {
Log.debug("Retrieved link: " + link); Log.debug("Retrieved link: " + link);
Window.open(link, itemDescriptionSelected.getName(), ""); Window.open(link, itemDescriptionSelected.getName(), "");
} }
}); });
} else { } else {
UtilsGXT3.info("Attention", "Select a Table!"); UtilsGXT3.info("Attention", "Select a Table!");

131
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java
View File

@ -47,28 +47,26 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class TabularFld extends AbstractFld implements public class TabularFld extends AbstractFld implements HasTabularFldChangeEventHandler {
HasTabularFldChangeEventHandler {
private SimpleContainer fieldContainer; private SimpleContainer fieldContainer;
private HBoxLayoutContainer horiz; private HBoxLayoutContainer horiz;
private VerticalLayoutContainer vp; private VerticalLayoutContainer vp;
private WorkspaceExplorerSelectDialog wselectDialog; private WorkspaceExplorerSelectDialog wselectDialog;
private TextButton selectButton, selectButton2, cancelButton, private TextButton selectButton, selectButton2, cancelButton, downloadButton;
downloadButton;
private HtmlLayoutContainer templatesList; private HtmlLayoutContainer templatesList;
private TableItemSimple selectedTableItem = null; private TableItemSimple selectedTableItem = null;
private ItemDescription itemDescriptionSelected; private ItemDescription itemDescriptionSelected;
private TabularParameter tabularParameter; private TabularParameter tabularParameter;
/** /**
* @param parameter * @param parameter
* parameter
*/ */
public TabularFld(Parameter parameter) { public TabularFld(Parameter parameter) {
super(parameter); super(parameter);
@ -85,8 +83,7 @@ public class TabularFld extends AbstractFld implements
showNoSelectionField(); showNoSelectionField();
} catch (Throwable e) { } catch (Throwable e) {
Log.error("TabularField: " + e.getLocalizedMessage()); Log.error("TabularField: " + e.getLocalizedMessage());
UtilsGXT3.alert("Error", UtilsGXT3.alert("Error", "Error creating Tabular Field: " + e.getLocalizedMessage());
"Error creating Tabular Field: " + e.getLocalizedMessage());
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -104,8 +101,7 @@ public class TabularFld extends AbstractFld implements
first = false; first = false;
} }
templatesList = new HtmlLayoutContainer( templatesList = new HtmlLayoutContainer("<p>Suitable Data Set Templates: <br>" + list + "</p>");
"<p>Suitable Data Set Templates: <br>" + list + "</p>");
templatesList.addStyleName("workflow-parameters-description"); templatesList.addStyleName("workflow-parameters-description");
} }
@ -123,8 +119,8 @@ public class TabularFld extends AbstractFld implements
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} else { } else {
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" descr = new HtmlLayoutContainer(
+ tabularParameter.getDescription() + "</p>"); "<p style='margin-left:5px !important;'>" + tabularParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} }
@ -149,7 +145,8 @@ public class TabularFld extends AbstractFld implements
* "multipart/x-zip" * "multipart/x-zip"
*/ */
// List<String> allowedMimeTypes = // List<String> allowedMimeTypes =
// Arrays.asList("text/csv","text/plain","text/plain; charset=ISO-8859-1"); // Arrays.asList("text/csv","text/plain","text/plain;
// charset=ISO-8859-1");
/** /**
* "zip" * "zip"
@ -162,8 +159,7 @@ public class TabularFld extends AbstractFld implements
* FilterCriteria(allowedMimeTypes, allowedFileExtensions, new * FilterCriteria(allowedMimeTypes, allowedFileExtensions, new
* HashMap<String, String>()); * HashMap<String, String>());
*/ */
wselectDialog = new WorkspaceExplorerSelectDialog("Select CSV", wselectDialog = new WorkspaceExplorerSelectDialog("Select CSV", false);
false);
// filterCriteria, selectableTypes); // filterCriteria, selectableTypes);
WorskpaceExplorerSelectNotificationListener handler = new WorskpaceExplorerSelectNotificationListener() { WorskpaceExplorerSelectNotificationListener handler = new WorskpaceExplorerSelectNotificationListener() {
@ -183,10 +179,8 @@ public class TabularFld extends AbstractFld implements
@Override @Override
public void onFailed(Throwable throwable) { public void onFailed(Throwable throwable) {
Log.error("Error in create project: " Log.error("Error in create project: " + throwable.getLocalizedMessage());
+ throwable.getLocalizedMessage()); UtilsGXT3.alert("Error", throwable.getLocalizedMessage());
UtilsGXT3.alert("Error",
throwable.getLocalizedMessage());
throwable.printStackTrace(); throwable.printStackTrace();
} }
@ -201,17 +195,14 @@ public class TabularFld extends AbstractFld implements
} }
}; };
wselectDialog wselectDialog.addWorkspaceExplorerSelectNotificationListener(handler);
.addWorkspaceExplorerSelectNotificationListener(handler);
wselectDialog.setZIndex(XDOM.getTopZIndex()); wselectDialog.setZIndex(XDOM.getTopZIndex());
} catch (Throwable e) { } catch (Throwable e) {
Log.error("TabularField error using WorkspaceExplorerSelectDialog: " Log.error("TabularField error using WorkspaceExplorerSelectDialog: " + e.getLocalizedMessage());
+ e.getLocalizedMessage());
e.printStackTrace(); e.printStackTrace();
throw new Exception( throw new Exception(
"TabularField error using WorkspaceExplorerSelectDialog: " "TabularField error using WorkspaceExplorerSelectDialog: " + e.getLocalizedMessage());
+ e.getLocalizedMessage());
} }
selectButton = new TextButton("Select Data Set"); selectButton = new TextButton("Select Data Set");
@ -268,66 +259,56 @@ public class TabularFld extends AbstractFld implements
private void retrieveTableInformation(Item item) { private void retrieveTableInformation(Item item) {
Log.debug("Retrieved: " + item); Log.debug("Retrieved: " + item);
itemDescriptionSelected = new ItemDescription( itemDescriptionSelected = new ItemDescription(item.getId(), item.getName(), item.getOwner(), item.getPath(),
item.getId(), item.getName(), item.getOwner(), item.getPath(),
item.getType().name()); item.getType().name());
DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(item, new AsyncCallback<TableItemSimple>() {
DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(item, @Override
new AsyncCallback<TableItemSimple>() { public void onFailure(Throwable caught) {
Log.error("Error in retrieveTableInformation " + caught.getMessage());
if (caught instanceof SessionExpiredServiceException) {
UtilsGXT3.alert("Error", "Expired Session");
@Override } else {
public void onFailure(Throwable caught) { UtilsGXT3.alert("Error", "Error retrieving table information: " + caught.getLocalizedMessage());
Log.error("Error in retrieveTableInformation " }
+ caught.getMessage());
if (caught instanceof SessionExpiredServiceException) {
UtilsGXT3.alert("Error", "Expired Session");
} else { }
UtilsGXT3.alert("Error",
"Error retrieving table information: "
+ caught.getLocalizedMessage());
}
} @Override
public void onSuccess(TableItemSimple result) {
@Override Log.debug("Retrieved: " + result);
public void onSuccess(TableItemSimple result) { selectedTableItem = result;
Log.debug("Retrieved: " + result); showFieldWithSelection();
selectedTableItem = result; updateListeners(selectedTableItem);
showFieldWithSelection(); }
updateListeners(selectedTableItem); });
}
});
} }
private void downloadFile() { private void downloadFile() {
if (itemDescriptionSelected != null) { if (itemDescriptionSelected != null) {
DataMinerPortletServiceAsync.INSTANCE.getPublicLink( DataMinerPortletServiceAsync.INSTANCE.getPublicLink(itemDescriptionSelected, new AsyncCallback<String>() {
itemDescriptionSelected, new AsyncCallback<String>() {
@Override @Override
public void onFailure(Throwable caught) { public void onFailure(Throwable caught) {
if (caught instanceof SessionExpiredServiceException) { if (caught instanceof SessionExpiredServiceException) {
EventBusProvider.INSTANCE EventBusProvider.INSTANCE.fireEvent(new SessionExpiredEvent());
.fireEvent(new SessionExpiredEvent()); } else {
} else { Log.error("Error downloading table: " + caught.getLocalizedMessage());
Log.error("Error downloading table: " UtilsGXT3.alert("Error", caught.getLocalizedMessage());
+ caught.getLocalizedMessage()); }
UtilsGXT3.alert("Error", caught.printStackTrace();
caught.getLocalizedMessage());
}
caught.printStackTrace();
} }
@Override @Override
public void onSuccess(String link) { public void onSuccess(String link) {
Log.debug("Retrieved link: " + link); Log.debug("Retrieved link: " + link);
Window.open(link, itemDescriptionSelected.getName(), ""); Window.open(link, itemDescriptionSelected.getName(), "");
} }
}); });
} else { } else {
UtilsGXT3.info("Attention", "Select a Table!"); UtilsGXT3.info("Attention", "Select a Table!");
@ -397,10 +378,8 @@ public class TabularFld extends AbstractFld implements
} }
@Override @Override
public HandlerRegistration addTabularFldChangeEventHandler( public HandlerRegistration addTabularFldChangeEventHandler(TabularFldChangeEventHandler handler) {
TabularFldChangeEventHandler handler) { return fieldContainer.addHandler(handler, TabularFldChangeEvent.getType());
return fieldContainer.addHandler(handler,
TabularFldChangeEvent.getType());
} }

28
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularListFld.java
View File

@ -22,8 +22,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class TabularListFld extends AbstractFld { public class TabularListFld extends AbstractFld {
@ -37,6 +37,7 @@ public class TabularListFld extends AbstractFld {
/** /**
* @param parameter * @param parameter
* parameter
*/ */
public TabularListFld(Parameter parameter) { public TabularListFld(Parameter parameter) {
super(parameter); super(parameter);
@ -81,8 +82,8 @@ public class TabularListFld extends AbstractFld {
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} else { } else {
/* listContainer.setToolTip(listParameter.getDescription()); */ /* listContainer.setToolTip(listParameter.getDescription()); */
descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" descr = new HtmlLayoutContainer(
+ tabularListParameter.getDescription() + "</p>"); "<p style='margin-left:5px !important;'>" + tabularListParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} }
@ -97,12 +98,9 @@ public class TabularListFld extends AbstractFld {
protected void addField(TabItem upperItem) { protected void addField(TabItem upperItem) {
try { try {
TabularParameter tabPar = new TabularParameter( TabularParameter tabPar = new TabularParameter(tabularListParameter.getName(),
tabularListParameter.getName(), tabularListParameter.getDescription(), null, tabularListParameter.getTemplates(),
tabularListParameter.getDescription(), null, tabularListParameter.getDefaultMimeType(), tabularListParameter.getSupportedMimeTypes());
tabularListParameter.getTemplates(),
tabularListParameter.getDefaultMimeType(),
tabularListParameter.getSupportedMimeTypes());
if (upperItem == null) { if (upperItem == null) {
TabItem item = new TabItem(this, tabPar, true); TabItem item = new TabItem(this, tabPar, true);
@ -137,10 +135,6 @@ public class TabularListFld extends AbstractFld {
} }
} }
/**
*
* @param item
*/
protected void removeField(TabItem item) { protected void removeField(TabItem item) {
items.remove(item); items.remove(item);
@ -152,9 +146,6 @@ public class TabularListFld extends AbstractFld {
forceLayout(); forceLayout();
} }
/**
*
*/
protected void forceLayout() { protected void forceLayout() {
vp.forceLayout(); vp.forceLayout();
listContainer.forceLayout(); listContainer.forceLayout();
@ -162,9 +153,6 @@ public class TabularListFld extends AbstractFld {
fieldContainer.forceLayout(); fieldContainer.forceLayout();
} }
/**
*
*/
@Override @Override
public String getValue() { public String getValue() {
String separator = tabularListParameter.getSeparator(); String separator = tabularListParameter.getSeparator();

18
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TimeFld.java
View File

@ -24,8 +24,8 @@ import com.sencha.gxt.widget.core.client.form.TimeField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class TimeFld extends AbstractFld { public class TimeFld extends AbstractFld {
@ -36,6 +36,7 @@ public class TimeFld extends AbstractFld {
/** /**
* @param parameter * @param parameter
* parameter
*/ */
public TimeFld(Parameter parameter) { public TimeFld(Parameter parameter) {
super(parameter); super(parameter);
@ -60,26 +61,21 @@ public class TimeFld extends AbstractFld {
HtmlLayoutContainer descr; HtmlLayoutContainer descr;
if (p.getDescription() == null) { if (p.getDescription() == null) {
descr = new HtmlLayoutContainer( descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
"<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} else { } else {
// textField.setToolTip(p.getDescription()); // textField.setToolTip(p.getDescription());
descr = new HtmlLayoutContainer( descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'>" + p.getDescription() + "</p>");
"<p style='margin-left:5px !important;'>"
+ p.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} }
SimpleContainer vContainer = new SimpleContainer(); SimpleContainer vContainer = new SimpleContainer();
VerticalLayoutContainer vField = new VerticalLayoutContainer(); VerticalLayoutContainer vField = new VerticalLayoutContainer();
HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( HtmlLayoutContainer typeDescription = new HtmlLayoutContainer("Time Value");
"Time Value");
typeDescription.setStylePrimaryName("workflow-parameters-description"); typeDescription.setStylePrimaryName("workflow-parameters-description");
vField.add(timeField, new VerticalLayoutData(-1, -1, new Margins(0))); vField.add(timeField, new VerticalLayoutData(-1, -1, new Margins(0)));
vField.add(typeDescription, new VerticalLayoutData(-1, -1, new Margins( vField.add(typeDescription, new VerticalLayoutData(-1, -1, new Margins(0)));
0)));
vContainer.add(vField); vContainer.add(vField);
fieldContainer = new SimpleContainer(); fieldContainer = new SimpleContainer();

25
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/WKTFld.java
View File

@ -30,8 +30,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class WKTFld extends AbstractFld { public class WKTFld extends AbstractFld {
@ -53,6 +53,7 @@ public class WKTFld extends AbstractFld {
/** /**
* @param parameter * @param parameter
* parameter
*/ */
public WKTFld(Parameter parameter) { public WKTFld(Parameter parameter) {
super(parameter); super(parameter);
@ -71,14 +72,12 @@ public class WKTFld extends AbstractFld {
HtmlLayoutContainer descr; HtmlLayoutContainer descr;
if (wktParameter.getDescription() == null) { if (wktParameter.getDescription() == null) {
descr = new HtmlLayoutContainer( descr = new HtmlLayoutContainer("<p style='margin-left:5px !important;'></p>");
"<p style='margin-left:5px !important;'></p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} else { } else {
descr = new HtmlLayoutContainer( descr = new HtmlLayoutContainer(
"<p style='margin-left:5px !important;'>" "<p style='margin-left:5px !important;'>" + wktParameter.getDescription() + "</p>");
+ wktParameter.getDescription() + "</p>");
descr.addStyleName("workflow-fieldDescription"); descr.addStyleName("workflow-fieldDescription");
} }
@ -136,8 +135,7 @@ public class WKTFld extends AbstractFld {
showFieldWithSelection(); showFieldWithSelection();
break; break;
case Failed: case Failed:
Log.error("Error during area selection: " Log.error("Error during area selection: " + event.getException());
+ event.getException());
UtilsGXT3.alert("Error", event.getErrorMessage()); UtilsGXT3.alert("Error", event.getErrorMessage());
break; break;
default: default:
@ -155,8 +153,7 @@ public class WKTFld extends AbstractFld {
} }
private void init() { private void init() {
selectButton = new TextButton("Draw a " selectButton = new TextButton("Draw a " + wktParameter.getWktGeometryType().getLabel());
+ wktParameter.getWktGeometryType().getLabel());
selectButton.setIcon(DataMinerManager.resources.drawGeometry()); selectButton.setIcon(DataMinerManager.resources.drawGeometry());
selectButton.addSelectHandler(new SelectEvent.SelectHandler() { selectButton.addSelectHandler(new SelectEvent.SelectHandler() {
@ -166,8 +163,8 @@ public class WKTFld extends AbstractFld {
} }
}); });
//selectButton.setToolTip("Draw a " // selectButton.setToolTip("Draw a "
// + wktParameter.getWktGeometryType().getLabel()); // + wktParameter.getWktGeometryType().getLabel());
selectButton2 = new TextButton(""); selectButton2 = new TextButton("");
selectButton2.setIcon(DataMinerManager.resources.folderExplore()); selectButton2.setIcon(DataMinerManager.resources.folderExplore());
@ -178,8 +175,8 @@ public class WKTFld extends AbstractFld {
drawAGeometry(); drawAGeometry();
} }
}); });
//selectButton2.setToolTip("Select Another " // selectButton2.setToolTip("Select Another "
// + wktParameter.getWktGeometryType().getLabel()); // + wktParameter.getWktGeometryType().getLabel());
cancelButton = new TextButton(""); cancelButton = new TextButton("");
cancelButton.setIcon(DataMinerManager.resources.cancel()); cancelButton.setIcon(DataMinerManager.resources.cancel());

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/properties/ColumnItemProperties.java
View File

@ -11,7 +11,7 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public interface ColumnItemProperties extends PropertyAccess<ColumnItem> { public interface ColumnItemProperties extends PropertyAccess<ColumnItem> {

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/properties/ColumnItemPropertiesCombo.java
View File

@ -10,7 +10,7 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public interface ColumnItemPropertiesCombo extends PropertyAccess<ColumnItem> { public interface ColumnItemPropertiesCombo extends PropertyAccess<ColumnItem> {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/resources/Resources.java
View File

@ -6,8 +6,8 @@ import com.google.gwt.resources.client.ImageResource;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public interface Resources extends ClientBundle { public interface Resources extends ClientBundle {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java
View File

@ -20,8 +20,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
/** /**
* *
* @author Giancarlo Panichi email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public interface DataMinerPortletServiceAsync { public interface DataMinerPortletServiceAsync {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/type/DataMinerWorkAreaElementType.java
View File

@ -2,8 +2,8 @@ package org.gcube.portlets.user.dataminermanager.client.type;
/** /**
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum DataMinerWorkAreaElementType { public enum DataMinerWorkAreaElementType {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/type/DataMinerWorkAreaEventType.java
View File

@ -2,8 +2,8 @@ package org.gcube.portlets.user.dataminermanager.client.type;
/** /**
* *
* @author "Giancarlo Panichi" * @author Giancarlo Panichi
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum DataMinerWorkAreaEventType { public enum DataMinerWorkAreaEventType {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/type/DataMinerWorkAreaRegionType.java
View File

@ -2,8 +2,8 @@ package org.gcube.portlets.user.dataminermanager.client.type;
/** /**
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum DataMinerWorkAreaRegionType { public enum DataMinerWorkAreaRegionType {

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/type/DataMinerWorkAreaRequestEventType.java
View File

@ -3,7 +3,7 @@ package org.gcube.portlets.user.dataminermanager.client.type;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum DataMinerWorkAreaRequestEventType { public enum DataMinerWorkAreaRequestEventType {

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/type/MenuType.java
View File

@ -3,7 +3,7 @@ package org.gcube.portlets.user.dataminermanager.client.type;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum MenuType { public enum MenuType {

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/type/OperatorsClassificationRequestType.java
View File

@ -3,7 +3,7 @@ package org.gcube.portlets.user.dataminermanager.client.type;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum OperatorsClassificationRequestType { public enum OperatorsClassificationRequestType {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/type/OutputResourceRequestEventType.java
View File

@ -2,8 +2,8 @@ package org.gcube.portlets.user.dataminermanager.client.type;
/** /**
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum OutputResourceRequestEventType { public enum OutputResourceRequestEventType {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/type/SessionExpiredEventType.java
View File

@ -2,8 +2,8 @@ package org.gcube.portlets.user.dataminermanager.client.type;
/** /**
* *
* @author "Giancarlo Panichi" * @author Giancarlo Panichi
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum SessionExpiredEventType { public enum SessionExpiredEventType {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/type/UIStateEventType.java
View File

@ -2,8 +2,8 @@ package org.gcube.portlets.user.dataminermanager.client.type;
/** /**
* *
* @author "Giancarlo Panichi" * @author Giancarlo Panichi
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum UIStateEventType { public enum UIStateEventType {

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/type/WPSMenuType.java
View File

@ -3,7 +3,7 @@ package org.gcube.portlets.user.dataminermanager.client.type;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public enum WPSMenuType { public enum WPSMenuType {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/util/InfoMessageBox.java
View File

@ -4,8 +4,8 @@ import com.sencha.gxt.widget.core.client.box.MessageBox;
/** /**
* *
* @author "Giancarlo Panichi" * @author Giancarlo Panichi
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class InfoMessageBox extends MessageBox { public class InfoMessageBox extends MessageBox {

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/util/UtilsGXT3.java
View File

@ -10,8 +10,8 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
/** /**
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class UtilsGXT3 { public class UtilsGXT3 {

23
src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/FileViewer.java
View File

@ -16,27 +16,29 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class FileViewer extends SimpleContainer { public class FileViewer extends SimpleContainer {
private FileResource fileResource; private FileResource fileResource;
/** /**
* @param mapImages *
* @param computationId
* computation id
* @param fileResource
* file resource
*/ */
public FileViewer(ComputationId computationId, public FileViewer(ComputationId computationId, FileResource fileResource) {
FileResource fileResource) {
super(); super();
this.fileResource = fileResource; this.fileResource = fileResource;
//this.computationId = computationId; // this.computationId = computationId;
init(); init();
create(); create();
} }
private void init(){ private void init() {
setHeight(56); setHeight(56);
} }
@ -44,10 +46,8 @@ public class FileViewer extends SimpleContainer {
VerticalLayoutContainer lc = new VerticalLayoutContainer(); VerticalLayoutContainer lc = new VerticalLayoutContainer();
final String fileName = fileResource.getName(); final String fileName = fileResource.getName();
final String fileUrl = fileResource.getUrl(); final String fileUrl = fileResource.getUrl();
HtmlLayoutContainer fileNameHtml = new HtmlLayoutContainer( HtmlLayoutContainer fileNameHtml = new HtmlLayoutContainer("<div class='computation-output-fileName'><p>"
"<div class='computation-output-fileName'><p>" + new SafeHtmlBuilder().appendEscaped(fileName).toSafeHtml().asString() + "</p></div>");
+ new SafeHtmlBuilder().appendEscaped(fileName)
.toSafeHtml().asString() + "</p></div>");
lc.add(fileNameHtml, new VerticalLayoutData(-1, -1, new Margins(0))); lc.add(fileNameHtml, new VerticalLayoutData(-1, -1, new Margins(0)));
TextButton downloadBtn = new TextButton("Download File"); TextButton downloadBtn = new TextButton("Download File");
downloadBtn.setIcon(DataMinerManager.resources.download()); downloadBtn.setIcon(DataMinerManager.resources.download());
@ -63,5 +63,4 @@ public class FileViewer extends SimpleContainer {
add(lc); add(lc);
} }
} }

31
src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/HashMapViewer.java
View File

@ -9,11 +9,10 @@ import java.util.Map.Entry;
import com.sencha.gxt.widget.core.client.container.HtmlLayoutContainer; import com.sencha.gxt.widget.core.client.container.HtmlLayoutContainer;
import com.sencha.gxt.widget.core.client.container.SimpleContainer; import com.sencha.gxt.widget.core.client.container.SimpleContainer;
/** /**
* *
* @author Giancarlo Panichi * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class HashMapViewer extends SimpleContainer { public class HashMapViewer extends SimpleContainer {
@ -23,10 +22,11 @@ public class HashMapViewer extends SimpleContainer {
/** /**
* *
* @param map * @param map
* map
*/ */
public HashMapViewer(Map<String, String> map) { public HashMapViewer(Map<String, String> map) {
super(); super();
this.map=map; this.map = map;
init(); init();
} }
@ -35,25 +35,18 @@ public class HashMapViewer extends SimpleContainer {
* *
*/ */
private void init() { private void init() {
String html =""; String html = "";
html += "<table class='jobViewer-table'>" + html += "<table class='jobViewer-table'>" + " <colgroup>" + " <col>"
" <colgroup>" + + " <col class='jobViewer-table-oce-first'>" + " </colgroup>" + " <tbody>";
" <col>" +
" <col class='jobViewer-table-oce-first'>" +
" </colgroup>"+
" <tbody>";
for (Entry<String, String> entry: map.entrySet()) for (Entry<String, String> entry : map.entrySet())
if (entry.getKey()!=null) { if (entry.getKey() != null) {
html += " <tr>" + html += " <tr>" + " <td>" + entry.getKey() + "</td>" + " <td>" + entry.getValue()
" <td>"+entry.getKey()+"</td>" + + "</td>" + " </tr>";
" <td>"+entry.getValue()+"</td>" +
" </tr>";
} }
html += " </tbody>" + html += " </tbody>" + "</table>";
"</table>"; HtmlLayoutContainer htmlContainer = new HtmlLayoutContainer(html);
HtmlLayoutContainer htmlContainer=new HtmlLayoutContainer(html);
add(htmlContainer); add(htmlContainer);
forceLayout(); forceLayout();
} }

Some files were not shown because too many files have changed in this diff Show More