getType() {
- return TYPE;
- }
-
- public static void fire(HasHandlers source, OutputShowRequestEvent event) {
- source.fireEvent(event);
- }
-
- public ItemDescription getItemDescription() {
- return itemDescription;
- }
-
- @Override
- public String toString() {
- return "OutputShowRequestEvent [itemDescription=" + itemDescription
- + "]";
- }
-
-}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationExecutionPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationExecutionPanel.java
index d11d315..60fde1f 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationExecutionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationExecutionPanel.java
@@ -6,8 +6,6 @@ import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
-import org.gcube.portlets.user.dataminermanager.client.events.OutputResourceEvent;
-import org.gcube.portlets.user.dataminermanager.client.events.OutputShowEvent;
import org.gcube.portlets.user.dataminermanager.client.events.ResubmitComputationExecutionEvent;
import org.gcube.portlets.user.dataminermanager.client.events.StartComputationExecutionEvent;
import org.gcube.portlets.user.dataminermanager.client.events.StartComputationExecutionRequestEvent;
@@ -81,6 +79,8 @@ public class ComputationExecutionPanel extends FramedPanel {
@Override
public void onResubmit(
ResubmitComputationExecutionEvent event) {
+ Log.debug("ResubmitComputationExecutionEvent: "
+ + event);
resubmitComputation(event);
}
});
@@ -93,31 +93,18 @@ public class ComputationExecutionPanel extends FramedPanel {
@Override
public void onStart(
StartComputationExecutionEvent event) {
+ Log.debug("Catch StartComputationExecutionEvent: "
+ + event);
startComputation(event);
}
});
-
- EventBusProvider.INSTANCE
- .addHandler(
- OutputShowEvent.getType(),
- new OutputShowEvent.OutputShowEventHandler() {
- @Override
- public void onOutputShow(OutputShowEvent event) {
- showOutput(event);
-
- }
+
- });
-
-
-
}
-
-
public void startNewComputation(final Operator operator) {
Log.debug("Computation Panel: start new computation ");
ComputationStatusPanel statusPanel = new ComputationStatusPanel(
@@ -180,25 +167,7 @@ public class ComputationExecutionPanel extends FramedPanel {
}
- private void showOutput(OutputShowEvent event) {
- /*
- final ComputationStatusPanel statusPanel = new ComputationStatusPanel(
- event.getComputationId().getOperatorName());
- computationStatusPanels.add(statusPanel);
- if (v.getWidgetCount() == 0) {
- v.add(statusPanel, new VerticalLayoutData(1, -1, new Margins(20)));
- } else {
- v.insert(statusPanel, 0, new VerticalLayoutData(1, -1, new Margins(
- 20)));
- }
- removeAllButton.setEnabled(true);
- statusPanel.computationStarted(event.getComputationId());
-
- forceLayout();
- */
- }
-
/**
*
*/
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationOutputPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationOutputPanel.java
index 9184a09..dba9c2d 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationOutputPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationOutputPanel.java
@@ -7,19 +7,20 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.FileResource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.ImagesResource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.MapResource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.ObjectResource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.Resource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.Resource.ResourceType;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.TableResource;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
-import org.gcube.portlets.user.dataminermanager.client.events.OutputResourceEvent;
-import org.gcube.portlets.user.dataminermanager.client.events.OutputResourceRequestEvent;
+import org.gcube.portlets.user.dataminermanager.client.events.OutputDataEvent;
+import org.gcube.portlets.user.dataminermanager.client.events.OutputDataRequestEvent;
+import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
import org.gcube.portlets.user.dataminermanager.client.widgets.ImagesViewer;
import org.gcube.portlets.user.dataminermanager.client.widgets.ResourceViewer;
import org.gcube.portlets.user.dataminermanager.shared.data.ComputationId;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.FileResource;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.ImagesResource;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.MapResource;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.ObjectResource;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.Resource;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.Resource.ResourceType;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.TableResource;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;
@@ -48,48 +49,64 @@ public class ComputationOutputPanel extends SimpleContainer {
public ComputationOutputPanel(ComputationId computationId) {
super();
this.computationId = computationId;
- Log.debug("ComputationOutputPanel");
+ Log.debug("ComputationOutputPanel: " + computationId);
bind();
init();
-
- }
+ OutputDataRequestEvent event = new OutputDataRequestEvent(computationId);
+ EventBusProvider.INSTANCE.fireEvent(event);
+ }
+
private void init() {
v = new VerticalLayoutContainer();
add(v);
- OutputResourceRequestEvent event=new OutputResourceRequestEvent(computationId);
- EventBusProvider.INSTANCE.fireEvent(event);
}
-
- private void bind(){
- EventBusProvider.INSTANCE.addHandler(
- OutputResourceEvent.TYPE,
- new OutputResourceEvent.OutputResourceEventHandler() {
- @Override
- public void onOutput(
- OutputResourceEvent event) {
- Log.debug("Catch OutputResourceEvent: "
- + event);
- showOutputInfo(event);
+ private void bind() {
+ EventBusProvider.INSTANCE.addHandler(OutputDataEvent.TYPE,
+ new OutputDataEvent.OutputDataEventHandler() {
+
+ @Override
+ public void onOutput(OutputDataEvent event) {
+ Log.debug("Catch OutputDataEvent: " + event);
+ if (event!=null&& event.getOutputData()!=null&&
+ event.getOutputData().getComputationId()!=null&&
+ event.getOutputData().getComputationId().getId()
+ .compareTo(computationId.getId()) == 0) {
+ manageOutputDataEvent(event);
+ }
+
+ }
+ });
- }
- });
-
}
-
-
-
+
/**
*
* @param resource
*/
- private void showOutputInfo(OutputResourceEvent event) {
+ private void manageOutputDataEvent(OutputDataEvent event) {
try {
- Resource resource=event.getResource();
- Log.info("Show Output Info on: " + resource);
- if (resource == null)
+ if (event == null || event.getOutputData() == null) {
+ Log.error("OutputDataEvent is null");
+ UtilsGXT3.alert("Error", "Invalid output data!");
return;
+ }
+ Resource resource = event.getOutputData().getResource();
+ showResource(resource);
+ } catch (Throwable e) {
+ Log.error("Error in show output info: " + e.getLocalizedMessage());
+ e.printStackTrace();
+ }
+ }
+
+ private void showResource(Resource resource) {
+ try {
+ Log.info("Show Output Info on: " + resource);
+ if (resource == null) {
+ Log.debug("Output Data hasn't resource!");
+ return;
+ }
ResourceType resourceType = resource.getResourceType();
@@ -108,7 +125,7 @@ public class ComputationOutputPanel extends SimpleContainer {
v.add(getHtmlTitle("The algorithm produced a", "Table"),
new VerticalLayoutData(1, -1, new Margins(0)));
// v.add(getTabResourceOutput(tabResource),
- //new VerticalLayoutData(1, -1, new Margins(0)));
+ // new VerticalLayoutData(1, -1, new Margins(0)));
break;
case IMAGES:
@@ -140,7 +157,7 @@ public class ComputationOutputPanel extends SimpleContainer {
forceLayout();
} catch (Throwable e) {
- Log.error("Error in show output info: " + e.getLocalizedMessage());
+ Log.error("Error in show resource: " + e.getLocalizedMessage());
e.printStackTrace();
}
}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java
index 47a4a56..3d8dceb 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java
@@ -9,9 +9,6 @@ import java.util.Map;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ColumnListParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ColumnParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.client.parametersfield.AbstractFld;
import org.gcube.portlets.user.dataminermanager.client.parametersfield.ColumnFld;
import org.gcube.portlets.user.dataminermanager.client.parametersfield.ColumnListFld;
@@ -19,6 +16,9 @@ import org.gcube.portlets.user.dataminermanager.client.parametersfield.OperatorF
import org.gcube.portlets.user.dataminermanager.client.parametersfield.TabularFld;
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnListParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java
index f004a3d..77cb40f 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java
@@ -3,17 +3,13 @@
*/
package org.gcube.portlets.user.dataminermanager.client.experiments;
-import java.util.Date;
-
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus.Status;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminermanager.client.custom.progress.GreenProgressBar;
import org.gcube.portlets.user.dataminermanager.client.custom.progress.RedProgressBar;
import org.gcube.portlets.user.dataminermanager.client.events.CancelComputationExecutionRequestEvent;
-import org.gcube.portlets.user.dataminermanager.client.events.DataMinerWorkAreaRequestEvent;
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
-import org.gcube.portlets.user.dataminermanager.client.type.DataMinerWorkAreaRequestEventType;
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
import org.gcube.portlets.user.dataminermanager.shared.Constants;
import org.gcube.portlets.user.dataminermanager.shared.data.ComputationId;
@@ -62,7 +58,6 @@ public class ComputationStatusPanel extends SimpleContainer {
private void init() {
setStylePrimaryName("computationStatusPanel");
-
}
private void create() {
@@ -70,13 +65,7 @@ public class ComputationStatusPanel extends SimpleContainer {
HtmlLayoutContainer title = new HtmlLayoutContainer(
"Computation of "
+ operatorName + "
");
- HtmlLayoutContainer date = new HtmlLayoutContainer(
- ""
- + new Date().toString() + "
");
-
vert.add(title, new VerticalLayoutData(-1, -1, new Margins(0)));
- vert.add(date, new VerticalLayoutData(-1, -1, new Margins(0)));
-
add(vert);
forceLayout();
}
@@ -87,6 +76,13 @@ public class ComputationStatusPanel extends SimpleContainer {
*/
public void computationStarted(ComputationId computationId) {
this.computationId = computationId;
+ /*
+ * HtmlLayoutContainer date = new HtmlLayoutContainer(
+ * "" + new Date().toString() +
+ * "
");
+ */
+ // vert.add(date, new VerticalLayoutData(-1, -1, new Margins(0)));
+
vert.add(new HtmlLayoutContainer("Created, the id is "
+ computationId.getId() + " [link]
"));
@@ -115,6 +111,8 @@ public class ComputationStatusPanel extends SimpleContainer {
timer.scheduleRepeating(Constants.TIME_UPDATE_COMPUTATION_STATUS_PANEL);
}
+
+
private void cancelComputation() {
CancelComputationExecutionRequestEvent event = new CancelComputationExecutionRequestEvent(
computationId);
@@ -126,7 +124,7 @@ public class ComputationStatusPanel extends SimpleContainer {
* @param operator
*
*/
- protected void computationTerminated(ComputationId computationId,
+ private void computationTerminated(ComputationId computationId,
ComputationStatus computationStatus) {
Log.debug("Computation Terminated");
Log.debug("Computation Status:" + computationStatus);
@@ -146,8 +144,7 @@ public class ComputationStatusPanel extends SimpleContainer {
progressBar.updateProgress(1, "Computation Complete");
vert.insert(progressBar, index, new VerticalLayoutData(1, -1,
new Margins(20)));
- showOutput();
- fireDataMinerWorkAreareRequestUpdate();
+ showComputationCompletedOutput();
} else if (computationStatus.isFailed()) {
Log.debug("Computation is Failed");
String errorMessage;
@@ -165,8 +162,7 @@ public class ComputationStatusPanel extends SimpleContainer {
UtilsGXT3.alert("Failed",
"The computation " + computationId.getId() + " of "
+ computationId.getOperatorName()
- + " has failed."
- + errorMessage);
+ + " has failed." + errorMessage);
int index = vert.getWidgetIndex(progressBar);
vert.remove(index);
// TODO
@@ -176,7 +172,6 @@ public class ComputationStatusPanel extends SimpleContainer {
.setMarginBottom(36, Unit.PX);
vert.insert(progressBar, index, new VerticalLayoutData(1, -1,
new Margins(20)));
- fireDataMinerWorkAreareRequestUpdate();
}
}
@@ -184,16 +179,12 @@ public class ComputationStatusPanel extends SimpleContainer {
forceLayout();
}
- private void fireDataMinerWorkAreareRequestUpdate() {
- DataMinerWorkAreaRequestEvent event = new DataMinerWorkAreaRequestEvent(
- DataMinerWorkAreaRequestEventType.UPDATE);
- EventBusProvider.INSTANCE.fireEvent(event);
- }
+
/**
*
*/
- private void showOutput() {
+ private void showComputationCompletedOutput() {
HtmlLayoutContainer computationEndMessage = new HtmlLayoutContainer(
"The computation " + computationId.getOperatorName()
+ " finished.
");
@@ -208,10 +199,12 @@ public class ComputationStatusPanel extends SimpleContainer {
}
+
+
/**
* @param computationStatus
*/
- protected void updateStatus(ComputationStatus computationStatus) {
+ private void updateStatus(ComputationStatus computationStatus) {
Log.debug("Conputation Status Panel ::Update Status ");
if (computationStatus.getStatus() == Status.PENDING)
progressBar.updateText("Pending...");
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/AbstractFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/AbstractFld.java
index 7dd2e44..edeaa9d 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/AbstractFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/AbstractFld.java
@@ -3,7 +3,7 @@
*/
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.google.gwt.user.client.ui.Widget;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/BooleanFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/BooleanFld.java
index 6bc62f8..c2cc25a 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/BooleanFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/BooleanFld.java
@@ -3,9 +3,9 @@
*/
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ObjectParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.StringUtil;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.google.gwt.user.client.ui.Widget;
import com.sencha.gxt.core.client.util.Margins;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnFld.java
index 6d460b2..b62a611 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnFld.java
@@ -5,13 +5,13 @@ package org.gcube.portlets.user.dataminermanager.client.parametersfield;
import java.util.ArrayList;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ColumnParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.client.events.TabularFldChangeEvent;
import org.gcube.portlets.user.dataminermanager.client.events.TabularFldChangeEvent.TabularFldChangeEventHandler;
import org.gcube.portlets.user.dataminermanager.client.properties.ColumnItemPropertiesCombo;
import org.gcube.portlets.user.dataminermanager.shared.data.ColumnItem;
import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Widget;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnListFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnListFld.java
index 218c733..3627f3d 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnListFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnListFld.java
@@ -6,13 +6,13 @@ package org.gcube.portlets.user.dataminermanager.client.parametersfield;
import java.util.ArrayList;
import java.util.List;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ColumnListParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.client.events.TabularFldChangeEvent;
import org.gcube.portlets.user.dataminermanager.client.events.TabularFldChangeEvent.TabularFldChangeEventHandler;
import org.gcube.portlets.user.dataminermanager.client.properties.ColumnItemProperties;
import org.gcube.portlets.user.dataminermanager.shared.data.ColumnItem;
import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnListParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Widget;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/DoubleFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/DoubleFld.java
index c0f9fa3..47b0f37 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/DoubleFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/DoubleFld.java
@@ -1,7 +1,7 @@
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ObjectParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.google.gwt.user.client.ui.Widget;
import com.sencha.gxt.core.client.util.Margins;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/EnumFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/EnumFld.java
index ebc2e78..8106d97 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/EnumFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/EnumFld.java
@@ -3,8 +3,8 @@
*/
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.EnumParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.EnumParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.google.gwt.user.client.ui.Widget;
import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java
index 48c8a64..e187fda 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java
@@ -8,11 +8,11 @@ import java.util.Arrays;
import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.FileParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.FileParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener;
import org.gcube.portlets.widgets.wsexplorer.client.select.WorkspaceExplorerSelectDialog;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FloatFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FloatFld.java
index a3b0d5e..d180667 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FloatFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FloatFld.java
@@ -1,7 +1,7 @@
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ObjectParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.google.gwt.user.client.ui.Widget;
import com.sencha.gxt.core.client.util.Margins;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/IntFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/IntFld.java
index 5f86ae6..d2b8cb6 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/IntFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/IntFld.java
@@ -1,7 +1,7 @@
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ObjectParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.google.gwt.user.client.ui.Widget;
import com.sencha.gxt.core.client.util.Margins;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListIntFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListIntFld.java
index cfd8022..413bec3 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListIntFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListIntFld.java
@@ -7,9 +7,9 @@ import java.util.ArrayList;
import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ListParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ObjectParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ListParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.google.gwt.user.client.ui.Widget;
import com.sencha.gxt.core.client.util.Margins;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListStringFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListStringFld.java
index 62dfef9..67edd07 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListStringFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ListStringFld.java
@@ -6,9 +6,9 @@ package org.gcube.portlets.user.dataminermanager.client.parametersfield;
import java.util.ArrayList;
import java.util.List;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ListParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ObjectParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ListParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.google.gwt.user.client.ui.Widget;
import com.sencha.gxt.core.client.util.Margins;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/OperatorFieldWidget.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/OperatorFieldWidget.java
index cc33c08..148e1a2 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/OperatorFieldWidget.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/OperatorFieldWidget.java
@@ -3,10 +3,10 @@
*/
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ListParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ObjectParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.StringUtil;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ListParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.allen_sauer.gwt.log.client.Log;
import com.sencha.gxt.widget.core.client.form.FieldLabel;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringFld.java
index bbc2eec..92d36f8 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringFld.java
@@ -3,8 +3,8 @@
*/
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ObjectParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import com.google.gwt.user.client.ui.Widget;
import com.sencha.gxt.core.client.util.Margins;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringItem.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringItem.java
index 8fcedd8..899feda 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringItem.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/StringItem.java
@@ -1,7 +1,7 @@
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ObjectParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.widget.core.client.button.TextButton;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java
index 258ada1..ccf362d 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java
@@ -5,11 +5,11 @@ import java.util.Arrays;
import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.TabularParameter;
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple;
import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularParameter;
import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener;
import org.gcube.portlets.widgets.wsexplorer.client.select.WorkspaceExplorerSelectDialog;
import org.gcube.portlets.widgets.wsexplorer.shared.Item;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java
index 7b58b96..a762b30 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java
@@ -8,8 +8,6 @@ import java.util.Arrays;
import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.TabularParameter;
import org.gcube.portlets.user.dataminermanager.client.events.TabularFldChangeEvent;
import org.gcube.portlets.user.dataminermanager.client.events.TabularFldChangeEvent.HasTabularFldChangeEventHandler;
import org.gcube.portlets.user.dataminermanager.client.events.TabularFldChangeEvent.TabularFldChangeEventHandler;
@@ -17,6 +15,8 @@ import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServi
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple;
import org.gcube.portlets.user.dataminermanager.shared.exception.ExpiredSessionServiceException;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularParameter;
import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener;
import org.gcube.portlets.widgets.wsexplorer.client.select.WorkspaceExplorerSelectDialog;
import org.gcube.portlets.widgets.wsexplorer.shared.Item;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularListFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularListFld.java
index 96a519f..09cad8f 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularListFld.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularListFld.java
@@ -6,9 +6,9 @@ package org.gcube.portlets.user.dataminermanager.client.parametersfield;
import java.util.ArrayList;
import java.util.List;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.TabularListParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.TabularParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularListParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularParameter;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.ui.Widget;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java
index 6a20c5a..9c8b88b 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java
@@ -5,11 +5,12 @@ import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.Resource;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.data.ComputationData;
import org.gcube.portlets.user.dataminermanager.shared.data.ComputationId;
+import org.gcube.portlets.user.dataminermanager.shared.data.OutputData;
import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple;
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo;
import org.gcube.portlets.user.dataminermanager.shared.workspace.DataMinerWorkArea;
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
@@ -52,8 +53,8 @@ public interface DataMinerPortletService extends RemoteService {
public void deleteItem(ItemDescription itemDescription)
throws ServiceException;
- public Resource getResourceByComputationId(ComputationId computationId) throws ServiceException;
+ public OutputData getOutputDataByComputationId(ComputationId computationId) throws ServiceException;
- public Resource getResourceByComputationItem(ItemDescription itemDescription) throws ServiceException;
+ public ComputationData getComputationData(ItemDescription itemDescription) throws ServiceException;
}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java
index f4039a0..f404f8a 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java
@@ -5,10 +5,11 @@ import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.Resource;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.data.ComputationData;
import org.gcube.portlets.user.dataminermanager.shared.data.ComputationId;
+import org.gcube.portlets.user.dataminermanager.shared.data.OutputData;
import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo;
import org.gcube.portlets.user.dataminermanager.shared.workspace.DataMinerWorkArea;
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
@@ -57,12 +58,12 @@ public interface DataMinerPortletServiceAsync {
AsyncCallback asyncCallback);
void deleteItem(ItemDescription itemDescription,
- AsyncCallback callback);
+ AsyncCallback callback);
- void getResourceByComputationId(ComputationId computationId,
- AsyncCallback callback);
+ void getOutputDataByComputationId(ComputationId computationId,
+ AsyncCallback callback);
- void getResourceByComputationItem(ItemDescription itemDescription,
- AsyncCallback callback);
+ void getComputationData(ItemDescription itemDescription,
+ AsyncCallback callback);
}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/ImagesViewer.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/ImagesViewer.java
index d47620a..69cadb1 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/ImagesViewer.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/ImagesViewer.java
@@ -1,8 +1,8 @@
package org.gcube.portlets.user.dataminermanager.client.widgets;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.ImagesResource;
import org.gcube.portlets.user.dataminermanager.shared.data.ComputationId;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.ImagesResource;
import com.google.gwt.user.client.ui.Image;
import com.sencha.gxt.core.client.util.Margins;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/ResourceViewer.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/ResourceViewer.java
index 8e1059f..a40aa90 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/ResourceViewer.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/widgets/ResourceViewer.java
@@ -6,8 +6,8 @@ package org.gcube.portlets.user.dataminermanager.client.widgets;
import java.util.Map;
import java.util.Map.Entry;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.ObjectResource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.Resource;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.ObjectResource;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.Resource;
import com.sencha.gxt.widget.core.client.container.HtmlLayoutContainer;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java
index 46929fa..069b930 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java
@@ -11,17 +11,18 @@ import org.gcube.application.framework.core.session.ASLSession;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.Resource;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletService;
import org.gcube.portlets.user.dataminermanager.server.smservice.SClient;
import org.gcube.portlets.user.dataminermanager.server.storage.StorageUtil;
import org.gcube.portlets.user.dataminermanager.server.util.DataMinerWorkAreaManager;
import org.gcube.portlets.user.dataminermanager.server.util.SessionUtil;
import org.gcube.portlets.user.dataminermanager.server.util.TableReader;
+import org.gcube.portlets.user.dataminermanager.shared.data.ComputationData;
import org.gcube.portlets.user.dataminermanager.shared.data.ComputationId;
+import org.gcube.portlets.user.dataminermanager.shared.data.OutputData;
import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple;
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo;
import org.gcube.portlets.user.dataminermanager.shared.workspace.DataMinerWorkArea;
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;
@@ -295,23 +296,23 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
}
@Override
- public Resource getResourceByComputationId(ComputationId computationId)
+ public OutputData getOutputDataByComputationId(ComputationId computationId)
throws ServiceException {
try {
- Log.debug("getResourceByComputationId: " + computationId);
+ Log.debug("getOutputDataByComputationId: " + computationId);
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getASLSession(session);
SClient smClient = SessionUtil.getSClient(session, aslSession);
- Resource resource = smClient
- .getResourceByComputationId(computationId);
- Log.debug("Resoure: " + resource);
- return resource;
+ OutputData outputData = smClient
+ .getOutputDataByComputationId(computationId);
+ Log.debug("OutputData: " + outputData);
+ return outputData;
} catch (ServiceException e) {
logger.error(e.getLocalizedMessage());
throw e;
} catch (Throwable e) {
- logger.error("Error in getResourceByComputationId: "
+ logger.error("Error retrieving output by computation id: "
+ e.getLocalizedMessage());
e.printStackTrace();
throw new ServiceException(e.getLocalizedMessage(), e);
@@ -321,22 +322,22 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
@Override
- public Resource getResourceByComputationItem(ItemDescription itemDescription)
+ public ComputationData getComputationData(ItemDescription itemDescription)
throws ServiceException {
try {
HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getASLSession(session);
- logger.debug("ResourceByComputationItemt(): " + itemDescription);
+ logger.debug("OutputDataByComputationItemt(): " + itemDescription);
Map properties = StorageUtil.getProperties(
aslSession.getUsername(), itemDescription.getId());
logger.debug("Properties: " + properties);
SClient smClient = SessionUtil.getSClient(session, aslSession);
- return smClient.getResourceByComputationProperties(properties);
+ return smClient.getComputationDataByComputationProperties(properties);
} catch (ServiceException e) {
logger.error(e.getLocalizedMessage());
throw e;
} catch (Throwable e) {
- logger.error("Error retrieving resource by computation item: "
+ logger.error("Error retrieving output by item: "
+ e.getLocalizedMessage());
e.printStackTrace();
throw new ServiceException(e.getLocalizedMessage());
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient.java
index f39fee1..8fc2448 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient.java
@@ -6,9 +6,10 @@ import java.util.Map;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.Resource;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.data.ComputationData;
import org.gcube.portlets.user.dataminermanager.shared.data.ComputationId;
+import org.gcube.portlets.user.dataminermanager.shared.data.OutputData;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
/**
*
@@ -36,10 +37,10 @@ public abstract class SClient {
public abstract ComputationStatus getComputationStatus(
ComputationId computationId) throws Exception;
- public abstract Resource getResourceByComputationId(
+ public abstract OutputData getOutputDataByComputationId(
ComputationId computationId) throws Exception;
- public abstract Resource getResourceByComputationProperties(
+ public abstract ComputationData getComputationDataByComputationProperties(
Map computationProperties) throws Exception;
public abstract String cancelComputation(ComputationId computationId)
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPS.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPS.java
index 1092b7b..5badd92 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPS.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPS.java
@@ -7,6 +7,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -34,14 +35,6 @@ import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus.St
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorCategory;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.FileResource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.ImagesResource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.MapResource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.ObjectResource;
-import org.gcube.portlets.user.dataminermanager.client.bean.output.Resource;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ObjectParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.TabularListParameter;
import org.gcube.portlets.user.dataminermanager.server.is.InformationSystemUtils;
import org.gcube.portlets.user.dataminermanager.server.smservice.wps.ProcessInformations;
import org.gcube.portlets.user.dataminermanager.server.smservice.wps.ResponseWPS;
@@ -50,7 +43,17 @@ import org.gcube.portlets.user.dataminermanager.server.smservice.wps.WPS2SM;
import org.gcube.portlets.user.dataminermanager.server.storage.StorageUtil;
import org.gcube.portlets.user.dataminermanager.server.util.ServiceCredential;
import org.gcube.portlets.user.dataminermanager.shared.Constants;
+import org.gcube.portlets.user.dataminermanager.shared.data.ComputationData;
import org.gcube.portlets.user.dataminermanager.shared.data.ComputationId;
+import org.gcube.portlets.user.dataminermanager.shared.data.OutputData;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.FileResource;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.ImagesResource;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.MapResource;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.ObjectResource;
+import org.gcube.portlets.user.dataminermanager.shared.data.output.Resource;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularListParameter;
import org.n52.wps.client.ExecuteRequestBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -399,10 +402,15 @@ public class SClient4WPS extends SClient {
Object responseObject = wpsClient.execute(wpsProcessingServlet,
execute);
String processLocation = null;
+ Date creationData = null;
if (responseObject != null) {
if (responseObject instanceof ExecuteResponseDocumentImpl) {
- processLocation = ((ExecuteResponseDocumentImpl) responseObject)
+ ExecuteResponseDocumentImpl executeResponseDocumentImpl = ((ExecuteResponseDocumentImpl) responseObject);
+ processLocation = executeResponseDocumentImpl
.getExecuteResponse().getStatusLocation();
+ creationData = executeResponseDocumentImpl
+ .getExecuteResponse().getStatus().getCreationTime()
+ .getTime();
} else {
throw new Exception(
"Invalid response from service, "
@@ -413,7 +421,8 @@ public class SClient4WPS extends SClient {
throw new Exception("Invalid Response from service, "
+ responseObject);
}
- logger.debug("Retrieved ProcessLocation: " + processLocation);
+ logger.debug("Retrieved: [ProcessLocation=" + processLocation
+ + ", CreationDate=" + creationData + "]");
return processLocation;
} catch (Throwable e) {
@@ -930,13 +939,14 @@ public class SClient4WPS extends SClient {
}
@Override
- public Resource getResourceByComputationId(ComputationId computationId)
+ public OutputData getOutputDataByComputationId(ComputationId computationId)
throws Exception {
Map resources = retrieveOutput(computationId);
MapResource mapResource = new MapResource("mapResource", "Resources",
"Resources", resources);
+ OutputData outputData = new OutputData(computationId, mapResource);
- return mapResource;
+ return outputData;
}
private Map retrieveOutput(ComputationId computationId)
@@ -1171,16 +1181,15 @@ public class SClient4WPS extends SClient {
}
Map userInputs = new LinkedHashMap<>();
- for (Map.Entry entry : computationProperties.entrySet()) {
- if (entry.getKey().startsWith("input")) {
- int inputSeparatorIndex = entry.getKey().indexOf("_");
- String inputKey = entry.getKey().substring(
- inputSeparatorIndex + 1);
+ for (String key : computationProperties.keySet()) {
+ if (key.startsWith("input")) {
+ int inputSeparatorIndex = key.indexOf("_");
+ String inputKey = key.substring(inputSeparatorIndex + 1);
if (inputKey.compareToIgnoreCase("user.name") != 0
&& inputKey.compareToIgnoreCase("scope") != 0) {
- userInputs.put(inputKey, entry.getValue());
+ userInputs.put(inputKey, computationProperties.get(key));
logger.debug("UserInputs[key=" + inputKey + ", value="
- + entry.getValue() + "]");
+ + computationProperties.get(key) + "]");
}
}
@@ -1217,10 +1226,65 @@ public class SClient4WPS extends SClient {
}
@Override
- public Resource getResourceByComputationProperties(
+ public ComputationData getComputationDataByComputationProperties(
Map computationProperties) throws Exception {
- // TODO Auto-generated method stub
- return null;
- }
+ if (computationProperties == null || computationProperties.isEmpty()) {
+ throw new Exception("Invalid computation properties: "
+ + computationProperties);
+ }
+ String compId = computationProperties.get("computation_id");
+
+ String operatorId = computationProperties.get("operator_id");
+ String operatorName = computationProperties.get("operator_name");
+ String operatorDescritpion = computationProperties
+ .get("operator_description");
+ String vre = computationProperties.get("VRE");
+ String startDate = computationProperties.get("startDate");
+ String endDate = computationProperties.get("endDate");
+ String status = computationProperties.get("status");
+ String executionType = computationProperties.get("execution_type");
+
+ ComputationId computationId = new ComputationId();
+ computationId.setId(compId);
+ computationId.setOperatorId(operatorId);
+ computationId.setOperatorName(operatorName);
+
+ LinkedHashMap inputParameters = new LinkedHashMap<>();
+ LinkedHashMap outputParameters = new LinkedHashMap<>();
+
+ for (String key : computationProperties.keySet()) {
+ if (key != null) {
+ if (key.startsWith("input")) {
+ int inputSeparatorIndex = key.indexOf("_");
+ String inputKey = key.substring(inputSeparatorIndex + 1);
+ if (inputKey.compareToIgnoreCase("user.name") != 0
+ && inputKey.compareToIgnoreCase("scope") != 0) {
+ inputParameters.put(inputKey,
+ computationProperties.get(key));
+
+ }
+
+ } else {
+ if (key.startsWith("output")) {
+ int outputSeparatorIndex = key.indexOf("_");
+ String outputKey = key
+ .substring(outputSeparatorIndex + 1);
+ outputParameters.put(outputKey,
+ computationProperties.get(key));
+
+ }
+
+ }
+
+ }
+ }
+
+ ComputationData computationData = new ComputationData(computationId,
+ inputParameters, outputParameters, operatorDescritpion,
+ startDate, endDate, status, executionType, vre);
+
+ return computationData;
+
+ }
}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/WPS2SM.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/WPS2SM.java
index 80afcbf..70d4638 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/WPS2SM.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/WPS2SM.java
@@ -17,16 +17,16 @@ import net.opengis.wps.x100.OutputDescriptionType;
import net.opengis.wps.x100.SupportedComplexDataInputType;
import net.opengis.wps.x100.SupportedComplexDataType;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ColumnListParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ColumnParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.EnumParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.FileParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ListParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.ObjectParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.Parameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.TabularListParameter;
-import org.gcube.portlets.user.dataminermanager.client.bean.parameters.TabularParameter;
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnListParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.EnumParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.FileParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ListParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularListParameter;
+import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularParameter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/ComputationData.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/ComputationData.java
new file mode 100644
index 0000000..1befe77
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/ComputationData.java
@@ -0,0 +1,130 @@
+package org.gcube.portlets.user.dataminermanager.shared.data;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+
+/**
+ *
+ * @author Giancarlo Panichi email: g.panichi@isti.cnr.it
+ *
+ */
+public class ComputationData implements Serializable {
+
+ private static final long serialVersionUID = -3039151542008171640L;
+ private ComputationId computationId;
+ private LinkedHashMap inputParameters;
+ private LinkedHashMap outputParameters;
+ private String operatorDescription;
+ private String startDate;
+ private String endDate;
+ private String status;
+ private String executionType;
+ private String vre;
+
+ public ComputationData() {
+ super();
+ }
+
+ public ComputationData(ComputationId computationId,
+ LinkedHashMap inputParameters,
+ LinkedHashMap outputParameters,
+ String operatorDescription, String startDate, String endDate,
+ String status, String executionType, String vre) {
+ super();
+ this.computationId = computationId;
+ this.inputParameters = inputParameters;
+ this.outputParameters = outputParameters;
+ this.operatorDescription = operatorDescription;
+ this.startDate = startDate;
+ this.endDate = endDate;
+ this.status = status;
+ this.executionType = executionType;
+ this.vre = vre;
+ }
+
+ public ComputationId getComputationId() {
+ return computationId;
+ }
+
+ public void setComputationId(ComputationId computationId) {
+ this.computationId = computationId;
+ }
+
+ public LinkedHashMap getInputParameters() {
+ return inputParameters;
+ }
+
+ public void setInputParameters(LinkedHashMap inputParameters) {
+ this.inputParameters = inputParameters;
+ }
+
+ public LinkedHashMap getOutputParameters() {
+ return outputParameters;
+ }
+
+ public void setOutputParameters(
+ LinkedHashMap outputParameters) {
+ this.outputParameters = outputParameters;
+ }
+
+ public String getOperatorDescription() {
+ return operatorDescription;
+ }
+
+ public void setOperatorDescription(String operatorDescription) {
+ this.operatorDescription = operatorDescription;
+ }
+
+ public String getStartDate() {
+ return startDate;
+ }
+
+ public void setStartDate(String startDate) {
+ this.startDate = startDate;
+ }
+
+ public String getEndDate() {
+ return endDate;
+ }
+
+ public void setEndDate(String endDate) {
+ this.endDate = endDate;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getExecutionType() {
+ return executionType;
+ }
+
+ public void setExecutionType(String executionType) {
+ this.executionType = executionType;
+ }
+
+ public String getVre() {
+ return vre;
+ }
+
+ public void setVre(String vre) {
+ this.vre = vre;
+ }
+
+ @Override
+ public String toString() {
+ return "ComputationData [computationId=" + computationId
+ + ", inputParameters=" + inputParameters
+ + ", outputParameters=" + outputParameters
+ + ", operatorDescription=" + operatorDescription
+ + ", startDate=" + startDate + ", endDate=" + endDate
+ + ", status=" + status + ", executionType=" + executionType
+ + ", vre=" + vre + "]";
+ }
+
+}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/OutputData.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/OutputData.java
new file mode 100644
index 0000000..e821b03
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/OutputData.java
@@ -0,0 +1,43 @@
+package org.gcube.portlets.user.dataminermanager.shared.data;
+
+import java.io.Serializable;
+
+import org.gcube.portlets.user.dataminermanager.shared.data.output.Resource;
+
+/**
+ *
+ * @author Giancarlo Panichi email: g.panichi@isti.cnr.it
+ *
+ */
+public class OutputData implements Serializable {
+
+ private static final long serialVersionUID = -3039151542008171640L;
+ private ComputationId computationId;
+ private Resource resource;
+
+ public OutputData() {
+ super();
+ }
+
+ public OutputData(ComputationId computationId, Resource resource) {
+ super();
+ this.computationId = computationId;
+ this.resource = resource;
+ }
+
+ public ComputationId getComputationId() {
+ return computationId;
+ }
+
+ public Resource getResource() {
+ return resource;
+ }
+
+ @Override
+ public String toString() {
+ return "OutputData [computationId=" + computationId + ", resource="
+ + resource + "]";
+ }
+
+}
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/FileResource.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/FileResource.java
similarity index 95%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/FileResource.java
rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/FileResource.java
index de8be3a..d9ff28d 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/FileResource.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/FileResource.java
@@ -1,7 +1,7 @@
/**
*
*/
-package org.gcube.portlets.user.dataminermanager.client.bean.output;
+package org.gcube.portlets.user.dataminermanager.shared.data.output;
import java.io.Serializable;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/ImagesResource.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/ImagesResource.java
similarity index 95%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/ImagesResource.java
rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/ImagesResource.java
index caa2fee..aeac780 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/ImagesResource.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/ImagesResource.java
@@ -1,7 +1,7 @@
/**
*
*/
-package org.gcube.portlets.user.dataminermanager.client.bean.output;
+package org.gcube.portlets.user.dataminermanager.shared.data.output;
import java.io.Serializable;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/MapResource.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/MapResource.java
similarity index 94%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/MapResource.java
rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/MapResource.java
index 4c5c872..a1e2f3f 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/MapResource.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/MapResource.java
@@ -1,7 +1,7 @@
/**
*
*/
-package org.gcube.portlets.user.dataminermanager.client.bean.output;
+package org.gcube.portlets.user.dataminermanager.shared.data.output;
import java.io.Serializable;
import java.util.Map;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/ObjectResource.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/ObjectResource.java
similarity index 94%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/ObjectResource.java
rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/ObjectResource.java
index 8dcc65b..2273cc1 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/ObjectResource.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/ObjectResource.java
@@ -1,7 +1,7 @@
/**
*
*/
-package org.gcube.portlets.user.dataminermanager.client.bean.output;
+package org.gcube.portlets.user.dataminermanager.shared.data.output;
import java.io.Serializable;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/Resource.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/Resource.java
similarity index 97%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/Resource.java
rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/Resource.java
index 0b7c553..eee983c 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/Resource.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/Resource.java
@@ -1,7 +1,7 @@
/**
*
*/
-package org.gcube.portlets.user.dataminermanager.client.bean.output;
+package org.gcube.portlets.user.dataminermanager.shared.data.output;
import java.io.Serializable;
diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/TableResource.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/TableResource.java
similarity index 94%
rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/TableResource.java
rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/TableResource.java
index c541255..be76966 100644
--- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/output/TableResource.java
+++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/data/output/TableResource.java
@@ -1,7 +1,7 @@
/**
*
*/
-package org.gcube.portlets.user.dataminermanager.client.bean.output;
+package org.gcube.portlets.user.dataminermanager.shared.data.output;
import com.google.gwt.user.client.rpc.IsSerializable;