diff --git a/.classpath b/.classpath index db5e9fc..06da46e 100644 --- a/.classpath +++ b/.classpath @@ -1,20 +1,28 @@ - + - + + + + + - - + + + + + + @@ -25,5 +33,5 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 443e085..6e80039 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 40ee30f..6c21ba9 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,7 @@ + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index c6144e8..427e35e 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,7 +1,7 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index a533e08..6cb1811 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Support Java 8 compatibility [ticket #8471] + First release diff --git a/pom.xml b/pom.xml index 1d4af21..52d09d2 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.widgets data-miner-manager-widget - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT data-miner-manager-widget data-miner-manager-widget offers a unique access to perform data mining and statistical operations on heterogeneous data @@ -40,8 +40,9 @@ config - - 1.7 + + 1.7 + 1.8 2.6.1 @@ -433,8 +434,8 @@ maven-compiler-plugin 2.3.2 - ${javaVersion} - ${javaVersion} + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerController.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerController.java index 76fee07..4506c23 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerController.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerController.java @@ -49,8 +49,8 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DataMinerManagerController { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerDialog.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerDialog.java index 4e54320..82d030f 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerDialog.java @@ -13,8 +13,8 @@ import com.sencha.gxt.widget.core.client.Window; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DataMinerManagerDialog extends Window implements HasExternalExecutionEventHandler { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerPanel.java index 7f04436..0d6a8f1 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerPanel.java @@ -23,8 +23,8 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DataMinerManagerPanel extends ContentPanel { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/Header.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/Header.java index 8168159..5933022 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/Header.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/Header.java @@ -21,8 +21,8 @@ import com.google.gwt.user.client.ui.Image; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Header extends HorizontalPanel { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/HomePanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/HomePanel.java index 0b1cbeb..fa168ed 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/HomePanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/HomePanel.java @@ -22,8 +22,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.Verti /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class HomePanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/PortalViewport.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/PortalViewport.java index c43024c..7778bc4 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/PortalViewport.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/PortalViewport.java @@ -15,8 +15,8 @@ import com.sencha.gxt.widget.core.client.container.Viewport.ViewportAppearance; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class PortalViewport extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/common/EventBusProvider.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/common/EventBusProvider.java index 4291e16..810c116 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/common/EventBusProvider.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/common/EventBusProvider.java @@ -8,8 +8,8 @@ import com.google.gwt.event.shared.SimpleEventBus; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class EventBusProvider { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFileListPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFileListPanel.java index be326e9..7c1110c 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFileListPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFileListPanel.java @@ -14,8 +14,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationValueFileListPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFilePanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFilePanel.java index 614312e..14b4c2f 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFilePanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFilePanel.java @@ -14,8 +14,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationValueFilePanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueImagePanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueImagePanel.java index 76c09f6..005c2f5 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueImagePanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueImagePanel.java @@ -14,8 +14,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationValueImagePanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsExecutedPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsExecutedPanel.java index 4d8c192..1f2fd79 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsExecutedPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsExecutedPanel.java @@ -50,8 +50,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationsExecutedPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPanel.java index 2ab338a..4b1a05d 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPanel.java @@ -20,8 +20,8 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationsPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPropertiesType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPropertiesType.java index b5d647f..c78bc92 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPropertiesType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPropertiesType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.computations; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum ComputationsPropertiesType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsViewerPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsViewerPanel.java index a0c385a..0afca61 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsViewerPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsViewerPanel.java @@ -26,8 +26,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationsViewerPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/Gxt2ZIndexXDOM.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/Gxt2ZIndexXDOM.java index 028f349..dfd76ab 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/Gxt2ZIndexXDOM.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/Gxt2ZIndexXDOM.java @@ -3,8 +3,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.custom; /** * Fix for z-index bug between GXT3 and GXT2 * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Gxt2ZIndexXDOM extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/GreenProgressBar.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/GreenProgressBar.java index 8bad886..015e2c8 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/GreenProgressBar.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/GreenProgressBar.java @@ -5,8 +5,8 @@ import com.sencha.gxt.widget.core.client.ProgressBar; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GreenProgressBar extends ProgressBar { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/GreenProgressBarAppearance.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/GreenProgressBarAppearance.java index eabd9fc..bd2b4c5 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/GreenProgressBarAppearance.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/GreenProgressBarAppearance.java @@ -19,8 +19,8 @@ import com.sencha.gxt.core.client.util.Format; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GreenProgressBarAppearance implements ProgressBarAppearance { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/OrangeProgressBar.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/OrangeProgressBar.java index 64b4a5d..844d02e 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/OrangeProgressBar.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/OrangeProgressBar.java @@ -5,8 +5,8 @@ import com.sencha.gxt.widget.core.client.ProgressBar; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OrangeProgressBar extends ProgressBar { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/OrangeProgressBarAppearance.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/OrangeProgressBarAppearance.java index 8c9c7cb..6f84112 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/OrangeProgressBarAppearance.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/OrangeProgressBarAppearance.java @@ -19,8 +19,8 @@ import com.sencha.gxt.core.client.util.Format; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OrangeProgressBarAppearance implements ProgressBarAppearance { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/RedProgressBar.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/RedProgressBar.java index 98f79d1..e43de67 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/RedProgressBar.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/RedProgressBar.java @@ -5,8 +5,8 @@ import com.sencha.gxt.widget.core.client.ProgressBar; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RedProgressBar extends ProgressBar { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/RedProgressBarAppearance.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/RedProgressBarAppearance.java index 542739e..f9a9540 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/RedProgressBarAppearance.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/custom/progress/RedProgressBarAppearance.java @@ -19,8 +19,8 @@ import com.sencha.gxt.core.client.util.Format; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RedProgressBarAppearance implements ProgressBarAppearance { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePanel.java index 33d294f..c8199e7 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePanel.java @@ -11,8 +11,8 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DataSpacePanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePropertiesType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePropertiesType.java index d5b2c2b..1ff6747 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePropertiesType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePropertiesType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.dataspace; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum DataSpacePropertiesType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/InputDataSetsPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/InputDataSetsPanel.java index 9c98b33..6cdbe9a 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/InputDataSetsPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/InputDataSetsPanel.java @@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class InputDataSetsPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/OutputDataSetsPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/OutputDataSetsPanel.java index 7ed3b38..d270bd8 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/OutputDataSetsPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/OutputDataSetsPanel.java @@ -48,8 +48,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OutputDataSetsPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/CancelComputationExecutionRequestEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/CancelComputationExecutionRequestEvent.java index a420ef9..4cfe7b7 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/CancelComputationExecutionRequestEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/CancelComputationExecutionRequestEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * Cancel Computation Request Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CancelComputationExecutionRequestEvent diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/CancelExecutionFromComputationsRequestEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/CancelExecutionFromComputationsRequestEvent.java index e51a153..10a27f7 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/CancelExecutionFromComputationsRequestEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/CancelExecutionFromComputationsRequestEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * Cancel Execution From Computations Request Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CancelExecutionFromComputationsRequestEvent diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationDataEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationDataEvent.java index a559ce6..ac2a427 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationDataEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationDataEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * Computation Data Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationDataEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationDataRequestEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationDataRequestEvent.java index e2bd831..4b8b670 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationDataRequestEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationDataRequestEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * Output Show Request Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationDataRequestEvent diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationReadyEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationReadyEvent.java index 8469f27..f828b55 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationReadyEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ComputationReadyEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * Computation Ready Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationReadyEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DataMinerWorkAreaEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DataMinerWorkAreaEvent.java index bb9ec47..a7948d7 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DataMinerWorkAreaEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DataMinerWorkAreaEvent.java @@ -13,8 +13,8 @@ import com.google.gwt.event.shared.HasHandlers; * Data Miner Work Area Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DataMinerWorkAreaEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DataMinerWorkAreaRequestEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DataMinerWorkAreaRequestEvent.java index 9aca3c7..6103445 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DataMinerWorkAreaRequestEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DataMinerWorkAreaRequestEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * Data Miner Work Area Request Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DataMinerWorkAreaRequestEvent diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DeleteItemRequestEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DeleteItemRequestEvent.java index e6dbeb6..58a37b0 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DeleteItemRequestEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/DeleteItemRequestEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * Delete Item Request Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DeleteItemRequestEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ExternalExecutionEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ExternalExecutionEvent.java index dc3dbf2..81d096f 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ExternalExecutionEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ExternalExecutionEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * External Execution Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ExternalExecutionEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ExternalExecutionRequestEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ExternalExecutionRequestEvent.java index 18a171e..eb272bd 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ExternalExecutionRequestEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ExternalExecutionRequestEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * Start Computation Execution Request Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ExternalExecutionRequestEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/MenuEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/MenuEvent.java index 9d28811..d3e3013 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/MenuEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/MenuEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * Menu Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MenuEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/MenuSwitchEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/MenuSwitchEvent.java index 1698b94..f6610be 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/MenuSwitchEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/MenuSwitchEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * Menu Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MenuSwitchEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OperatorsClassificationEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OperatorsClassificationEvent.java index 9f534ac..786776f 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OperatorsClassificationEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OperatorsClassificationEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * Operators Classification Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OperatorsClassificationEvent diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OperatorsClassificationRequestEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OperatorsClassificationRequestEvent.java index 70a0275..79b1dd7 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OperatorsClassificationRequestEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OperatorsClassificationRequestEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * Operators Classification Request Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OperatorsClassificationRequestEvent diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OutputDataEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OutputDataEvent.java index 81b06fb..5ec82a9 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OutputDataEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OutputDataEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * Output Data Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OutputDataEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OutputDataRequestEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OutputDataRequestEvent.java index 702e0f1..b6df2bf 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OutputDataRequestEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/OutputDataRequestEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * Output Data Request Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OutputDataRequestEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/RefreshDataMinerWorkAreaEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/RefreshDataMinerWorkAreaEvent.java index 305380b..8df1bd1 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/RefreshDataMinerWorkAreaEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/RefreshDataMinerWorkAreaEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * Refresh DataMiner Work Area Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RefreshDataMinerWorkAreaEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ResubmitComputationExecutionEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ResubmitComputationExecutionEvent.java index 5b6b00e..0e91972 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ResubmitComputationExecutionEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ResubmitComputationExecutionEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * Resubmit Computation Execution Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ResubmitComputationExecutionEvent diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ResubmitComputationExecutionRequestEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ResubmitComputationExecutionRequestEvent.java index a912542..b42dee0 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ResubmitComputationExecutionRequestEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/ResubmitComputationExecutionRequestEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * Resubmit Computation Execution Request Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ResubmitComputationExecutionRequestEvent diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/SessionExpiredEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/SessionExpiredEvent.java index 6486fee..d4fcdde 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/SessionExpiredEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/SessionExpiredEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * Session Expired Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SessionExpiredEvent extends GwtEvent { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/StartComputationExecutionEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/StartComputationExecutionEvent.java index 8bb7b41..476d892 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/StartComputationExecutionEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/StartComputationExecutionEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * Start Computation Execution Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class StartComputationExecutionEvent diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/StartComputationExecutionRequestEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/StartComputationExecutionRequestEvent.java index d9f61cf..0801ae7 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/StartComputationExecutionRequestEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/StartComputationExecutionRequestEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * Start Computation Execution Request Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class StartComputationExecutionRequestEvent diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularFldChangeEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularFldChangeEvent.java index e3adc71..ad72902 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularFldChangeEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularFldChangeEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * TabularFldChangeEvent * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TabularFldChangeEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularResourceInfoEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularResourceInfoEvent.java index 9ca2404..8eea01e 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularResourceInfoEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularResourceInfoEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * Tabular Resource Info Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TabularResourceInfoEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularResourceInfoRequestEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularResourceInfoRequestEvent.java index add4006..1671476 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularResourceInfoRequestEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/TabularResourceInfoRequestEvent.java @@ -9,8 +9,8 @@ import com.google.gwt.event.shared.HasHandlers; * Tabular Resource Info Request Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TabularResourceInfoRequestEvent diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/UIStateEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/UIStateEvent.java index 50764bd..910237a 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/UIStateEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/UIStateEvent.java @@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers; * User Interface State Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class UIStateEvent extends GwtEvent { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/WPSMenuEvent.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/WPSMenuEvent.java index ecb3991..527537a 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/WPSMenuEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/events/WPSMenuEvent.java @@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers; * WPS Menu Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class WPSMenuEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationExecutionPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationExecutionPanel.java index 604516b..5c79e60 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationExecutionPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationExecutionPanel.java @@ -25,8 +25,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationExecutionPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationOutputPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationOutputPanel.java index 5493caf..d8a2918 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationOutputPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationOutputPanel.java @@ -34,8 +34,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.Verti /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationOutputPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationPanel.java index 9db0e2f..5d3100e 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationPanel.java @@ -28,8 +28,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationPanel extends FramedPanel implements HasComputationReadyEventHandler diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java index d8426ae..fe2292c 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java @@ -44,8 +44,8 @@ import com.sencha.gxt.widget.core.client.form.FormPanel; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationParametersPanel extends SimpleContainer { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationStatusPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationStatusPanel.java index 021b60c..08cc2b6 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationStatusPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationStatusPanel.java @@ -33,8 +33,8 @@ import com.sencha.gxt.widget.core.client.info.Info; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ComputationStatusPanel extends SimpleContainer { @@ -49,6 +49,7 @@ public class ComputationStatusPanel extends SimpleContainer { /** * + * @param operatorName operator name */ public ComputationStatusPanel(String operatorName) { super(); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/EquivalentRequestDialog.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/EquivalentRequestDialog.java index 0153870..16fa8c1 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/EquivalentRequestDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/EquivalentRequestDialog.java @@ -10,8 +10,8 @@ import com.sencha.gxt.widget.core.client.form.TextArea; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class EquivalentRequestDialog extends Dialog { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ExperimentPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ExperimentPanel.java index b110732..fd345e2 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ExperimentPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ExperimentPanel.java @@ -11,8 +11,8 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ExperimentPanel extends SimpleContainer implements diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorCategoryPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorCategoryPanel.java index 16432fe..7100283 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorCategoryPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorCategoryPanel.java @@ -22,8 +22,8 @@ import com.sencha.gxt.widget.core.client.tips.ToolTipConfig; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OperatorCategoryPanel extends SimpleContainer { @@ -38,14 +38,14 @@ public class OperatorCategoryPanel extends SimpleContainer { /** * - * @param handler - * @param cat + * @param handler operator panel handler + * @param operatorCategory operator category */ public OperatorCategoryPanel(OperatorsPanelHandler handler, - OperatorCategory cat) { + OperatorCategory operatorCategory) { super(); this.handler = handler; - this.category = cat; + this.category = operatorCategory; create(); } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorPanel.java index 550c8a0..6e4484a 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorPanel.java @@ -1,6 +1,5 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.experiments; - import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel; @@ -19,7 +18,7 @@ import com.sencha.gxt.widget.core.client.tips.ToolTipConfig; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class OperatorPanel extends SimpleContainer { @@ -36,7 +35,9 @@ public class OperatorPanel extends SimpleContainer { /** * * @param operator + * operator * @param handler + * operator panel handler */ public OperatorPanel(Operator operator, OperatorsPanelHandler handler) { super(); @@ -56,7 +57,7 @@ public class OperatorPanel extends SimpleContainer { public void onClick(ClickEvent event) { event.stopPropagation(); handler.addOperator(OperatorPanel.this, operator); - + } }, ClickEvent.getType()); @@ -64,31 +65,30 @@ public class OperatorPanel extends SimpleContainer { titleHtml = new HTML(operator.getName()); 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"); - - vert=new VerticalLayoutContainer(); - + + vert = new VerticalLayoutContainer(); + vert.add(titleHtml, new VerticalLayoutData(1, -1, new Margins(0))); vert.add(descriptionHtml, new VerticalLayoutData(1, -1, new Margins(0))); add(vert); ToolTipConfig tooltipConfig = createToolTip(operator); setToolTipConfig(tooltipConfig); - + } /** * - * @return + * @return operator */ public Operator getOperator() { return operator; } - /** - * @return - */ + private ToolTipConfig createToolTip(Operator op) { ToolTipConfig tooltipConfig = new ToolTipConfig(); tooltipConfig.setTitleHtml("
  " + op.getName()); @@ -96,32 +96,26 @@ public class OperatorPanel extends SimpleContainer { tooltipConfig.setMouseOffsetY(0); tooltipConfig.setAnchor(Side.LEFT); tooltipConfig.setDismissDelay(5000); - tooltipConfig.setBodyHtml(getTooltipTemplate(GWT.getModuleBaseURL(), - op.getId(), op.hasImage(), op.getDescription())); + tooltipConfig.setBodyHtml( + getTooltipTemplate(GWT.getModuleBaseURL(), op.getId(), op.hasImage(), op.getDescription())); // config.setCloseable(true); tooltipConfig.setMaxWidth(TOOLTIP_WIDTH); return tooltipConfig; } - /** - * - * @param base - * @param id - * @param hasImage - * @param description - * @return - */ - private String getTooltipTemplate(String base, String id, boolean hasImage, - String description) { - String image=DataMinerManagerPanel.resources.operatorsDefaultImage().getSafeUri().asString(); - - String template = "
" + "" + Format.ellipse(description, TOOLTIP_DESCRIPTION_LENGHT) - + "
"; + private String getTooltipTemplate(String base, String id, boolean hasImage, String description) { + String image = DataMinerManagerPanel.resources.operatorsDefaultImage().getSafeUri().asString(); + + String template = "
" + "" + + Format.ellipse(description, TOOLTIP_DESCRIPTION_LENGHT) + "
"; return template; }; + /** + * + * @param isSelect set if is selected + */ public void toggleSelected(boolean isSelect) { if (isSelect) this.addStyleName("operatorPanel-selected"); @@ -130,8 +124,11 @@ public class OperatorPanel extends SimpleContainer { this.removeStyleName("operatorPanel-selected"); // titleHtml.removeStyleName("operatorPanel-title-selected"); } - - public void setAsTheDefaultOperator(){ + + /** + * + */ + public void setAsTheDefaultOperator() { handler.addOperator(OperatorPanel.this, operator); } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanel.java index ac31188..3d0bc3a 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanel.java @@ -42,8 +42,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OperatorsPanel extends FramedPanel { @@ -70,9 +70,10 @@ public class OperatorsPanel extends FramedPanel { private View view = null; private String currentClassificationName = Constants.UserClassificationName; - /** * + * @param handler + * operators panel handler */ public OperatorsPanel(OperatorsPanelHandler handler) { super(); @@ -91,81 +92,67 @@ public class OperatorsPanel extends FramedPanel { } private void bind() { - EventBusProvider.INSTANCE - .addHandler( - OperatorsClassificationEvent.TYPE, - new OperatorsClassificationEvent.OperatorsClassificationEventHandler() { + EventBusProvider.INSTANCE.addHandler(OperatorsClassificationEvent.TYPE, + new OperatorsClassificationEvent.OperatorsClassificationEventHandler() { - @Override - public void onOperatorsClassification( - OperatorsClassificationEvent event) { - Log.debug("OperatorsPanel catch OperatorsClassificationEvent: " - + event); - manageOperatorsClassificationEvent(event); - } - }); + @Override + public void onOperatorsClassification(OperatorsClassificationEvent event) { + Log.debug("OperatorsPanel catch OperatorsClassificationEvent: " + event); + manageOperatorsClassificationEvent(event); + } + }); } - private void manageOperatorsClassificationEvent( - OperatorsClassificationEvent event) { - if (event.getOperatorsClassificationRequestType().compareTo( - OperatorsClassificationRequestType.ByName) == 0) { - if (currentClassificationName.compareTo(event - .getClassificationName()) == 0) { + private void manageOperatorsClassificationEvent(OperatorsClassificationEvent event) { + if (event.getOperatorsClassificationRequestType().compareTo(OperatorsClassificationRequestType.ByName) == 0) { + if (currentClassificationName.compareTo(event.getClassificationName()) == 0) { waitMessage(false); if (event.getOperatorsClassification() != null) { - operatorsClassification = event - .getOperatorsClassification(); + operatorsClassification = event.getOperatorsClassification(); operators.clear(); - operators.addAll(event.getOperatorsClassification() - .getOperators()); + operators.addAll(event.getOperatorsClassification().getOperators()); String operatorId = event.getOperatorId(); Log.debug("ShowCategoriesList"); - List categoryPanels = mapCategoriesPanels - .get(currentClassificationName); + List categoryPanels = mapCategoriesPanels.get(currentClassificationName); if (categoryPanels == null) { categoryPanels = new ArrayList(); if (operatorsClassification != null) { - for (OperatorCategory cat : operatorsClassification - .getOperatorCategories()) { - categoryPanels.add(new OperatorCategoryPanel( - handler, cat)); + for (OperatorCategory cat : operatorsClassification.getOperatorCategories()) { + categoryPanels.add(new OperatorCategoryPanel(handler, cat)); } } - mapCategoriesPanels.put(currentClassificationName, - categoryPanels); + mapCategoriesPanels.put(currentClassificationName, categoryPanels); } v.clear(); - for (OperatorCategoryPanel panel : categoryPanels){ + for (OperatorCategoryPanel panel : categoryPanels) { v.add(panel); - + } view = View.CATEGORIES; - if(operatorId!=null&&!operatorId.isEmpty()){ - OperatorCategory operatorCategoryDefault=null; - Operator operatorDefault=null; - for(Operator op:operators){ - if(op.getId().compareTo(operatorId)==0){ - operatorDefault=op; - operatorCategoryDefault=op.getCategory(); + if (operatorId != null && !operatorId.isEmpty()) { + OperatorCategory operatorCategoryDefault = null; + Operator operatorDefault = null; + for (Operator op : operators) { + if (op.getId().compareTo(operatorId) == 0) { + operatorDefault = op; + operatorCategoryDefault = op.getCategory(); break; } } - if(operatorCategoryDefault!=null){ - for (OperatorCategoryPanel opCategoryPanel : categoryPanels){ - if(opCategoryPanel.getCategory().compareTo(operatorCategoryDefault)==0){ + if (operatorCategoryDefault != null) { + for (OperatorCategoryPanel opCategoryPanel : categoryPanels) { + if (opCategoryPanel.getCategory().compareTo(operatorCategoryDefault) == 0) { opCategoryPanel.setOperatorDefault(operatorDefault); break; } - + } } - - + } - + forceLayout(); } @@ -188,8 +175,7 @@ public class OperatorsPanel extends FramedPanel { OperatorsClassificationRequestEvent operatorsClassificationRequestEvent = new OperatorsClassificationRequestEvent( currentClassificationName, true); Log.debug("OperatorsPanel fire: " + operatorsClassificationRequestEvent); - EventBusProvider.INSTANCE - .fireEvent(operatorsClassificationRequestEvent); + EventBusProvider.INSTANCE.fireEvent(operatorsClassificationRequestEvent); } /** @@ -201,8 +187,7 @@ public class OperatorsPanel extends FramedPanel { final StoreFilterField filterField = new StoreFilterField() { @Override - protected boolean doSelect(Store store, String parent, - String item, String filter) { + protected boolean doSelect(Store store, String parent, String item, String filter) { Log.debug("StoreFilterField: " + item + " " + filter); return false; } @@ -227,18 +212,16 @@ public class OperatorsPanel extends FramedPanel { filterField.setWidth(100); TextButton showAllOperatorsButton = new TextButton(); - showAllOperatorsButton.setIcon(DataMinerManagerPanel.resources - .sortAscending()); - showAllOperatorsButton - .addSelectHandler(new SelectEvent.SelectHandler() { + showAllOperatorsButton.setIcon(DataMinerManagerPanel.resources.sortAscending()); + showAllOperatorsButton.addSelectHandler(new SelectEvent.SelectHandler() { - @Override - public void onSelect(SelectEvent event) { - filterField.clear(); - showAllOperatorsList(); + @Override + public void onSelect(SelectEvent event) { + filterField.clear(); + showAllOperatorsList(); - } - }); + } + }); showAllOperatorsButton.setToolTip(SHOW_ALL_OPERATORS_TOOLTIP); TextButton showCategoriesButton = new TextButton(); @@ -255,18 +238,15 @@ public class OperatorsPanel extends FramedPanel { showCategoriesButton.setToolTip(SHOW_CATEGORIES_TOOLTIP); - final TextButton btnMenuPerspective = new TextButton( - currentClassificationName); - btnMenuPerspective - .setIcon(DataMinerManagerPanel.resources.userPerspective()); + final TextButton btnMenuPerspective = new TextButton(currentClassificationName); + btnMenuPerspective.setIcon(DataMinerManagerPanel.resources.userPerspective()); Menu menuPerspective = new Menu(); for (final String perspectiveName : Constants.ClassificationNames) { - final ImageResource img = perspectiveName - .equals(Constants.UserClassificationName) ? DataMinerManagerPanel.resources - .userPerspective() : DataMinerManagerPanel.resources - .computationPerspective(); + final ImageResource img = perspectiveName.equals(Constants.UserClassificationName) + ? DataMinerManagerPanel.resources.userPerspective() + : DataMinerManagerPanel.resources.computationPerspective(); MenuItem perspectiveItem = new MenuItem(perspectiveName); perspectiveItem.addSelectionHandler(new SelectionHandler() { @@ -306,16 +286,14 @@ public class OperatorsPanel extends FramedPanel { List ids = new ArrayList(); for (Operator op : operators) // check for filtering and prevent duplicates - if (op.getName().toLowerCase().contains(searchText.toLowerCase()) - && !ids.contains(op.getId())) { + if (op.getName().toLowerCase().contains(searchText.toLowerCase()) && !ids.contains(op.getId())) { filteredOperators.add(op); ids.add(op.getId()); } v.clear(); - HTML html = new HTML("Filtered results (" - + filteredOperators.size() + " item" + HTML html = new HTML("Filtered results (" + filteredOperators.size() + " item" + (filteredOperators.size() == 1 ? "" : "s") + " found)"); html.addStyleName("filterResultText"); v.add(html); @@ -332,19 +310,15 @@ public class OperatorsPanel extends FramedPanel { try { if (force || view != View.CATEGORIES) { Log.debug("ShowCategoriesList"); - List categoryPanels = mapCategoriesPanels - .get(currentClassificationName); + List categoryPanels = mapCategoriesPanels.get(currentClassificationName); if (categoryPanels == null) { categoryPanels = new ArrayList(); if (operatorsClassification != null) { - for (OperatorCategory cat : operatorsClassification - .getOperatorCategories()) { - categoryPanels.add(new OperatorCategoryPanel( - handler, cat)); + for (OperatorCategory cat : operatorsClassification.getOperatorCategories()) { + categoryPanels.add(new OperatorCategoryPanel(handler, cat)); } } - mapCategoriesPanels.put(currentClassificationName, - categoryPanels); + mapCategoriesPanels.put(currentClassificationName, categoryPanels); } v.clear(); @@ -363,8 +337,7 @@ public class OperatorsPanel extends FramedPanel { if (view != View.ALL) { v.clear(); - HTML html = new HTML("All Operators (" - + operators.size() + " item" + HTML html = new HTML("All Operators (" + operators.size() + " item" + (operators.size() == 1 ? "" : "s") + " found)"); html.addStyleName("filterResultText"); v.add(html); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanelHandler.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanelHandler.java index e3e00e2..3e36ed9 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanelHandler.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanelHandler.java @@ -9,14 +9,14 @@ import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public interface OperatorsPanelHandler { /** - * @param operatorPanel - * @param operator + * @param operatorPanel operator panel + * @param operator operator */ void addOperator(OperatorPanel operatorPanel, Operator operator); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/WorkflowPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/WorkflowPanel.java index f237690..599acd8 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/WorkflowPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/WorkflowPanel.java @@ -16,8 +16,8 @@ import com.sencha.gxt.widget.core.client.TabPanel; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class WorkflowPanel extends TabPanel { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/monitor/StatusMonitor.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/monitor/StatusMonitor.java index 8552f56..989edff 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/monitor/StatusMonitor.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/monitor/StatusMonitor.java @@ -5,8 +5,8 @@ import com.sencha.gxt.widget.core.client.box.AutoProgressMessageBox; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class StatusMonitor extends AutoProgressMessageBox { @@ -18,8 +18,8 @@ public class StatusMonitor extends AutoProgressMessageBox { /** * - * @param headingHtml - * @param messageHtml + * @param headingHtml head + * @param messageHtml message */ public StatusMonitor(SafeHtml headingHtml, SafeHtml messageHtml) { super(headingHtml, messageHtml); @@ -28,7 +28,7 @@ public class StatusMonitor extends AutoProgressMessageBox { /** * - * @param headingHtml + * @param headingHtml head */ public StatusMonitor(SafeHtml headingHtml) { super(headingHtml); @@ -37,8 +37,8 @@ public class StatusMonitor extends AutoProgressMessageBox { /** * - * @param headingHtml - * @param messageHtml + * @param headingHtml head + * @param messageHtml message */ public StatusMonitor(String headingHtml, String messageHtml) { super(headingHtml, messageHtml); @@ -47,7 +47,7 @@ public class StatusMonitor extends AutoProgressMessageBox { /** * - * @param headingHtml + * @param headingHtml head */ public StatusMonitor(String headingHtml) { super(headingHtml); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/AbstractFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/AbstractFld.java index a00ebcf..5be6699 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/AbstractFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/AbstractFld.java @@ -3,7 +3,6 @@ */ package org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield; - import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; import com.google.gwt.user.client.ui.Widget; @@ -11,44 +10,47 @@ import com.google.gwt.user.client.ui.Widget; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public abstract class AbstractFld { - + protected Parameter parameter; - public abstract String getValue(); + + public abstract String getValue(); + public abstract Widget getWidget(); - - + /** * + * @param parameter + * parameter */ public AbstractFld(Parameter parameter) { this.parameter = parameter; } - + /** * @return the operator */ public Parameter getParameter() { return parameter; } - + /** - * @param operator the operator to set + * + * @param parameter parameter */ public void setParameter(Parameter parameter) { this.parameter = parameter; } - + /** * - * @return + * @return true if is valid */ public boolean isValid() { return true; } - - + } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/BooleanFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/BooleanFld.java index 8153d89..19f7ea7 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/BooleanFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/BooleanFld.java @@ -19,8 +19,8 @@ import com.sencha.gxt.widget.core.client.form.SimpleComboBox; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class BooleanFld extends AbstractFld { @@ -30,6 +30,7 @@ public class BooleanFld extends AbstractFld { /** * @param parameter + * parameter */ public BooleanFld(Parameter parameter) { super(parameter); @@ -48,14 +49,14 @@ public class BooleanFld extends AbstractFld { listBox.setEditable(false); listBox.setTriggerAction(TriggerAction.ALL); - if (p.getDefaultValue() != null&& !p.getDefaultValue().isEmpty()) { - Boolean b=Boolean.valueOf(p.getDefaultValue()); - if(b){ + if (p.getDefaultValue() != null && !p.getDefaultValue().isEmpty()) { + Boolean b = Boolean.valueOf(p.getDefaultValue()); + if (b) { listBox.setValue("true"); } else { listBox.setValue("false"); } - + } else { listBox.setValue("false"); } @@ -63,15 +64,12 @@ public class BooleanFld extends AbstractFld { HtmlLayoutContainer descr; if (p.getDescription() == null) { - descr = new HtmlLayoutContainer( - "

"); + descr = new HtmlLayoutContainer("

"); descr.addStyleName("workflow-fieldDescription"); } else { // listBox.setToolTip(p.getDescription()); - descr = new HtmlLayoutContainer( - "

" - + p.getDescription() + "

"); + descr = new HtmlLayoutContainer("

" + p.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } horiz.add(listBox, new BoxLayoutData(new Margins())); @@ -82,17 +80,11 @@ public class BooleanFld extends AbstractFld { } - /** - * - */ @Override public String getValue() { return listBox.getCurrentValue(); } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ColumnFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ColumnFld.java index 9c34bcc..5d335dd 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ColumnFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ColumnFld.java @@ -31,12 +31,11 @@ import com.sencha.gxt.widget.core.client.form.ComboBox; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ -public class ColumnFld extends AbstractFld implements - TabularFldChangeEventHandler { +public class ColumnFld extends AbstractFld implements TabularFldChangeEventHandler { private String defaultColumn; private ComboBox comboBox; @@ -49,14 +48,14 @@ public class ColumnFld extends AbstractFld implements /** * @param parameter + * parameter */ public ColumnFld(Parameter parameter) { super(parameter); ColumnParameter columnParameter = (ColumnParameter) parameter; - referredTabularParameterName = columnParameter - .getReferredTabularParameterName(); + referredTabularParameterName = columnParameter.getReferredTabularParameterName(); defaultColumn = columnParameter.getDefaultColumn(); fieldContainer = new SimpleContainer(); @@ -64,8 +63,7 @@ public class ColumnFld extends AbstractFld implements horiz.setPack(BoxLayoutPack.START); horiz.setEnableOverflow(false); - ColumnItemPropertiesCombo props = GWT - .create(ColumnItemPropertiesCombo.class); + ColumnItemPropertiesCombo props = GWT.create(ColumnItemPropertiesCombo.class); store = new ListStore(props.id()); @@ -78,15 +76,13 @@ public class ColumnFld extends AbstractFld implements HtmlLayoutContainer descr; if (columnParameter.getDescription() == null) { - descr = new HtmlLayoutContainer( - "

"); + descr = new HtmlLayoutContainer("

"); descr.addStyleName("workflow-fieldDescription"); } else { // comboBox.setToolTip(columnParameter.getDescription()); descr = new HtmlLayoutContainer( - "

" - + columnParameter.getDescription() + "

"); + "

" + columnParameter.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } @@ -105,12 +101,10 @@ public class ColumnFld extends AbstractFld implements VerticalLayoutContainer vField = new VerticalLayoutContainer(); HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( "

Select table from parameter " - + Format.ellipse(referredTabularParameterName, 30) - + "

"); + + Format.ellipse(referredTabularParameterName, 30) + "

"); typeDescription.setStylePrimaryName("workflow-parameters-description"); vField.add(comboBox, 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); } @@ -119,18 +113,13 @@ public class ColumnFld extends AbstractFld implements VerticalLayoutContainer vField = new VerticalLayoutContainer(); HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( "

Columns of Table " - + Format.ellipse(tableItem.getName(), 30) - + "

"); + + Format.ellipse(tableItem.getName(), 30) + "

"); typeDescription.setStylePrimaryName("workflow-parameters-description"); vField.add(comboBox, 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); } - /** - * - */ @Override public String getValue() { if (tableItemSimple == null) { @@ -149,9 +138,6 @@ public class ColumnFld extends AbstractFld implements } } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ColumnListFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ColumnListFld.java index 5cb32d5..43b2122 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ColumnListFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ColumnListFld.java @@ -39,12 +39,11 @@ import com.sencha.gxt.widget.core.client.grid.Grid; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ -public class ColumnListFld extends AbstractFld implements - TabularFldChangeEventHandler { +public class ColumnListFld extends AbstractFld implements TabularFldChangeEventHandler { interface LabelTemplates extends XTemplates { @XTemplate("{value}") @@ -63,6 +62,7 @@ public class ColumnListFld extends AbstractFld implements /** * * @param parameter + * parameter */ public ColumnListFld(Parameter parameter) { super(parameter); @@ -80,15 +80,13 @@ public class ColumnListFld extends AbstractFld implements HtmlLayoutContainer descr; if (columnListParameter.getDescription() == null) { - descr = new HtmlLayoutContainer( - "

"); + descr = new HtmlLayoutContainer("

"); descr.addStyleName("workflow-fieldDescription"); } else { // grid.setToolTip(columnListParameter.getDescription()); descr = new HtmlLayoutContainer( - "

" - + columnListParameter.getDescription() + "

"); + "

" + columnListParameter.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } @@ -105,15 +103,13 @@ public class ColumnListFld extends AbstractFld implements private void createGrid() { ColumnItemProperties props = GWT.create(ColumnItemProperties.class); - ColumnConfig labelCol = new ColumnConfig( - props.label()); + ColumnConfig labelCol = new ColumnConfig(props.label()); labelCol.setCell(new AbstractCell() { @Override public void render(Context context, String value, SafeHtmlBuilder sb) { - LabelTemplates labelTemplates = GWT - .create(LabelTemplates.class); + LabelTemplates labelTemplates = GWT.create(LabelTemplates.class); sb.append(labelTemplates.format(value)); } }); @@ -150,13 +146,10 @@ public class ColumnListFld extends AbstractFld implements VerticalLayoutContainer vField = new VerticalLayoutContainer(); HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( "

Select table from parameter " - + Format.ellipse(columnListParameter - .getReferredTabularParameterName(), 30) - + "

"); + + Format.ellipse(columnListParameter.getReferredTabularParameterName(), 30) + "

"); typeDescription.setStylePrimaryName("workflow-parameters-description"); vField.add(grid, 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); } @@ -165,18 +158,13 @@ public class ColumnListFld extends AbstractFld implements VerticalLayoutContainer vField = new VerticalLayoutContainer(); HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( "

Columns of Table " - + Format.ellipse(tableItem.getName(), 30) - + "

"); + + Format.ellipse(tableItem.getName(), 30) + "

"); typeDescription.setStylePrimaryName("workflow-parameters-description"); vField.add(grid, 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); } - /** - * - */ @Override public String getValue() { String separator = columnListParameter.getSeparator(); @@ -201,17 +189,11 @@ public class ColumnListFld extends AbstractFld implements } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; } - /** - * - */ @Override public boolean isValid() { return (sm.getSelection() != null && sm.getSelection().size() > 0); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/DateFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/DateFld.java index 8429859..73c9976 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/DateFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/DateFld.java @@ -23,8 +23,8 @@ import com.sencha.gxt.widget.core.client.form.DateField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DateFld extends AbstractFld { @@ -35,6 +35,7 @@ public class DateFld extends AbstractFld { /** * @param parameter + * parameter */ public DateFld(Parameter parameter) { super(parameter); @@ -57,26 +58,21 @@ public class DateFld extends AbstractFld { HtmlLayoutContainer descr; if (p.getDescription() == null) { - descr = new HtmlLayoutContainer( - "

"); + descr = new HtmlLayoutContainer("

"); descr.addStyleName("workflow-fieldDescription"); } else { // textField.setToolTip(p.getDescription()); - descr = new HtmlLayoutContainer( - "

" - + p.getDescription() + "

"); + descr = new HtmlLayoutContainer("

" + p.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } SimpleContainer vContainer = new SimpleContainer(); VerticalLayoutContainer vField = new VerticalLayoutContainer(); - HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( - "Date Value"); + HtmlLayoutContainer typeDescription = new HtmlLayoutContainer("Date Value"); typeDescription.setStylePrimaryName("workflow-parameters-description"); vField.add(dateField, 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); fieldContainer = new SimpleContainer(); @@ -92,18 +88,12 @@ public class DateFld extends AbstractFld { } - /** - * - */ @Override public String getValue() { String dateS = dateFormat.format(dateField.getCurrentValue()); return dateS; } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/DoubleFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/DoubleFld.java index 5ef3228..bcc1e16 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/DoubleFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/DoubleFld.java @@ -1,6 +1,5 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield; - import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ObjectParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; @@ -17,21 +16,23 @@ import com.sencha.gxt.widget.core.client.form.DoubleField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DoubleFld extends AbstractFld { - + private SimpleContainer fieldContainer; private DoubleField numberField; /** - * @param operator + * + * @param parameter + * parameter */ public DoubleFld(Parameter parameter) { super(parameter); - fieldContainer=new SimpleContainer(); + fieldContainer = new SimpleContainer(); HBoxLayoutContainer horiz = new HBoxLayoutContainer(); horiz.setPack(BoxLayoutPack.START); horiz.setEnableOverflow(false); @@ -43,7 +44,7 @@ public class DoubleFld extends AbstractFld { if (p.getDefaultValue() != null) numberField.setValue(Double.parseDouble(p.getDefaultValue())); numberField.setAllowBlank(false); - + HtmlLayoutContainer descr; if (p.getDescription() == null) { @@ -51,52 +52,40 @@ public class DoubleFld extends AbstractFld { descr.addStyleName("workflow-fieldDescription"); } else { - //numberField.setToolTip(p.getDescription()); - descr = new HtmlLayoutContainer("

" - + p.getDescription() + "

"); + // numberField.setToolTip(p.getDescription()); + descr = new HtmlLayoutContainer("

" + p.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } - SimpleContainer vContainer=new SimpleContainer(); + SimpleContainer vContainer = new SimpleContainer(); VerticalLayoutContainer vField = new VerticalLayoutContainer(); - HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( - "Double Value"); + HtmlLayoutContainer typeDescription = new HtmlLayoutContainer("Double Value"); typeDescription.setStylePrimaryName("workflow-parameters-description"); - vField.add(numberField, new VerticalLayoutData(-1,-1,new Margins(0))); - vField.add(typeDescription, 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))); vContainer.add(vField); - + horiz.add(vContainer, new BoxLayoutData(new Margins())); horiz.add(descr, new BoxLayoutData(new Margins())); fieldContainer.add(horiz); - + fieldContainer.forceLayout(); } - /** - * - */ @Override public String getValue() { return numberField.getCurrentValue().toString(); } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; } - - /** - * - */ + @Override public boolean isValid() { return numberField.isValid(); } - } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/EnumFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/EnumFld.java index 17d0fd2..a9ef46f 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/EnumFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/EnumFld.java @@ -3,7 +3,6 @@ */ package org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield; - import org.gcube.data.analysis.dataminermanagercl.shared.parameters.EnumParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; @@ -20,8 +19,8 @@ import com.sencha.gxt.widget.core.client.form.SimpleComboBox; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class EnumFld extends AbstractFld { @@ -31,6 +30,7 @@ public class EnumFld extends AbstractFld { /** * @param parameter + * parameter */ public EnumFld(Parameter parameter) { super(parameter); @@ -58,9 +58,8 @@ public class EnumFld extends AbstractFld { descr.addStyleName("workflow-fieldDescription"); } else { - //listBox.setToolTip(p.getDescription()); - descr = new HtmlLayoutContainer("

" - + p.getDescription() + "

"); + // listBox.setToolTip(p.getDescription()); + descr = new HtmlLayoutContainer("

" + p.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } horiz.add(listBox, new BoxLayoutData(new Margins())); @@ -71,17 +70,11 @@ public class EnumFld extends AbstractFld { } - /** - * - */ @Override public String getValue() { return listBox.getCurrentValue(); } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; @@ -91,5 +84,5 @@ public class EnumFld extends AbstractFld { public boolean isValid() { return listBox.isValid(); } - + } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java index 2657234..9772511 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java @@ -43,8 +43,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class FileFld extends AbstractFld { @@ -52,7 +52,7 @@ public class FileFld extends AbstractFld { private VerticalLayoutContainer vp; private SimpleContainer fieldContainer; private HBoxLayoutContainer horiz; - + // FileSelector fileSelector; private WorkspaceExplorerSelectDialog wselectDialog; private TextButton selectButton; @@ -67,10 +67,9 @@ public class FileFld extends AbstractFld { private FileParameter fileParameter; private boolean created = false; - - /** * @param parameter + * parameter */ public FileFld(Parameter parameter) { super(parameter); @@ -84,7 +83,7 @@ public class FileFld extends AbstractFld { retrieveTabularResourceInfo(); } - + private void bind() { EventBusProvider.INSTANCE.addHandler(TabularResourceInfoEvent.TYPE, new TabularResourceInfoEvent.TabularResourceInfoEventHandler() { @@ -107,8 +106,8 @@ public class FileFld extends AbstractFld { TabularResourceInfoRequestEvent event = new TabularResourceInfoRequestEvent(); EventBusProvider.INSTANCE.fireEvent(event); } - - private void create(){ + + private void create() { SimpleContainer tabContainer = new SimpleContainer(); vp = new VerticalLayoutContainer(); init(); @@ -126,8 +125,8 @@ public class FileFld extends AbstractFld { descr.addStyleName("workflow-fieldDescription"); } else { - descr = new HtmlLayoutContainer("

" - + fileParameter.getDescription() + "

"); + descr = new HtmlLayoutContainer( + "

" + fileParameter.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } @@ -165,8 +164,7 @@ public class FileFld extends AbstractFld { @Override public void onFailed(Throwable throwable) { - Log.error("Error in create project: " - + throwable.getLocalizedMessage()); + Log.error("Error in create project: " + throwable.getLocalizedMessage()); UtilsGXT3.alert("Error", throwable.getLocalizedMessage()); throwable.printStackTrace(); } @@ -185,7 +183,6 @@ public class FileFld extends AbstractFld { wselectDialog.addWorkspaceExplorerSelectNotificationListener(handler); wselectDialog.setZIndex(XDOM.getTopZIndex()); - selectTRButton = new TextButton("Use Tabular Resource"); selectTRButton.addSelectHandler(new SelectEvent.SelectHandler() { @@ -194,8 +191,7 @@ public class FileFld extends AbstractFld { useTabularResource(); } }); - selectTRButton.setIcon(DataMinerManagerPanel.resources - .tabularResource()); + selectTRButton.setIcon(DataMinerManagerPanel.resources.tabularResource()); selectTRButton.setToolTip("Use Tabular Resource"); selectTRButton2 = new TextButton(""); @@ -207,12 +203,9 @@ public class FileFld extends AbstractFld { } }); - selectTRButton2.setIcon(DataMinerManagerPanel.resources - .tabularResource()); + selectTRButton2.setIcon(DataMinerManagerPanel.resources.tabularResource()); selectTRButton2.setToolTip("Use Tabular Resource"); - - selectButton = new TextButton("Select File"); selectButton.setIcon(DataMinerManagerPanel.resources.folderExplore()); selectButton.addSelectHandler(new SelectEvent.SelectHandler() { @@ -260,82 +253,69 @@ public class FileFld extends AbstractFld { downloadButton.setToolTip("Download File"); } - + private void useTabularResource() { Log.debug("TabularResourceData: " + tabularResourceData); - selectedFileItem = new ItemDescription( - tabularResourceData.getTabularResourceId(), - tabularResourceData.getName(), - "","", - tabularResourceData.getType()); - selectedFileItem.setPublicLink(tabularResourceData.getTabularResourceId()); + selectedFileItem = new ItemDescription(tabularResourceData.getTabularResourceId(), + tabularResourceData.getName(), "", "", tabularResourceData.getType()); + selectedFileItem.setPublicLink(tabularResourceData.getTabularResourceId()); showFieldWithTRSelection(); } - private void retrieveFileInformation(final Item item) { Log.debug("Retrieved: " + item); - final ItemDescription itemDescription = new ItemDescription( - item.getId(), item.getName(), item.getOwner(), item.getPath(), - item.getType().name()); + final ItemDescription itemDescription = new ItemDescription(item.getId(), item.getName(), item.getOwner(), + item.getPath(), item.getType().name()); - DataMinerPortletServiceAsync.INSTANCE.getPublicLink(itemDescription, - new AsyncCallback() { + DataMinerPortletServiceAsync.INSTANCE.getPublicLink(itemDescription, new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - Log.error("Error in retrieveFileInformation: " - + caught.getMessage()); - if (caught instanceof SessionExpiredServiceException) { - UtilsGXT3.alert("Error", "Expired Session"); + @Override + public void onFailure(Throwable caught) { + Log.error("Error in retrieveFileInformation: " + caught.getMessage()); + if (caught instanceof SessionExpiredServiceException) { + UtilsGXT3.alert("Error", "Expired Session"); - } else { - UtilsGXT3.alert("Error", - "Error retrieving file informations: " - + caught.getLocalizedMessage()); - } + } else { + UtilsGXT3.alert("Error", "Error retrieving file informations: " + caught.getLocalizedMessage()); + } - } + } - @Override - public void onSuccess(String result) { - itemDescription.setPublicLink(result); - selectedFileItem = itemDescription; - Log.debug("SelectedFileItem: " + selectedFileItem); - showFieldWithFileSelection(); + @Override + public void onSuccess(String result) { + itemDescription.setPublicLink(result); + selectedFileItem = itemDescription; + Log.debug("SelectedFileItem: " + selectedFileItem); + showFieldWithFileSelection(); - } - }); + } + }); } private void downloadFile() { if (selectedFileItem != null) { - DataMinerPortletServiceAsync.INSTANCE.getPublicLink( - selectedFileItem, new AsyncCallback() { + DataMinerPortletServiceAsync.INSTANCE.getPublicLink(selectedFileItem, new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - if (caught instanceof SessionExpiredServiceException) { - EventBusProvider.INSTANCE - .fireEvent(new SessionExpiredEvent()); - } else { - Log.error("Error downloading file: " - + caught.getLocalizedMessage()); - UtilsGXT3.alert("Error", - caught.getLocalizedMessage()); - } - caught.printStackTrace(); + @Override + public void onFailure(Throwable caught) { + if (caught instanceof SessionExpiredServiceException) { + EventBusProvider.INSTANCE.fireEvent(new SessionExpiredEvent()); + } else { + Log.error("Error downloading file: " + caught.getLocalizedMessage()); + UtilsGXT3.alert("Error", caught.getLocalizedMessage()); + } + caught.printStackTrace(); - } + } - @Override - public void onSuccess(String link) { - Log.debug("Retrieved link: " + link); - Window.open(link, selectedFileItem.getName(), ""); - } + @Override + public void onSuccess(String link) { + Log.debug("Retrieved link: " + link); + Window.open(link, selectedFileItem.getName(), ""); + } - }); + }); } else { UtilsGXT3.info("Attention", "Select a file!"); @@ -343,7 +323,6 @@ public class FileFld extends AbstractFld { } - private void showNoSelectionField() { vp.clear(); vp.add(selectTRButton); @@ -351,8 +330,7 @@ public class FileFld extends AbstractFld { vp.forceLayout(); fieldContainer.forceLayout(); } - - + private void showFieldWithFileSelection() { String fileName = selectedFileItem.getName(); @@ -376,7 +354,7 @@ public class FileFld extends AbstractFld { fieldContainer.forceLayout(); } - + private void showFieldWithTRSelection() { String fileName = selectedFileItem.getName(); @@ -401,10 +379,6 @@ public class FileFld extends AbstractFld { } - - /** - * - */ @Override public boolean isValid() { return (selectedFileItem != null); @@ -417,8 +391,7 @@ public class FileFld extends AbstractFld { @Override public String getValue() { - return (selectedFileItem == null) ? null : selectedFileItem - .getPublicLink(); + return (selectedFileItem == null) ? null : selectedFileItem.getPublicLink(); } } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FloatFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FloatFld.java index 1305a5f..405fd46 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FloatFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FloatFld.java @@ -1,6 +1,5 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield; - import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ObjectParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; @@ -17,8 +16,8 @@ import com.sencha.gxt.widget.core.client.form.FloatField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class FloatFld extends AbstractFld { @@ -27,7 +26,9 @@ public class FloatFld extends AbstractFld { private FloatField numberField; /** - * @param operator + * + * @param parameter + * parameter */ public FloatFld(Parameter parameter) { super(parameter); @@ -51,20 +52,17 @@ public class FloatFld extends AbstractFld { descr.addStyleName("workflow-fieldDescription"); } else { - //numberField.setToolTip(p.getDescription()); - descr = new HtmlLayoutContainer("

" - + p.getDescription() + "

"); + // numberField.setToolTip(p.getDescription()); + descr = new HtmlLayoutContainer("

" + p.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } SimpleContainer vContainer = new SimpleContainer(); VerticalLayoutContainer vField = new VerticalLayoutContainer(); - HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( - "Float Value"); + HtmlLayoutContainer typeDescription = new HtmlLayoutContainer("Float Value"); typeDescription.setStylePrimaryName("workflow-parameters-description"); 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); horiz.add(vContainer, new BoxLayoutData(new Margins())); @@ -75,18 +73,12 @@ public class FloatFld extends AbstractFld { } - /** - * - */ @Override public String getValue() { Float f = numberField.getCurrentValue(); return f.toString(); } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/IntFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/IntFld.java index 6adef8e..ff1d5dc 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/IntFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/IntFld.java @@ -1,6 +1,5 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield; - import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ObjectParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; @@ -17,8 +16,8 @@ import com.sencha.gxt.widget.core.client.form.IntegerField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class IntFld extends AbstractFld { @@ -27,7 +26,9 @@ public class IntFld extends AbstractFld { private IntegerField numberField; /** - * @param operator + * + * @param parameter + * parameter */ public IntFld(Parameter parameter) { super(parameter); @@ -51,21 +52,19 @@ public class IntFld extends AbstractFld { descr.addStyleName("workflow-fieldDescription"); } else { - //numberField.setToolTip(p.getDescription()); - descr = new HtmlLayoutContainer("

" - + p.getDescription() + "

"); + // numberField.setToolTip(p.getDescription()); + descr = new HtmlLayoutContainer("

" + p.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } - SimpleContainer vContainer=new SimpleContainer(); + SimpleContainer vContainer = new SimpleContainer(); VerticalLayoutContainer vField = new VerticalLayoutContainer(); - HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( - "Integer Value"); + HtmlLayoutContainer typeDescription = new HtmlLayoutContainer("Integer Value"); typeDescription.setStylePrimaryName("workflow-parameters-description"); - vField.add(numberField, new VerticalLayoutData(-1,-1,new Margins(0))); - vField.add(typeDescription, 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))); vContainer.add(vField); - + horiz.add(vContainer, new BoxLayoutData(new Margins())); horiz.add(descr, new BoxLayoutData(new Margins())); @@ -74,24 +73,17 @@ public class IntFld extends AbstractFld { } - /** - * - */ @Override public String getValue() { Integer i = numberField.getCurrentValue(); return i.toString(); } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; } - - + @Override public boolean isValid() { return numberField.isValid(); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListIntFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListIntFld.java index f905ea1..ff028bd 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListIntFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListIntFld.java @@ -28,7 +28,7 @@ import com.sencha.gxt.widget.core.client.form.IntegerField; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class ListIntFld extends AbstractFld { @@ -42,23 +42,25 @@ public class ListIntFld extends AbstractFld { private HBoxLayoutContainer horiz; /** + * * @param parameter + * parameter */ public ListIntFld(Parameter parameter) { super(parameter); this.listParameter = (ListParameter) parameter; - + listContainer = new SimpleContainer(); vp = new VerticalLayoutContainer(); items = new ArrayList(); addField(null); listContainer.add(vp, new MarginData(new Margins())); - + fieldContainer = new SimpleContainer(); horiz = new HBoxLayoutContainer(); horiz.setPack(BoxLayoutPack.START); horiz.setEnableOverflow(false); - + HtmlLayoutContainer descr; if (listParameter.getDescription() == null) { @@ -66,9 +68,9 @@ public class ListIntFld extends AbstractFld { descr.addStyleName("workflow-fieldDescription"); } else { - //listContainer.setToolTip(listParameter.getDescription()); - descr = new HtmlLayoutContainer("

" - + listParameter.getDescription() + "

"); + // listContainer.setToolTip(listParameter.getDescription()); + descr = new HtmlLayoutContainer( + "

" + listParameter.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } @@ -77,14 +79,13 @@ public class ListIntFld extends AbstractFld { fieldContainer.add(horiz); fieldContainer.forceLayout(); - - + } private void addField(Item upperItem) { - ObjectParameter objPar = new ObjectParameter(listParameter.getName(), - listParameter.getDescription(), listParameter.getType(), null); + ObjectParameter objPar = new ObjectParameter(listParameter.getName(), listParameter.getDescription(), + listParameter.getType(), null); if (upperItem == null) { Item item = new Item(objPar, true); @@ -107,25 +108,19 @@ public class ListIntFld extends AbstractFld { } - /** - * @param item - */ private void removeField(Item item) { items.remove(item); vp.remove(item); - + if (items.size() == 1) { items.get(0).hideCancelButton(); } - + simpleContainer.forceLayout(); } - /** - * - */ @Override public String getValue() { String separator = listParameter.getSeparator(); @@ -141,17 +136,11 @@ public class ListIntFld extends AbstractFld { return value; } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; } - /** - * - */ @Override public boolean isValid() { for (Item item : items) @@ -167,15 +156,12 @@ public class ListIntFld extends AbstractFld { private TextButton addBtn; private TextButton removeBtn; - /** - * @param objPar - */ public Item(ObjectParameter objectParameter, boolean first) { super(); - + field = new IntegerField(); field.setAllowBlank(false); - + addBtn = new TextButton(""); addBtn.setIcon(DataMinerManagerPanel.resources.add()); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListStringFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListStringFld.java index 80a3b99..f99b26e 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListStringFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListStringFld.java @@ -22,8 +22,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ListStringFld extends AbstractFld { @@ -38,6 +38,7 @@ public class ListStringFld extends AbstractFld { /** * * @param parameter + * parameter */ public ListStringFld(Parameter parameter) { super(parameter); @@ -61,9 +62,9 @@ public class ListStringFld extends AbstractFld { descr.addStyleName("workflow-fieldDescription"); } else { - /*listContainer.setToolTip(listParameter.getDescription());*/ - descr = new HtmlLayoutContainer("

" - + listParameter.getDescription() + "

"); + /* listContainer.setToolTip(listParameter.getDescription()); */ + descr = new HtmlLayoutContainer( + "

" + listParameter.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } @@ -76,8 +77,8 @@ public class ListStringFld extends AbstractFld { protected void addField(StringItem upperItem) { - ObjectParameter objPar = new ObjectParameter(listParameter.getName(), - listParameter.getDescription(), listParameter.getType(), null); + ObjectParameter objPar = new ObjectParameter(listParameter.getName(), listParameter.getDescription(), + listParameter.getType(), null); if (upperItem == null) { StringItem item = new StringItem(this, objPar, true); @@ -91,30 +92,27 @@ public class ListStringFld extends AbstractFld { upperItem.forceLayout(); StringItem item = new StringItem(this, objPar, false); 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 { upperItem.forceLayout(); StringItem item = new StringItem(this, objPar, true); 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(); - } - - protected void forceLayout(){ + + protected void forceLayout() { vp.forceLayout(); horiz.forceLayout(); fieldContainer.forceLayout(); } - - /** - * @param item - */ protected void removeField(StringItem item) { items.remove(item); @@ -124,13 +122,10 @@ public class ListStringFld extends AbstractFld { items.get(0).hideCancelButton(); items.get(0).forceLayout(); } - + forceLayout(); } - /** - * - */ @Override public String getValue() { String separator = listParameter.getSeparator(); @@ -146,17 +141,11 @@ public class ListStringFld extends AbstractFld { return value; } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; } - /** - * - */ @Override public boolean isValid() { boolean valid = false; @@ -168,6 +157,4 @@ public class ListStringFld extends AbstractFld { return valid; } - - } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/OperatorFieldWidget.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/OperatorFieldWidget.java index df17640..ad9f23a 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/OperatorFieldWidget.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/OperatorFieldWidget.java @@ -3,7 +3,6 @@ */ package org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield; - import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ListParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ObjectParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; @@ -13,8 +12,8 @@ import com.sencha.gxt.widget.core.client.form.FieldLabel; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OperatorFieldWidget { @@ -24,46 +23,49 @@ public class OperatorFieldWidget { private FieldLabel parameterLabel; /** + * + * @param parameter + * parameter */ - public OperatorFieldWidget(Parameter p) { + public OperatorFieldWidget(Parameter parameter) { super(); - this.parameter = p; + this.parameter = parameter; try { - if (p.getTypology() != null) { - switch (p.getTypology()) { + if (parameter.getTypology() != null) { + switch (parameter.getTypology()) { case COLUMN: - field = new ColumnFld(p); + field = new ColumnFld(parameter); break; case COLUMN_LIST: - field = new ColumnListFld(p); + field = new ColumnListFld(parameter); break; case ENUM: - field = new EnumFld(p); + field = new EnumFld(parameter); break; case FILE: - field = new FileFld(p); + field = new FileFld(parameter); break; case LIST: - field = createListField(p); + field = createListField(parameter); break; case OBJECT: - field = createObjectField(p); + field = createObjectField(parameter); break; case TABULAR: - field = new TabularFld(p); + field = new TabularFld(parameter); break; case TABULAR_LIST: - field = new TabularListFld(p); + field = new TabularListFld(parameter); break; case WKT: - field = new WKTFld(p); + field = new WKTFld(parameter); break; case DATE: - field = new DateFld(p); - break; + field = new DateFld(parameter); + break; case TIME: - field = new TimeFld(p); + field = new TimeFld(parameter); break; default: break; @@ -72,12 +74,12 @@ public class OperatorFieldWidget { } if (field == null) { - parameterLabel = new FieldLabel(null, p.getName()); + parameterLabel = new FieldLabel(null, parameter.getName()); parameterLabel.setLabelWidth(200); parameterLabel.setLabelWordWrap(true); } else { - parameterLabel = new FieldLabel(field.getWidget(), p.getName()); + parameterLabel = new FieldLabel(field.getWidget(), parameter.getName()); parameterLabel.setLabelWidth(200); parameterLabel.setLabelWordWrap(true); } @@ -107,10 +109,6 @@ public class OperatorFieldWidget { return parameterLabel; } - /** - * @param p - * @return - */ private AbstractFld createObjectField(Parameter p) { ObjectParameter objectParameter = (ObjectParameter) p; String type = objectParameter.getType(); @@ -128,18 +126,15 @@ public class OperatorFieldWidget { return null; } - /** - * - */ private AbstractFld createListField(Parameter p) { ListParameter listParameter = (ListParameter) p; String type = listParameter.getType(); - if (type.contentEquals(String.class.getName()) - || type.contentEquals("STRING")) { // TODO REMOVE "STRING" + if (type.contentEquals(String.class.getName()) || type.contentEquals("STRING")) { // TODO + // REMOVE + // "STRING" return new ListStringFld(listParameter); - } else if (type.contentEquals(Integer.class.getName()) - || type.contentEquals("NUMBER")) { + } else if (type.contentEquals(Integer.class.getName()) || type.contentEquals("NUMBER")) { return new ListIntFld(listParameter); } // } else if (type.contentEquals(Boolean.class.getName())) { @@ -153,9 +148,6 @@ public class OperatorFieldWidget { return null; } - /** - * - */ public void updateOperatorParameterValue() { this.parameter.setValue(this.getFieldValue()); } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringFld.java index 8447318..066dd3b 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringFld.java @@ -3,7 +3,6 @@ */ package org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield; - import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ObjectParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; @@ -20,8 +19,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class StringFld extends AbstractFld { @@ -31,12 +30,13 @@ public class StringFld extends AbstractFld { /** * @param parameter + * parameter */ public StringFld(Parameter parameter) { super(parameter); - + ObjectParameter p = (ObjectParameter) parameter; - + textField = new TextField(); textField.setValue(p.getDefaultValue()); @@ -46,49 +46,41 @@ public class StringFld extends AbstractFld { HtmlLayoutContainer descr; if (p.getDescription() == null) { - descr=new HtmlLayoutContainer("

"); + descr = new HtmlLayoutContainer("

"); descr.addStyleName("workflow-fieldDescription"); - + } else { - //textField.setToolTip(p.getDescription()); - descr=new HtmlLayoutContainer("

"+p.getDescription()+"

"); + // textField.setToolTip(p.getDescription()); + descr = new HtmlLayoutContainer("

" + p.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } - - SimpleContainer vContainer=new SimpleContainer(); + + SimpleContainer vContainer = new SimpleContainer(); VerticalLayoutContainer vField = new VerticalLayoutContainer(); - HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( - "String Value"); + HtmlLayoutContainer typeDescription = new HtmlLayoutContainer("String Value"); typeDescription.setStylePrimaryName("workflow-parameters-description"); - vField.add(textField, new VerticalLayoutData(-1,-1,new Margins(0))); - vField.add(typeDescription, new VerticalLayoutData(-1,-1,new Margins(0))); + vField.add(textField, new VerticalLayoutData(-1, -1, new Margins(0))); + vField.add(typeDescription, new VerticalLayoutData(-1, -1, new Margins(0))); vContainer.add(vField); - + fieldContainer = new SimpleContainer(); HBoxLayoutContainer horiz = new HBoxLayoutContainer(); horiz.setPack(BoxLayoutPack.START); horiz.setEnableOverflow(false); - - + horiz.add(vContainer, new BoxLayoutData(new Margins())); horiz.add(descr, new BoxLayoutData(new Margins())); fieldContainer.add(horiz); fieldContainer.forceLayout(); - + } - /** - * - */ @Override public String getValue() { return textField.getValue(); } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; @@ -98,5 +90,5 @@ public class StringFld extends AbstractFld { public boolean isValid() { return textField.isValid(); } - + } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringItem.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringItem.java index afb4108..f7d4378 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringItem.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringItem.java @@ -12,7 +12,7 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class StringItem extends HBoxLayoutContainer { @@ -22,7 +22,10 @@ public class StringItem extends HBoxLayoutContainer { private TextButton removeBtn; /** - * @param objPar + * + * @param parent parent + * @param objectParameter object parameter + * @param first true if first */ public StringItem(ListStringFld parent, ObjectParameter objectParameter, boolean first) { super(); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java index 3422ec2..a3c1a06 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java @@ -33,8 +33,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TabItem extends HBoxLayoutContainer { @@ -60,12 +60,14 @@ public class TabItem extends HBoxLayoutContainer { /** * - * @param tabularListFld + * @param parent + * parent * @param tabularParameter + * tabular parameter * @param first + * true if is first */ - public TabItem(TabularListFld parent, TabularParameter tabularParameter, - boolean first) { + public TabItem(TabularListFld parent, TabularParameter tabularParameter, boolean first) { super(); this.parent = parent; this.first = first; @@ -117,8 +119,7 @@ public class TabItem extends HBoxLayoutContainer { useTabularResource(); } }); - selectTRButton.setIcon(DataMinerManagerPanel.resources - .tabularResource()); + selectTRButton.setIcon(DataMinerManagerPanel.resources.tabularResource()); selectTRButton.setToolTip("Use Tabular Resource"); selectTRButton2 = new TextButton(""); @@ -129,11 +130,9 @@ public class TabItem extends HBoxLayoutContainer { useTabularResource(); } }); - selectTRButton2.setIcon(DataMinerManagerPanel.resources - .tabularResource()); + selectTRButton2.setIcon(DataMinerManagerPanel.resources.tabularResource()); selectTRButton2.setToolTip("Use Tabular Resource"); - - + selectButton = new TextButton("Select Data Set"); selectButton.addSelectHandler(new SelectEvent.SelectHandler() { @@ -156,7 +155,7 @@ public class TabItem extends HBoxLayoutContainer { wselectDialog.show(); } }); - + downloadButton = new TextButton(""); downloadButton.setIcon(DataMinerManagerPanel.resources.download()); downloadButton.addSelectHandler(new SelectEvent.SelectHandler() { @@ -167,7 +166,6 @@ public class TabItem extends HBoxLayoutContainer { } }); downloadButton.setToolTip("Download Data Set"); - addBtn = new TextButton(""); addBtn.setIcon(DataMinerManagerPanel.resources.add()); @@ -191,7 +189,6 @@ public class TabItem extends HBoxLayoutContainer { } }); - setPack(BoxLayoutPack.START); setEnableOverflow(false); @@ -209,7 +206,7 @@ public class TabItem extends HBoxLayoutContainer { selectButton2.setVisible(false); downloadButton.setVisible(false); removeBtn.setVisible(!first); - + forceLayout(); } @@ -228,7 +225,8 @@ public class TabItem extends HBoxLayoutContainer { * "multipart/x-zip" */ // List 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" @@ -260,8 +258,7 @@ public class TabItem extends HBoxLayoutContainer { @Override public void onFailed(Throwable throwable) { - Log.error("Error in create project: " - + throwable.getLocalizedMessage()); + Log.error("Error in create project: " + throwable.getLocalizedMessage()); UtilsGXT3.alert("Error", throwable.getLocalizedMessage()); throwable.printStackTrace(); } @@ -284,66 +281,56 @@ public class TabItem extends HBoxLayoutContainer { private void retrieveTableInformation(Item item) { Log.debug("Retrieved: " + item); - itemDescriptionSelected = new ItemDescription(item.getId(), - item.getName(), item.getOwner(), item.getPath(), item.getType() - .name()); + itemDescriptionSelected = new ItemDescription(item.getId(), item.getName(), item.getOwner(), item.getPath(), + item.getType().name()); - DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(item, - new AsyncCallback() { + DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(item, new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - Log.error("Error in retrieveTableInformation " - + caught.getMessage()); - if (caught instanceof SessionExpiredServiceException) { - UtilsGXT3.alert("Error", "Expired Session"); + @Override + public void onFailure(Throwable caught) { + 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()); - } + } else { + UtilsGXT3.alert("Error", "Error retrieving table information: " + caught.getLocalizedMessage()); + } - } + } - @Override - public void onSuccess(TableItemSimple result) { - Log.debug("Retrieved: " + result); - selectedTableItem = result; - showFieldWithFileSelection(); + @Override + public void onSuccess(TableItemSimple result) { + Log.debug("Retrieved: " + result); + selectedTableItem = result; + showFieldWithFileSelection(); - } - }); + } + }); } private void downloadFile() { if (itemDescriptionSelected != null) { - DataMinerPortletServiceAsync.INSTANCE.getPublicLink( - itemDescriptionSelected, new AsyncCallback() { + DataMinerPortletServiceAsync.INSTANCE.getPublicLink(itemDescriptionSelected, new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - if (caught instanceof SessionExpiredServiceException) { - EventBusProvider.INSTANCE - .fireEvent(new SessionExpiredEvent()); - } else { - Log.error("Error downloading table: " - + caught.getLocalizedMessage()); - UtilsGXT3.alert("Error", - caught.getLocalizedMessage()); - } - caught.printStackTrace(); + @Override + public void onFailure(Throwable caught) { + if (caught instanceof SessionExpiredServiceException) { + EventBusProvider.INSTANCE.fireEvent(new SessionExpiredEvent()); + } else { + Log.error("Error downloading table: " + caught.getLocalizedMessage()); + UtilsGXT3.alert("Error", caught.getLocalizedMessage()); + } + caught.printStackTrace(); - } + } - @Override - public void onSuccess(String link) { - Log.debug("Retrieved link: " + link); - Window.open(link, - itemDescriptionSelected.getName(), ""); - } + @Override + public void onSuccess(String link) { + Log.debug("Retrieved link: " + link); + Window.open(link, itemDescriptionSelected.getName(), ""); + } - }); + }); } else { UtilsGXT3.info("Attention", "Select a Table!"); @@ -353,18 +340,12 @@ public class TabItem extends HBoxLayoutContainer { private void useTabularResource() { Log.debug("TabularResourceData: " + tabularResourceData); - selectedTableItem = new TableItemSimple( - tabularResourceData.getTabularResourceId(), - tabularResourceData.getName(), - tabularResourceData.getDescription(), - tabularResourceData.getType()); + selectedTableItem = new TableItemSimple(tabularResourceData.getTabularResourceId(), + tabularResourceData.getName(), tabularResourceData.getDescription(), tabularResourceData.getType()); selectedTableItem.setColumns(tabularResourceData.getColumns()); showFieldWithTRSelection(); } - /** - * - */ private void showFieldWithTRSelection() { try { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java index 5662391..ac96b34 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java @@ -50,12 +50,11 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ -public class TabularFld extends AbstractFld implements - HasTabularFldChangeEventHandler { +public class TabularFld extends AbstractFld implements HasTabularFldChangeEventHandler { private SimpleContainer fieldContainer; private HBoxLayoutContainer horiz; @@ -78,6 +77,7 @@ public class TabularFld extends AbstractFld implements /** * @param parameter + * parameter */ public TabularFld(Parameter parameter) { super(parameter); @@ -90,7 +90,7 @@ public class TabularFld extends AbstractFld implements retrieveTabularResourceInfo(); } - + private void bind() { EventBusProvider.INSTANCE.addHandler(TabularResourceInfoEvent.TYPE, new TabularResourceInfoEvent.TabularResourceInfoEventHandler() { @@ -120,21 +120,18 @@ public class TabularFld extends AbstractFld implements SimpleContainer tabContainer = new SimpleContainer(); vp = new VerticalLayoutContainer(); - //retrieveInfo(); + // retrieveInfo(); init(); createField(tabContainer); showNoSelectionField(); } catch (Throwable e) { Log.error("TabularField: " + e.getLocalizedMessage()); - UtilsGXT3.alert("Error", - "Error creating Tabular Field: " + e.getLocalizedMessage()); + UtilsGXT3.alert("Error", "Error creating Tabular Field: " + e.getLocalizedMessage()); e.printStackTrace(); } } - - private void createField(SimpleContainer tabContainer) { List templates = tabularParameter.getTemplates(); if (templates == null || templates.isEmpty()) { @@ -148,8 +145,7 @@ public class TabularFld extends AbstractFld implements first = false; } - templatesList = new HtmlLayoutContainer( - "

Suitable Data Set Templates:
" + list + "

"); + templatesList = new HtmlLayoutContainer("

Suitable Data Set Templates:
" + list + "

"); templatesList.addStyleName("workflow-parameters-description"); } @@ -163,14 +159,12 @@ public class TabularFld extends AbstractFld implements HtmlLayoutContainer descr; if (tabularParameter.getDescription() == null) { - descr = new HtmlLayoutContainer( - "

"); + descr = new HtmlLayoutContainer("

"); descr.addStyleName("workflow-fieldDescription"); } else { descr = new HtmlLayoutContainer( - "

" - + tabularParameter.getDescription() + "

"); + "

" + tabularParameter.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } @@ -195,7 +189,8 @@ public class TabularFld extends AbstractFld implements * "multipart/x-zip" */ // List 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" @@ -208,8 +203,7 @@ public class TabularFld extends AbstractFld implements * FilterCriteria(allowedMimeTypes, allowedFileExtensions, new * HashMap()); */ - wselectDialog = new WorkspaceExplorerSelectDialog("Select CSV", - false); + wselectDialog = new WorkspaceExplorerSelectDialog("Select CSV", false); // filterCriteria, selectableTypes); WorskpaceExplorerSelectNotificationListener handler = new WorskpaceExplorerSelectNotificationListener() { @@ -229,10 +223,8 @@ public class TabularFld extends AbstractFld implements @Override public void onFailed(Throwable throwable) { - Log.error("Error in create project: " - + throwable.getLocalizedMessage()); - UtilsGXT3.alert("Error", - throwable.getLocalizedMessage()); + Log.error("Error in create project: " + throwable.getLocalizedMessage()); + UtilsGXT3.alert("Error", throwable.getLocalizedMessage()); throwable.printStackTrace(); } @@ -247,17 +239,14 @@ public class TabularFld extends AbstractFld implements } }; - wselectDialog - .addWorkspaceExplorerSelectNotificationListener(handler); + wselectDialog.addWorkspaceExplorerSelectNotificationListener(handler); wselectDialog.setZIndex(XDOM.getTopZIndex()); } catch (Throwable e) { - Log.error("TabularField error using WorkspaceExplorerSelectDialog: " - + e.getLocalizedMessage()); + Log.error("TabularField error using WorkspaceExplorerSelectDialog: " + e.getLocalizedMessage()); e.printStackTrace(); throw new Exception( - "TabularField error using WorkspaceExplorerSelectDialog: " - + e.getLocalizedMessage()); + "TabularField error using WorkspaceExplorerSelectDialog: " + e.getLocalizedMessage()); } selectTRButton = new TextButton("Use Tabular Resource"); @@ -268,8 +257,7 @@ public class TabularFld extends AbstractFld implements useTabularResource(); } }); - selectTRButton.setIcon(DataMinerManagerPanel.resources - .tabularResource()); + selectTRButton.setIcon(DataMinerManagerPanel.resources.tabularResource()); selectTRButton.setToolTip("Use Tabular Resource"); selectTRButton2 = new TextButton(""); @@ -281,8 +269,7 @@ public class TabularFld extends AbstractFld implements } }); - selectTRButton2.setIcon(DataMinerManagerPanel.resources - .tabularResource()); + selectTRButton2.setIcon(DataMinerManagerPanel.resources.tabularResource()); selectTRButton2.setToolTip("Use Tabular Resource"); selectButton = new TextButton("Select Data Set"); @@ -293,8 +280,7 @@ public class TabularFld extends AbstractFld implements wselectDialog.show(); } }); - selectButton.setIcon(DataMinerManagerPanel.resources - .folderExplore()); + selectButton.setIcon(DataMinerManagerPanel.resources.folderExplore()); selectButton.setToolTip("Select Data Set"); selectButton2 = new TextButton(""); @@ -306,8 +292,7 @@ public class TabularFld extends AbstractFld implements } }); - selectButton2.setIcon(DataMinerManagerPanel.resources - .folderExplore()); + selectButton2.setIcon(DataMinerManagerPanel.resources.folderExplore()); selectButton2.setToolTip("Select Another Data Set"); cancelButton = new TextButton(""); @@ -321,9 +306,8 @@ public class TabularFld extends AbstractFld implements updateListeners(null); } }); - - cancelButton.setToolTip("Cancel"); + cancelButton.setToolTip("Cancel"); downloadButton = new TextButton(""); downloadButton.setIcon(DataMinerManagerPanel.resources.download()); @@ -335,7 +319,7 @@ public class TabularFld extends AbstractFld implements } }); downloadButton.setToolTip("Download Data Set"); - + } catch (Throwable e) { Log.error("TabularField init: " + e.getLocalizedMessage()); e.printStackTrace(); @@ -345,11 +329,8 @@ public class TabularFld extends AbstractFld implements private void useTabularResource() { Log.debug("TabularResourceData: " + tabularResourceData); - selectedTableItem = new TableItemSimple( - tabularResourceData.getTabularResourceId(), - tabularResourceData.getName(), - tabularResourceData.getDescription(), - tabularResourceData.getType()); + selectedTableItem = new TableItemSimple(tabularResourceData.getTabularResourceId(), + tabularResourceData.getName(), tabularResourceData.getDescription(), tabularResourceData.getType()); selectedTableItem.setColumns(tabularResourceData.getColumns()); selectedTableItem.setTabularResource(true); showFieldWithTRSelection(); @@ -359,66 +340,56 @@ public class TabularFld extends AbstractFld implements private void retrieveTableInformation(Item item) { Log.debug("Retrieved: " + item); - itemDescriptionSelected = new ItemDescription(item.getId(), - item.getName(), item.getOwner(), item.getPath(), item.getType() - .name()); + itemDescriptionSelected = new ItemDescription(item.getId(), item.getName(), item.getOwner(), item.getPath(), + item.getType().name()); - DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(item, - new AsyncCallback() { + DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(item, new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - Log.error("Error in retrieveTableInformation " - + caught.getMessage()); - if (caught instanceof SessionExpiredServiceException) { - UtilsGXT3.alert("Error", "Expired Session"); + @Override + public void onFailure(Throwable caught) { + 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()); - } + } else { + UtilsGXT3.alert("Error", "Error retrieving table information: " + caught.getLocalizedMessage()); + } - } + } - @Override - public void onSuccess(TableItemSimple result) { - Log.debug("Retrieved: " + result); - selectedTableItem = result; - showFieldWithFileSelection(); - updateListeners(selectedTableItem); - } - }); + @Override + public void onSuccess(TableItemSimple result) { + Log.debug("Retrieved: " + result); + selectedTableItem = result; + showFieldWithFileSelection(); + updateListeners(selectedTableItem); + } + }); } private void downloadFile() { if (itemDescriptionSelected != null) { - DataMinerPortletServiceAsync.INSTANCE.getPublicLink( - itemDescriptionSelected, new AsyncCallback() { + DataMinerPortletServiceAsync.INSTANCE.getPublicLink(itemDescriptionSelected, new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - if (caught instanceof SessionExpiredServiceException) { - EventBusProvider.INSTANCE - .fireEvent(new SessionExpiredEvent()); - } else { - Log.error("Error downloading table: " - + caught.getLocalizedMessage()); - UtilsGXT3.alert("Error", - caught.getLocalizedMessage()); - } - caught.printStackTrace(); + @Override + public void onFailure(Throwable caught) { + if (caught instanceof SessionExpiredServiceException) { + EventBusProvider.INSTANCE.fireEvent(new SessionExpiredEvent()); + } else { + Log.error("Error downloading table: " + caught.getLocalizedMessage()); + UtilsGXT3.alert("Error", caught.getLocalizedMessage()); + } + caught.printStackTrace(); - } + } - @Override - public void onSuccess(String link) { - Log.debug("Retrieved link: " + link); - Window.open(link, - itemDescriptionSelected.getName(), ""); - } + @Override + public void onSuccess(String link) { + Log.debug("Retrieved link: " + link); + Window.open(link, itemDescriptionSelected.getName(), ""); + } - }); + }); } else { UtilsGXT3.info("Attention", "Select a Table!"); @@ -426,9 +397,6 @@ public class TabularFld extends AbstractFld implements } - /** - * - */ private void showNoSelectionField() { vp.clear(); vp.add(selectTRButton); @@ -484,35 +452,24 @@ public class TabularFld extends AbstractFld implements fieldContainer.forceLayout(); } - /** - * - */ @Override public String getValue() { return (selectedTableItem == null) ? null : selectedTableItem.getId(); } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; } - /** - * - */ @Override public boolean isValid() { return (selectedTableItem != null); } @Override - public HandlerRegistration addTabularFldChangeEventHandler( - TabularFldChangeEventHandler handler) { - return fieldContainer.addHandler(handler, - TabularFldChangeEvent.getType()); + public HandlerRegistration addTabularFldChangeEventHandler(TabularFldChangeEventHandler handler) { + return fieldContainer.addHandler(handler, TabularFldChangeEvent.getType()); } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularListFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularListFld.java index 8ff7a1a..0c6cd62 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularListFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularListFld.java @@ -22,8 +22,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TabularListFld extends AbstractFld { @@ -37,6 +37,7 @@ public class TabularListFld extends AbstractFld { /** * @param parameter + * parameter */ public TabularListFld(Parameter parameter) { super(parameter); @@ -81,8 +82,8 @@ public class TabularListFld extends AbstractFld { descr.addStyleName("workflow-fieldDescription"); } else { /* listContainer.setToolTip(listParameter.getDescription()); */ - descr = new HtmlLayoutContainer("

" - + tabularListParameter.getDescription() + "

"); + descr = new HtmlLayoutContainer( + "

" + tabularListParameter.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } @@ -97,12 +98,9 @@ public class TabularListFld extends AbstractFld { protected void addField(TabItem upperItem) { try { - TabularParameter tabPar = new TabularParameter( - tabularListParameter.getName(), - tabularListParameter.getDescription(), null, - tabularListParameter.getTemplates(), - tabularListParameter.getDefaultMimeType(), - tabularListParameter.getSupportedMimeTypes()); + TabularParameter tabPar = new TabularParameter(tabularListParameter.getName(), + tabularListParameter.getDescription(), null, tabularListParameter.getTemplates(), + tabularListParameter.getDefaultMimeType(), tabularListParameter.getSupportedMimeTypes()); if (upperItem == null) { TabItem item = new TabItem(this, tabPar, true); @@ -114,18 +112,20 @@ public class TabularListFld extends AbstractFld { int pos = items.indexOf(upperItem); if (pos == 0) { upperItem.showCancelButton(); - + TabItem item = new TabItem(this, tabPar, false); items.add(1, item); vp.insert(item, 1);// don't use new - // VerticalLayoutData(-1, -1,new - // Margins(0)) + // VerticalLayoutData(-1, -1,new + // Margins(0)) } else { - //upperItem.forceLayout(); + // upperItem.forceLayout(); TabItem item = new TabItem(this, tabPar, false); - items.add(pos+1,item); - vp.insert(item,pos+1);// don't use new VerticalLayoutData(-1, -1, new - // Margins(0)) + items.add(pos + 1, item); + vp.insert(item, pos + 1);// don't use new + // VerticalLayoutData(-1, -1, + // new + // Margins(0)) } } @@ -137,24 +137,17 @@ public class TabularListFld extends AbstractFld { } } - /** - * - * @param item - */ protected void removeField(TabItem item) { items.remove(item); if (items.size() == 1) { - TabItem topItem=items.get(0); + TabItem topItem = items.get(0); topItem.hideCancelButton(); } vp.remove(item); forceLayout(); } - /** - * - */ protected void forceLayout() { vp.forceLayout(); listContainer.forceLayout(); @@ -162,9 +155,6 @@ public class TabularListFld extends AbstractFld { fieldContainer.forceLayout(); } - /** - * - */ @Override public String getValue() { String separator = tabularListParameter.getSeparator(); @@ -181,9 +171,6 @@ public class TabularListFld extends AbstractFld { return value; } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TimeFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TimeFld.java index 0e91c14..592535d 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TimeFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TimeFld.java @@ -24,8 +24,8 @@ import com.sencha.gxt.widget.core.client.form.TimeField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TimeFld extends AbstractFld { @@ -36,6 +36,7 @@ public class TimeFld extends AbstractFld { /** * @param parameter + * parameter */ public TimeFld(Parameter parameter) { super(parameter); @@ -60,26 +61,21 @@ public class TimeFld extends AbstractFld { HtmlLayoutContainer descr; if (p.getDescription() == null) { - descr = new HtmlLayoutContainer( - "

"); + descr = new HtmlLayoutContainer("

"); descr.addStyleName("workflow-fieldDescription"); } else { // textField.setToolTip(p.getDescription()); - descr = new HtmlLayoutContainer( - "

" - + p.getDescription() + "

"); + descr = new HtmlLayoutContainer("

" + p.getDescription() + "

"); descr.addStyleName("workflow-fieldDescription"); } SimpleContainer vContainer = new SimpleContainer(); VerticalLayoutContainer vField = new VerticalLayoutContainer(); - HtmlLayoutContainer typeDescription = new HtmlLayoutContainer( - "Time Value"); + HtmlLayoutContainer typeDescription = new HtmlLayoutContainer("Time Value"); typeDescription.setStylePrimaryName("workflow-parameters-description"); vField.add(timeField, 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); fieldContainer = new SimpleContainer(); @@ -95,18 +91,12 @@ public class TimeFld extends AbstractFld { } - /** - * - */ @Override public String getValue() { String timeS = timeFormat.format(timeField.getCurrentValue()); return timeS; } - /** - * - */ @Override public Widget getWidget() { return fieldContainer; diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/WKTFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/WKTFld.java index 7a9ee41..a8b4543 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/WKTFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/WKTFld.java @@ -30,8 +30,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class WKTFld extends AbstractFld { @@ -52,7 +52,7 @@ public class WKTFld extends AbstractFld { private TextField selectedAreaField; /** - * @param parameter + * @param parameter parameter */ public WKTFld(Parameter parameter) { super(parameter); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/properties/ColumnItemProperties.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/properties/ColumnItemProperties.java index fdd8188..35ff042 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/properties/ColumnItemProperties.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/properties/ColumnItemProperties.java @@ -12,7 +12,7 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public interface ColumnItemProperties extends PropertyAccess { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/properties/ColumnItemPropertiesCombo.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/properties/ColumnItemPropertiesCombo.java index bba3775..9605c1f 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/properties/ColumnItemPropertiesCombo.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/properties/ColumnItemPropertiesCombo.java @@ -11,7 +11,7 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public interface ColumnItemPropertiesCombo extends PropertyAccess { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/resources/Resources.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/resources/Resources.java index afa91da..86a0107 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/resources/Resources.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/resources/Resources.java @@ -7,8 +7,8 @@ import com.google.gwt.resources.client.ImageResource; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface Resources extends ClientBundle { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletServiceAsync.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletServiceAsync.java index d7ebe83..56121a4 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletServiceAsync.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletServiceAsync.java @@ -20,8 +20,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface DataMinerPortletServiceAsync { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/tr/TabularResourceData.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/tr/TabularResourceData.java index 7a7c640..1503003 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/tr/TabularResourceData.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/tr/TabularResourceData.java @@ -10,8 +10,8 @@ import org.gcube.data.analysis.dataminermanagercl.shared.data.ColumnItem; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TabularResourceData implements Serializable { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaElementType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaElementType.java index bd0c3eb..53f519d 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaElementType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaElementType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.type; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum DataMinerWorkAreaElementType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaEventType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaEventType.java index 0676c1c..dcf4f48 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaEventType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaEventType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.type; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum DataMinerWorkAreaEventType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaRegionType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaRegionType.java index 84ee7ff..98fbc25 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaRegionType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaRegionType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.type; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum DataMinerWorkAreaRegionType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaRequestEventType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaRequestEventType.java index e0a20c1..666b5dd 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaRequestEventType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/DataMinerWorkAreaRequestEventType.java @@ -3,7 +3,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.type; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public enum DataMinerWorkAreaRequestEventType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/MenuType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/MenuType.java index 8ec59de..967a936 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/MenuType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/MenuType.java @@ -3,7 +3,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.type; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public enum MenuType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/OperatorsClassificationRequestType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/OperatorsClassificationRequestType.java index d28eccb..28acb5c 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/OperatorsClassificationRequestType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/OperatorsClassificationRequestType.java @@ -3,7 +3,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.type; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public enum OperatorsClassificationRequestType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/OutputResourceRequestEventType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/OutputResourceRequestEventType.java index 716180b..167191a 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/OutputResourceRequestEventType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/OutputResourceRequestEventType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.type; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum OutputResourceRequestEventType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/SessionExpiredEventType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/SessionExpiredEventType.java index 5a021dd..3cd117c 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/SessionExpiredEventType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/SessionExpiredEventType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.type; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum SessionExpiredEventType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/UIStateEventType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/UIStateEventType.java index d25d71f..651060b 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/UIStateEventType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/UIStateEventType.java @@ -2,8 +2,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.type; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum UIStateEventType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/WPSMenuType.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/WPSMenuType.java index 2c08f17..1e7982d 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/WPSMenuType.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/type/WPSMenuType.java @@ -3,7 +3,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.type; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public enum WPSMenuType { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/util/InfoMessageBox.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/util/InfoMessageBox.java index 9b80245..0677140 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/util/InfoMessageBox.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/util/InfoMessageBox.java @@ -4,8 +4,8 @@ import com.sencha.gxt.widget.core.client.box.MessageBox; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class InfoMessageBox extends MessageBox { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/util/UtilsGXT3.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/util/UtilsGXT3.java index 9314e25..27127ba 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/util/UtilsGXT3.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/util/UtilsGXT3.java @@ -10,8 +10,8 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class UtilsGXT3 { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/FileViewer.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/FileViewer.java index 2bdf572..f2e37a3 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/FileViewer.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/FileViewer.java @@ -16,27 +16,29 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class FileViewer extends SimpleContainer { private FileResource fileResource; - /** - * @param mapImages + * + * @param computationId + * computation id + * @param fileResource + * file resource */ - public FileViewer(ComputationId computationId, - FileResource fileResource) { + public FileViewer(ComputationId computationId, FileResource fileResource) { super(); this.fileResource = fileResource; - //this.computationId = computationId; + // this.computationId = computationId; init(); create(); } - - private void init(){ + + private void init() { setHeight(56); } @@ -44,10 +46,8 @@ public class FileViewer extends SimpleContainer { VerticalLayoutContainer lc = new VerticalLayoutContainer(); final String fileName = fileResource.getName(); final String fileUrl = fileResource.getUrl(); - HtmlLayoutContainer fileNameHtml = new HtmlLayoutContainer( - "

" - + new SafeHtmlBuilder().appendEscaped(fileName) - .toSafeHtml().asString() + "

"); + HtmlLayoutContainer fileNameHtml = new HtmlLayoutContainer("

" + + new SafeHtmlBuilder().appendEscaped(fileName).toSafeHtml().asString() + "

"); lc.add(fileNameHtml, new VerticalLayoutData(-1, -1, new Margins(0))); TextButton downloadBtn = new TextButton("Download File"); downloadBtn.setIcon(DataMinerManagerPanel.resources.download()); @@ -62,6 +62,5 @@ public class FileViewer extends SimpleContainer { lc.add(downloadBtn, new VerticalLayoutData(-1, -1, new Margins(0))); add(lc); } - - + } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/HashMapViewer.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/HashMapViewer.java index 4fc257f..061d5e4 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/HashMapViewer.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/HashMapViewer.java @@ -13,7 +13,7 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class HashMapViewer extends SimpleContainer { @@ -22,7 +22,7 @@ public class HashMapViewer extends SimpleContainer { /** * - * @param map + * @param map map */ public HashMapViewer(Map map) { super(); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ImageViewer.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ImageViewer.java index 6e397df..178084e 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ImageViewer.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ImageViewer.java @@ -16,7 +16,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class ImageViewer extends SimpleContainer { @@ -26,31 +26,30 @@ public class ImageViewer extends SimpleContainer { protected static final String SAVE_FAIL_TITLE = "Error"; protected static final String SAVE_FAIL_MESSAGE = "Error in saving images."; private ImageResource imagesResource; - //private ComputationId computationId; - + // private ComputationId computationId; /** - * @param mapImages + * + * @param computationId + * computation id + * @param imagesResource + * image resource */ - public ImageViewer(ComputationId computationId, - ImageResource imagesResource) { + public ImageViewer(ComputationId computationId, ImageResource imagesResource) { super(); this.imagesResource = imagesResource; - //this.computationId = computationId; + // this.computationId = computationId; create(); } private void create() { VerticalLayoutContainer v = new VerticalLayoutContainer(); add(v); - if (imagesResource == null || imagesResource.getLink() == null - || imagesResource.getLink().isEmpty()) - v.add(new HtmlLayoutContainer("No image found."), new VerticalLayoutData(-1, -1, - new Margins(0))); + if (imagesResource == null || imagesResource.getLink() == null || imagesResource.getLink().isEmpty()) + v.add(new HtmlLayoutContainer("No image found."), new VerticalLayoutData(-1, -1, new Margins(0))); else { - v.add(new HtmlLayoutContainer(imagesResource.getName()),new VerticalLayoutData(-1, -1, new Margins(0))); - TextButton saveImageBtn = new TextButton( - "Download Image"); + v.add(new HtmlLayoutContainer(imagesResource.getName()), new VerticalLayoutData(-1, -1, new Margins(0))); + TextButton saveImageBtn = new TextButton("Download Image"); saveImageBtn.setIcon(DataMinerManagerPanel.resources.download()); saveImageBtn.addSelectHandler(new SelectEvent.SelectHandler() { @@ -61,9 +60,9 @@ public class ImageViewer extends SimpleContainer { } }); - v.add(saveImageBtn,new VerticalLayoutData(-1, -1, new Margins(0))); + v.add(saveImageBtn, new VerticalLayoutData(-1, -1, new Margins(0))); final Image img = new Image(imagesResource.getLink()); - v.add(img,new VerticalLayoutData(1, -1, new Margins(0))); + v.add(img, new VerticalLayoutData(1, -1, new Margins(0))); } forceLayout(); @@ -71,30 +70,20 @@ public class ImageViewer extends SimpleContainer { } /* - private void saveImages() { - EventBusProvider.INSTANCE.fireEvent(new MaskEvent( - "Saving on the workspace...")); - // handler.maskAll("Saving on the workspace..."); - DataMinerManager.getService().saveImage(computationId, imagesResource, - new AsyncCallback() { - @Override - public void onSuccess(String result) { - EventBusProvider.INSTANCE - .fireEvent(new MaskEvent(null)); - // handler.unmaskAll(); - UtilsGXT3.info(SAVE_OK_TITLE, SAVE_OK_MESSAGE + "\"" - + result + "\""); - } - - @Override - public void onFailure(Throwable caught) { - EventBusProvider.INSTANCE - .fireEvent(new MaskEvent(null)); - // handler.unmaskAll(); - UtilsGXT3.alert(SAVE_FAIL_TITLE, SAVE_FAIL_MESSAGE, - null); - } - }); - } - */ + * private void saveImages() { EventBusProvider.INSTANCE.fireEvent(new + * MaskEvent( "Saving on the workspace...")); // + * handler.maskAll("Saving on the workspace..."); + * DataMinerManager.getService().saveImage(computationId, imagesResource, + * new AsyncCallback() { + * + * @Override public void onSuccess(String result) { + * EventBusProvider.INSTANCE .fireEvent(new MaskEvent(null)); // + * handler.unmaskAll(); UtilsGXT3.info(SAVE_OK_TITLE, SAVE_OK_MESSAGE + "\"" + * + result + "\""); } + * + * @Override public void onFailure(Throwable caught) { + * EventBusProvider.INSTANCE .fireEvent(new MaskEvent(null)); // + * handler.unmaskAll(); UtilsGXT3.alert(SAVE_FAIL_TITLE, SAVE_FAIL_MESSAGE, + * null); } }); } + */ } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ResourceViewer.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ResourceViewer.java index a10b45a..695bb35 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ResourceViewer.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ResourceViewer.java @@ -14,7 +14,7 @@ import com.sencha.gxt.widget.core.client.container.HtmlLayoutContainer; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class ResourceViewer { @@ -22,7 +22,7 @@ public class ResourceViewer { private Map map; /** - * @param map + * @param map map */ public ResourceViewer(Map map) { this.map = map; @@ -30,8 +30,8 @@ public class ResourceViewer { } /** - * @param map - * @return + * + * @return resource viewer container */ public HtmlLayoutContainer getHtml() { String html = ""; diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/portlet/DataMinerManager.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/portlet/DataMinerManager.java index 68986a3..7ba47d8 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/portlet/DataMinerManager.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/portlet/DataMinerManager.java @@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class DataMinerManager extends GenericPortlet { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DataMinerManagerServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DataMinerManagerServiceImpl.java index 6a894a7..5bee3aa 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DataMinerManagerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DataMinerManagerServiceImpl.java @@ -35,8 +35,8 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @SuppressWarnings("serial") diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DescriptionRepository.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DescriptionRepository.java index fcbe1de..517aa6b 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DescriptionRepository.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DescriptionRepository.java @@ -10,7 +10,7 @@ import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorCategor /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class DescriptionRepository { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DownloadFolderServlet.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DownloadFolderServlet.java index 5b09a95..1065d90 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DownloadFolderServlet.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/DownloadFolderServlet.java @@ -20,8 +20,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * * Download Folder Servlet * diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/SessionUtil.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/SessionUtil.java index 7290953..22d3507 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/SessionUtil.java @@ -23,8 +23,8 @@ import org.gcube.vomanagement.usermanagement.model.GCubeUser; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SessionUtil { @@ -34,23 +34,27 @@ public class SessionUtil { /** * * @param httpServletRequest - * @return - * @throws TDGWTServiceException + * http servlet request + * @return service credentials + * @throws ServiceException + * service exception */ - public static ServiceCredentials getServiceCredentials( - HttpServletRequest httpServletRequest) throws ServiceException { + public static ServiceCredentials getServiceCredentials(HttpServletRequest httpServletRequest) + throws ServiceException { return getServiceCredentials(httpServletRequest, null); } /** * * @param httpServletRequest + * http servlet request * @param scopeGroupId - * @return - * @throws TDGWTServiceException + * scope group id + * @return service credentials + * @throws ServiceException + * service exception */ - public static ServiceCredentials getServiceCredentials( - HttpServletRequest httpServletRequest, String scopeGroupId) + public static ServiceCredentials getServiceCredentials(HttpServletRequest httpServletRequest, String scopeGroupId) throws ServiceException { ServiceCredentials sCredentials = null; @@ -108,8 +112,7 @@ public class SessionUtil { GCubeUser gCubeUser = pContext.getCurrentUser(httpServletRequest); if (gCubeUser == null) { - String error = "Error retrieving gCubeUser in scope " + scope - + ": " + gCubeUser; + String error = "Error retrieving gCubeUser in scope " + scope + ": " + gCubeUser; logger.error(error); throw new ServiceException(error); } @@ -117,8 +120,7 @@ public class SessionUtil { userName = gCubeUser.getUsername(); if (userName == null || userName.isEmpty()) { - String error = "Error retrieving username in scope " + scope - + ": " + userName; + String error = "Error retrieving username in scope " + scope + ": " + userName; logger.error(error); throw new ServiceException(error); } @@ -126,8 +128,7 @@ public class SessionUtil { token = pContext.getCurrentUserToken(scope, userName); if (token == null || token.isEmpty()) { - String error = "Error retrieving token for " + userName - + " in " + scope + ": " + token; + String error = "Error retrieving token for " + userName + " in " + scope + ": " + token; logger.error(error); throw new ServiceException(error); } @@ -171,16 +172,14 @@ public class SessionUtil { } else { - groupId = String.valueOf(pContext - .getCurrentGroupId(httpServletRequest)); + groupId = String.valueOf(pContext.getCurrentGroupId(httpServletRequest)); groupName = pContext.getCurrentGroupName(httpServletRequest); } - sCredentials = new ServiceCredentials(userName, fullName, name, - lastName, email, scope, groupId, groupName, userAvatarURL, - token); + sCredentials = new ServiceCredentials(userName, fullName, name, lastName, email, scope, groupId, groupName, + userAvatarURL, token); } logger.debug("ServiceCredentials: " + sCredentials); @@ -188,16 +187,25 @@ public class SessionUtil { return sCredentials; } - public static SClient getSClient(HttpServletRequest httpRequest, - ServiceCredentials serviceCredentials) throws Exception { - - + /** + * + * @param httpRequest + * http servlet request + * @param serviceCredentials + * service credendials + * @return client + * @throws Exception + * exception + */ + public static SClient getSClient(HttpServletRequest httpRequest, ServiceCredentials serviceCredentials) + throws Exception { + if (serviceCredentials == null) { logger.error("ServiceCredentials is null!"); throw new ServiceException("Service Credentials is null!"); } - HttpSession session=httpRequest.getSession(); - + HttpSession session = httpRequest.getSession(); + SClient sClient; Object obj = session.getAttribute(Constants.SClientMap); @@ -205,7 +213,7 @@ public class SessionUtil { logger.debug("Create new SClientMap"); HashMap sClientMap = new HashMap<>(); logger.debug("Create new SClient"); - DataMinerService dataMinerService=new DataMinerService(); + DataMinerService dataMinerService = new DataMinerService(); sClient = dataMinerService.getClient(serviceCredentials.getToken()); sClientMap.put(serviceCredentials.getScope(), sClient); session.setAttribute(Constants.SClientMap, sClientMap); @@ -218,7 +226,7 @@ public class SessionUtil { sClient = sClientMap.get(serviceCredentials.getScope()); } else { logger.debug("Create new SClient"); - DataMinerService dataMinerService=new DataMinerService(); + DataMinerService dataMinerService = new DataMinerService(); sClient = dataMinerService.getClient(serviceCredentials.getToken()); sClientMap.put(serviceCredentials.getScope(), sClient); session.setAttribute(Constants.SClientMap, sClientMap); @@ -226,8 +234,7 @@ public class SessionUtil { } else { logger.error("Attention no SClientMap in Session!"); - throw new ServiceException( - "Sign Out, portlet is changed, a new session is required!"); + throw new ServiceException("Sign Out, portlet is changed, a new session is required!"); } } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/DataMinerWorkAreaManager.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/DataMinerWorkAreaManager.java index 850b901..d63acd6 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/DataMinerWorkAreaManager.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/DataMinerWorkAreaManager.java @@ -14,8 +14,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DataMinerWorkAreaManager { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/StorageUtil.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/StorageUtil.java index f81d876..ab2fa3b 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/StorageUtil.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/StorageUtil.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class StorageUtil { @@ -33,12 +33,14 @@ public class StorageUtil { /** * * @param user + * user * @param itemId - * @return + * item id + * @return map * @throws ServiceException + * service exception */ - public static Map getProperties(String user, - String itemId) throws ServiceException { + public static Map getProperties(String user, String itemId) throws ServiceException { try { Workspace ws = HomeLibrary.getUserWorkspace(user); @@ -55,18 +57,17 @@ public class StorageUtil { } - /** * * @param user * User * @param itemId * Item id - * @return Input stream - * @throws StatAlgoImporterServiceException + * @return InputStream + * @throws ServiceException + * service exception */ - public static InputStream getInputStreamForItemOnWorkspace(String user, - String itemId) throws ServiceException { + public static InputStream getInputStreamForItemOnWorkspace(String user, String itemId) throws ServiceException { Workspace ws; try { ws = HomeLibrary.getUserWorkspace(user); @@ -92,10 +93,10 @@ public class StorageUtil { * @param wi * WorkspaceItem * @return InputStream - * @throws StatAlgoImporterServiceException + * @throws ServiceException + * service exception */ - private static InputStream getInputStream(String user, WorkspaceItem wi) - throws ServiceException { + private static InputStream getInputStream(String user, WorkspaceItem wi) throws ServiceException { InputStream is = null; try { @@ -106,8 +107,7 @@ public class StorageUtil { } catch (Throwable e) { logger.error("Error retrieving InputStream from storage", e); e.printStackTrace(); - throw new ServiceException("Error retrieving file from storage: " - + e.getLocalizedMessage(), e); + throw new ServiceException("Error retrieving file from storage: " + e.getLocalizedMessage(), e); } } @@ -118,11 +118,11 @@ public class StorageUtil { * User * @param itemId * Item id - * @return Public link - * @throws StatAlgoImporterServiceException + * @return link + * @throws ServiceException + * service exception */ - public static String getPublicLink(String user, String itemId) - throws ServiceException { + public static String getPublicLink(String user, String itemId) throws ServiceException { Workspace ws; try { ws = HomeLibrary.getUserWorkspace(user); @@ -135,32 +135,32 @@ public class StorageUtil { return workSpaceItem.getPublicLink(false); } catch (Throwable e) { - logger.error("Error retrieving public link: " - + e.getLocalizedMessage()); + logger.error("Error retrieving public link: " + e.getLocalizedMessage()); e.printStackTrace(); throw new ServiceException(e.getLocalizedMessage()); } } - + /** * * @param user + * user * @param folderId - * @return + * folder id + * @return File * @throws ServiceException + * service exception */ - public static File zipFolder(String user, String folderId) - throws ServiceException { + public static File zipFolder(String user, String folderId) throws ServiceException { Workspace ws; try { - logger.debug("zipFolder: [user="+user+", folderId="+folderId+"]"); + logger.debug("zipFolder: [user=" + user + ", folderId=" + folderId + "]"); ws = HomeLibrary.getUserWorkspace(user); WorkspaceItem workSpaceItem = ws.getItem(folderId); if (!workSpaceItem.isFolder()) { - throw new ServiceException( - "Item is not valid folder!"); + throw new ServiceException("Item is not valid folder!"); } WorkspaceFolder folder = (WorkspaceFolder) workSpaceItem; @@ -179,12 +179,14 @@ public class StorageUtil { /** * * @param user + * user * @param itemName - * @return + * item name + * @return workspace item * @throws ServiceException + * service exception */ - public static WorkspaceItem getItemInRootFolderOnWorkspace(String user, - String itemName) throws ServiceException { + public static WorkspaceItem getItemInRootFolderOnWorkspace(String user, String itemName) throws ServiceException { Workspace ws; try { ws = HomeLibrary.getUserWorkspace(user); @@ -202,13 +204,17 @@ public class StorageUtil { /** * * @param user + * user * @param folderId + * folder id * @param itemName - * @return + * item name + * @return workspace item * @throws ServiceException + * service exception */ - public static WorkspaceItem getItemInFolderOnWorkspace(String user, - String folderId, String itemName) throws ServiceException { + public static WorkspaceItem getItemInFolderOnWorkspace(String user, String folderId, String itemName) + throws ServiceException { Workspace ws; try { ws = HomeLibrary.getUserWorkspace(user); @@ -226,11 +232,13 @@ public class StorageUtil { /** * * @param user + * user * @param itemId + * item id * @throws ServiceException + * service exception */ - public static void deleteItem(String user, String itemId) - throws ServiceException { + public static void deleteItem(String user, String itemId) throws ServiceException { Workspace ws; try { logger.debug("User: " + user + ", ItemId:" + itemId); @@ -247,18 +255,23 @@ public class StorageUtil { } - public static String saveOnStorageInTemporalFile(InputStream is) - throws ServiceException { + /** + * + * @param is + * input stream + * @return public link + * @throws ServiceException + * service exception + */ + public static String saveOnStorageInTemporalFile(InputStream is) throws ServiceException { try { logger.debug("SaveOnStorageInTemporalFile()"); SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss"); Double v = Math.random() * 10000; - String tempFile = "P_" + sdf.format(new Date()) + "_" - + v.intValue() + ".xml"; + String tempFile = "P_" + sdf.format(new Date()) + "_" + v.intValue() + ".xml"; String remotePath = "/DataMiner/AlgoritmsParameters/" + tempFile; - IClient client = new StorageClient("DataAnalysis", "DataMiner", - "DataMiner", AccessType.PUBLIC, MemoryType.VOLATILE) - .getClient(); + IClient client = new StorageClient("DataAnalysis", "DataMiner", "DataMiner", AccessType.PUBLIC, + MemoryType.VOLATILE).getClient(); String storageId = client.put(true).LFile(is).RFile(remotePath); logger.debug("Storage id: " + storageId); String publicLink = client.getHttpUrl().RFile(remotePath); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/TableReader.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/TableReader.java index 9155fa2..9f75eda 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/TableReader.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/server/util/TableReader.java @@ -19,8 +19,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TableReader { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/Constants.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/Constants.java index f89cb78..b5fbf84 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/Constants.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/Constants.java @@ -3,7 +3,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.shared; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class Constants { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/StringUtil.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/StringUtil.java index a81f3df..15b17d1 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/StringUtil.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/StringUtil.java @@ -6,7 +6,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.shared; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class StringUtil { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/exception/ServiceException.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/exception/ServiceException.java index 62c1580..0d6e846 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/exception/ServiceException.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/exception/ServiceException.java @@ -5,8 +5,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ServiceException extends Exception { @@ -23,15 +23,20 @@ public class ServiceException extends Exception { } /** - * @param message + * @param message message */ public ServiceException(String message) { super(message); } - public ServiceException(String message,Throwable t) { - super(message,t); + /** + * + * @param message message + * @param throwable error + */ + public ServiceException(String message,Throwable throwable) { + super(message,throwable); } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/exception/SessionExpiredServiceException.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/exception/SessionExpiredServiceException.java index 7ad34da..7d33da2 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/exception/SessionExpiredServiceException.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/exception/SessionExpiredServiceException.java @@ -3,7 +3,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception; /** * Session Expired Service Exception * - * @author "Giancarlo Panichi" + * @author Giancarlo Panichi * */ public class SessionExpiredServiceException extends @@ -19,7 +19,7 @@ public class SessionExpiredServiceException extends } /** - * @param message + * @param message message */ public SessionExpiredServiceException(String message) { super(message); @@ -27,11 +27,11 @@ public class SessionExpiredServiceException extends /** * - * @param message - * @param t + * @param message message + * @param throwable error */ - public SessionExpiredServiceException(String message, Throwable t) { - super(message, t); + public SessionExpiredServiceException(String message, Throwable throwable) { + super(message, throwable); } } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/session/UserInfo.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/session/UserInfo.java index 3a7131d..52f82d8 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/session/UserInfo.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/session/UserInfo.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** * * @author giancarlo - * email: g.panichi@isti.cnr.it + * * */ public class UserInfo implements Serializable { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/Computations.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/Computations.java index b10991c..89ff9e6 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/Computations.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/Computations.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Computations implements Serializable { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/DataMinerWorkArea.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/DataMinerWorkArea.java index 57ef595..6b32bba 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/DataMinerWorkArea.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/DataMinerWorkArea.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DataMinerWorkArea implements Serializable { @@ -23,6 +23,7 @@ public class DataMinerWorkArea implements Serializable { /** * * @param dataMinerWorkAreaFolder + * DataMiner work area folder */ public DataMinerWorkArea(ItemDescription dataMinerWorkAreaFolder) { super(); @@ -33,13 +34,16 @@ public class DataMinerWorkArea implements Serializable { /** * * @param dataMinerWorkAreaFolder + * DataMiner work area folder * @param inputDataSets + * input data sets * @param outputDataSets + * output data sets * @param computations + * computations */ - public DataMinerWorkArea(ItemDescription dataMinerWorkAreaFolder, - InputDataSets inputDataSets, OutputDataSets outputDataSets, - Computations computations) { + public DataMinerWorkArea(ItemDescription dataMinerWorkAreaFolder, InputDataSets inputDataSets, + OutputDataSets outputDataSets, Computations computations) { super(); this.dataMinerWorkAreaFolder = dataMinerWorkAreaFolder; this.inputDataSets = inputDataSets; @@ -81,13 +85,8 @@ public class DataMinerWorkArea implements Serializable { @Override public String toString() { - return "DataMinerWorkArea [dataMinerWorkAreaFolder=" - + dataMinerWorkAreaFolder + ", inputDataSets=" + inputDataSets - + ", outputDataSets=" + outputDataSets + ", computations=" - + computations + "]"; + return "DataMinerWorkArea [dataMinerWorkAreaFolder=" + dataMinerWorkAreaFolder + ", inputDataSets=" + + inputDataSets + ", outputDataSets=" + outputDataSets + ", computations=" + computations + "]"; } - - - } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/InputDataSets.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/InputDataSets.java index c5b6cfa..2d22601 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/InputDataSets.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/InputDataSets.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class InputDataSets implements Serializable { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/ItemDescription.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/ItemDescription.java index cff6b8a..e65fda9 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/ItemDescription.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/ItemDescription.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ItemDescription implements Serializable { @@ -84,8 +84,8 @@ public class ItemDescription implements Serializable { /** * Compare basic information with another ItemDescription not null * - * @param itemDescription - * @return boolean + * @param itemDescription item description + * @return boolean true if match * */ public boolean compareInfo(ItemDescription itemDescription){ diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/OutputDataSets.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/OutputDataSets.java index 12c50b1..9b1f1a8 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/OutputDataSets.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/OutputDataSets.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OutputDataSets implements Serializable { diff --git a/src/test/java/org/gcube/portlets/widgets/dataminermanagerwidget/TestDataMinerService.java b/src/test/java/org/gcube/portlets/widgets/dataminermanagerwidget/TestDataMinerService.java index dd97038..cc9f97f 100644 --- a/src/test/java/org/gcube/portlets/widgets/dataminermanagerwidget/TestDataMinerService.java +++ b/src/test/java/org/gcube/portlets/widgets/dataminermanagerwidget/TestDataMinerService.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class TestDataMinerService extends TestCase {