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

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@95239 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-04-30 08:49:48 +00:00
parent 4ad7b3e5fd
commit d22b1f05bb
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2234,6 +2234,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
importMonitor.setProgress(task.getProgress()); importMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case INITIALIZING: case INITIALIZING:
break; break;
default: default:
@ -2633,6 +2635,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
importMonitor.setProgress(task.getProgress()); importMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case INITIALIZING: case INITIALIZING:
@ -3289,6 +3293,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
exportMonitor.setProgress(task.getProgress()); exportMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case INITIALIZING: case INITIALIZING:
@ -3451,6 +3457,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
exportMonitor.setProgress(task.getProgress()); exportMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case STOPPED: case STOPPED:
@ -4083,6 +4091,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
changeColumnTypeMonitor.setProgress(task.getProgress()); changeColumnTypeMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case STOPPED: case STOPPED:
@ -4226,6 +4236,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
deleteColumnMonitor.setProgress(task.getProgress()); deleteColumnMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case STOPPED: case STOPPED:
@ -4369,6 +4381,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
labelColumnMonitor.setProgress(task.getProgress()); labelColumnMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case STOPPED: case STOPPED:
@ -4514,6 +4528,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
changeTableTypeMonitor.setProgress(task.getProgress()); changeTableTypeMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case STOPPED: case STOPPED:
@ -4769,6 +4785,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
deleteRowsMonitor.setProgress(task.getProgress()); deleteRowsMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case STOPPED: case STOPPED:
@ -4977,6 +4995,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
duplicatesMonitor.setProgress(task.getProgress()); duplicatesMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case STOPPED: case STOPPED:
@ -5332,6 +5352,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
templateApplyMonitor.setProgress(task.getProgress()); templateApplyMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case STOPPED: case STOPPED:
@ -5512,6 +5534,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
replaceColumnMonitor.setProgress(task.getProgress()); replaceColumnMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case STOPPED: case STOPPED:
@ -5666,6 +5690,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
replaceBatchColumnMonitor.setProgress(task replaceBatchColumnMonitor.setProgress(task
.getProgress()); .getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case STOPPED: case STOPPED:
@ -6041,7 +6067,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
logger.error("Error on service Task null"); logger.error("Error on service Task null");
throw new TDGWTServiceException("Task not started"); throw new TDGWTServiceException("Task not started");
} }
logger.debug("Start Task on service: TaskId " + trTask.getId()); logger.debug("Start Task on service: " + trTask.getId());
SessionUtil.setRollBackSessionTask(session, trTask); SessionUtil.setRollBackSessionTask(session, trTask);
return; return;
@ -6120,6 +6146,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
case VALIDATING_RULES: case VALIDATING_RULES:
rollBackMonitor.setProgress(task.getProgress()); rollBackMonitor.setProgress(task.getProgress());
break; break;
case GENERATING_VIEW:
break;
case ABORTED: case ABORTED:
break; break;
case STOPPED: case STOPPED:

2
src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TaskStateMap.java
View File

@ -27,7 +27,7 @@ public class TaskStateMap {
case VALIDATING_RULES: case VALIDATING_RULES:
return State.VALIDATING_RULES; return State.VALIDATING_RULES;
case GENERATING_VIEW: case GENERATING_VIEW:
return State.IN_PROGRESS; return State.GENERATING_VIEW;
default: default:
return State.FAILED; return State.FAILED;
} }

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

@ -14,6 +14,7 @@ public enum State implements Serializable{
INITIALIZING, INITIALIZING,
IN_PROGRESS, IN_PROGRESS,
VALIDATING_RULES, VALIDATING_RULES,
GENERATING_VIEW,
STOPPED, STOPPED,
SUCCEDED, SUCCEDED,
ABORTED, ABORTED,