diff --git a/pom.xml b/pom.xml index b31dfaa..356c253 100644 --- a/pom.xml +++ b/pom.xml @@ -137,6 +137,7 @@ com.allen-sauer.gwt.log gwt-log + 3.2.1 diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressBarUpdater.java deleted file mode 100644 index e237b7a..0000000 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressBarUpdater.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.td.tablewidget.client.progress; - - - - -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; - -import com.allen_sauer.gwt.log.client.Log; -import com.sencha.gxt.widget.core.client.ProgressBar; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class TaskResubmitProgressBarUpdater implements TaskResubmitProgressListener { - - protected ProgressBar progressBar; - - /** - * Creates a new {@link ProgressBar} updater. - * @param progressBar the {@link ProgressBar} to update. - */ - public TaskResubmitProgressBarUpdater(ProgressBar progressBar) { - this.progressBar = progressBar; - } - - - /** - * {@inheritDoc} - */ - @Override - public void operationComplete(TRId trId) { - Log.info("Completed"); - progressBar.updateProgress(1, "Completed"); - - } - - /** - * {@inheritDoc} - */ - @Override - public void operationFailed(Throwable caught, String reason, String failureDetails) { - Log.info("Failed"); - progressBar.updateText("Failed"); - } - - @Override - public void operationInitializing() { - Log.info("Inizializing"); - progressBar.updateProgress(0, "Initializing..."); - } - - @Override - public void operationUpdate(float elaborated) { - Log.info("Elaborated: "+elaborated); - if (elaborated == 0) progressBar.updateProgress(0, "Initializing..."); - if (elaborated>0 && elaborated<1) { - Log.trace("progress "+elaborated); - int elab=new Float(elaborated*100).intValue(); - progressBar.updateProgress(elaborated,elab+"% Progress..."); - } - if (elaborated == 1) progressBar.updateProgress(1, "Completing..."); - - } - - @Override - public void operationValidate(float elaborated) { - Log.info("Validation Elaborated: "+elaborated); - if (elaborated == 0) progressBar.updateProgress(0, "Start Validation..."); - if (elaborated>0 && elaborated<1) { - Log.trace("Validation progress "+elaborated); - int elab=new Float(elaborated*100).intValue(); - progressBar.updateProgress(elaborated,elab+"% Validation Progress..."); - } - if (elaborated == 1) progressBar.updateProgress(1, "Validation..."); - } - - @Override - public void operationStopped(TRId trId,String reason, String details) { - Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); - progressBar.updateText("Validations failed"); - - } - - @Override - public void operationGeneratingView() { - Log.info("Generating View..."); - progressBar.updateText("Generating View..."); - - } - -} diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressDialog.java deleted file mode 100644 index f67cd55..0000000 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressDialog.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.gcube.portlets.user.td.tablewidget.client.progress; - -import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; -import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResubmitSession; -import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3; -import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; -import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent; -import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType; -import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableWhy; -import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType; -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.web.bindery.event.shared.EventBus; -import com.sencha.gxt.core.client.util.Margins; -import com.sencha.gxt.widget.core.client.FramedPanel; -import com.sencha.gxt.widget.core.client.ProgressBar; -import com.sencha.gxt.widget.core.client.Window; -import com.sencha.gxt.widget.core.client.button.TextButton; -import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; -import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; -import com.sencha.gxt.widget.core.client.event.SelectEvent; -import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; - -/** - * LabelColumnProgressDialog is a Dialog that show progress of change the column - * label - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class TaskResubmitProgressDialog extends Window implements - TaskResubmitProgressListener { - public static final int STATUS_POLLING_DELAY = 1000; - protected String WIDTH = "400px"; - protected String HEIGHT = "120px"; - protected TaskResubmitSession taskResubmitSession; - protected EventBus eventBus; - protected TaskResubmitProgressUpdater progressUpdater; - protected TextButton ok; - protected TRId trId; - private ChangeTableWhy why; - - public TaskResubmitProgressDialog(TaskResubmitSession taskResubmitSession, - EventBus eventBus) { - this.taskResubmitSession = taskResubmitSession; - this.eventBus = eventBus; - setWidth(WIDTH); - setHeight(HEIGHT); - setBodyBorder(false); - setResizable(true); - setModal(true); - setHeadingText("Task Resubmit Progress"); - - trId = null; - - FramedPanel panel = new FramedPanel(); - panel.setHeaderVisible(false); - panel.setBodyBorder(false); - - VerticalLayoutContainer v = new VerticalLayoutContainer(); - - ProgressBar progressBar = new ProgressBar(); - - ok = new TextButton("OK"); - ok.addSelectHandler(new SelectHandler() { - - public void onSelect(SelectEvent event) { - updateInvocation(); - - } - }); - - v.add(progressBar, - new VerticalLayoutData(1, 1, new Margins(5, 5, 5, 5))); - - panel.add(v); - panel.addButton(ok); - add(panel); - - progressUpdater = new TaskResubmitProgressUpdater(); - progressUpdater.addListener(new TaskResubmitProgressBarUpdater( - progressBar)); - - progressUpdater.addListener(this); - progressUpdater.scheduleRepeating(STATUS_POLLING_DELAY); - show(); - ok.setVisible(false); - - } - - public void operationInitializing() { - // TODO Auto-generated method stub - - } - - public void operationUpdate(float elaborated) { - // TODO Auto-generated method stub - - } - - public void operationComplete(TRId trId) { - Log.debug("Operation Complete return: " + trId.toString()); - this.trId = trId; - why = ChangeTableWhy.TABLEUPDATED; - updateInvocation(); - - } - - public void operationFailed(Throwable caught, String reason, - String failureDetails) { - if (caught instanceof TDGWTSessionExpiredException) { - eventBus.fireEvent(new SessionExpiredEvent( - SessionExpiredType.EXPIREDONSERVER)); - } else { - ok.setVisible(true); - this.trId = null; - UtilsGXT3.alert("Error Task Resubmit", reason); - } - } - - public void updateInvocation() { - if (trId != null) { - ChangeTableRequestEvent changeTableRequestEvent = new ChangeTableRequestEvent( - ChangeTableRequestType.TASKRESUBMIT, trId, why); - eventBus.fireEvent(changeTableRequestEvent); - } - hide(); - } - - @Override - public void operationStopped(TRId trId, String reason, String details) { - Log.debug("Operation Stopped: [" + trId.toString() + ", " + reason - + ", " + details + "]"); - ok.setVisible(true); - this.trId = trId; - why = ChangeTableWhy.TABLECURATION; - } - - @Override - public void operationGeneratingView() { - // TODO Auto-generated method stub - - } - - @Override - public void operationValidate(float elaborated) { - // TODO Auto-generated method stub - - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressListener.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressListener.java deleted file mode 100644 index d444bcf..0000000 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressListener.java +++ /dev/null @@ -1,62 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.td.tablewidget.client.progress; - -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; - - - -/** - * Defines a listener for operation progress. - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public interface TaskResubmitProgressListener { - - /** - * Called when the operation is starting. - */ - public void operationInitializing(); - - /** - * Called when there is a progress for the operation. - * @param elaborated the elaborated part. - */ - public void operationUpdate(float elaborated); - - /** - * Called when there is a validate for the operation. - * @param elaborated the elaborated part. - */ - public void operationValidate(float elaborated); - - /** - * Called when the operation is complete. - */ - public void operationComplete(TRId trId); - - /** - * Called when the operation is failed. - * @param caught the failure exception. - * @param reason the failure reason. - */ - public void operationFailed(Throwable caught, String reason, String failureDetails); - - /** - * Called when the operation is stopped - * - * @param trId - * @param reason - * @param details - */ - public void operationStopped(TRId trId, String reason, String details); - - /** - * Called when the operation is generating the view - */ - public void operationGeneratingView(); - -} diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressUpdater.java deleted file mode 100644 index 1c5534e..0000000 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/TaskResubmitProgressUpdater.java +++ /dev/null @@ -1,195 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.td.tablewidget.client.progress; - -import java.util.ArrayList; - -import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; -import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResubmitMonitor; -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.rpc.AsyncCallback; - - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class TaskResubmitProgressUpdater extends Timer { - - protected ArrayList listeners = new ArrayList(); - - /** - * {@inheritDoc} - */ - @Override - public void run() { - Log.debug("requesting operation progress"); - TDGWTServiceAsync.INSTANCE - .getTaskResubmitMonitor(new AsyncCallback() { - - - public void onFailure(Throwable caught) { - cancel(); - Log.error("Error retrieving the operation state", - caught); - String message = getStack(caught); - fireOperationFailed(caught, - "Failed getting operation updates", message); - } - - public void onSuccess(TaskResubmitMonitor result) { - Log.info("retrieved TaskResubmitMonitor: " - + result.getStatus()); - switch (result.getStatus()) { - case INITIALIZING: - Log.info("Initializing..."); - fireOperationInitializing(); - break; - case ABORTED: - cancel(); - Log.info("Delete Rows Operation Aborted"); - break; - case IN_PROGRESS: - fireOperationUpdate(result.getProgress()); - break; - case VALIDATING_RULES: - fireOperationValidate(result.getProgress()); - break; - case GENERATING_VIEW: - Log.info("Generating View..."); - fireOperationGeneratingView(); - break; - case STOPPED: - cancel(); - stopMessage(result); - break; - case FAILED: - cancel(); - errorMessage(result); - break; - case SUCCEDED: - cancel(); - Log.info("Fisnish TableId :" - + result.getTrId()); - fireOperationComplete(result.getTrId()); - break; - default: - Log.info("Unknow State"); - break; - } - - } - - - - }); - - } - - protected void errorMessage(TaskResubmitMonitor result) { - Log.info("Task Resubmit Failed"); - Throwable th = null; - String failure = null; - String details = null; - if (result.getError() != null) { - th = result.getError(); - failure = "Failed Client Library Task Resubmit"; - details = result.getError().getLocalizedMessage(); - } else { - th = new Throwable("Failed"); - failure = "Failed Client Library Task Resubmit"; - details = "Task Resubmit failed"; - } - - fireOperationFailed(th, failure, details); - } - - protected void stopMessage(TaskResubmitMonitor result) { - Log.info("Task Resubmit Stopped"); - String failure = null; - String details = null; - if (result.getError() != null) { - failure = "Stopped task resubmit"; - details = result.getError().getLocalizedMessage(); - } else { - failure = "Stopped task resubmit"; - details = "Task Resubmit stopped"; - } - - fireOperationStopped(result.getTrId(),failure, details); - } - - - protected String getStack(Throwable e) { - String message = e.getLocalizedMessage() + " ->
"; - Throwable c = e.getCause(); - if (c != null) - message += getStack(c); - return message; - } - - protected void fireOperationInitializing() { - for (TaskResubmitProgressListener listener : listeners) - listener.operationInitializing(); - } - - protected void fireOperationGeneratingView() { - for (TaskResubmitProgressListener listener : listeners) - listener.operationGeneratingView(); - } - - protected void fireOperationUpdate(float elaborated) { - for (TaskResubmitProgressListener listener : listeners) - listener.operationUpdate(elaborated); - } - - protected void fireOperationValidate(float elaborated) { - for (TaskResubmitProgressListener listener : listeners) - listener.operationValidate(elaborated); - } - - protected void fireOperationComplete(TRId trId) { - for (TaskResubmitProgressListener listener : listeners) - listener.operationComplete(trId); - } - - protected void fireOperationFailed(Throwable caught, String failure, - String failureDetails) { - for (TaskResubmitProgressListener listener : listeners) - listener.operationFailed(caught, failure, failureDetails); - } - - protected void fireOperationStopped(TRId trId, String reason, String details) { - for (TaskResubmitProgressListener listener : listeners) - listener.operationStopped(trId,reason, details); - } - - - /** - * Add a new {@link TaskResubmitProgressListener} to this - * {@link TaskResubmitProgressUpdater}. - * - * @param listener - * the listener to add. - */ - public void addListener(TaskResubmitProgressListener listener) { - listeners.add(listener); - } - - /** - * Removes the specified {@link TaskResubmitProgressListener} from this - * {@link TaskResubmitProgressUpdater}. - * - * @param listener - * the listener to remove. - */ - public void removeListener(TaskResubmitProgressListener listener) { - listeners.remove(listener); - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTasksPanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTasksPanel.java index b378e2b..dd84ce5 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTasksPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTasksPanel.java @@ -387,6 +387,7 @@ public class ValidationsTasksPanel extends FramedPanel { invocationS.getRefColumn()); map.put(Constants.REQUEST_PROPERTIES_COLUMNID, invocationS.getColumnId()); + map.put(Constants.REQUEST_PROPERTIES_TASKID, invocationS.getTaskId()); RequestProperties props = new RequestProperties(map); widgetRequestEvent.setRequestProperties(props); eventBus.fireEvent(widgetRequestEvent);