diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java index 6d39599..1f1eae0 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java @@ -886,8 +886,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return State.IN_PROGRESS; case SUCCEDED: return State.SUCCEDED; - case FALLBACK: - return State.FAILED; + case STOPPED: + return State.STOPPED; default: return State.FAILED; } @@ -955,6 +955,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } importMonitor.setProgress(task.getProgress()); break; + case STOPPED: + break; case ABORTED: break; case WAITING: @@ -1312,6 +1314,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements csvImportTabResource); SessionUtil.setTRId(session, trId); break; + case STOPPED: + break; case IN_PROGRESS: importMonitor.setProgress(task.getProgress()); break; @@ -1771,6 +1775,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements .format(exportMetadata.getExportDate())); exportMonitor.setTabExportMetadata(tabExportMetadata); break; + case STOPPED: + break; case IN_PROGRESS: exportMonitor.setProgress(task.getProgress()); break; @@ -1934,6 +1940,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements break; case ABORTED: break; + case STOPPED: + break; case INITIALIZING: break; case WAITING: diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/State.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/State.java index 364e24a..8d5a9a9 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/State.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/State.java @@ -16,6 +16,7 @@ public enum State implements Serializable{ IN_PROGRESS, SUCCEDED, FAILED, - ABORTED; + ABORTED, + STOPPED; } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnTypeCode.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnTypeCode.java deleted file mode 100644 index 2338bb2..0000000 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ColumnTypeCode.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.gcube.portlets.user.td.gwtservice.shared.tr; - -import java.io.Serializable; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class ColumnTypeCode implements Serializable { - - private static final long serialVersionUID = -564910517277612291L; - - protected String id; // For insert in table only - protected org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode code; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode getCode() { - return code; - } - public void setCode( - org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode code) { - this.code = code; - } - - public String getLabel() { - return code.getColumnTypeCodeLabel(); - } - - @Override - public String toString() { - return "ColumnTypeCode [id=" + id + ", code=" + code + ", getLabel()=" - + getLabel() + "]"; - } - - -}