Updated OperationMonitor

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@99233 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/td/gwtservice/shared/UIOperationsId.java

@@ -65,63 +65,36 @@ package org.gcube.portlets.user.td.gwtservice.shared;
  */
 
 public enum UIOperationsId {
-	CSVImport("100"), 
+	CSVImport("CSV Import"), 
-	CSVExport("101"),
+	CSVExport("CSV Export"),
-	CLONE("102"),
+	Clone("Clone"),
-	SDMXCodelistImport("200"),	
+	SDMXImport("SDMX Import"),	
-	SDMXCodelistExport("201"),
+	SDMXExport("SDMX Export"),
-	SDMXDatasetImport("202"), 
+	JSONImport("JSON Import"),	
-  	SDMXDatasetExport("203"),
+  	JSONExport("JSON Export"),
-  	JSONImport("300"),	
+  	ChangeTableType("Change Table Type"), 
-  	JSONExport("301"),
+	DeleteColumn("Delete Column"), 
-  	ValidateCodelist("1000"),
+	AddColumn("Add Column"),
-	ValidateDataset("1001"), 
+	ChangeColumnLabel("Change Column Label"),
-	ChangeTableType("1002"), 
+	ChangeColumnType("Change Column Type"), 
-	CreateDatasetView("1003"), 
+	EditRow("Edit Row"),
-	RemoveColumn("1004"), 
+	DeleteRow("Delete Row"),
-	AddColumn("1005"),
+	Denormalize("Denormalize"),
-	ColumnNameAdd("1006"),
+	GroupBy("Group By"),
-	ColumnNameRemove("1007"),
+	MergeColumn("Merge Column"),
-	TableNameAdd("1008"),
+	SplitColumn("Split Column"),
-	TableNameRemove("1009"),
+	Normalize("Normalize"),
-	ChangeToAnnotationColumn("2000"), 
+	ReplaceValue("Replace Value"), 
-	ChangeToAttributeColumn("2001"), 
+	ReplaceBatch("Replace Batch"),
-	ChangeToMeasureColumn("2002"), 
+	Filter("Filter"),
-	ChangeToCodeColumn("2003"),
+	Union("Union"),
-	ChangeToCodeName("2004"), 
+	DuplicateTuples("Duplicate Tuples"),
-	ChangeToCodeDescription("2005"), 
+	ExtractCodelist("Extract Codelist"),
-	ChangeToDimensionColumn("2006"), 
+	CodelistMappingImport("Codelist Mapping Import"), 
-	ChangeToTimeDimensionColumn("2007"),
+	ResumeTask("Resume Task"),
-	ModifyTuplesValuesByExpression("3000"),
+	ResubmitTask("ResubmitTask"),
-	ModifyTuplesValuesById("3001"),
+	RollBack("Roll Back"),
-	ModifyTuplesValuesByValidation("3002"),
+	ApplyTemplate("Apply Template");
-	AddRow("3004"),
-	Denormalize("3005"),
-	GroupBy("3006"),
-	RemoveDuplicateTuples("3007"),
-	Normalize("3008"),
-	ReplaceColumnByExpression("3101"),
-	ReplaceById("3102"), 
-	FilterByExpression("3201"),
-	RemoveRowById("3202"),
-	Union("3208"),
-	CodelistValidation("5001"),
-	ColumnTypeCastCheck("5002"),
-	DuplicateTupleValidation("5003"),
-	DuplicateValuesInColumnValidator("5004"),
-	PeriodFormatCheck("5005"),
-	ExpressionValidation("5006"),
-	AmbiguousExternalReferenceCheck("5007"),
-	DimensionColumnValidator("5010"),
-	ValidateTable("5011"),
-	ValidateDataSet("5012"),
-	ValidateGeneric("5013"),
-	StatisticalOperation("10001"),
-	ExportToStatisticalOperation("10002"),
-	ImportFromStatistical("10003"),
-	ExtractCodelist("11001"),
-	GuessCodelist("11002"),
-	CodelistMappingImport("12001");
 	
 	/**
 	 * @param text

src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVExportMonitor.java

@@ -1,94 +0,0 @@
-/**
- * 
- */
-package org.gcube.portlets.user.td.gwtservice.shared.csv;
-
-import java.io.Serializable;
-
-import org.gcube.portlets.user.td.gwtservice.shared.task.State;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabExportMetadata;
-import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
-
-/**
- * 
- * @author "Giancarlo Panichi" 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
- *
- */
-public class CSVExportMonitor implements Serializable {
-
-private static final long serialVersionUID = -5998841163159590481L;
-	
-	protected float progress;
-	protected State status;
-	protected String statusDescription;
-	protected Throwable error;
-	protected TRId trId;
-	protected TabExportMetadata trExportMetadata;
-	
-	
-	public float getProgress(){
-		return progress;
-	};
-
-	public State getStatus(){
-		return status;
-	}
-	
-	public String getStatusDescription(){
-		return statusDescription;
-	}
-
-	public void setProgress(float progress) {
-		this.progress = progress;
-	}
-
-	public void setStatus(State status) {
-		this.status = status;
-	}
-	
-	public void setStatus(int status) {
-		this.status = State.values()[status];
-	}
-
-	public TabExportMetadata getTrExportMetadata() {
-		return trExportMetadata;
-	}
-
-	public void setTrExportMetadata(TabExportMetadata trExportMetadata) {
-		this.trExportMetadata = trExportMetadata;
-	}
-
-	public void setStatusDescription(String statusDescription) {
-		this.statusDescription = statusDescription;
-	}
-
-	public Throwable getError() {
-		return error;
-	}
-
-	public void setError(Throwable error) {
-		this.error = error;
-	}
-
-	public TRId getTrId() {
-		return trId;
-	}
-
-	public void setTrId(TRId trId) {
-		this.trId = trId;
-	}
-
-	@Override
-	public String toString() {
-		return "CSVExportMonitor [progress=" + progress + ", status=" + status
-				+ ", statusDescription=" + statusDescription + ", error="
-				+ error + ", trId=" + trId + ", trExportMetadata="
-				+ trExportMetadata + "]";
-	}
-
-
-	
-
-		
-}

src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVImportMonitor.java

@@ -1,81 +0,0 @@
-/**
- * 
- */
-package org.gcube.portlets.user.td.gwtservice.shared.csv;
-
-import java.io.Serializable;
-
-import org.gcube.portlets.user.td.gwtservice.shared.task.State;
-import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
-
-/**
- * 
- * @author "Giancarlo Panichi" 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
- *
- */
-public class CSVImportMonitor implements Serializable {
-
-private static final long serialVersionUID = -5998841163159590481L;
-	
-	protected float progress;
-	protected State status;
-	protected String statusDescription;
-	protected Throwable error;
-	protected TRId trId;
-	
-	public float getProgress(){
-		return progress;
-	};
-
-	public State getStatus(){
-		return status;
-	}
-	
-	public String getStatusDescription(){
-		return statusDescription;
-	}
-
-	public void setProgress(float progress) {
-		this.progress = progress;
-	}
-
-	public void setStatus(State status) {
-		this.status = status;
-	}
-	
-	public void setStatus(int status) {
-		this.status = State.values()[status];
-	}
-
-	public void setStatusDescription(String statusDescription) {
-		this.statusDescription = statusDescription;
-	}
-
-	public Throwable getError() {
-		return error;
-	}
-
-	public void setError(Throwable error) {
-		this.error = error;
-	}
-
-	public TRId getTrId() {
-		return trId;
-	}
-
-	public void setTrId(TRId trId) {
-		this.trId = trId;
-	}
-
-
-	@Override
-	public String toString() {
-		return "CSVImportMonitor [progress=" + progress + ", status=" + status
-				+ ", statusDescription=" + statusDescription + ", error="
-				+ error + ", trId=" + trId  + "]";
-	}
-	
-
-		
-}

src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/TaskWrapper.java

@@ -0,0 +1,78 @@
+package org.gcube.portlets.user.td.gwtservice.shared.task;
+
+import java.io.Serializable;
+
+
+import org.gcube.data.analysis.tabulardata.service.operation.Task;
+import org.gcube.portlets.user.td.gwtservice.shared.UIOperationsId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+
+/**
+ * 
+ * @author "Giancarlo Panichi"
+ * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ *
+ */
+public class TaskWrapper implements Serializable {
+
+
+	private static final long serialVersionUID = -3291738536272488206L;
+	
+	private Task task;
+	private UIOperationsId operationId;
+	private TRId trId;
+	
+	public TaskWrapper(){
+		
+	}
+	
+	public TaskWrapper(Task task, UIOperationsId operationId, TRId trId) {
+		super();
+		this.task = task;
+		this.operationId = operationId;
+		this.trId = trId;
+	}
+
+
+	public Task getTask() {
+		return task;
+	}
+
+
+	public void setTask(Task task) {
+		this.task = task;
+	}
+
+
+	public UIOperationsId getOperationId() {
+		return operationId;
+	}
+
+
+	public void setOperationId(UIOperationsId operationId) {
+		this.operationId = operationId;
+	}
+
+
+	public TRId getTrId() {
+		return trId;
+	}
+
+
+	public void setTrId(TRId trId) {
+		this.trId = trId;
+	}
+
+
+	@Override
+	public String toString() {
+		return "TaskWrapper [task=" + task + ", operationId=" + operationId
+				+ ", trId=" + trId + "]";
+	}
+	
+	
+	
+	
+	
+	
+}

src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/clone/CloneTabularResourceSession.java

@@ -14,7 +14,8 @@ public class CloneTabularResourceSession implements Serializable {
 
 	private static final long serialVersionUID = -1896235499708614266L;
 
-	protected TRId trId;
+	private TRId trId;
+	private TRId trIdClone;
 	
 	public CloneTabularResourceSession(){
 		
@@ -22,6 +23,7 @@ public class CloneTabularResourceSession implements Serializable {
 	
 	public CloneTabularResourceSession(TRId trId){
 		this.trId=trId;
+		this.trIdClone=null;
 	}
 
 	public TRId getTrId() {
@@ -32,9 +34,20 @@ public class CloneTabularResourceSession implements Serializable {
 		this.trId = trId;
 	}
 
-	@Override
+	
-	public String toString() {
+	public TRId getTrIdClone() {
-		return "CloneTabularResourceSession [trId=" + trId + "]";
+		return trIdClone;
 	}
 
+	public void setTrIdClone(TRId trIdClone) {
+		this.trIdClone = trIdClone;
+	}
+
+	@Override
+	public String toString() {
+		return "CloneTabularResourceSession [trId=" + trId + ", trIdClone="
+				+ trIdClone + "]";
+	}
+
+	
 }