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 4506c23..1b59933 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 @@ -6,6 +6,8 @@ import org.gcube.data.analysis.dataminermanagercl.shared.data.OutputData; import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationData; import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationId; import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWorkArea; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.CancelComputationExecutionRequestEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.CancelExecutionFromComputationsRequestEvent; @@ -39,8 +41,6 @@ import org.gcube.portlets.widgets.dataminermanagerwidget.client.util.UtilsGXT3; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.Constants; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.SessionExpiredServiceException; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.session.UserInfo; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.DataMinerWorkArea; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.rpc.AsyncCallback; 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 f226cae..2c9ea0c 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 @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import org.gcube.portal.clientcontext.client.GCubeClientContext; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; @@ -20,7 +21,7 @@ import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWo import org.gcube.portlets.widgets.dataminermanagerwidget.client.util.UtilsGXT3; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.Constants; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.SessionExpiredServiceException; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; + import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload; 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 0b4309e..ed34a42 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 @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import org.gcube.portal.clientcontext.client.GCubeClientContext; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; @@ -18,7 +19,7 @@ import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWo import org.gcube.portlets.widgets.dataminermanagerwidget.client.util.UtilsGXT3; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.Constants; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.SessionExpiredServiceException; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; + import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload; 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 be76c50..1537de2 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 @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import org.gcube.portal.clientcontext.client.GCubeClientContext; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; @@ -18,7 +19,7 @@ import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWo import org.gcube.portlets.widgets.dataminermanagerwidget.client.util.UtilsGXT3; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.Constants; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.SessionExpiredServiceException; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; + import org.gcube.portlets.widgets.workspaceuploader.client.WorkspaceUploadNotification.WorskpaceUploadNotificationListener; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE; import org.gcube.portlets.widgets.workspaceuploader.client.uploader.dragdrop.MultipleDNDUpload; 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 10a27f7..9958a0d 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 @@ -1,6 +1,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.events; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; + + +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; 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 4b8b670..a7b66c8 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 @@ -1,6 +1,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.events; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; + + +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; 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 a7948d7..119372d 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 @@ -1,8 +1,9 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.events; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWorkArea; import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWorkAreaEventType; import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWorkAreaRegionType; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.DataMinerWorkArea; + import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; 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 58a37b0..e110fea 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 @@ -1,7 +1,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.events; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWorkAreaElementType; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; + import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; 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 b42dee0..ebb77f1 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 @@ -1,6 +1,8 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.events; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; + + +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; 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 1994dc2..40f7126 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 @@ -9,6 +9,7 @@ import java.util.List; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.FileParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent; @@ -18,7 +19,7 @@ import org.gcube.portlets.widgets.dataminermanagerwidget.client.rpc.DataMinerPor import org.gcube.portlets.widgets.dataminermanagerwidget.client.tr.TabularResourceData; import org.gcube.portlets.widgets.dataminermanagerwidget.client.util.UtilsGXT3; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.SessionExpiredServiceException; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; + import org.gcube.portlets.widgets.netcdfbasicwidgets.client.event.SelectVariableEvent; import org.gcube.portlets.widgets.netcdfbasicwidgets.client.event.SelectVariableEvent.SelectVariableEventHandler; import org.gcube.portlets.widgets.netcdfbasicwidgets.client.widgets.NetCDFPreviewDialog; 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 a3c1a06..d0ebdc8 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 @@ -6,6 +6,7 @@ import java.util.List; import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.TabularParameter; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent; @@ -15,7 +16,7 @@ import org.gcube.portlets.widgets.dataminermanagerwidget.client.rpc.DataMinerPor import org.gcube.portlets.widgets.dataminermanagerwidget.client.tr.TabularResourceData; import org.gcube.portlets.widgets.dataminermanagerwidget.client.util.UtilsGXT3; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.SessionExpiredServiceException; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; + 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/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java index ac96b34..56b888a 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 @@ -10,6 +10,7 @@ import java.util.List; import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.TabularParameter; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent; @@ -22,7 +23,7 @@ import org.gcube.portlets.widgets.dataminermanagerwidget.client.rpc.DataMinerPor import org.gcube.portlets.widgets.dataminermanagerwidget.client.tr.TabularResourceData; import org.gcube.portlets.widgets.dataminermanagerwidget.client.util.UtilsGXT3; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.SessionExpiredServiceException; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; + 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/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletService.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletService.java index abdd497..180c14f 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletService.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletService.java @@ -10,10 +10,10 @@ import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; import org.gcube.data.analysis.dataminermanagercl.shared.process.ComputationStatus; import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWorkArea; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.ServiceException; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.session.UserInfo; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.DataMinerWorkArea; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.wsexplorer.shared.Item; import com.google.gwt.user.client.rpc.RemoteService; 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 56121a4..59ed9e9 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 @@ -10,9 +10,10 @@ import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; import org.gcube.data.analysis.dataminermanagercl.shared.process.ComputationStatus; import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWorkArea; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.session.UserInfo; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.DataMinerWorkArea; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; + import org.gcube.portlets.widgets.wsexplorer.shared.Item; import com.google.gwt.core.client.GWT; 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 6cd08b5..999ddb6 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 @@ -17,13 +17,13 @@ import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; import org.gcube.data.analysis.dataminermanagercl.shared.process.ComputationStatus; import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWorkArea; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; import org.gcube.portlets.widgets.dataminermanagerwidget.server.storage.StorageUtil; import org.gcube.portlets.widgets.dataminermanagerwidget.server.util.DataMinerWorkAreaManager; import org.gcube.portlets.widgets.dataminermanagerwidget.server.util.TableReader; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.ServiceException; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.session.UserInfo; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.DataMinerWorkArea; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; //import org.gcube.portlets.user.tdw.server.datasource.DataSourceFactoryRegistry; //import org.gcube.portlets.widgets.file_dw_import_wizard.server.file.TargetRegistry; import org.gcube.portlets.widgets.wsexplorer.shared.Item; 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 3744f4d..3ab8d73 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 @@ -2,13 +2,14 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.server.util; import org.gcube.common.storagehub.model.items.Item; import org.gcube.data.analysis.dataminermanagercl.server.util.ServiceCredentials; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.Computations; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWorkArea; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.InputDataSets; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription; +import org.gcube.data.analysis.dataminermanagercl.shared.workspace.OutputDataSets; import org.gcube.portlets.widgets.dataminermanagerwidget.server.storage.StorageUtil; import org.gcube.portlets.widgets.dataminermanagerwidget.shared.exception.ServiceException; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.Computations; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.DataMinerWorkArea; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.InputDataSets; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.ItemDescription; -import org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace.OutputDataSets; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 deleted file mode 100644 index 89ff9e6..0000000 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/Computations.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace; - -import java.io.Serializable; - -/** - * - * @author Giancarlo Panichi - * - * - */ -public class Computations implements Serializable { - - private static final long serialVersionUID = 7375248981531583668L; - private ItemDescription folder; - - public Computations() { - super(); - } - - public Computations(ItemDescription folder) { - super(); - this.folder = folder; - } - - public ItemDescription getFolder() { - return folder; - } - - public void setFolder(ItemDescription folder) { - this.folder = folder; - } - - @Override - public String toString() { - return "Computations [folder=" + folder + "]"; - } - -} 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 deleted file mode 100644 index 6b32bba..0000000 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/DataMinerWorkArea.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace; - -import java.io.Serializable; - -/** - * - * @author Giancarlo Panichi - * - * - */ -public class DataMinerWorkArea implements Serializable { - - private static final long serialVersionUID = -7906477664944910362L; - private ItemDescription dataMinerWorkAreaFolder; - private InputDataSets inputDataSets; - private OutputDataSets outputDataSets; - private Computations computations; - - public DataMinerWorkArea() { - super(); - } - - /** - * - * @param dataMinerWorkAreaFolder - * DataMiner work area folder - */ - public DataMinerWorkArea(ItemDescription dataMinerWorkAreaFolder) { - super(); - this.dataMinerWorkAreaFolder = dataMinerWorkAreaFolder; - - } - - /** - * - * @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) { - super(); - this.dataMinerWorkAreaFolder = dataMinerWorkAreaFolder; - this.inputDataSets = inputDataSets; - this.outputDataSets = outputDataSets; - this.computations = computations; - } - - public ItemDescription getDataMinerWorkAreaFolder() { - return dataMinerWorkAreaFolder; - } - - public void setDataMinerWorkAreaFolder(ItemDescription dataMinerWorkAreaFolder) { - this.dataMinerWorkAreaFolder = dataMinerWorkAreaFolder; - } - - public InputDataSets getInputDataSets() { - return inputDataSets; - } - - public void setInputDataSets(InputDataSets inputDataSets) { - this.inputDataSets = inputDataSets; - } - - public OutputDataSets getOutputDataSets() { - return outputDataSets; - } - - public void setOutputDataSets(OutputDataSets outputDataSets) { - this.outputDataSets = outputDataSets; - } - - public Computations getComputations() { - return computations; - } - - public void setComputations(Computations computations) { - this.computations = computations; - } - - @Override - public String toString() { - 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 deleted file mode 100644 index 2d22601..0000000 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/InputDataSets.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace; - -import java.io.Serializable; - -/** - * - * @author Giancarlo Panichi - * - * - */ -public class InputDataSets implements Serializable { - private static final long serialVersionUID = -4408116083736005844L; - - private ItemDescription folder; - - public InputDataSets() { - super(); - } - - public InputDataSets(ItemDescription folder) { - super(); - this.folder = folder; - } - - public ItemDescription getFolder() { - return folder; - } - - public void setFolder(ItemDescription folder) { - this.folder = folder; - } - - @Override - public String toString() { - return "ImportedData [folder=" + folder + "]"; - } - -} 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 deleted file mode 100644 index e65fda9..0000000 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/ItemDescription.java +++ /dev/null @@ -1,112 +0,0 @@ -package org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace; - -import java.io.Serializable; - -/** - * - * @author Giancarlo Panichi - * - * - */ -public class ItemDescription implements Serializable { - - private static final long serialVersionUID = -6624452446980057923L; - - private String id; - private String name; - private String owner; - private String path; - private String type; - private String publicLink; - - public ItemDescription() { - super(); - } - - public ItemDescription(String id, String name, String owner, String path, - String type) { - super(); - this.id = id; - this.name = name; - this.owner = owner; - this.path = path; - this.type = type; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getOwner() { - return owner; - } - - public void setOwner(String owner) { - this.owner = owner; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getPublicLink() { - return publicLink; - } - - public void setPublicLink(String publicLink) { - this.publicLink = publicLink; - } - - /** - * Compare basic information with another ItemDescription not null - * - * @param itemDescription item description - * @return boolean true if match - * - */ - public boolean compareInfo(ItemDescription itemDescription){ - if(itemDescription!=null && id.compareTo(itemDescription.getId())==0 && - name.compareTo(itemDescription.getName())==0 && - owner.compareTo(itemDescription.getOwner())==0 && - path.compareTo(itemDescription.getPath())==0 && - type.compareTo(itemDescription.getType())==0 - ){ - return true; - } else { - return false; - } - - } - - @Override - public String toString() { - return "ItemDescription [id=" + id + ", name=" + name + ", owner=" - + owner + ", path=" + path + ", type=" + type + ", publicLink=" - + publicLink + "]"; - } - -} 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 deleted file mode 100644 index 9b1f1a8..0000000 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/workspace/OutputDataSets.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.gcube.portlets.widgets.dataminermanagerwidget.shared.workspace; - -import java.io.Serializable; - -/** - * - * @author Giancarlo Panichi - * - * - */ -public class OutputDataSets implements Serializable { - private static final long serialVersionUID = -8235652292513149983L; - - private ItemDescription folder; - - public OutputDataSets() { - super(); - } - - public OutputDataSets(ItemDescription folder) { - super(); - this.folder = folder; - } - - public ItemDescription getFolder() { - return folder; - } - - public void setFolder(ItemDescription folder) { - this.folder = folder; - } - - @Override - public String toString() { - return "ComputedData [folder=" + folder + "]"; - } - -}