gCubeSystem
/
tabular-data-gwt-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated to new service client library 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@90812 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-01-31 17:26:49 +00:00
parent 470c1b05f0
commit ccf2f851aa
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
View File

@ -45,7 +45,7 @@ import org.gcube.data.analysis.tabulardata.service.exception.NoSuchTabularResour
import org.gcube.data.analysis.tabulardata.service.impl.TabularDataServiceFactory;
import org.gcube.data.analysis.tabulardata.service.operation.OperationInterface;
import org.gcube.data.analysis.tabulardata.service.operation.Task;
import org.gcube.data.analysis.tabulardata.service.operation.TaskStatus;
import org.gcube.data.analysis.tabulardata.commons.webservice.types.TaskStatus;
import org.gcube.data.analysis.tabulardata.service.tabular.TabularResource;
import org.gcube.data.analysis.tabulardata.service.tabular.TabularResourceId;
import org.gcube.data.analysis.tabulardata.service.tabular.TabularResourceInterface;
@ -898,6 +898,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
return State.SUCCEDED;
case STOPPED:
return State.STOPPED;
case VALIDATING_RULES:
return State.VALIDATING_RULES;
default:
return State.FAILED;
}
@ -969,11 +971,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
break;
case ABORTED:
break;
case WAITING:
break;
case IN_PROGRESS:
importMonitor.setProgress(task.getProgress());
break;
case VALIDATING_RULES:
importMonitor.setProgress(task.getProgress());
break;
case INITIALIZING:
break;
default:
@ -1331,12 +1334,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case IN_PROGRESS:
importMonitor.setProgress(task.getProgress());
break;
case VALIDATING_RULES:
importMonitor.setProgress(task.getProgress());
break;
case ABORTED:
break;
case INITIALIZING:
break;
case WAITING:
break;
default:
break;
}
@ -1830,14 +1834,15 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case STOPPED:
break;
case IN_PROGRESS:
exportMonitor.setProgress(task.getProgress());
break;
case VALIDATING_RULES:
exportMonitor.setProgress(task.getProgress());
break;
case ABORTED:
break;
case INITIALIZING:
break;
case WAITING:
break;
default:
break;
}
@ -1989,15 +1994,16 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
break;
case IN_PROGRESS:
exportMonitor.setProgress(task.getProgress());
break;
break;
case VALIDATING_RULES:
exportMonitor.setProgress(task.getProgress());
break;
case ABORTED:
break;
case STOPPED:
break;
case INITIALIZING:
break;
case WAITING:
break;
default:
break;
}

8
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/State.java
View File

@ -11,12 +11,12 @@ import java.io.Serializable;
*
*/
public enum State implements Serializable{
WAITING,
INITIALIZING,
INITIALIZING,
IN_PROGRESS,
VALIDATING_RULES,
STOPPED,
SUCCEDED,
FAILED,
ABORTED,
STOPPED;
FAILED;
}

2
src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestService.java
View File

@ -15,7 +15,7 @@ import org.gcube.data.analysis.tabulardata.query.parameters.QueryPage;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.data.analysis.tabulardata.service.impl.TabularDataServiceFactory;
import org.gcube.data.analysis.tabulardata.service.operation.Task;
import org.gcube.data.analysis.tabulardata.service.operation.TaskStatus;
import org.gcube.data.analysis.tabulardata.commons.webservice.types.TaskStatus;
import org.gcube.data.analysis.tabulardata.service.tabular.TabularResource;
import org.gcube.data.analysis.tabulardata.service.tabular.TabularResourceId;
import org.gcube.data.analysis.tabulardata.service.tabular.metadata.NameMetadata;