From d22b1f05bbe047ff80482d6a9595c7a053c79740 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 30 Apr 2014 08:49:48 +0000 Subject: [PATCH] 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 --- .../gwtservice/server/TDGWTServiceImpl.java | 30 ++++++++++++++++++- .../server/trservice/TaskStateMap.java | 2 +- .../user/td/gwtservice/shared/task/State.java | 1 + 3 files changed, 31 insertions(+), 2 deletions(-) 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 f73ad72..8cb382f 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 @@ -2234,6 +2234,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: importMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case INITIALIZING: break; default: @@ -2633,6 +2635,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: importMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case INITIALIZING: @@ -3289,6 +3293,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: exportMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case INITIALIZING: @@ -3451,6 +3457,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: exportMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: @@ -4083,6 +4091,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: changeColumnTypeMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: @@ -4226,6 +4236,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: deleteColumnMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: @@ -4369,6 +4381,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: labelColumnMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: @@ -4514,6 +4528,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: changeTableTypeMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: @@ -4769,6 +4785,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: deleteRowsMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: @@ -4977,6 +4995,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: duplicatesMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: @@ -5332,6 +5352,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: templateApplyMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: @@ -5512,6 +5534,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: replaceColumnMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: @@ -5666,6 +5690,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements replaceBatchColumnMonitor.setProgress(task .getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: @@ -6041,7 +6067,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.error("Error on service Task null"); 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); return; @@ -6120,6 +6146,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements case VALIDATING_RULES: rollBackMonitor.setProgress(task.getProgress()); break; + case GENERATING_VIEW: + break; case ABORTED: break; case STOPPED: diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TaskStateMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TaskStateMap.java index 17cfc85..05cde6e 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TaskStateMap.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/TaskStateMap.java @@ -27,7 +27,7 @@ public class TaskStateMap { case VALIDATING_RULES: return State.VALIDATING_RULES; case GENERATING_VIEW: - return State.IN_PROGRESS; + return State.GENERATING_VIEW; default: return State.FAILED; } 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 0400355..d67e25a 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 @@ -14,6 +14,7 @@ public enum State implements Serializable{ INITIALIZING, IN_PROGRESS, VALIDATING_RULES, + GENERATING_VIEW, STOPPED, SUCCEDED, ABORTED,