diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java index f9a0559..97e7451 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java @@ -4,7 +4,6 @@ package org.gcube.portlets.user.td.monitorwidget.client; import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitor; -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; @@ -33,7 +32,7 @@ public class MonitorBarUpdater implements MonitorUpdaterListener { * {@inheritDoc} */ @Override - public void monitorComplete(TRId trId, OperationMonitor operationMonitor) { + public void monitorComplete(OperationMonitor operationMonitor) { Log.info("Completed"); progressBar.updateProgress(1, "Completed"); @@ -81,8 +80,8 @@ public class MonitorBarUpdater implements MonitorUpdaterListener { } @Override - public void monitorStopped(TRId trId,String reason, String details, OperationMonitor operationMonitor) { - Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]"); + public void monitorStopped(String reason, String details, OperationMonitor operationMonitor) { + Log.debug("Operation Stopped: ["+operationMonitor.getTrId()+", "+reason+", "+details+"]"); progressBar.updateText("Validations failed"); } diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java index 64b9311..6a45922 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java @@ -10,7 +10,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.event.BackgroundReque import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.BackgroundRequestType; import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType; -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; +import org.gcube.portlets.user.td.widgetcommonevent.shared.OperationResult; import com.allen_sauer.gwt.log.client.Log; import com.google.web.bindery.event.shared.EventBus; @@ -51,7 +51,7 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener { private TextButton btnOk; private TextButton btnBackground; private TextButton btnAbort; - private TRId trId; + private OperationMonitor operationMonitorResult; private String reason; private String details; @@ -65,7 +65,7 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener { public MonitorDialog(String taskId, EventBus eventBus) { this.eventBus = eventBus; this.taskId = taskId; - trId = null; + operationMonitorResult = null; //Log.debug("Monitor Dialog Creation Start: "+dateTimeFormat.format(new Date())); initWindow(); create(); @@ -266,7 +266,7 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener { } @Override - public void monitorComplete(TRId trId, OperationMonitor operationMonitor) { + public void monitorComplete(OperationMonitor operationMonitor) { try { if (monitorDetailPanel != null) { monitorDetailPanel.update(operationMonitor); @@ -274,12 +274,12 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener { } catch (Throwable e) { Log.debug(e.getLocalizedMessage()); } - Log.debug("Operation Complete return: " + trId.toString()); - this.trId = trId; + Log.debug("Operation Complete return: " + operationMonitor.getTrId()); + this.operationMonitorResult = operationMonitor; btnBackground.setVisible(false); btnAbort.setVisible(false); forceLayout(); - fireOperationComplete(trId); + fireOperationComplete(operationMonitor); close(); } @@ -306,15 +306,15 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener { } public void updateInvocation() { - if (trId != null) { - fireOperationStopped(trId, reason, details); + if (operationMonitorResult != null) { + fireOperationStopped(operationMonitorResult, reason, details); } close(); } @Override - public void monitorStopped(TRId trId, String reason, String details, + public void monitorStopped(String reason, String details, OperationMonitor operationMonitor) { try { if (monitorDetailPanel != null) { @@ -323,9 +323,9 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener { } catch (Throwable e) { Log.debug(e.getLocalizedMessage()); } - Log.debug("Operation Stopped: [" + trId.toString() + ", " + reason + Log.debug("Operation Stopped: [" + operationMonitor.getTrId() + ", " + reason + ", " + details + "]"); - this.trId = trId; + this.operationMonitorResult = operationMonitor; this.reason = reason; this.details = details; btnOk.setVisible(true); @@ -376,9 +376,12 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener { } - protected void fireOperationComplete(TRId trId) { - for (MonitorDialogListener listener : listeners) - listener.operationComplete(trId); + protected void fireOperationComplete(OperationMonitor operationMonitor) { + for (MonitorDialogListener listener : listeners){ + OperationResult operationResult=new OperationResult(operationMonitor.getTrId(), + operationMonitor.getCollateralTableIds()); + listener.operationComplete(operationResult); + } } protected void fireOperationFailed(Throwable caught, String reason, @@ -387,9 +390,12 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener { listener.operationFailed(caught, reason, details); } - protected void fireOperationStopped(TRId trId, String reason, String details) { - for (MonitorDialogListener listener : listeners) - listener.operationStopped(trId, reason, details); + protected void fireOperationStopped(OperationMonitor operationMonitor, String reason, String details) { + for (MonitorDialogListener listener : listeners){ + OperationResult operationResult=new OperationResult(operationMonitor.getTrId(), + operationMonitor.getCollateralTableIds()); + listener.operationStopped(operationResult, reason, details); + } } protected void fireOperationAborted() { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogListener.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogListener.java index 0bc5c92..9c5eb83 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogListener.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogListener.java @@ -1,7 +1,7 @@ package org.gcube.portlets.user.td.monitorwidget.client; -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; +import org.gcube.portlets.user.td.widgetcommonevent.shared.OperationResult; /** * @@ -14,8 +14,9 @@ public interface MonitorDialogListener { /** * Called when the operation is complete. + * @param operationResult TODO */ - public void operationComplete(TRId trId); + public void operationComplete(OperationResult operationResult); /** * Called when the operation is failed. @@ -30,12 +31,11 @@ public interface MonitorDialogListener { /** * Called when the operation is stopped - * - * @param trId + * @param operationResult TODO * @param reason * @param details */ - public void operationStopped(TRId trId, String reason, String details); + public void operationStopped(OperationResult operationResult, String reason, String details); /** diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java index ed7c2ce..bb28821 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitor; import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitorSession; -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.Timer; @@ -145,7 +144,7 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene details = "Operation stopped"; } - fireMonitorStopped(result.getTrId(),reason, details,result); + fireMonitorStopped(reason, details,result); } @@ -179,7 +178,7 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene protected void fireMonitorComplete(OperationMonitor result) { for (MonitorUpdaterListener listener : listeners) - listener.monitorComplete(result.getTrId(), result); + listener.monitorComplete(result); } protected void fireMonitorFailed(Throwable caught, String failure, @@ -188,9 +187,9 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene listener.monitorFailed(caught, failure, failureDetails, operationMonitor); } - protected void fireMonitorStopped(TRId trId, String reason, String details, OperationMonitor operationMonitor) { + protected void fireMonitorStopped(String reason, String details, OperationMonitor operationMonitor) { for (MonitorUpdaterListener listener : listeners) - listener.monitorStopped(trId,reason, details, operationMonitor); + listener.monitorStopped(reason, details, operationMonitor); } protected void fireMonitorAborted() { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java index 7379fd0..f43761c 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java @@ -2,7 +2,6 @@ package org.gcube.portlets.user.td.monitorwidget.client; import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitor; -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; @@ -34,9 +33,9 @@ public interface MonitorUpdaterListener { /** * Called when the operation is complete. - * @param operationMonitor TODO + * @param operationMonitor */ - public void monitorComplete(TRId trId, OperationMonitor operationMonitor); + public void monitorComplete(OperationMonitor operationMonitor); /** * Called when the operation is failed. @@ -44,19 +43,18 @@ public interface MonitorUpdaterListener { * @param caught * @param reason * @param details - * @param operationMonitor TODO + * @param operationMonitor */ public void monitorFailed(Throwable caught, String reason, String details, OperationMonitor operationMonitor); /** * Called when the operation is stopped - * - * @param trId + * * @param reason * @param details - * @param operationMonitor TODO + * @param operationMonitor */ - public void monitorStopped(TRId trId, String reason, String details, OperationMonitor operationMonitor); + public void monitorStopped(String reason, String details, OperationMonitor operationMonitor); /**